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

Author: shivani170

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.20.3-pre-11",
+    "version": "1.20.5-pre-5",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -49,6 +49,7 @@ class CoreAPI {
         preventLicenseRedirect = false,
         shouldParseServerErrorForUnauthorizedUser = false,
         isMultipartRequest,
+        isProxyHost = false,
     }: FetchAPIParamsType<K>): Promise<ResponseType> => {
         const options: RequestInit = {
             method: type,
@@ -58,7 +59,7 @@ class CoreAPI {
         // eslint-disable-next-line dot-notation
         options['credentials'] = 'include' as RequestCredentials
         return fetch(
-            `${this.host}/${url}`,
+            `${isProxyHost ? '/proxy' : this.host}/${url}`,
             !isMultipartRequest
                 ? options
                 : ({

src/Common/API/CoreAPI.ts

@@ -40,5 +40,10 @@ export interface FetchInTimeParamsType<Data = object> {
 export interface FetchAPIParamsType<Data = object>
     extends Omit<FetchInTimeParamsType<Data>, 'options'>,
         Pick<APIOptions, 'preventAutoLogout' | 'preventLicenseRedirect' | 'shouldParseServerErrorForUnauthorizedUser'> {
+    /**
+     * @default false
+     * @description - If true, will override the default host (orchestrator or whatever defined initially in CoreAPI constructor) with the `proxy` host
+     */
+    isProxyHost?: boolean
     signal: AbortSignal
 }

src/Common/API/types.ts

@@ -57,7 +57,7 @@ const SOFTWARE_RELEASE_MANAGEMENT_ROOT = '/software-release-management'
 const COST_VISIBILITY_ROOT = '/cost-visibility'
 const SECURITY_CENTER_ROOT = '/security-center'
 const AUTOMATION_AND_ENABLEMENT_ROOT = '/automation-and-enablement'
-const BACKUP_AND_RESTORE_ROOT = '/backup-and-restore'
+const DATA_PROTECTION_ROOT = '/data-protection-management'
 const GLOBAL_CONFIG_ROOT = '/global-configuration'
 const AI_RECOMMENDATIONS_ROOT = '/ai-recommendations'
 
@@ -124,9 +124,12 @@ export const URLS = {
     // AUTOMATION AND ENABLEMENT
     AUTOMATION_AND_ENABLEMENT: AUTOMATION_AND_ENABLEMENT_ROOT,
     AUTOMATION_AND_ENABLEMENT_JOB: `${AUTOMATION_AND_ENABLEMENT_ROOT}/job`,
-    // BACKUP AND RESTORE
-    BACKUP_AND_RESTORE: BACKUP_AND_RESTORE_ROOT,
-    BACKUP_AND_RESTORE_OVERVIEW: `${BACKUP_AND_RESTORE_ROOT}/overview`,
+    // DATA PROTECTION
+    DATA_PROTECTION: DATA_PROTECTION_ROOT,
+    DATA_PROTECTION_OVERVIEW: `${DATA_PROTECTION_ROOT}/overview`,
+    DATA_PROTECTION_BACKUP_AND_SCHEDULE: `${DATA_PROTECTION_ROOT}/backup-and-schedule`,
+    DATA_PROTECTION_RESTORES: `${DATA_PROTECTION_ROOT}/restores`,
+    DATA_PROTECTION_BACKUP_LOCATIONS: `${DATA_PROTECTION_ROOT}/backup-locations`,
     // GLOBAL CONFIGURATION
     GLOBAL_CONFIG: GLOBAL_CONFIG_ROOT,
     GLOBAL_CONFIG_DOCKER: `${GLOBAL_CONFIG_ROOT}/docker`,

src/Common/Constants.ts

@@ -51,12 +51,12 @@ export type NavigationItemID =
     | 'global-configuration-cluster-and-environments'
     | 'global-configuration-container-oci-registry'
     | 'global-configuration-authorization'
-    | 'backup-and-restore-overview'
-    | 'backup-and-restore-backup-and-schedule'
-    | 'backup-and-restore-restores'
-    | 'backup-and-restore-backup-repositories'
-    | 'backup-and-restore-backup-locations'
-    | 'backup-and-restore-history-and-logs'
+    | 'data-protection-overview'
+    | 'data-protection-backup-and-schedule'
+    | 'data-protection-restores'
+    | 'data-protection-backup-repositories'
+    | 'data-protection-backup-locations'
+    | 'data-protection-history-and-logs'
     | 'ai-recommendations-overview'
 
 export type NavigationSubMenuItemID =