Merge branch 'develop' of https://github.com/devtron-labs/dashboard into fix-ng-changes-develop

Author: AbhishekA1509

package.json

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

src/components/app/list/expandedRow/ExpandedRow.tsx

@@ -36,10 +36,10 @@ export class ExpandedRow extends Component<ExpandedRowProps> {
                 <Link
                     key={env.id}
                     to={`${this.props.redirect(this.props.app, env.id)}`}
-                    className="app-list__row app-list__row--expanded"
+                    className={`app-list__row app-list__row--expanded ${!this.props.isArgoInstalled ? 'app-list__row--argo-not-installed' : ''}`}
                 >
                     <div className="app-list__cell--icon" />
-                    <div className="app-list__cell app-list__cell--name">
+                    <div className="app-list__cell app-list__cell--name dc__overflow-hidden">
                         <svg className="app-status app-status--pseudo" preserveAspectRatio="none" viewBox="0 0 200 40">
                             <line x1="0" y1="20" x2="100%" y2="20" stroke={color} strokeWidth="1" />
                             <line x1="0" y1="15" x2="0" y2="25" stroke={color} strokeWidth="1" />
@@ -52,15 +52,15 @@ export class ExpandedRow extends Component<ExpandedRowProps> {
                     )}
                     <div className="app-list__cell app-list__cell--env">{env.name}</div>
                     <div className="app-list__cell app-list__cell--cluster">
-                        <p className="dc__truncate-text">{env.clusterName}</p>
+                        <p className="dc__truncate-text m-0">{env.clusterName}</p>
                     </div>
                     <div className="app-list__cell app-list__cell--namespace">
-                        <p className="dc__truncate-text">{env.namespace}</p>
+                        <p className="dc__truncate-text m-0">{env.namespace}</p>
                     </div>
                     <div className="app-list__cell app-list__cell--time">
                         {env.lastDeployedTime && (
                             <Tippy className="default-tt" arrow placement="top" content={env.lastDeployedTime}>
-                                <p className="dc__truncate-text  m-0">{handleUTCTime(env.lastDeployedTime, true)}</p>
+                                <p className="dc__truncate-text m-0">{handleUTCTime(env.lastDeployedTime, true)}</p>
                             </Tippy>
                         )}
                     </div>

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)

yarn.lock

@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]beta-7":
-  version "1.11.0-beta-7"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.11.0-beta-7.tgz#19e398fb2ceb93544954a5c54fff5d4a5c245103"
-  integrity sha512-ncy2smv0gsLfMpmW0l6GUezb7J1IlRQ87ZqJ1TAWu5vPc0LevIKMh5zbDBWVGlmWU75T8OCpEi1DMxU1UcN4Vg==
+"@devtron-labs/[email protected]pre-6":
+  version "1.11.0-pre-6"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.11.0-pre-6.tgz#e74d94c895e0fdbbe4101341d8d00444a4bdf792"
+  integrity sha512-nNQOtzsXbs+c0H/EcR00ucsl7X/VjeOZ3spWDcZ3PQbSC+kpi4bHkcQFyAv3H2YGf8C6QVNeoTPtmfr+r/Vsmg==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"