Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/filter-chip-variants

ot push

Author: Elessar1802

.env

@@ -60,7 +60,6 @@ FEATURE_SWAP_TRAFFIC_ENABLE=false
 FEATURE_RB_SYNC_CLUSTER_ENABLE=true
 FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
 FEATURE_DEFAULT_MERGE_STRATEGY=
-FEATURE_CLUSTER_MAP_ENABLE=true
 FEATURE_DEFAULT_LANDING_RB_ENABLE=false
 FEATURE_ACTION_AUDIOS_ENABLE=true
 FEATURE_APPLICATION_TEMPLATES_ENABLE=true
@@ -76,3 +75,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-alpha-5",
+        "@devtron-labs/devtron-fe-common-lib": "1.18.0-alpha-7",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DTChartSelector.tsx

@@ -120,7 +120,7 @@ const ChartSelectorDropdown = ({
                     />
                 </div>
             </PopupMenu.Button>
-            <PopupMenu.Body rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
+            <PopupMenu.Body noBackDrop rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
                 <>
                     {customCharts.length > 0 && (
                         <div

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'> {}