Merge branch 'main' of github.com:devtron-labs/dashboard into feat/node-search-filters

Author: RohitRaj011

.env

@@ -76,3 +76,4 @@ FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
 FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE=false
 FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
 FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false
+FEATURE_CANARY_ROLLOUT_PROGRESS_ENABLE=true

package.json

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

src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppOrJobSelector.tsx

@@ -70,7 +70,7 @@ const AppOrJobSelector = ({
                 _permission.entityName.filter((option) => option.value !== SELECT_ALL_VALUE).map((app) => app.label) ??
                 []
             const { appIdWorkflowNamesMapping } = await getUserAccessAllWorkflows({
-                appIds: jobNames,
+                appNames: jobNames,
                 options: { abortControllerRef },
             })
             const workflowOptions = getWorkflowOptions(appIdWorkflowNamesMapping)

src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx

@@ -345,7 +345,7 @@ const AppPermissions = () => {
     async function setAllWorkflows(jobOptions) {
         const jobNames = jobOptions.filter((job) => job.value !== SELECT_ALL_VALUE).map((job) => job.label)
         try {
-            const result = await getUserAccessAllWorkflows(jobNames)
+            const result = await getUserAccessAllWorkflows({ appNames: jobNames })
 
             const workflowOptions = getWorkflowOptions(result?.appIdWorkflowNamesMapping)
             return [

src/Pages/GlobalConfigurations/Authorization/authorization.service.ts

@@ -312,10 +312,10 @@ export const getUserAccessClusterList = () =>
         payload: { entity: EntityTypes.CLUSTER },
     })
 
-export const getUserAccessAllWorkflows = ({ appIds, options }: GetUserAccessAllWorkflowsParams) =>
+export const getUserAccessAllWorkflows = ({ appNames, options }: GetUserAccessAllWorkflowsParams) =>
     getUserResourceOptions<AppIdWorkflowNamesMapping>({
-        kind: UserAccessResourceKind.JOBS,
-        payload: { entity: EntityTypes.JOB, appIds },
+        kind: UserAccessResourceKind.WORKFLOW,
+        payload: { entity: EntityTypes.JOB, appNames },
         options,
     })
 

src/Pages/GlobalConfigurations/Authorization/types.ts

@@ -347,6 +347,7 @@ export interface GetUserPermissionResourcesPayload
     accessType?: ACCESS_TYPE_MAP.DEVTRON_APPS | ACCESS_TYPE_MAP.HELM_APPS
     teamIds?: number[]
     appIds?: string[]
+    appNames?: string[]
 }
 
 export interface GetUserResourceOptionsProps {
@@ -356,5 +357,5 @@ export interface GetUserResourceOptionsProps {
 }
 
 export interface GetUserAccessAllWorkflowsParams
-    extends Pick<GetUserPermissionResourcesPayload, 'appIds'>,
+    extends Pick<GetUserPermissionResourcesPayload, 'appNames'>,
         Pick<GetUserResourceOptionsProps, 'options'> {}

src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx

@@ -328,15 +328,6 @@ export const ConfigMapSecretContainer = ({
         }
     }, [configMapSecretResLoading, configMapSecretRes])
 
-    // CONFIGMAP/SECRET DELETED
-    const configHasBeenDeleted = useMemo(
-        () =>
-            !configMapSecretResLoading && configMapSecretRes
-                ? !configMapSecretData && !inheritedConfigMapSecretData && !draftData
-                : null,
-        [configMapSecretResLoading, configMapSecretRes],
-    )
-
     // CONFIGMAP/SECRET ERROR
     const configMapSecretResErr = useMemo(
         () =>
@@ -348,6 +339,18 @@ export const ConfigMapSecretContainer = ({
         [configMapSecretResLoading, configMapSecretRes],
     )
 
+    // CONFIGMAP/SECRET DELETED
+    const configHasBeenDeleted = useMemo(
+        () =>
+            !configMapSecretResLoading &&
+            configMapSecretRes &&
+            !configMapSecretResErr &&
+            !configMapSecretData &&
+            !inheritedConfigMapSecretData &&
+            !draftData,
+        [configMapSecretResLoading, configMapSecretRes, configMapSecretResErr],
+    )
+
     // ASYNC CALL - CONFIGMAP/SECRET RESOLVED DATA
     const [resolvedScopeVariablesResLoading, resolvedScopeVariablesRes, reloadResolvedScopeVariablesResErr] = useAsync(
         () =>

src/index.tsx

@@ -181,6 +181,7 @@ if (!window || !window._env_) {
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: true,
         FEATURE_FLUX_DEPLOYMENTS_ENABLE: false,
         FEATURE_LINK_EXTERNAL_FLUX_ENABLE: false,
+        FEATURE_CANARY_ROLLOUT_PROGRESS_ENABLE: true,
     }
 }
 

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.18.0-pre-0":
-  version: 1.18.0-pre-0
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.0-pre-0"
+"@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-0":
+  version: 1.18.1-pre-0
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.18.1-pre-0"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1774,7 +1774,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/1bcecf97315a63222d7063d181ec751fb7a8970e0de585e71d0725acaa2d0d60e264311404bd1c333ae2623fc9607ad965e47a26948156a7e4942b77bb1c1303
+  checksum: 10c0/de563e385f44c1ed357fad7c2ce01989857a7acd3164958b7817e0a64fbb61648e4bff4aee207c3de2c18027b6364ab8f67a962420ddfd7aeebf813500dd985d
   languageName: node
   linkType: hard
 
@@ -5721,7 +5721,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.18.0-pre-0"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.18.1-pre-0"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"