Skip to content

Commit ae2ae8a

Browse files
ferruhcihanferruhcihan
authored
feat: build page using new form components (#536)
* test: new build components & page * test: build page * fix: conflicts * feat: update keyValue component * fix: update builds overview * feat: update TextFields comp * test: autocomplete * test: autocomplete comp * test: new build page * test: build page * test: validation * feat: update code repo pages * fix: code repo name field * fix: enable harbor information banner * fix: edit code repository page * fix: build page default path and pipeline link * fix: builds overview copy repository * feat: improve build page styles & update related components * feat: improve build yup validation * fix: coderepos & build buttons * fix: button labels * feat: improve delete dialog comp * fix: get repo branches * fix: load build data * fix: tag naming convention * fix: update redux store * feat: add getBuildName function & update component function names * fix: autocomplete component
1 parent b3f9603 commit ae2ae8a

27 files changed

+1319
-183
lines changed

‎public/i18n/en/common.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"App": "App",
33
"Apps": "Apps",
4-
"Build": "Build",
54
"BUTTON_NEW_RESOURCE": "Create {{model}}",
65
"CREATE_MODEL": "Create a {{model}}",
76
"CREATE_MODEL_FOR_TEAM": "Create a {{model}} for team {{teamName}}",
@@ -78,8 +77,6 @@
7877
"TITLE_PROJECTS": "Projects",
7978
"TITLE_PROJECT": "Project details",
8079
"DELETE_PROJECT_WARNING": "Deleting this project will permanently remove all associated collections (build, workload, service) and their data. This action cannot be undone.",
81-
"TITLE_BUILDS": "Builds",
82-
"TITLE_BUILD": "Build details",
8380
"Team_plural": "Teams",
8481
"Teams": "Teams",
8582
"Workload": "Workload",
@@ -90,7 +87,6 @@
9087
"User": "User",
9188
"User_plural": "Users",
9289
"Project_plural": "Projects",
93-
"Build_plural": "Builds",
9490
"WELCOME_DASHBOARD": "Team <1>{{teamName}}</1> dashboard",
9591
"add item": "add item",
9692
"admin": "admin",
@@ -101,8 +97,12 @@
10197
"enabled": "enabled",
10298
"help": "help",
10399
"submit": "submit",
104-
"CodeRepository": "Code Repository",
105-
"CodeRepository_plural": "Code Repositories",
106-
"TITLE_CODEREPOSITORY": "Code Repository Details",
107-
"TITLE_CODEREPOSITORIES": "Code Repositories - {{scope}}"
100+
"Container-image": "Container Image",
101+
"Container-image_plural": "Container Images",
102+
"TITLE_CONTAINER_IMAGE": "Container image details",
103+
"TITLE_CONTAINER_IMAGES": "Container images - {{scope}}",
104+
"Code-repository": "Code Repository",
105+
"Code-repository_plural": "Code Repositories",
106+
"TITLE_CODE_REPOSITORY": "Code repository details",
107+
"TITLE_CODE_REPOSITORIES": "Code repositories - {{scope}}"
108108
}

‎public/logos/buildpacks_logo.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎public/logos/docker_logo.svg‎

Lines changed: 12 additions & 0 deletions
Loading

‎src/App.tsx‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import cookie from 'cookie'
77
import Backups from 'pages/Backups'
88
import Netpols from 'pages/Netpols'
99
import Workloads from 'pages/Workloads'
10-
import Builds from 'pages/Builds'
10+
import Build from 'pages/builds/create-edit'
11+
import Builds from 'pages/builds/overview'
1112
import OtomiApp from 'pages/App'
1213
import Apps from 'pages/Apps'
1314
import Cluster from 'pages/Cluster'
@@ -35,7 +36,6 @@ import { store } from 'redux/store'
3536
import { IoProvider } from 'socket.io-react-hook'
3637
import Backup from 'pages/Backup'
3738
import Netpol from 'pages/Netpol'
38-
import Build from 'pages/Build'
3939
import LoadingScreen from 'components/LoadingScreen'
4040
import Dashboard from 'pages/Dashboard'
4141
import Users from 'pages/Users'
@@ -51,9 +51,8 @@ import Policy from 'pages/Policy'
5151
import Maintenance from 'pages/Maintenance'
5252
import PrivateRoute from 'components/AuthzRoute'
5353
import Logout from 'pages/Logout'
54-
// TODO: Uncomment the following line(s) when the new build page is ready
55-
// import CodeRepository from 'pages/code-repositories/create-edit'
56-
// import CodeRepositories from 'pages/code-repositories/overview'
54+
import CodeRepository from 'pages/code-repositories/create-edit'
55+
import CodeRepositories from 'pages/code-repositories/overview'
5756
import { HttpErrorBadRequest } from './utils/error'
5857
import { NotistackProvider, SnackbarUtilsConfigurator } from './utils/snack'
5958

@@ -88,28 +87,27 @@ function App() {
8887
<Helmet titleTemplate='%s | APL' defaultTitle='Akamai APL Platform' />
8988
<Switch>
9089
<Route path='/' component={Dashboard} exact />
91-
{/* TODO: Uncomment the following line(s) when the new build page is ready */}
92-
{/* <PrivateRoute
93-
path='/coderepositories'
90+
<PrivateRoute
91+
path='/code-repositories'
9492
component={CodeRepositories}
9593
platformAdminRoute
9694
exact
9795
/>
9896
<PrivateRoute
99-
path='/teams/:teamId/coderepositories'
97+
path='/teams/:teamId/code-repositories'
10098
component={CodeRepositories}
10199
exact
102100
/>
103101
<PrivateRoute
104-
path='/teams/:teamId/create-coderepository'
102+
path='/teams/:teamId/create-code-repository'
105103
component={CodeRepository}
106104
exact
107105
/>
108106
<PrivateRoute
109-
path='/teams/:teamId/coderepositories/:codeRepositoryName'
107+
path='/teams/:teamId/code-repositories/:codeRepositoryName'
110108
component={CodeRepository}
111109
exact
112-
/> */}
110+
/>
113111

114112
<PrivateRoute path='/apps/:teamId' component={Apps} exact />
115113
<PrivateRoute path='/apps/:teamId/:appId' component={OtomiApp} exact />
@@ -150,7 +148,7 @@ function App() {
150148
<PrivateRoute path='/users/:userId' component={User} platformAdminRoute exact />
151149
<PrivateRoute path='/teams/:teamId/users' component={Users} teamAdminRoute exact />
152150
<PrivateRoute path='/projects' component={Projects} platformAdminRoute exact />
153-
<PrivateRoute path='/builds' component={Builds} platformAdminRoute exact />
151+
<PrivateRoute path='/container-images' component={Builds} platformAdminRoute exact />
154152
<PrivateRoute path='/settings/:settingId' component={Setting} exact />
155153
<PrivateRoute path='/teams' component={Teams} platformAdminRoute exact />
156154
<PrivateRoute path='/teams/:teamId' component={Team} exact />
@@ -164,7 +162,7 @@ function App() {
164162
<PrivateRoute path='/teams/:teamId/create-service' component={Service} exact />
165163
<PrivateRoute path='/teams/:teamId/create-user' component={User} exact />
166164
<PrivateRoute path='/teams/:teamId/create-project' component={Project} exact />
167-
<PrivateRoute path='/teams/:teamId/create-build' component={Build} exact />
165+
<PrivateRoute path='/teams/:teamId/create-container-image' component={Build} exact />
168166
<PrivateRoute path='/teams/:teamId/sealed-secrets' component={SealedSecrets} exact />
169167
<PrivateRoute
170168
path='/teams/:teamId/sealed-secrets/:sealedSecretName'
@@ -177,9 +175,12 @@ function App() {
177175
<PrivateRoute path='/teams/:teamId/netpols/:netpolName' component={Netpol} exact />
178176
<PrivateRoute path='/teams/:teamId/projects' component={Projects} exact />
179177
<PrivateRoute path='/teams/:teamId/projects/:projectName' component={Project} exact />
180-
{/* <Route path='/teams/:teamId/builds' component={Builds} exact /> */}
181-
<PrivateRoute exact path='/teams/:teamId/builds' component={Builds} />
182-
<PrivateRoute path='/teams/:teamId/builds/:buildName' component={Build} exact />
178+
<PrivateRoute exact path='/teams/:teamId/container-images' component={Builds} />
179+
<PrivateRoute
180+
path='/teams/:teamId/container-images/:buildName'
181+
component={Build}
182+
exact
183+
/>
183184
<PrivateRoute path='/teams/:teamId/policies' component={Policies} exact />
184185
<PrivateRoute path='/teams/:teamId/policies/:policyName' component={Policy} exact />
185186
<PrivateRoute path='/teams/:teamId/workloads' component={Workloads} exact />

0 commit comments

Comments
 (0)