Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: App uses named exports and dispatch hook #75

Merged
merged 1 commit into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 60 additions & 53 deletions src/main/frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,48 @@
*
*/
import React, {useEffect} from 'react';
import {connect} from 'react-redux';
import {useDispatch} from 'react-redux';
import {BrowserRouter as Router, Route, Routes} from 'react-router-dom';
import * as apis from './apis';
import * as crb from './clusterrolebindings';
import * as cr from './clusterroles';
import * as cm from './configmaps';
import * as cj from './cronjobs';
import {
ClusterRoleBindingsPage,
ClusterRoleBindingsDetailPage,
ClusterRoleBindingsEditPage
} from './clusterrolebindings';
import {
ClusterRolesPage,
ClusterRolesDetailPage,
ClusterRolesEditPage
} from './clusterroles';
import {
ConfigMapsPage,
ConfigMapsDetailPage,
ConfigMapsEditPage
} from './configmaps';
import {CronJobsPage, CronJobsDetailPage, CronJobsEditPage} from './cronjobs';
import crd from './customresourcedefinitions';
import dc from './deploymentconfigs';
import * as ds from './daemonsets';
import {
DaemonSetsPage,
DaemonSetsDetailPage,
DaemonSetsEditPage
} from './daemonsets';
import {
DeploymentsPage,
DeploymentsEditPage,
DeploymentsDetailPage
} from './deployments';
import * as ep from './endpoints';
import {EndpointsPage, EndpointsDetailPage} from './endpoints';
import {
HorizontalPodAutoscalersPage,
HorizontalPodAutoscalersDetailPage,
HorizontalPodAutoscalersEditPage
} from './horizontalpodautoscalers';
import * as ingresses from './ingresses';
import {
IngressesPage,
IngressesDetailPage,
IngressesEditPage
} from './ingresses';
import {JobsPage, JobsEditPage, JobsDetailPage} from './jobs';
import {NodesPage, NodesDetailPage, NodesEditPage} from './nodes';
import ns from './namespaces';
Expand All @@ -47,10 +67,14 @@ import rc from './replicationcontrollers';
import {apiGroupsSet, setError, setOffline} from './redux';
import roles from './roles';
import routes from './routes';
import * as search from './search';
import {SearchPage} from './search';
import secrets from './secrets';
import services from './services';
import * as sa from './serviceaccounts';
import {
ServiceAccountsPage,
ServiceAccountsDetailPage,
ServiceAccountsEditPage
} from './serviceaccounts';
import sts from './statefulsets';
import watch from './watch';
import Home from './Home';
Expand Down Expand Up @@ -92,7 +116,8 @@ const onUnmount = () => {
}
};

const App = ({dispatch}) => {
export const App = () => {
const dispatch = useDispatch();
useEffect(() => {
onMount({dispatch});
return onUnmount;
Expand All @@ -104,50 +129,46 @@ const App = ({dispatch}) => {
<Route
exact
path='/clusterrolebindings'
element={<crb.ClusterRoleBindingsPage />}
element={<ClusterRoleBindingsPage />}
/>
<Route
exact
path='/clusterrolebindings/:uidOrName'
element={<crb.ClusterRoleBindingsDetailPage />}
element={<ClusterRoleBindingsDetailPage />}
/>
<Route
exact
path='/clusterrolebindings/:uid/edit'
element={<crb.ClusterRoleBindingsEditPage />}
element={<ClusterRoleBindingsEditPage />}
/>
<Route exact path='/clusterroles' element={<cr.ClusterRolesPage />} />
<Route exact path='/clusterroles' element={<ClusterRolesPage />} />
<Route
exact
path='/clusterroles/:uidOrName'
element={<cr.ClusterRolesDetailPage />}
element={<ClusterRolesDetailPage />}
/>
<Route
exact
path='/clusterroles/:uid/edit'
element={<cr.ClusterRolesEditPage />}
element={<ClusterRolesEditPage />}
/>
<Route exact path='/configmaps' element={<cm.ConfigMapsPage />} />
<Route exact path='/configmaps' element={<ConfigMapsPage />} />
<Route
exact
path='/configmaps/:uid'
element={<cm.ConfigMapsDetailPage />}
element={<ConfigMapsDetailPage />}
/>
<Route
exact
path='/configmaps/:uid/edit'
element={<cm.ConfigMapsEditPage />}
/>
<Route exact path='/cronjobs' element={<cj.CronJobsPage />} />
<Route
exact
path='/cronjobs/:uid'
element={<cj.CronJobsDetailPage />}
element={<ConfigMapsEditPage />}
/>
<Route exact path='/cronjobs' element={<CronJobsPage />} />
<Route exact path='/cronjobs/:uid' element={<CronJobsDetailPage />} />
<Route
exact
path='/cronjobs/:uid/edit'
element={<cj.CronJobsEditPage />}
element={<CronJobsEditPage />}
/>
<Route
exact
Expand All @@ -164,16 +185,16 @@ const App = ({dispatch}) => {
path='/customresourcedefinitions/:uid/edit'
element={<crd.CustomResourceDefinitionsEditPage />}
/>
<Route exact path='/daemonsets' element={<ds.DaemonSetsPage />} />
<Route exact path='/daemonsets' element={<DaemonSetsPage />} />
<Route
exact
path='/daemonsets/:uid'
element={<ds.DaemonSetsDetailPage />}
element={<DaemonSetsDetailPage />}
/>
<Route
exact
path='/daemonsets/:uid/edit'
element={<ds.DaemonSetsEditPage />}
element={<DaemonSetsEditPage />}
/>
<Route
exact
Expand Down Expand Up @@ -201,12 +222,8 @@ const App = ({dispatch}) => {
path='/deployments/:uid/edit'
element={<DeploymentsEditPage />}
/>
<Route exact path='/endpoints' element={<ep.EndpointsPage />} />
<Route
exact
path='/endpoints/:uid'
element={<ep.EndpointsDetailPage />}
/>
<Route exact path='/endpoints' element={<EndpointsPage />} />
<Route exact path='/endpoints/:uid' element={<EndpointsDetailPage />} />
<Route
exact
path='/horizontalpodautoscalers'
Expand All @@ -222,16 +239,12 @@ const App = ({dispatch}) => {
path='/horizontalpodautoscalers/:uid/edit'
element={<HorizontalPodAutoscalersEditPage />}
/>
<Route exact path='/ingresses' element={<ingresses.IngressesPage />} />
<Route
exact
path='/ingresses/:uid'
element={<ingresses.IngressesDetailPage />}
/>
<Route exact path='/ingresses' element={<IngressesPage />} />
<Route exact path='/ingresses/:uid' element={<IngressesDetailPage />} />
<Route
exact
path='/ingresses/:uid/edit'
element={<ingresses.IngressesEditPage />}
element={<IngressesEditPage />}
/>
<Route exact path='/jobs' element={<JobsPage />} />
<Route exact path='/jobs/:uid' element={<JobsDetailPage />} />
Expand Down Expand Up @@ -313,7 +326,7 @@ const App = ({dispatch}) => {
path='/routes/:uid/edit'
element={<routes.RoutesEditPage />}
/>
<Route exact path='/search' element={<search.SearchPage />} />
<Route exact path='/search' element={<SearchPage />} />
<Route exact path='/secrets' element={<secrets.SecretsPage />} />
<Route
exact
Expand All @@ -339,17 +352,17 @@ const App = ({dispatch}) => {
<Route
exact
path='/serviceaccounts'
element={<sa.ServiceAccountsPage />}
element={<ServiceAccountsPage />}
/>
<Route
exact
path='/serviceaccounts/:uid'
element={<sa.ServiceAccountsDetailPage />}
element={<ServiceAccountsDetailPage />}
/>
<Route
exact
path='/serviceaccounts/:uid/edit'
element={<sa.ServiceAccountsEditPage />}
element={<ServiceAccountsEditPage />}
/>
<Route exact path='/statefulsets' element={<sts.StatefulSetsPage />} />
<Route
Expand All @@ -367,9 +380,3 @@ const App = ({dispatch}) => {
</Router>
);
};

const mapStateToProps = () => ({});

const mapDispatchToProps = dispatch => ({dispatch});

export default connect(mapStateToProps, mapDispatchToProps)(App);
2 changes: 1 addition & 1 deletion src/main/frontend/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import React from 'react';
import {createRoot} from 'react-dom/client';
import {Provider} from 'react-redux';
import {store} from './redux';
import App from './App';
import {App} from './App';

import 'typeface-open-sans/index.css';
import '@fortawesome/fontawesome-free/css/all.min.css';
Expand Down