Merge branch 'develop' into fix/expanded-app-list-safari

Author: AbhishekA1509

src/components/common/DynamicTabs/types.ts

@@ -75,12 +75,6 @@ export interface TimerType {
     format?: (start: Dayjs, now: Dayjs) => string
 }
 
-export type ParsedTabsDataV1 = {
-    key: string
-    data: DynamicTabType[]
-    version: 'v1'
-}
-
 export type ParsedTabsData = {
     data: Record<string, DynamicTabType[]>
     version: typeof TAB_DATA_VERSION

src/components/common/DynamicTabs/useTabs.ts

@@ -21,7 +21,6 @@ import { DynamicTabType, InitTabType, noop } from '@devtron-labs/devtron-fe-comm
 
 import { FALLBACK_TAB, TAB_DATA_LOCAL_STORAGE_KEY, TAB_DATA_VERSION } from './constants'
 import { AddTabParamsType, ParsedTabsData, PopulateTabDataPropsType, UseTabsReturnType } from './types'
-import { convertV1TabsDataToV2 } from './utils'
 
 export function useTabs(persistenceKey: string, fallbackTabIndex = FALLBACK_TAB): UseTabsReturnType {
     const [tabs, setTabs] = useState<DynamicTabType[]>([])
@@ -107,7 +106,7 @@ export function useTabs(persistenceKey: string, fallbackTabIndex = FALLBACK_TAB)
         } else {
             const persistedTabsData = getTabDataFromLocalStorage()
             try {
-                _parsedTabsData = convertV1TabsDataToV2(JSON.parse(persistedTabsData))
+                _parsedTabsData = JSON.parse(persistedTabsData)
             } catch {
                 noop()
             }
@@ -177,7 +176,7 @@ export function useTabs(persistenceKey: string, fallbackTabIndex = FALLBACK_TAB)
             if (!reInit) {
                 const persistedTabsData = getTabDataFromLocalStorage()
                 try {
-                    parsedTabsData = convertV1TabsDataToV2(JSON.parse(persistedTabsData))
+                    parsedTabsData = JSON.parse(persistedTabsData)
                     _tabs = parsedTabsData ? parsedTabsData.data[persistenceKey] ?? [] : prevTabs
                 } catch {
                     _tabs = prevTabs

src/components/common/DynamicTabs/utils.ts

@@ -17,8 +17,7 @@
 import { Dayjs } from 'dayjs'
 
 import { MARK_AS_STALE_DATA_CUT_OFF_MINS } from '../../ResourceBrowser/Constants'
-import { TAB_DATA_VERSION } from './constants'
-import { DynamicTabsVariantType, ParsedTabsData, ParsedTabsDataV1 } from './types'
+import { DynamicTabsVariantType } from './types'
 
 export const checkIfDataIsStale = (start: Dayjs, now: Dayjs): boolean =>
     now.diff(start, 'minutes') > MARK_AS_STALE_DATA_CUT_OFF_MINS
@@ -35,14 +34,3 @@ export const getClassNameForVariant = (variant: DynamicTabsVariantType) => {
             return ''
     }
 }
-
-export const convertV1TabsDataToV2 = (tabsData: ParsedTabsDataV1 | ParsedTabsData): ParsedTabsData => {
-    if (tabsData.version === TAB_DATA_VERSION) {
-        return tabsData
-    }
-
-    return {
-        data: { [tabsData.key]: tabsData.data },
-        version: TAB_DATA_VERSION,
-    }
-}

src/components/common/navigation/NavigationRoutes.tsx

@@ -78,7 +78,7 @@ import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
 import YamlWorker from '../../../yaml.worker.js?worker'
 import { TAB_DATA_LOCAL_STORAGE_KEY } from '../DynamicTabs/constants'
 import { ENVIRONMENT_DATA_FALLBACK, INITIAL_ENV_DATA_STATE } from './constants'
-import { ParsedTabsData, ParsedTabsDataV1 } from '../DynamicTabs/types'
+import { ParsedTabsData } from '../DynamicTabs/types'
 import { SwitchThemeDialog } from '@Pages/Shared'
 import { SwitchThemeDialogProps } from '@Pages/Shared/SwitchThemeDialog/types'
 import { EnvironmentDataStateType } from './types'
@@ -401,19 +401,10 @@ export default function NavigationRoutes() {
         const persistedTabs = localStorage.getItem(TAB_DATA_LOCAL_STORAGE_KEY)
         if (persistedTabs) {
             try {
-                const parsedTabsData: ParsedTabsData | ParsedTabsDataV1 = JSON.parse(persistedTabs)
-                if (parsedTabsData.version === 'v1') {
-                    if (
-                        location.pathname === parsedTabsData.key ||
-                        !location.pathname.startsWith(`${parsedTabsData.key}/`)
-                    ) {
-                        localStorage.removeItem(TAB_DATA_LOCAL_STORAGE_KEY)
-                    }
-                } else {
-                    const keys = Object.keys(parsedTabsData.data)
-                    if (keys.every((key) => location.pathname !== key && !location.pathname.startsWith(`${key}/`))) {
-                        localStorage.removeItem(TAB_DATA_LOCAL_STORAGE_KEY)
-                    }
+                const parsedTabsData: ParsedTabsData = JSON.parse(persistedTabs)
+                const keys = Object.keys(parsedTabsData.data)
+                if (keys.every((key) => location.pathname !== key && !location.pathname.startsWith(`${key}/`))) {
+                    localStorage.removeItem(TAB_DATA_LOCAL_STORAGE_KEY)
                 }
             } catch {
                 localStorage.removeItem(TAB_DATA_LOCAL_STORAGE_KEY)