Skip to content

Commit 7cf5bc9

Browse files
dennisvankekemdennisvankekem
authored
fix: rerouted index ts to named files for readability (#617)
1 parent cffe915 commit 7cf5bc9

19 files changed

+99
-40
lines changed

‎src/App.tsx‎

Lines changed: 57 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import { CssBaseline } from '@mui/material'
66
import cookie from 'cookie'
77
import Backups from 'pages/Backups'
88
import Workloads from 'pages/Workloads'
9-
import Build from 'pages/builds/create-edit'
10-
import Builds from 'pages/builds/overview'
119
import OtomiApp from 'pages/App'
1210
import Apps from 'pages/Apps'
1311
import Cluster from 'pages/Cluster'
@@ -17,13 +15,11 @@ import Catalog from 'pages/Catalog'
1715
import Error from 'pages/Error'
1816
import Setting from 'pages/Setting'
1917
import SettingsOverview from 'pages/SettingsOverview'
20-
import Team from 'pages/teams/create-edit'
21-
import Teams from 'pages/teams/overview'
2218
import Policies from 'pages/Policies'
2319
import SessionProvider from 'providers/Session'
2420
import SocketProvider from 'providers/Socket'
2521
import ThemeProvider from 'theme'
26-
import React, { Suspense } from 'react'
22+
import { Suspense } from 'react'
2723
import { ErrorBoundary } from 'react-error-boundary'
2824
import Helmet from 'react-helmet'
2925
import { Provider } from 'react-redux'
@@ -45,15 +41,19 @@ import Policy from 'pages/Policy'
4541
import Maintenance from 'pages/Maintenance'
4642
import PrivateRoute from 'components/AuthzRoute'
4743
import Logout from 'pages/Logout'
48-
import Service from 'pages/services/create-edit'
49-
import Services from 'pages/services/overview'
50-
import CodeRepository from 'pages/code-repositories/create-edit'
51-
import CodeRepositories from 'pages/code-repositories/overview'
52-
import SecretOverviewPage from 'pages/secrets/overview/SecretOverviewPage'
53-
import SecretCreateEditPage from 'pages/secrets/create-edit/SecretCreateEditPage'
44+
import BuildsCreateEditPage from 'pages/builds/create-edit/BuildsCreateEditPage'
45+
import BuildsOverviewPage from 'pages/builds/overview/BuildsOverviewPage'
46+
import CodeRepositoriesCreateEditPage from 'pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage'
47+
import CodeRepositoriesOverviewPage from 'pages/code-repositories/overview/CodeRepositoriesOverviewPage'
5448
import NetworkPoliciesOverviewPage from 'pages/network-policies/overview/NetworkPoliciesOverviewPage'
5549
import NetworkPoliciesIngressCreateEditPage from 'pages/network-policies/create-edit/NetworkPoliciesIngressCreateEditPage'
5650
import NetworkPoliciesEgressCreateEditPage from 'pages/network-policies/create-edit/NetworkPoliciesEgressCreateEditPage'
51+
import SecretOverviewPage from 'pages/secrets/overview/SecretOverviewPage'
52+
import SecretCreateEditPage from 'pages/secrets/create-edit/SecretCreateEditPage'
53+
import ServicesCreateEditPage from 'pages/services/create-edit/ServicesCreateEditPage'
54+
import ServicesOverviewPage from 'pages/services/overview/ServicesOverviewPage'
55+
import TeamsCreateEditPage from 'pages/teams/create-edit/TeamsCreateEditPage'
56+
import TeamsOverviewPage from 'pages/teams/overview/TeamsOverviewPage'
5757
import { HttpErrorBadRequest } from './utils/error'
5858
import { NotistackProvider, SnackbarUtilsConfigurator } from './utils/snack'
5959

@@ -90,23 +90,23 @@ function App() {
9090
<Route path='/' component={Dashboard} exact />
9191
<PrivateRoute
9292
path='/code-repositories'
93-
component={CodeRepositories}
93+
component={CodeRepositoriesOverviewPage}
9494
platformAdminRoute
9595
exact
9696
/>
9797
<PrivateRoute
9898
path='/teams/:teamId/code-repositories'
99-
component={CodeRepositories}
99+
component={CodeRepositoriesOverviewPage}
100100
exact
101101
/>
102102
<PrivateRoute
103103
path='/teams/:teamId/code-repositories/create'
104-
component={CodeRepository}
104+
component={CodeRepositoriesCreateEditPage}
105105
exact
106106
/>
107107
<PrivateRoute
108108
path='/teams/:teamId/code-repositories/:codeRepositoryName'
109-
component={CodeRepository}
109+
component={CodeRepositoriesCreateEditPage}
110110
exact
111111
/>
112112

@@ -120,7 +120,12 @@ function App() {
120120
exact
121121
/>
122122
<PrivateRoute path='/clusters' component={Clusters} platformAdminRoute exact />
123-
<PrivateRoute path='/teams/create' component={Team} platformAdminRoute exact />
123+
<PrivateRoute
124+
path='/teams/create'
125+
component={TeamsCreateEditPage}
126+
platformAdminRoute
127+
exact
128+
/>
124129
<PrivateRoute
125130
path='/network-policies'
126131
component={NetworkPoliciesOverviewPage}
@@ -141,7 +146,12 @@ function App() {
141146
component={Catalog}
142147
exact
143148
/>
144-
<PrivateRoute path='/services' component={Services} platformAdminRoute exact />
149+
<PrivateRoute
150+
path='/services'
151+
component={ServicesOverviewPage}
152+
platformAdminRoute
153+
exact
154+
/>
145155
<PrivateRoute path='/secrets' component={SecretOverviewPage} platformAdminRoute exact />
146156
<PrivateRoute path='/workloads' component={Workloads} platformAdminRoute exact />
147157
<PrivateRoute path='/settings' component={SettingsOverview} platformAdminRoute exact />
@@ -154,10 +164,15 @@ function App() {
154164
platformAdminRoute
155165
exact
156166
/>
157-
<PrivateRoute path='/container-images' component={Builds} platformAdminRoute exact />
167+
<PrivateRoute
168+
path='/container-images'
169+
component={BuildsOverviewPage}
170+
platformAdminRoute
171+
exact
172+
/>
158173
<PrivateRoute path='/settings/:settingId' component={Setting} exact />
159-
<PrivateRoute path='/teams' component={Teams} platformAdminRoute exact />
160-
<PrivateRoute path='/teams/:teamId' component={Team} exact />
174+
<PrivateRoute path='/teams' component={TeamsOverviewPage} platformAdminRoute exact />
175+
<PrivateRoute path='/teams/:teamId' component={TeamsCreateEditPage} exact />
161176
<PrivateRoute path='/teams/:teamId/backups/create' component={Backup} exact />
162177
<PrivateRoute
163178
path='/teams/:teamId/network-policies/inbound-rules/create'
@@ -174,10 +189,18 @@ function App() {
174189
component={SecretCreateEditPage}
175190
exact
176191
/>
177-
<PrivateRoute path='/teams/:teamId/services/create' component={Service} exact />
192+
<PrivateRoute
193+
path='/teams/:teamId/services/create'
194+
component={ServicesCreateEditPage}
195+
exact
196+
/>
178197
<PrivateRoute path='/teams/:teamId/users/create' component={User} exact />
179198
<PrivateRoute path='/teams/:teamId/projects/create' component={Project} exact />
180-
<PrivateRoute path='/teams/:teamId/container-images/create' component={Build} exact />
199+
<PrivateRoute
200+
path='/teams/:teamId/container-images/create'
201+
component={BuildsCreateEditPage}
202+
exact
203+
/>
181204
<PrivateRoute path='/teams/:teamId/secrets' component={SecretOverviewPage} exact />
182205
<PrivateRoute
183206
path='/teams/:teamId/secrets/:sealedSecretName'
@@ -203,17 +226,25 @@ function App() {
203226
/>
204227
<PrivateRoute path='/teams/:teamId/projects' component={Projects} exact />
205228
<PrivateRoute path='/teams/:teamId/projects/:projectName' component={Project} exact />
206-
<PrivateRoute exact path='/teams/:teamId/container-images' component={Builds} />
229+
<PrivateRoute
230+
exact
231+
path='/teams/:teamId/container-images'
232+
component={BuildsOverviewPage}
233+
/>
207234
<PrivateRoute
208235
path='/teams/:teamId/container-images/:buildName'
209-
component={Build}
236+
component={BuildsCreateEditPage}
210237
exact
211238
/>
212239
<PrivateRoute path='/teams/:teamId/policies' component={Policies} exact />
213240
<PrivateRoute path='/teams/:teamId/policies/:policyName' component={Policy} exact />
214241
<PrivateRoute path='/teams/:teamId/workloads' component={Workloads} exact />
215-
<PrivateRoute path='/teams/:teamId/services' component={Services} exact />
216-
<PrivateRoute path='/teams/:teamId/services/:serviceName' component={Service} exact />
242+
<PrivateRoute path='/teams/:teamId/services' component={ServicesOverviewPage} exact />
243+
<PrivateRoute
244+
path='/teams/:teamId/services/:serviceName'
245+
component={ServicesCreateEditPage}
246+
exact
247+
/>
217248
<PrivateRoute path='/maintenance' component={Maintenance} platformAdminRoute exact />
218249
<Route path='/logout' component={Logout} />
219250
<Route path='*'>

‎src/pages/builds/create-edit/index.tsx‎ renamed to ‎src/pages/builds/create-edit/BuildsCreateEditPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import ControlledCheckbox from 'components/forms/ControlledCheckbox'
3030
import { Autocomplete } from 'components/forms/Autocomplete'
3131
import { useSession } from 'providers/Session'
3232
import { LoadingButton } from '@mui/lab'
33-
import { buildApiResponseSchema } from './create-edit.validator'
33+
import { buildApiResponseSchema } from './create-edit-builds.validator'
3434

3535
const getBuildName = (name: string, tag: string): string => {
3636
return `${name}-${tag}`
@@ -45,7 +45,7 @@ interface Params {
4545
buildName?: string
4646
}
4747

48-
export default function CreateEditBuilds({
48+
export default function BuildsCreateEditPage({
4949
match: {
5050
params: { teamId, buildName },
5151
},

‎src/pages/builds/create-edit/create-edit.validator.ts‎ renamed to ‎src/pages/builds/create-edit/create-edit-builds.validator.ts‎

File renamed without changes.

‎src/pages/builds/index.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import BuildsOverviewPage from './overview/BuildsOverviewPage'
2+
import BuildsCreateEditPage from './create-edit/BuildsCreateEditPage'
3+
4+
export default {
5+
BuildsCreateEditPage,
6+
BuildsOverviewPage,
7+
}

‎src/pages/builds/overview/index.tsx‎ renamed to ‎src/pages/builds/overview/BuildsOverviewPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ interface Params {
9191
teamId?: string
9292
}
9393

94-
export default function BuildsOverview({
94+
export default function BuildsOverviewPage({
9595
match: {
9696
params: { teamId },
9797
},

‎src/pages/code-repositories/create-edit/index.tsx‎ renamed to ‎src/pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import Section from 'components/Section'
3030
import DeleteButton from 'components/DeleteButton'
3131
import { isEmpty } from 'lodash'
3232
import { LoadingButton } from '@mui/lab'
33-
import { coderepoApiResponseSchema } from './create-edit.validator'
34-
import { useStyles } from './create-edit.styles'
33+
import { coderepoApiResponseSchema } from './create-edit-codeRepositories.validator'
34+
import { useStyles } from './create-edit-codeRepositories.styles'
3535

3636
const extractRepoName = (url: string): string => {
3737
const match = url.match(/\/([^/]+)\.git$/)
@@ -43,7 +43,7 @@ interface Params {
4343
codeRepositoryName?: string
4444
}
4545

46-
export default function CreateEditCodeRepositories({
46+
export default function CodeRepositoriesCreateEditPage({
4747
match: {
4848
params: { teamId, codeRepositoryName },
4949
},

‎src/pages/code-repositories/create-edit/create-edit.styles.ts‎ renamed to ‎src/pages/code-repositories/create-edit/create-edit-codeRepositories.styles.ts‎

File renamed without changes.

‎src/pages/code-repositories/create-edit/create-edit.validator.ts‎ renamed to ‎src/pages/code-repositories/create-edit/create-edit-codeRepositories.validator.ts‎

File renamed without changes.

‎src/pages/code-repositories/index.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import CodeRepositoriesOverviewPage from './overview/CodeRepositoriesOverviewPage'
2+
import CodeRepositoriesCreateEditPage from './create-edit/CodeRepositoriesCreateEditPage'
3+
4+
export default {
5+
CodeRepositoriesOverviewPage,
6+
CodeRepositoriesCreateEditPage,
7+
}

‎src/pages/code-repositories/overview/index.tsx‎ renamed to ‎src/pages/code-repositories/overview/CodeRepositoriesOverviewPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ interface Params {
5353
teamId?: string
5454
}
5555

56-
export default function CodeRepositoriesOverview({
56+
export default function CodeRepositoriesOverviewPage({
5757
match: {
5858
params: { teamId },
5959
},

0 commit comments

Comments
 (0)