Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/security-summary-card

Author: arunjaindev

.eslintignore

@@ -92,7 +92,6 @@ src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx
 src/components/ResourceBrowser/ResourceList/__tests__/Sidebar.test.tsx
 src/components/__mocks__/monaco-editor.js
 src/components/__mocks__/xterm-webfont.js
-src/components/app/EventsLogs.tsx
 src/components/app/LogFilter.test.ts
 src/components/app/LogFilter.ts
 src/components/app/Overview/EnvironmentList.tsx
@@ -102,7 +101,6 @@ src/components/app/Overview/utils.tsx
 src/components/app/ResourceTreeNodes.tsx
 src/components/app/ResponsiveDrawer.tsx
 src/components/app/WebWorker.ts
-src/components/app/__tests__/EventsLogs.test.tsx
 src/components/app/appLabelCommon.tsx
 src/components/app/create/CreateApp.tsx
 src/components/app/create/validationRules.ts
@@ -284,7 +282,6 @@ src/components/common/formFields/CopyButton.tsx
 src/components/common/formFields/CustomPassword.tsx
 src/components/common/formFields/DevtronSwitch.tsx
 src/components/common/formFields/Typeahead.tsx
-src/components/common/formFields/Widgets/Widgets.tsx
 src/components/common/helpers/Helpers.tsx
 src/components/common/helpers/compareVersion.ts
 src/components/common/helpers/isSubset.ts
@@ -409,7 +406,6 @@ src/components/v2/appDetails/appDetails.store.ts
 src/components/v2/appDetails/appDetails.type.ts
 src/components/v2/appDetails/ea/EAAppDetail.component.tsx
 src/components/v2/appDetails/k8Resource/FilterResource.tsx
-src/components/v2/appDetails/k8Resource/K8Resource.component.tsx
 src/components/v2/appDetails/k8Resource/NodeTreeTabList.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/EphemeralContainerDrawer.tsx
 src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetail.component.tsx
@@ -432,7 +428,6 @@ src/components/v2/appDetails/k8Resource/nodeDetail/nodeDetail.util.ts
 src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/NodeTree.component.tsx
-src/components/v2/appDetails/k8Resource/nodeType/PodHeader.component.tsx
 src/components/v2/appDetails/k8Resource/nodeType/PodTabSection.tsx
 src/components/v2/appDetails/k8Resource/nodeType/__tests__/NodeTree.component.test.ts
 src/components/v2/appDetails/k8Resource/nodeType/nodeType.util.ts
@@ -467,11 +462,9 @@ src/components/v2/utils/useSharedState.ts
 src/components/v2/values/ChartValues.component.tsx
 src/components/v2/values/chartValuesDiff/ChartRepoSelector.tsx
 src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx
-src/components/v2/values/chartValuesDiff/ChartValuesGUIView.tsx
 src/components/v2/values/chartValuesDiff/ChartValuesView.component.tsx
 src/components/v2/values/chartValuesDiff/ChartValuesView.reducer.ts
 src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
-src/components/v2/values/chartValuesDiff/ChartValuesView.utils.ts
 src/components/v2/values/chartValuesDiff/ProjectUpdateModal.tsx
 src/components/v2/values/common/chartValues.api.ts
 src/components/workflowEditor/CDSuccessModal.tsx

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.6-beta-3",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.11",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -46,7 +46,7 @@
         "rxjs": "^7.5.4",
         "sockjs-client": "1.6.1",
         "tippy.js": "^6.3.7",
-        "vite": "5.4.2",
+        "vite": "5.4.6",
         "vite-plugin-require-transform": "1.0.21",
         "vite-plugin-svgr": "^2.4.0",
         "xterm": "^4.19.0",

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

@@ -42,7 +42,6 @@ export const RestartStatusListDrawer = ({
 }: RestartStatusListDrawerProps) => {
     const [expandedAppIds, setExpandedAppIds] = useState<number[]>([])
     const [isExpandableButtonClicked, setExpandableButtonClicked] = useState(false)
-
     const hasPartialDeploymentWindowAccess = (appId) =>
         hibernateInfoMap[appId] &&
         hibernateInfoMap[appId].userActionState &&

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

@@ -76,6 +76,7 @@ export const RestartWorkloadModal = ({
     const abortControllerRef = useRef<AbortController>(new AbortController())
     const [showResistanceBox, setShowResistanceBox] = useState(false)
     const [isExpandableButtonClicked, setExpandableButtonClicked] = useState(false)
+
     const { searchParams } = useSearchString()
     const history = useHistory()
     const [showStatusModal, setShowStatusModal] = useState(false)
@@ -506,12 +507,35 @@ export const RestartWorkloadModal = ({
     }
 
     const postRestartPodBatchFunction = (payload) => () =>
-        postRestartWorkloadRotatePods(payload).then((response) => {
-            if (response.result) {
-                // showing the status modal in case batch promise resolved
-                updateBulkRotatePodsMapWithStatusCounts(response, payload.appId)
-            }
-        })
+        postRestartWorkloadRotatePods(payload)
+            .then((response) => {
+                if (response.result) {
+                    // showing the status modal in case batch promise resolved
+                    updateBulkRotatePodsMapWithStatusCounts(response, payload.appId)
+                }
+            })
+            .catch((serverError) => {
+                if (serverError.code === 409) {
+                    serverError.errors.map(({ userMessage }) => {
+                        const _bulkRotatePodsMap = { ...bulkRotatePodsMap }
+                        const _resources: ResourcesMetaDataMap = _bulkRotatePodsMap[payload.appId].resources
+
+                        // Iterate through the Map and update errorResponse
+                        Object.keys(_resources).forEach((kindName) => {
+                            _resources[kindName].containsError = true
+                            _resources[kindName].errorResponse = userMessage
+                        })
+
+                        _bulkRotatePodsMap[payload.appId].failedCount = Object.keys(_resources).length
+                        _bulkRotatePodsMap[payload.appId].errorResponse = userMessage
+                        _bulkRotatePodsMap[payload.appId].resources = _resources
+                        // Updating the state with the modified map
+                        setBulkRotatePodsMap(_bulkRotatePodsMap)
+
+                        return null
+                    })
+                }
+            })
 
     const createFunctionCallsFromRestartPodMap = () => {
         // default case for restart workload for all apps

src/components/ClusterNodes/NodeDetails.tsx

@@ -211,7 +211,6 @@ const NodeDetails = ({ isSuperAdmin, addTab, k8SObjectMapRaw, updateTabUrl }: Cl
                 label: NODE_DETAILS_TABS.yaml,
                 tabType: 'navLink',
                 icon: Edit,
-                iconType: 'stroke',
                 props: {
                     to: `?tab=${NODE_DETAILS_TABS.yaml.toLowerCase()}`,
                     onClick: changeNodeTab,

src/components/ClusterNodes/clusterNodes.scss

@@ -70,6 +70,10 @@
         width: max-content;
         min-width: 100%;
 
+        &:hover > :first-child {
+            background-color: var(--N50);
+        }
+
         & > :first-child {
             position: sticky;
             left: 0;

src/components/ResourceBrowser/ResourceBrowser.scss

@@ -139,6 +139,10 @@
                     min-width: 100%;
                     display: grid;
 
+                    &:hover > :first-child {
+                        background-color: var(--N50);
+                    }
+
                     & > :first-child {
                         position: sticky;
                         left: 0;