Skip to content

Commit 5334064

Browse files
authored
Merge pull request #2926 from devtron-labs/feat/deployment-metrics-charts
feat: replace recharts with Chart component in deployment metrics
2 parents c288555 + 5ecc4b7 commit 5334064

File tree

9 files changed

+787
-1001
lines changed

9 files changed

+787
-1001
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ src/components/app/details/cdDetails/CDDetails.tsx
9292
src/components/app/details/cicdHistory/History.components.tsx
9393
src/components/app/details/main.tsx
9494
src/components/app/details/metrics/BenchmarkModal.tsx
95-
src/components/app/details/metrics/DeploymentMetrics.tsx
9695
src/components/app/details/metrics/DeploymentTable.tsx
9796
src/components/app/details/metrics/DeploymentTableModal.tsx
9897
src/components/app/details/metrics/deploymentMetrics.service.ts

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.20.3-pre-9",
7+
"@devtron-labs/devtron-fe-common-lib": "1.20.3-alpha-9",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -31,7 +31,6 @@
3131
"react-router-dom": "^5.3.4",
3232
"react-select": "5.8.0",
3333
"react-virtualized": "^9.22.5",
34-
"recharts": "^2.1.9",
3534
"rollup-plugin-node-polyfills": "0.2.1",
3635
"rxjs": "^7.5.4",
3736
"sockjs-client": "1.6.1",
@@ -79,7 +78,6 @@
7978
"@types/react-dom": "17.0.13",
8079
"@types/react-router-dom": "^5.3.3",
8180
"@types/react-transition-group": "^4.4.4",
82-
"@types/recharts": "^1.8.23",
8381
"@types/recompose": "^0.30.10",
8482
"@typescript-eslint/eslint-plugin": "8.3.0",
8583
"@typescript-eslint/parser": "8.3.0",

src/components/app/details/main.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -432,20 +432,9 @@ export default function AppDetailsPage() {
432432
<CIDetails key={appId} filteredEnvIds={_filteredEnvIds} />
433433
</AIAgentContextSetterWrapper>
434434
</Route>
435-
<Route
436-
path={`${path}/${URLS.APP_DEPLOYMENT_METRICS}/:envId(\\d+)?`}
437-
render={(props) => {
438-
const envId = props.match.params.envId
439-
const match = {
440-
...props.match,
441-
params: {
442-
appId: appId,
443-
envId: envId,
444-
},
445-
}
446-
return <DeploymentMetrics {...props} match={match} filteredEnvIds={_filteredEnvIds} />
447-
}}
448-
/>
435+
<Route path={`${path}/${URLS.APP_DEPLOYMENT_METRICS}/:envId(\\d+)?`}>
436+
<DeploymentMetrics filteredEnvIds={_filteredEnvIds} />
437+
</Route>
449438
<Route
450439
path={`${path}/${URLS.APP_CD_DETAILS}/:envId(\\d+)?/:pipelineId(\\d+)?/:triggerId(\\d+)?`}
451440
>

0 commit comments

Comments
 (0)