Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/infra-overview

Author: arunjaindev

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<AppStatusModalTabType>(initialTab || null)
 
     const appDetailsAbortControllerRef = useRef<AbortController>(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: <ConfigDriftModal appId={appDetails.appId} envId={appDetails.environmentId} />,
+              })
           }
         : null
 
-    const handleCloseConfigDriftModal = () => {
-        handleClose()
-        setShowConfigDriftModal(false)
-    }
-
     const handleSelectTab = async (updatedTab: AppStatusModalTabType) => {
         handleClearDeploymentStatusTimeout()
         setSelectedTab(updatedTab)
     }
 
-    if (showConfigDriftModal) {
-        return (
-            <ConfigDriftModal
-                appId={appDetails.appId}
-                envId={+appDetails.environmentId}
-                handleCloseModal={handleCloseConfigDriftModal}
-            />
-        )
-    }
-
     const filteredTitleSegments = (titleSegments || []).filter((segment) => !!segment)
 
     const getEmptyStateMessage = () => {

src/Shared/Components/ContextSwitcher/ContextSwitcher.tsx

@@ -45,6 +45,7 @@ export const ContextSwitcher = ({
     optionListError,
     reloadOptionList,
     classNamePrefix,
+    resource,
 }: ContextSwitcherTypes) => {
     const selectRef = useRef<SelectInstance<SelectPickerOptionType>>(null)
     const shouldShowToastRef = useRef<boolean>(true)
@@ -60,7 +61,7 @@ export const ContextSwitcher = ({
         if (shouldShowToastRef.current) {
             ToastManager.showToast({
                 variant: ToastVariantType.shortcut,
-                text: 'to switch Applications',
+                text: `to switch ${resource}`,
                 shortcuts: ['S'],
             })
         }

src/Shared/Components/ContextSwitcher/types.ts

@@ -36,6 +36,7 @@ export interface ContextSwitcherTypes
     > {
     options: GroupBase<SelectPickerOptionType<string | number>>[]
     isAppDataAvailable?: boolean
+    resource: 'Cluster' | 'Release' | 'Tenant' | 'Application' | 'Job' | 'Application Group' | 'Chart Store'
 }
 
 export interface RecentlyVisitedOptions extends SelectPickerOptionType<number> {

src/Shared/types.ts

@@ -262,7 +262,6 @@ export interface AppDetails {
 
 export interface ConfigDriftModalProps extends Required<Pick<AppDetails, 'appId'>> {
     envId: number
-    handleCloseModal?: () => void
 }
 
 export enum RegistryType {