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

Author: arunjaindev

.eslintignore

@@ -410,7 +410,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
@@ -433,7 +432,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

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.6",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.7",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

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/app/details/appDetails/AppDetails.tsx

@@ -408,7 +408,10 @@ export const Details: React.FC<DetailsType> = ({
             .then((response) => {
                 isVirtualEnvRef.current = response.result?.isVirtualEnvironment
                 // This means the CD is not triggered and the app is not helm migrated i.e. Empty State
-                if (!response.result.isPipelineTriggered && response.result.releaseMode === ReleaseMode.NEW_DEPLOYMENT  ) {
+                if (
+                    !response.result.isPipelineTriggered &&
+                    response.result.releaseMode === ReleaseMode.NEW_DEPLOYMENT
+                ) {
                     setResourceTreeFetchTimeOut(false)
                     setLoadingResourceTree(false)
                     setAppDetails(null)
@@ -761,7 +764,6 @@ export const Details: React.FC<DetailsType> = ({
             ) : (
                 renderAppDetails()
             )}
-
             {detailedStatus && <AppStatusDetailModal close={hideAppDetailsStatus} showAppStatusMessage={false} />}
             {location.search.includes(DEPLOYMENT_STATUS_QUERY_PARAM) && (
                 <DeploymentStatusDetailModal
@@ -909,10 +911,10 @@ export const EnvSelector = ({
             return acc
         }, []) || []
 
-        // Pushing the virtual environment group to the end of the list
-        if(groupList[0]?.label === 'Virtual environments' && groupList.length === 2) {
-            groupList.reverse()
-        }
+    // Pushing the virtual environment group to the end of the list
+    if (groupList[0]?.label === 'Virtual environments' && groupList.length === 2) {
+        groupList.reverse()
+    }
 
     return (
         <>

src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx

@@ -16,7 +16,7 @@
 
 import React, { useState } from 'react'
 import { useHistory, useLocation } from 'react-router-dom'
-import { showError, Progressing, sortCallback, stopPropagation } from '@devtron-labs/devtron-fe-common-lib'
+import { showError, Progressing, sortCallback, stopPropagation, getUrlWithSearchParams } from '@devtron-labs/devtron-fe-common-lib'
 import moment from 'moment'
 import { getCIWebhookPayload } from './ciWebhook.service'
 import { getCIPipelineURL } from '../../../common'
@@ -60,7 +60,7 @@ export default function CiWebhookModal({
                 'noreferrer',
             )
         } else {
-            history.push(`edit/workflow/${workflowId}/ci-pipeline/${ciPipelineId}`)
+            history.push(`/app/${appId}/edit/workflow/${workflowId}/ci-pipeline/${ciPipelineId}`)
         }
     }
 
@@ -267,7 +267,7 @@ export default function CiWebhookModal({
 
     const renderTimeStampDetailedDescription = () => {
         return (
-            <div style={{ height: 'calc(100vh - 75px' }} className="bcn-0 pl-16 mt-20">
+            <div style={{ height: 'calc(100vh - 75px' }} className="bcn-0 px-16 mt-20">
                 <div style={{ background: '#f2f4f7' }}>
                     <div className="cn-9 fs-12 fw-6 pt-12 pl-12">Incoming Payload</div>
                     <div
@@ -286,11 +286,11 @@ export default function CiWebhookModal({
                     >
                         {expandIncomingPayload ? 'Collapse' : 'Expand'}
                     </button>
-                    <div className="cn-9 fw-6 fs-14 flex left">
+                    <div className="cn-9 fw-6 fs-14 flex left dc__content-space">
                         Filter matching results
                         <button
                             type="button"
-                            className="mr-20 dc__transparent dc__align-right"
+                            className="dc__transparent"
                             onClick={() => onEditShowEditableCiModal(ciPipelineId, workflowId)}
                         >
                             {/* Here the CI model requires the CiPipelineId not the CiPipelineMaterialId */}
@@ -358,7 +358,7 @@ export default function CiWebhookModal({
     const renderTimeStampDetailedIncomingModal = () => {
         return (
             <div
-                className={`bcn-0 w-800 bcn-0 dc__position-fixed dc__top-0 dc__right-0 timestamp-detail-container ${
+                className={`bcn-0 w-1024 bcn-0 dc__position-fixed dc__top-0 dc__right-0 timestamp-detail-container ${
                     fromBulkCITrigger ? 'env-modal-width' : ''
                 }`}
                 style={{ zIndex: 100 }}

src/components/externalLinks/ExternalLinks.utils.ts

@@ -153,7 +153,7 @@ export const NodeLevelSelectStyles = {
     ...customMultiSelectStyles,
     menu: (base) => ({
         ...base,
-        width: '150px',
+        width: '120px',
     }),
     control: (base) => ({
         ...base,

src/components/v2/appDetails/NodeTreeDetailTab.tsx

@@ -15,7 +15,7 @@
  */
 
 import { useState, useEffect, useRef } from 'react'
-import K8ResourceComponent from './k8Resource/K8Resource.component'
+import { K8ResourceComponent } from './k8Resource/K8Resource.component'
 import './appDetails.scss'
 import LogAnalyzerComponent from './logAnalyzer/LogAnalyzer.component'
 import { Route, Switch, useRouteMatch, Redirect, useParams } from 'react-router-dom'

src/components/v2/appDetails/appDetails.type.ts

@@ -26,7 +26,6 @@ import { ExternalLink, OptionTypeWithIcon } from '../../externalLinks/ExternalLi
 import { iLink } from '../utils/tabUtils/link.type'
 import { EphemeralForm, EphemeralFormAdvancedType } from './k8Resource/nodeDetail/nodeDetail.type'
 import { useTabs } from '../../common/DynamicTabs/useTabs'
-import { ManifestTabJSON } from '../utils/tabUtils/tab.json'
 
 export interface ApplicationObject extends iLink {
     selectedNode: string
@@ -470,18 +469,27 @@ export interface ManifestViewRefType {
         manifest: string
         activeManifestEditorData: string
         modifiedManifest: string
-        isEditmode: boolean
-        activeTab: (typeof ManifestTabJSON)[number]['name']
     }
     id: string
 }
 
+export enum ManifestCodeEditorMode {
+    READ = 'read',
+    EDIT = 'edit',
+    APPLY_CHANGES = 'applyChanges',
+    CANCEL = 'cancel',
+}
+
+
 export interface ManifestActionPropsType extends ResourceInfoActionPropsType {
     hideManagedFields: boolean
     toggleManagedFields: (managedFieldsExist: boolean) => void
     manifestViewRef: MutableRefObject<ManifestViewRefType>
     getComponentKey: () => string
-    isExternalApp: boolean
+    showManifestCompareView: boolean
+    setShowManifestCompareView: Dispatch<SetStateAction<boolean>>
+    manifestCodeEditorMode: ManifestCodeEditorMode
+    setManifestCodeEditorMode: Dispatch<SetStateAction<ManifestCodeEditorMode>>
 }
 
 export interface NodeTreeDetailTabProps {