From 32050df02fff0fd55228caedfbf30f8fba7665ef Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Mon, 10 Nov 2025 15:39:36 +0530 Subject: [PATCH 1/7] feat: update navigation href --- src/components/Navigation/constants.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index dc6a5d37b8..16e21f89cc 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -436,8 +436,7 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ dataTestId: 'data-protection-overview', id: 'data-protection-overview', icon: 'ic-chart-line-up', - disabled: true, - href: '/dummy-url', + href: COMMON_URLS.DATA_PROTECTION_OVERVIEW, }, { title: 'Backup & Schedule', From 6a28a9b7b65f375eed33c62f076d48a3b95145ac Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 10 Nov 2025 15:45:10 +0530 Subject: [PATCH 2/7] chore: clean up imports and navigation constants, remove unused AI recommendations --- .../DeploymentTemplate/DeploymentTemplate.tsx | 2 +- src/components/Navigation/NavItem.tsx | 8 ++-- src/components/Navigation/constants.ts | 42 ++++--------------- src/components/Navigation/types.ts | 1 - .../common/navigation/NavigationRoutes.tsx | 14 +++++-- 5 files changed, 24 insertions(+), 43 deletions(-) diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx index f9aee2bbc5..30921b3a42 100644 --- a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx +++ b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx @@ -2292,4 +2292,4 @@ const DeploymentTemplate = ({ ) } -export default DeploymentTemplate \ No newline at end of file +export default DeploymentTemplate diff --git a/src/components/Navigation/NavItem.tsx b/src/components/Navigation/NavItem.tsx index f126d23f2a..367c55b1ea 100644 --- a/src/components/Navigation/NavItem.tsx +++ b/src/components/Navigation/NavItem.tsx @@ -1,7 +1,7 @@ import { useEffect, useMemo, useState } from 'react' import { NavLink, useLocation } from 'react-router-dom' -import { Icon, preventDefault, TreeView } from '@devtron-labs/devtron-fe-common-lib' +import { Icon, TreeView } from '@devtron-labs/devtron-fe-common-lib' import { NavItemProps } from './types' import { doesNavigationItemMatchPath, getNavigationTreeNodes } from './utils' @@ -67,8 +67,8 @@ export const NavItem = ({ hasSearchText, ...navItem }: NavItemProps) => { return (
{title} @@ -80,7 +80,7 @@ export const NavItem = ({ hasSearchText, ...navItem }: NavItemProps) => { diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index 7c1da4babf..27a9205ad6 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -13,7 +13,6 @@ import { URLS } from '@Config/routes' import { NavigationGroupType, NavigationItemType } from './types' const FE_LIB_ROUTER_URLS = importComponentFromFELibrary('ROUTER_URLS', {}, 'function') -const AuditLog = importComponentFromFELibrary('AuditLog') export const APPLICATION_MANAGEMENT_CONFIGURATIONS: NavigationItemType['subItems'] = [ { @@ -300,7 +299,7 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ id: 'infrastructure-management-audit-logs', icon: 'ic-monitoring', href: COMMON_URLS.INFRASTRUCTURE_MANAGEMENT_AUDIT_LOGS, - } + }, ], }, { @@ -400,6 +399,13 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ icon: 'ic-k8s-job', href: URLS.AUTOMATION_AND_ENABLEMENT_JOB, }, + { + title: 'Runbook Automation', + dataTestId: 'runbook-automation', + id: 'automation-and-enablement-runbook-automation', + icon: 'ic-book-open', + href: COMMON_URLS.AUTOMATION_ENABLEMENT_RUNBOOKS, + }, { title: 'Alerting', dataTestId: 'alerting', @@ -424,14 +430,6 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ href: '/dummy-url', disabled: true, }, - { - title: 'Runbook Automation', - dataTestId: 'runbook-automation', - id: 'automation-and-enablement-runbook-automation', - icon: 'ic-book-open', - href: '/dummy-url', - disabled: true, - }, ], }, { @@ -472,30 +470,6 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ }, ], }, -{ - id: 'ai-recommendations', - title: 'AI Recommendations', - icon: 'ic-openai', - disabled: false, // Enable AI Recommendations section - items: [ - { - title: 'Notifications', - dataTestId: 'ai-recommendations-notifications', - id: 'ai-recommendations-notifications', - icon: 'ic-speedometer', - disabled: false, - href: COMMON_URLS.AI_RECOMMENDATIONS_NOTIFICATIONS, - }, - { - title: 'Runbooks', - dataTestId: 'ai-recommendations-runbooks', - id: 'ai-recommendations-runbooks', - icon: 'ic-book-open', - disabled: false, - href: COMMON_URLS.AI_RECOMMENDATIONS_RUNBOOKS, - }, - ], - }, { id: 'global-configuration', title: 'Global Configuration', diff --git a/src/components/Navigation/types.ts b/src/components/Navigation/types.ts index a8f017b64c..2fdd9ea17d 100644 --- a/src/components/Navigation/types.ts +++ b/src/components/Navigation/types.ts @@ -21,7 +21,6 @@ export type NavigationRootItemID = | 'automation-and-enablement' | 'data-protection-management' | 'global-configuration' - | 'ai-recommendations' type CommonNavigationItemType = { title: string diff --git a/src/components/common/navigation/NavigationRoutes.tsx b/src/components/common/navigation/NavigationRoutes.tsx index 1419eefe63..be8c509f57 100644 --- a/src/components/common/navigation/NavigationRoutes.tsx +++ b/src/components/common/navigation/NavigationRoutes.tsx @@ -136,6 +136,7 @@ const AIResponseWidget = importComponentFromFELibrary('AIResponseWidget', null, const EnterpriseRouter = importComponentFromFELibrary('EnterpriseRouter', null, 'function') const CostVisibilityRenderProvider: FunctionComponent | null = importComponentFromFELibrary('CostVisibilityRenderProvider', null, 'function') +const AIRecommendations = importComponentFromFELibrary('AIRecommendations', null, 'function') const NavigationRoutes = ({ reloadVersionConfig }: Readonly) => { const history = useHistory() @@ -599,10 +600,16 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly } />, - + {(props) => } , - + , @@ -776,6 +783,7 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly From 88ab364d57c23582fec645e61e2c06305af19abe Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 10 Nov 2025 15:50:54 +0530 Subject: [PATCH 3/7] chore: update @devtron-labs/devtron-fe-common-lib to version 1.20.6-pre-46 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ed55c10d9b..700f6d487c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-45", + "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-46", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index a3b5116181..94886a5877 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,9 +1722,9 @@ __metadata: languageName: node linkType: hard -"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-45": - version: 1.20.6-pre-45 - resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-45" +"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-46": + version: 1.20.6-pre-46 + resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-46" dependencies: "@codemirror/autocomplete": "npm:6.18.6" "@codemirror/lang-json": "npm:6.0.1" @@ -1776,7 +1776,7 @@ __metadata: react-select: 5.8.0 rxjs: ^7.8.1 yaml: ^2.4.1 - checksum: 10c0/eda2e9de0756513f7c420f59e6b2908d2425a1f8407a7955892153e4102a55c5a7c58ff166863968308c7dc294853abe509a6171cb8691dc69e0016a872b3050 + checksum: 10c0/27bb5b9ba2c3ba37e7d072e4c02d9238e20de64fa44868a557d6628d60c1991dbbacff68a8f688b78da6d69f74f575341835ee5b2c81f5fda6bf919a94a4d7d7 languageName: node linkType: hard @@ -5581,7 +5581,7 @@ __metadata: version: 0.0.0-use.local resolution: "dashboard@workspace:." dependencies: - "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-45" + "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-46" "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3" "@playwright/test": "npm:^1.32.1" "@rjsf/core": "npm:^5.13.3" From 3f067154cfe013162a9f719af92e484149d17afb Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 10 Nov 2025 16:21:01 +0530 Subject: [PATCH 4/7] fix: update iframeSrc query parameter to use 'docusaurus-theme' instead of 'theme' --- src/components/common/SidePanel/SidePanelDocumentation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/SidePanel/SidePanelDocumentation.tsx b/src/components/common/SidePanel/SidePanelDocumentation.tsx index 6b97a3078c..cfa2bf5235 100644 --- a/src/components/common/SidePanel/SidePanelDocumentation.tsx +++ b/src/components/common/SidePanel/SidePanelDocumentation.tsx @@ -69,7 +69,7 @@ export const SidePanelDocumentation = ({ SidePanelHeaderActions }: SidePanelCont const iframeKeyRef = useRef(`${docLink}-${getUniqueId()}`) // CONSTANTS - const iframeSrc = `${docLink}${docLink.includes('?') ? `&theme=${appTheme}` : `?theme=${appTheme}`}` + const iframeSrc = `${docLink}${docLink.includes('?') ? `&docusaurus-theme=${appTheme}` : `?docusaurus-theme=${appTheme}`}` useEffect(() => { /** From 190867d3a815e3f006ac46f10aad16a5617e0d0d Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Mon, 10 Nov 2025 16:24:51 +0530 Subject: [PATCH 5/7] fix: correct URL construction for chart store link --- src/components/app/Overview/Overview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/app/Overview/Overview.tsx b/src/components/app/Overview/Overview.tsx index 4c78b16e3a..85b4b6ab81 100644 --- a/src/components/app/Overview/Overview.tsx +++ b/src/components/app/Overview/Overview.tsx @@ -293,7 +293,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn {chartUsed.appStoreChartName}/ {chartUsed.appStoreAppName} ({chartUsed.appStoreAppVersion}) From 7dbaf87c844230ff5f4cddd4b71a3e5fbe8feb9c Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Mon, 10 Nov 2025 17:07:22 +0530 Subject: [PATCH 6/7] fix: update devtron-fe-common-lib version to 1.20.6-pre-47 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 75ba286615..8f926e15a3 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-44", + "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-47", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index 363ebe696c..78a3ee068c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,9 +1722,9 @@ __metadata: languageName: node linkType: hard -"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-44": - version: 1.20.6-pre-44 - resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-44" +"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-47": + version: 1.20.6-pre-47 + resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-47" dependencies: "@codemirror/autocomplete": "npm:6.18.6" "@codemirror/lang-json": "npm:6.0.1" @@ -1776,7 +1776,7 @@ __metadata: react-select: 5.8.0 rxjs: ^7.8.1 yaml: ^2.4.1 - checksum: 10c0/ff9bb0c968cd29a851338f4066ac33afef6e8802e0d240e50dea47e93f27cf90c5380012b5fd8c08c3322da03da5ee322e5406aa50d944f7d9808664bebfdc73 + checksum: 10c0/ba442929b3f3565b3face81a29ca74a7aa867ce5a032fee1141dbd6949ffac61d55fbcf8d8a99cf057f685249477ca0791da059d670b5c35c3932135930ef763 languageName: node linkType: hard @@ -5581,7 +5581,7 @@ __metadata: version: 0.0.0-use.local resolution: "dashboard@workspace:." dependencies: - "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-44" + "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-47" "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3" "@playwright/test": "npm:^1.32.1" "@rjsf/core": "npm:^5.13.3" From 2d3700f77fe503f4e1f8059a8f8026e004f32a22 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 10 Nov 2025 17:41:04 +0530 Subject: [PATCH 7/7] fix: update devtron-fe-common-lib version to 1.20.6-pre-48 --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8f926e15a3..3965b750c9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-47", + "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-48", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index 78a3ee068c..397d6c1136 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,9 +1722,9 @@ __metadata: languageName: node linkType: hard -"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-47": - version: 1.20.6-pre-47 - resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-47" +"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-48": + version: 1.20.6-pre-48 + resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-48" dependencies: "@codemirror/autocomplete": "npm:6.18.6" "@codemirror/lang-json": "npm:6.0.1" @@ -1776,7 +1776,7 @@ __metadata: react-select: 5.8.0 rxjs: ^7.8.1 yaml: ^2.4.1 - checksum: 10c0/ba442929b3f3565b3face81a29ca74a7aa867ce5a032fee1141dbd6949ffac61d55fbcf8d8a99cf057f685249477ca0791da059d670b5c35c3932135930ef763 + checksum: 10c0/e82ec479f6d6afb33220040900bbdd64d094676c1b375f7131714fbcc36b5487f3457d37821ac84a14625e643a276b5b6714d30504474d37c42476aaef3a9caa languageName: node linkType: hard @@ -5581,7 +5581,7 @@ __metadata: version: 0.0.0-use.local resolution: "dashboard@workspace:." dependencies: - "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-47" + "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-48" "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3" "@playwright/test": "npm:^1.32.1" "@rjsf/core": "npm:^5.13.3"