Merge branch 'fix/ai-fixes' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/ai-actions

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.22.6-beta-6",
+    "version": "1.22.8-beta-3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -102,7 +102,6 @@ export const URLS = {
     APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP_CREATE: `${APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP}/create`,
     // NOTE: using appId since we are re-using AppConfig component
     APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP_DETAIL: `${APPLICATION_MANAGEMENT_TEMPLATES_DEVTRON_APP}/detail/:appId`,
-    APPLICATION_MANAGEMENT_PROJECTS: `${APPLICATION_MANAGEMENT_ROOT}/projects`,
     APPLICATION_MANAGEMENT_CONFIGURATIONS,
     APPLICATION_MANAGEMENT_CONFIGURATIONS_DEPLOYMENT_CHARTS: `${APPLICATION_MANAGEMENT_CONFIGURATIONS}/deployment-charts`,
     APPLICATION_MANAGEMENT_CONFIGURATIONS_SCOPED_VARIABLES: `${APPLICATION_MANAGEMENT_CONFIGURATIONS}/scoped-variables`,
@@ -154,6 +153,7 @@ export const URLS = {
     GLOBAL_CONFIG: GLOBAL_CONFIG_ROOT,
     GLOBAL_CONFIG_DOCKER: `${GLOBAL_CONFIG_ROOT}/docker`,
     GLOBAL_CONFIG_EDIT_CLUSTER: `${GLOBAL_CONFIG_ROOT}/cluster-env/edit/:clusterId`,
+    GLOBAL_CONFIG_PROJECTS: `${GLOBAL_CONFIG_ROOT}/projects`,
     PERMISSION_GROUPS: `${GLOBAL_CONFIG_ROOT}/auth/groups`,
     EXTERNAL_APPS: 'ea',
 } as const

src/Common/Constants.ts

@@ -8,7 +8,6 @@ export type NavigationItemID =
     | 'application-management-application-groups'
     | 'application-management-bulk-edit'
     | 'application-management-application-templates'
-    | 'application-management-projects'
     | 'application-management-configurations'
     | 'application-management-policies'
     | 'infrastructure-management-overview'
@@ -38,6 +37,7 @@ export type NavigationItemID =
     | 'global-configuration-cluster-and-environments'
     | 'global-configuration-container-oci-registry'
     | 'global-configuration-authorization'
+    | 'global-configuration-projects'
     | 'data-protection-overview'
     | 'data-protection-backup-and-schedule'
     | 'data-protection-restores'

src/Pages-Devtron-2.0/Navigation/types.ts

@@ -188,6 +188,8 @@ export interface customEnv {
      */
     FEATURE_STORAGE_ENABLE?: boolean
     FEATURE_ATHENA_DEBUG_MODE_ENABLE?: boolean
+    /** Org ID for grafana */
+    GRAFANA_ORG_ID?: number
 }
 declare global {
     interface Window {