Merge pull request #2106 from devtron-labs/chore/main-sync

Elessar1802 · web-flow · commit cc8c4382dd1f · 2024-10-07T16:26:39.000+05:30
chore: main sync
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.22",
+        "@devtron-labs/devtron-fe-common-lib": "4.0.1",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/assets/icons/ic-close.svg b/src/assets/icons/ic-close.svg
@@ -16,10 +16,10 @@
 
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
     <defs>
-        <path id="a" class="stroke-color" d="M18.295 5.705a.997.997 0 0 0-1.41 0L12 10.59 7.115 5.705a.997.997 0 1 0-1.41 1.41L10.59 12l-4.885 4.885a.997.997 0 1 0 1.41 1.41L12 13.41l4.885 4.885a.997.997 0 0 0 1.41-1.41L13.41 12l4.885-4.885a.997.997 0 0 0 0-1.41z"/>
+        <path id="ic-close-dashboard" class="stroke-color" d="M18.295 5.705a.997.997 0 0 0-1.41 0L12 10.59 7.115 5.705a.997.997 0 1 0-1.41 1.41L10.59 12l-4.885 4.885a.997.997 0 1 0 1.41 1.41L12 13.41l4.885 4.885a.997.997 0 0 0 1.41-1.41L13.41 12l4.885-4.885a.997.997 0 0 0 0-1.41z"/>
     </defs>
     <g fill="none" fill-rule="evenodd">
         <path d=""/>
-        <use fill="#999" xlink:href="#a"/>
+        <use fill="#999" xlink:href="#ic-close-dashboard"/>
     </g>
 </svg>
diff --git a/src/components/ApplicationGroup/Details/EnvironmentOverview/EnvironmentOverview.tsx b/src/components/ApplicationGroup/Details/EnvironmentOverview/EnvironmentOverview.tsx
@@ -260,12 +260,12 @@ export default function EnvironmentOverview({
     }
 
     const openHibernateModalPopup = () => {
-        setIsDeploymentLoading(true)
+        setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)
         setOpenedHibernateModalType(MODAL_TYPE.HIBERNATE)
     }
 
     const openUnHibernateModalPopup = () => {
-        setIsDeploymentLoading(true)
+        setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)
         setOpenedHibernateModalType(MODAL_TYPE.UNHIBERNATE)
     }
 
diff --git a/src/components/ClusterNodes/ClusterOverview.tsx b/src/components/ClusterNodes/ClusterOverview.tsx
@@ -205,9 +205,9 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps
                         errorType: _nodeError,
                         filterText: clusterCapacityResponse.value.result.nodeErrors[_nodeError],
                     })
-                    setClusterErrorList(_errorList)
                 }
             }
+            setClusterErrorList(_errorList)
         } else {
             setErrorCode(clusterCapacityResponse.reason['code'])
         }
@@ -259,7 +259,7 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps
             return
         }
         return (
-            <div className="mb-16 dc__border br-4 pt-12">
+            <div className="mb-16 dc__border br-4 pt-12 bcn-0">
                 <div className="flexbox pointer mb-12 pl-16 pr-16">
                     <Error className="mt-2 mb-2 mr-8 icon-dim-20" />
                     <span className="fw-6 fs-13 cn-9 mr-16">
diff --git a/src/components/ClusterNodes/ClusterTerminal.tsx b/src/components/ClusterNodes/ClusterTerminal.tsx
@@ -759,7 +759,7 @@ node-details-full-screen
         ]
 
         return (
-            <div className="mr-16">
+            <div>
                 <TabGroup tabs={tabs} size={ComponentSizeType.medium} />
             </div>
         )
@@ -861,14 +861,34 @@ node-details-full-screen
 
     const fullScreenClassWrapper = isFullScreen ? 'cluster-full_screen' : 'cluster-terminal-view-container'
 
+    const getNodeGroupOptions = () => {
+        const nodeGroupOptions = nodeGroups.reduce((acc, group) => {
+            if (group.label) {
+                acc.push({
+                    label: group.label,
+                    options: group.options,
+                })
+            } else {
+                const options = group.options.map((option) => ({
+                    label: option.label,
+                    value: option.value,
+                }))
+                acc.push(...options) // Flatten the array into the accumulator
+            }
+            return acc
+        }, [])
+
+        return nodeGroupOptions
+    }
+
     const selectionListData: TerminalSelectionListDataType = {
         firstRow: [
             {
                 type: TerminalWrapperType.REACT_SELECT,
                 classNamePrefix: 'cluster-terminal-node',
                 title: SELECT_TITLE.NODE,
                 placeholder: 'Select node',
-                options: nodeGroups,
+                options: getNodeGroupOptions(),
                 defaultValue: selectedNodeName,
                 value: selectedNodeName,
                 onChange: onChangeNodes,
diff --git a/src/components/ClusterNodes/NodeDetailsList.tsx b/src/components/ClusterNodes/NodeDetailsList.tsx
@@ -133,6 +133,10 @@ export default function NodeDetailsList({ isSuperAdmin, renderRefreshBar, addTab
         const qs = queryString.parse(location.search)
         const offset = Number(qs['offset'])
         setNodeListOffset(offset || 0)
+        const version = qs['k8sversion']
+        if (version && typeof version === 'string' && selectedVersion.value !== version) {
+            setSelectedVersion({ label: `K8s version: ${version}`, value: version })
+        }
     }, [location.search])
 
     useEffect(() => {
diff --git a/src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx b/src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx
@@ -195,6 +195,7 @@ const ResourceBrowserActionMenu: React.FC<ResourceBrowserActionMenuType> = ({
                     isLoading={resourceScanLoading}
                     error={resourceScanError}
                     responseData={resourceScanResponse?.result}
+                    hidePolicy
                 />
             )}
         </>
diff --git a/src/components/app/details/appDetails/AppSecurity.tsx b/src/components/app/details/appDetails/AppSecurity.tsx
@@ -36,8 +36,7 @@ export const useGetAppSecurityDetails = ({
     )
 
     const [executionDetailsLoading, executionDetailsResponse, executionDetailsError, reloadExecutionDetails] = useAsync(
-        () =>
-            getExecutionDetails(appId && artifactId ? { appId, artifactId } : { appId, envId, imageScanDeployInfoId }),
+        () => getExecutionDetails(artifactId ? { appId, envId, artifactId } : { appId, envId, imageScanDeployInfoId }),
         [appId, envId, imageScanDeployInfoId, artifactId],
         !isSecurityScanV2Enabled && !!appId,
     )
diff --git a/src/components/app/details/appDetails/SecurityVulnerabilityCard.tsx b/src/components/app/details/appDetails/SecurityVulnerabilityCard.tsx
@@ -197,6 +197,7 @@ export const SecurityVulnerabilityCard = ({
                     isLoading={scanDetailsLoading}
                     error={scanDetailsError}
                     responseData={scanDetailsResponse?.result}
+                    hidePolicy
                 />
             )}
         </button>
diff --git a/src/components/app/details/cIDetails/CIDetails.tsx b/src/components/app/details/cIDetails/CIDetails.tsx
@@ -740,6 +740,7 @@ const SecurityTab = ({ ciPipelineId, artifactId, status, appIdFromParent }: Secu
                 SecurityModalSidebar={SecurityModalSidebar}
                 isSecurityScanV2Enabled={isSecurityScanV2Enabled}
                 responseData={isSecurityScanV2Enabled ? scanResultResponse?.result : parseExecutionDetailResponse(executionDetailsResponse?.result)}
+                hidePolicy
             />
         </div>
     )
diff --git a/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx b/src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx
@@ -171,7 +171,7 @@ export default function CiWebhookModal({
                             >
                                 <div>
                                     Received at{' '}
-                                    <button className="dc__transparent filter-icon">
+                                    <button className="dc__transparent fs-12 dc__align-right">
                                         <i className="fa fa-caret-down" />
                                     </button>
                                 </div>
diff --git a/src/components/app/details/triggerView/cdMaterial.tsx b/src/components/app/details/triggerView/cdMaterial.tsx
@@ -1574,6 +1574,7 @@ const CDMaterial = ({
                         (isMaterialInfoAvailable || mat.appliedFilters?.length) &&
                         hideSourceInfo && (
                             <ImageCardAccordion
+                                environmentId={envId}
                                 isSecurityModuleInstalled={state.isSecurityModuleInstalled}
                                 artifactId={+mat.id}
                                 applicationId={appId}
diff --git a/src/components/app/list/list.scss b/src/components/app/list/list.scss
@@ -28,6 +28,7 @@
     z-index: var(--page-header-index);
 }
 
+// TODO (Arun): Remove unused css after filter clean up
 .app-list-filters.filters .filter {
     min-width: unset;
     flex-basis: unset;
diff --git a/src/components/security/security.util.tsx b/src/components/security/security.util.tsx
@@ -85,8 +85,3 @@ export const parseVulnerabilityExposureSearchParams = (searchParams: URLSearchPa
     [VulnerabilityExposureFilterKeys.environment]: searchParams.getAll(VulnerabilityExposureFilterKeys.environment),
     [VulnerabilityExposureSearchParams.cveName]: searchParams.get(VulnerabilityExposureSearchParams.cveName) ?? '',
 })
-
-
-
-
-
diff --git a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/Terminal.tsx
@@ -295,7 +295,7 @@ export default function TerminalView({
                 data-testid="terminal-editor-container"
                 className={`mt-8 mb-4 terminal-component ${
                     fullScreenView ? 'terminal-component--fullscreen' : ''
-                } ml-20 ${!isResourceBrowserView && !fullScreenView ? 'terminal-component__zoom--bottom-41' : ''}`}
+                } ml-20 ${!isResourceBrowserView && !fullScreenView && isSuperAdmin ? 'terminal-component__zoom--bottom-41' : ''}`}
             >
                 <CopyToast showCopyToast={popupText} />
                 <LogResizeButton
diff --git a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/TerminalWrapper.component.tsx b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/TerminalWrapper.component.tsx
@@ -32,7 +32,7 @@ export default function TerminalWrapper({
 }: TerminalWrapperProps) {
     const firstStrip = () => {
         return (
-            <div className="flex left w-100">
+            <div className="flex left w-100 dc__gap-10 dc__zi-13">
                 {selectionListData.firstRow.map((ele) => {
                     return terminalStripTypeData(ele)
                 })}
@@ -77,7 +77,7 @@ export default function TerminalWrapper({
         <div className={className} data-testid={dataTestId}>
             <div className="flex bcn-0 pl-20 h-32 terminal-action-strip dc__zi-11">{firstStrip()}</div>
             {selectionListData.secondRow && (
-                <div className="flex left bcn-0 pl-20 dc__border-top terminal-action-strip">{secondStrip()}</div>
+                <div className="flex left bcn-0 pl-20 dc__border-top terminal-action-strip dc__gap-12">{secondStrip()}</div>
             )}
             {typeof selectionListData.tabSwitcher.terminalTabWrapper === 'function'
                 ? selectionListData.tabSwitcher.terminalTabWrapper(renderTerminalView())
diff --git a/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/terminal.utils.tsx b/src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/terminal/terminal.utils.tsx
@@ -60,7 +60,7 @@ const creatableSelectWrapper = (selectData: SelectWrapperType) => {
                     iconClassName="icon-dim-16 fcn-6"
                 />
             )}
-            <div className="cn-6 ml-8 mr-4">{selectData.title}</div>
+            <div className="cn-6">{selectData.title}</div>
             <div>
                 <CreatableSelect
                     placeholder={selectData.placeholder}
@@ -126,15 +126,15 @@ const connectionButton = (connectData: ConnectionButtonType) => {
             content={connectData.connectTerminal ? 'Disconnect and terminate pod' : 'Connect to terminal'}
         >
             {connectData.connectTerminal ? (
-                <span className="flex mr-8">
+                <span className="flex">
                     <Disconnect
                         className="icon-dim-16 mr-4 cursor"
                         data-testid="node-details-terminal-disconnect"
                         onClick={connectData.closeTerminalModal}
                     />
                 </span>
             ) : (
-                <span className="flex mr-8">
+                <span className="flex">
                     <Connect
                         className="icon-dim-16 mr-4 cursor"
                         data-testid="node-details-terminal-connect"
@@ -195,19 +195,19 @@ const connectionSwitch = (switchProps: ConnectionSwitchType) => {
     }
     return (
         <>
-            <span className="bcn-2 mr-8 h-32" style={{ width: '1px' }} />
+            <span className="bcn-2 h-32" style={{ width: '1px' }} />
             <Tippy
                 className="default-tt cursor"
                 arrow={false}
                 placement="bottom"
                 content={switchProps.toggleButton ? 'Disconnect from pod' : 'Reconnect to pod'}
             >
                 {switchProps.toggleButton ? (
-                    <span className="mr-8 flex" data-testid="disconnect-button">
+                    <span className="flex" data-testid="disconnect-button">
                         <Stop className="icon-dim-16 fcr-5 mr-4 cursor" onClick={switchProps.stopTerminalConnection} />
                     </span>
                 ) : (
-                    <span className="mr-8 flex" data-testid="play-button">
+                    <span className="flex" data-testid="play-button">
                         <Play className="icon-dim-16 fcg-5 mr-4 cursor" onClick={switchProps.resumePodConnection} />
                     </span>
                 )}
@@ -222,7 +222,7 @@ const clearTerminal = (clearProps: ClearTerminalType) => {
     }
     return (
         <Tippy className="default-tt" arrow={false} placement="bottom" content="Clear">
-            <div className="flex mr-8" data-testid={clearProps.dataTestId}>
+            <div className="flex" data-testid={clearProps.dataTestId}>
                 <Abort className="icon-dim-16 mr-4 fcn-6 cursor" onClick={clearProps.setTerminalCleared} />
             </div>
         </Tippy>
@@ -235,7 +235,7 @@ const debugModeToggleButton = (selectData: DebugModeType) => {
     }
     return (
         <>
-            <span className="bcn-2 mr-8 h-32" style={{ width: '1px' }} />
+            <span className="bcn-2 h-32" style={{ width: '1px' }} />
             {selectData.showInfoTippy && (
                 <InfoIconTippy
                     heading="Debug mode"
@@ -247,7 +247,7 @@ const debugModeToggleButton = (selectData: DebugModeType) => {
                 />
             )}
             <span>Debug Mode</span>
-            <span className="toggle-icon-dim ml-8">
+            <span className="toggle-icon-dim">
                 <Toggle onSelect={selectData.onToggle} dataTestId="toggle-debug-mode" selected={selectData.isEnabled} />
             </span>
         </>
@@ -314,7 +314,7 @@ const manifestEditButtons = ({
 
     return (
         <>
-            <span className="bcn-2 mr-8 h-32" style={{ width: '1px' }} />
+            <span className="bcn-2 h-32" style={{ width: '1px' }} />
             {renderButtons()}
             {buttonSelectionState !== EditModeType.NON_EDIT && (
                 <span
diff --git a/src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx b/src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx
@@ -410,12 +410,7 @@ const NodeComponent = ({
                                                 {node.kind !== NodeType.Containers && (
                                                     <>
                                                         <div className="bw-1 en-2 dc__right-radius-4 node-empty dc__no-left-border" />
-                                                        {node.kind.toLowerCase() == NodeType.Pod.toLowerCase() && (
-                                                            <>
-                                                                <div className="bw-1 en-2 dc__right-radius-4 node-empty dc__no-left-border" />
-                                                                <div className="bw-1 en-2 dc__right-radius-4 node-empty dc__no-left-border" />
-                                                            </>
-                                                        )}
+                                                        <div className="bw-1 en-2 dc__right-radius-4 node-empty dc__no-left-border" />
                                                     </>
                                                 )}
                                             </>
diff --git a/src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx b/src/components/v2/appDetails/k8Resource/nodeType/NodeDelete.component.tsx
@@ -221,6 +221,7 @@ const NodeDeleteComponent = ({ nodeDetails, appDetails, isDeploymentBlocked }: N
                     isLoading={resourceScanLoading}
                     error={resourceScanError}
                     responseData={resourceScanResponse?.result}
+                    hidePolicy
                 />
             )}
             {renderDeleteResourcePopup()}
diff --git a/src/components/v2/assets/icons/ic-close.svg b/src/components/v2/assets/icons/ic-close.svg
@@ -16,10 +16,10 @@
 
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
     <defs>
-        <path id="a" class="stroke-color" d="M18.295 5.705a.997.997 0 0 0-1.41 0L12 10.59 7.115 5.705a.997.997 0 1 0-1.41 1.41L10.59 12l-4.885 4.885a.997.997 0 1 0 1.41 1.41L12 13.41l4.885 4.885a.997.997 0 0 0 1.41-1.41L13.41 12l4.885-4.885a.997.997 0 0 0 0-1.41z"/>
+        <path id="ic-close-v2" class="stroke-color" d="M18.295 5.705a.997.997 0 0 0-1.41 0L12 10.59 7.115 5.705a.997.997 0 1 0-1.41 1.41L10.59 12l-4.885 4.885a.997.997 0 1 0 1.41 1.41L12 13.41l4.885 4.885a.997.997 0 0 0 1.41-1.41L13.41 12l4.885-4.885a.997.997 0 0 0 0-1.41z"/>
     </defs>
     <g fill="none" fill-rule="evenodd">
         <path d=""/>
-        <use fill="#999" xlink:href="#a"/>
+        <use fill="#999" xlink:href="#ic-close-v2"/>
     </g>
 </svg>
diff --git a/src/components/v2/values/chartValuesDiff/ChartValuesView.tsx b/src/components/v2/values/chartValuesDiff/ChartValuesView.tsx
@@ -1626,7 +1626,7 @@ const ChartValuesView = ({
             >
                 {renderValuesTabsContainer()}
                 <div className="chart-values-view__wrapper flexbox flex-grow-1 dc__overflow-hidden">
-                    <div className="chart-values-view__details dc__border-right dc__overflow-scroll">
+                    <div className="flexbox-col dc__gap-12 chart-values-view__details dc__border-right dc__overflow-scroll">
                         {isCreateValueView && (
                             <ValueNameInput
                                 valueName={valueName}
diff --git a/src/css/base.scss b/src/css/base.scss
@@ -4427,6 +4427,10 @@ textarea::placeholder {
     z-index: 11;
 }
 
+.dc__zi-13 {
+    z-index: 13;
+}
+
 .dc__zi-20 {
     z-index: 20;
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -260,12 +260,12 @@ export default function EnvironmentOverview({`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`const openHibernateModalPopup = () => {`
`263`		`- setIsDeploymentLoading(true)`
	`263`	`+ setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)`
`264`	`264`	`setOpenedHibernateModalType(MODAL_TYPE.HIBERNATE)`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`const openUnHibernateModalPopup = () => {`
`268`		`- setIsDeploymentLoading(true)`
	`268`	`+ setIsDeploymentLoading(!!processDeploymentWindowAppGroupOverviewMap)`
`269`	`269`	`setOpenedHibernateModalType(MODAL_TYPE.UNHIBERNATE)`
`270`	`270`	`}`
`271`	`271`
Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,9 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps`
`205`	`205`	`errorType: _nodeError,`
`206`	`206`	`filterText: clusterCapacityResponse.value.result.nodeErrors[_nodeError],`
`207`	`207`	`})`
`208`		`- setClusterErrorList(_errorList)`
`209`	`208`	`}`
`210`	`209`	`}`
	`210`	`+ setClusterErrorList(_errorList)`
`211`	`211`	`} else {`
`212`	`212`	`setErrorCode(clusterCapacityResponse.reason['code'])`
`213`	`213`	`}`
`@@ -259,7 +259,7 @@ function ClusterOverview({ isSuperAdmin, selectedCluster }: ClusterOverviewProps`
`259`	`259`	`return`
`260`	`260`	`}`
`261`	`261`	`return (`
`262`		`- <div className="mb-16 dc__border br-4 pt-12">`
	`262`	`+ <div className="mb-16 dc__border br-4 pt-12 bcn-0">`
`263`	`263`	`<div className="flexbox pointer mb-12 pl-16 pr-16">`
`264`	`264`	`<Error className="mt-2 mb-2 mr-8 icon-dim-20" />`
`265`	`265`	`<span className="fw-6 fs-13 cn-9 mr-16">`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,7 @@ export const useGetAppSecurityDetails = ({`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`const [executionDetailsLoading, executionDetailsResponse, executionDetailsError, reloadExecutionDetails] = useAsync(`
`39`		`- () =>`
`40`		`- getExecutionDetails(appId && artifactId ? { appId, artifactId } : { appId, envId, imageScanDeployInfoId }),`
	`39`	`+ () => getExecutionDetails(artifactId ? { appId, envId, artifactId } : { appId, envId, imageScanDeployInfoId }),`
`41`	`40`	`[appId, envId, imageScanDeployInfoId, artifactId],`
`42`	`41`	`!isSecurityScanV2Enabled && !!appId,`
`43`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,7 @@ const SecurityTab = ({ ciPipelineId, artifactId, status, appIdFromParent }: Secu`
`740`	`740`	`SecurityModalSidebar={SecurityModalSidebar}`
`741`	`741`	`isSecurityScanV2Enabled={isSecurityScanV2Enabled}`
`742`	`742`	`responseData={isSecurityScanV2Enabled ? scanResultResponse?.result : parseExecutionDetailResponse(executionDetailsResponse?.result)}`
	`743`	`+ hidePolicy`
`743`	`744`	`/>`
`744`	`745`	`</div>`
`745`	`746`	`)`