diff --git a/package-lock.json b/package-lock.json index 3d6dd9eb9..059ab3a50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.4", + "version": "1.20.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.4", + "version": "1.20.6", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index cc09e2edb..1639eeb38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.4", + "version": "1.20.6", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Assets/IconV2/ic-gift-animated.svg b/src/Assets/IconV2/ic-gift-animated.svg index 18ac348e2..922c9997d 100644 --- a/src/Assets/IconV2/ic-gift-animated.svg +++ b/src/Assets/IconV2/ic-gift-animated.svg @@ -1 +1,38 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx b/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx index c5e0295fc..e8b053ca8 100644 --- a/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx +++ b/src/Shared/Components/AppStatusModal/AppStatusModal.component.tsx @@ -28,6 +28,7 @@ import { ComponentSizeType, PROGRESSING_DEPLOYMENT_STATUS_POLLING_INTERVAL, } from '@Shared/constants' +import { useMainContext } from '@Shared/Providers' import { AppType } from '@Shared/types' import { APIResponseHandler } from '../APIResponseHandler' @@ -57,7 +58,7 @@ const AppStatusModal = ({ initialTab, debugWithAIButton, }: AppStatusModalProps) => { - const [showConfigDriftModal, setShowConfigDriftModal] = useState(false) + const { setTempAppWindowConfig } = useMainContext() const [selectedTab, setSelectedTab] = useState(initialTab || null) const appDetailsAbortControllerRef = useRef(new AbortController()) @@ -241,30 +242,20 @@ const AppStatusModal = ({ const handleShowConfigDriftModal = isConfigDriftEnabled ? () => { - setShowConfigDriftModal(true) + handleClose() + setTempAppWindowConfig({ + open: true, + title: `${appDetails.appName} / Live and desired manifest comparison`, + component: , + }) } : null - const handleCloseConfigDriftModal = () => { - handleClose() - setShowConfigDriftModal(false) - } - const handleSelectTab = async (updatedTab: AppStatusModalTabType) => { handleClearDeploymentStatusTimeout() setSelectedTab(updatedTab) } - if (showConfigDriftModal) { - return ( - - ) - } - const filteredTitleSegments = (titleSegments || []).filter((segment) => !!segment) const getEmptyStateMessage = () => { diff --git a/src/Shared/types.ts b/src/Shared/types.ts index 0d2fc6724..c4b758b5f 100644 --- a/src/Shared/types.ts +++ b/src/Shared/types.ts @@ -262,7 +262,6 @@ export interface AppDetails { export interface ConfigDriftModalProps extends Required> { envId: number - handleCloseModal?: () => void } export enum RegistryType {