Merge pull request #2847 from devtron-labs/fix/cm-secret-incorrect-error-state

fix: CM/Secret Incorrect Error State, Permissions - job workflows api endpoint

Author: RohitRaj011

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

@@ -345,6 +345,7 @@ export interface GetUserPermissionResourcesPayload
     accessType?: ACCESS_TYPE_MAP.DEVTRON_APPS | ACCESS_TYPE_MAP.HELM_APPS
     teamIds?: number[]
     appIds?: string[]
+    appNames?: string[]
 }
 
 export interface GetUserResourceOptionsProps {
@@ -354,5 +355,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(
         () =>