Merge branch 'kubecon-2025' into feat/nested-navigation-route

Author: shivani170

package.json

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

src/components/Navigation/constants.ts

@@ -414,58 +414,38 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [
         ],
     },
     {
-        title: 'Backup & Restore',
-        id: 'backup-and-restore',
+        title: 'Data Protection Management',
+        id: 'data-protection-management',
         icon: 'ic-database-backup',
-        disabled: true,
         items: [
             {
                 title: 'Overview',
-                dataTestId: 'backup-and-restore-overview',
-                id: 'backup-and-restore-overview',
+                dataTestId: 'data-protection-overview',
+                id: 'data-protection-overview',
                 icon: 'ic-speedometer',
                 disabled: true,
-                href: COMMON_URLS.BACKUP_AND_RESTORE_OVERVIEW,
+                href: COMMON_URLS.DATA_PROTECTION_OVERVIEW,
             },
             {
                 title: 'Backup & Schedule',
-                dataTestId: 'backup-and-restore-backup-and-schedule',
-                id: 'backup-and-restore-backup-and-schedule',
+                dataTestId: 'data-protection-backup-and-schedule',
+                id: 'data-protection-backup-and-schedule',
                 icon: 'ic-floppy-disk',
-                href: '/dummy-url',
-                disabled: true,
+                href: COMMON_URLS.DATA_PROTECTION_BACKUP_AND_SCHEDULE,
             },
             {
                 title: 'Restores',
-                dataTestId: 'backup-and-restore-restores',
-                id: 'backup-and-restore-restores',
+                dataTestId: 'data-protection-restores',
+                id: 'data-protection-restores',
                 icon: 'ic-clock-counterclockwise',
-                href: '/dummy-url',
-                disabled: true,
-            },
-            {
-                title: 'Backup Repositories',
-                dataTestId: 'backup-repositories',
-                id: 'backup-and-restore-backup-repositories',
-                icon: 'ic-folder',
-                href: '/dummy-url',
-                disabled: true,
+                href: COMMON_URLS.DATA_PROTECTION_RESTORES,
             },
             {
                 title: 'Backup Locations',
                 dataTestId: 'backup-locations',
-                id: 'backup-and-restore-backup-locations',
+                id: 'data-protection-backup-locations',
                 icon: 'ic-storage',
-                href: '/dummy-url',
-                disabled: true,
-            },
-            {
-                title: 'History & Logs',
-                dataTestId: 'history-and-logs',
-                id: 'backup-and-restore-history-and-logs',
-                icon: 'ic-clipboard',
-                href: '/dummy-url',
-                disabled: true,
+                href: COMMON_URLS.DATA_PROTECTION_BACKUP_LOCATIONS,
             },
         ],
     },

src/components/Navigation/types.ts

@@ -19,7 +19,7 @@ export type NavigationRootItemID =
     | 'cost-visibility'
     | 'security-center'
     | 'automation-and-enablement'
-    | 'backup-and-restore'
+    | 'data-protection-management'
     | 'global-configuration'
     | 'ai-recommendations'
 

src/components/common/navigation/NavigationRoutes.tsx

@@ -682,6 +682,7 @@ const NavigationRoutes = ({ reloadVersionConfig }: Readonly<NavigationRoutesType
                                                 CommonURLS.APPLICATION_MANAGEMENT,
                                                 CommonURLS.COST_VISIBILITY,
                                                 CommonURLS.AI_RECOMMENDATIONS,
+                                                CommonURLS.DATA_PROTECTION,
                                             ]}
                                         >
                                             <CostVisibilityRenderProvider renderClusterForm={renderClusterForm}>

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-10":
-  version: 1.20.3-pre-10
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-10"
+"@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-12":
+  version: 1.20.3-pre-12
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-12"
   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/16e11c69fb84aeb11b56335fdbfbe38c036ddf83d1df169cbf94bd3ce234c5d31fef710f1ba0c665574227c1660ef3891b6f8fae822ce4de35cf7dc8e49ce68f
+  checksum: 10c0/33b9aec93cc00f5aadd38ac8ff47f05aa5f0872360b96cec7f4cd97197914fd26da39a173bade82e723ab2661f7142b76291df60bac203643b4f6387143cab48
   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.3-pre-10"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.3-pre-12"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"