Skip to content

Commit c1e1ebf

Browse files
arunjaindevarunjaindev
committed
Merge branch 'feat/security-summary-card' of https://github.com/devtron-labs/dashboard into fix/migrate-security
2 parents d2bb6d0 + fc5b4c8 commit c1e1ebf

File tree

61 files changed

+1603
-3578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1603
-3578
lines changed

‎.eslintignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
9292
src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
9393
src/components/__mocks__/monaco-editor.js
9494
src/components/__mocks__/xterm-webfont.js
95-
src/components/app/EventsLogs.tsx
9695
src/components/app/LogFilter.test.ts
9796
src/components/app/LogFilter.ts
9897
src/components/app/Overview/EnvironmentList.tsx
@@ -102,7 +101,6 @@ src/components/app/Overview/utils.tsx
102101
src/components/app/ResourceTreeNodes.tsx
103102
src/components/app/ResponsiveDrawer.tsx
104103
src/components/app/WebWorker.ts
105-
src/components/app/__tests__/EventsLogs.test.tsx
106104
src/components/app/appLabelCommon.tsx
107105
src/components/app/create/CreateApp.tsx
108106
src/components/app/create/validationRules.ts
@@ -284,7 +282,6 @@ src/components/common/formFields/CopyButton.tsx
284282
src/components/common/formFields/CustomPassword.tsx
285283
src/components/common/formFields/DevtronSwitch.tsx
286284
src/components/common/formFields/Typeahead.tsx
287-
src/components/common/formFields/Widgets/Widgets.tsx
288285
src/components/common/helpers/Helpers.tsx
289286
src/components/common/helpers/compareVersion.ts
290287
src/components/common/helpers/isSubset.ts
@@ -409,7 +406,6 @@ src/components/v2/appDetails/appDetails.store.ts
409406
src/components/v2/appDetails/appDetails.type.ts
410407
src/components/v2/appDetails/ea/EAAppDetail.component.tsx
411408
src/components/v2/appDetails/k8Resource/FilterResource.tsx
412-
src/components/v2/appDetails/k8Resource/K8Resource.component.tsx
413409
src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
414410
src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
415411
src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
@@ -432,7 +428,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts
432428
src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
433429
src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
434430
src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
435-
src/components/v2/appDetails/k8Resource/nodeType/PodHeader.component.tsx
436431
src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
437432
src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
438433
src/components/v2/appDetails/k8Resource/nodeType/nodeType.util.ts
@@ -467,11 +462,9 @@ src/components/v2/utils/useSharedState.ts
467462
src/components/v2/values/ChartValues.component.tsx
468463
src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
469464
src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx
470-
src/components/v2/values/chartValuesDiff/ChartValuesGUIView.tsx
471465
src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
472466
src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
473467
src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
474-
src/components/v2/values/chartValuesDiff/ChartValuesView.utils.ts
475468
src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
476469
src/components/v2/values/common/chartValues.api.ts
477470
src/components/workflowEditor/CDSuccessModal.tsx

‎package.json‎

Lines changed: 2 additions & 2 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": "0.3.9-beta-1",
7+
"@devtron-labs/devtron-fe-common-lib": "0.3.11-beta-1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",
@@ -46,7 +46,7 @@
4646
"rxjs": "^7.5.4",
4747
"sockjs-client": "1.6.1",
4848
"tippy.js": "^6.3.7",
49-
"vite": "5.4.2",
49+
"vite": "5.4.6",
5050
"vite-plugin-require-transform": "1.0.21",
5151
"vite-plugin-svgr": "^2.4.0",
5252
"xterm": "^4.19.0",

‎src/components/ApplicationGroup/Details/EnvironmentOverview/RestartStatusListDrawer.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export const RestartStatusListDrawer = ({
4242
}: RestartStatusListDrawerProps) => {
4343
const [expandedAppIds, setExpandedAppIds] = useState<number[]>([])
4444
const [isExpandableButtonClicked, setExpandableButtonClicked] = useState(false)
45-
4645
const hasPartialDeploymentWindowAccess = (appId) =>
4746
hibernateInfoMap[appId] &&
4847
hibernateInfoMap[appId].userActionState &&

‎src/components/ApplicationGroup/Details/EnvironmentOverview/RestartWorkloadModal.tsx‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ export const RestartWorkloadModal = ({
7676
const abortControllerRef = useRef<AbortController>(new AbortController())
7777
const [showResistanceBox, setShowResistanceBox] = useState(false)
7878
const [isExpandableButtonClicked, setExpandableButtonClicked] = useState(false)
79+
7980
const { searchParams } = useSearchString()
8081
const history = useHistory()
8182
const [showStatusModal, setShowStatusModal] = useState(false)
@@ -506,12 +507,35 @@ export const RestartWorkloadModal = ({
506507
}
507508

508509
const postRestartPodBatchFunction = (payload) => () =>
509-
postRestartWorkloadRotatePods(payload).then((response) => {
510-
if (response.result) {
511-
// showing the status modal in case batch promise resolved
512-
updateBulkRotatePodsMapWithStatusCounts(response, payload.appId)
513-
}
514-
})
510+
postRestartWorkloadRotatePods(payload)
511+
.then((response) => {
512+
if (response.result) {
513+
// showing the status modal in case batch promise resolved
514+
updateBulkRotatePodsMapWithStatusCounts(response, payload.appId)
515+
}
516+
})
517+
.catch((serverError) => {
518+
if (serverError.code === 409) {
519+
serverError.errors.map(({ userMessage }) => {
520+
const _bulkRotatePodsMap = { ...bulkRotatePodsMap }
521+
const _resources: ResourcesMetaDataMap = _bulkRotatePodsMap[payload.appId].resources
522+
523+
// Iterate through the Map and update errorResponse
524+
Object.keys(_resources).forEach((kindName) => {
525+
_resources[kindName].containsError = true
526+
_resources[kindName].errorResponse = userMessage
527+
})
528+
529+
_bulkRotatePodsMap[payload.appId].failedCount = Object.keys(_resources).length
530+
_bulkRotatePodsMap[payload.appId].errorResponse = userMessage
531+
_bulkRotatePodsMap[payload.appId].resources = _resources
532+
// Updating the state with the modified map
533+
setBulkRotatePodsMap(_bulkRotatePodsMap)
534+
535+
return null
536+
})
537+
}
538+
})
515539

516540
const createFunctionCallsFromRestartPodMap = () => {
517541
// default case for restart workload for all apps

‎src/components/ClusterNodes/NodeDetails.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ const NodeDetails = ({ isSuperAdmin, addTab, k8SObjectMapRaw, updateTabUrl }: Cl
211211
label: NODE_DETAILS_TABS.yaml,
212212
tabType: 'navLink',
213213
icon: Edit,
214-
iconType: 'stroke',
215214
props: {
216215
to: `?tab=${NODE_DETAILS_TABS.yaml.toLowerCase()}`,
217216
onClick: changeNodeTab,

‎src/components/ClusterNodes/clusterNodes.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070
width: max-content;
7171
min-width: 100%;
7272

73+
&:hover > :first-child {
74+
background-color: var(--N50);
75+
}
76+
7377
& > :first-child {
7478
position: sticky;
7579
left: 0;

‎src/components/ResourceBrowser/ResourceBrowser.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@
139139
min-width: 100%;
140140
display: grid;
141141

142+
&:hover > :first-child {
143+
background-color: var(--N50);
144+
}
145+
142146
& > :first-child {
143147
position: sticky;
144148
left: 0;

0 commit comments

Comments
 (0)