Merge pull request #850 from devtron-labs/fix/bulk-deploy-trigger

feat: add api options in service

Author: AbhishekA1509

package-lock.json

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

package.json

@@ -17,6 +17,7 @@
 import { MutableRefObject } from 'react'
 import moment from 'moment'
 import {
+    getIsApprovalPolicyConfigured,
     sanitizeApprovalConfigData,
     sanitizeTargetPlatforms,
     sanitizeUserApprovalList,
@@ -49,6 +50,7 @@ import {
     EnvAppsMetaDTO,
     GetAppsInfoForEnvProps,
     AppMeta,
+    ApprovalRuntimeStateType,
 } from './Types'
 import { ApiResourceType, STAGE_MAP } from '../Pages'
 import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types'
@@ -116,6 +118,8 @@ const cdMaterialListModal = ({
     artifactId,
     artifactStatus,
     disableDefaultSelection,
+    isExceptionUser,
+    isApprovalConfigured,
 }: CDMaterialListModalServiceUtilProps) => {
     if (!artifacts || !artifacts.length) return []
 
@@ -131,8 +135,15 @@ const cdMaterialListModal = ({
             artifactStatusValue = artifactStatus
         }
 
+        const isConsumedNonApprovedImage =
+            !isExceptionUser && isApprovalConfigured &&
+            (!material.userApprovalMetadata ||
+            material.userApprovalMetadata.approvalRuntimeState !== ApprovalRuntimeStateType.approved)
+
         const selectImage =
-            !isImageMarked && markFirstSelected && filterState === FilterStates.ALLOWED ? !material.vulnerable : false
+            !isImageMarked && markFirstSelected && filterState === FilterStates.ALLOWED && !isConsumedNonApprovedImage
+                ? !material.vulnerable
+                : false
         if (selectImage) {
             isImageMarked = true
         }
@@ -328,17 +339,27 @@ export const processCDMaterialServiceResponse = (
         }
     }
 
+    const approvalInfo = processCDMaterialsApprovalInfo(
+        stage === DeploymentNodeType.CD || stage === DeploymentNodeType.APPROVAL,
+        cdMaterialsResult,
+    )
+
+    const isApprovalConfigured = getIsApprovalPolicyConfigured(
+        approvalInfo?.deploymentApprovalInfo?.approvalConfigData,
+    )
+
+    const isExceptionUser = approvalInfo?.deploymentApprovalInfo?.approvalConfigData?.isExceptionUser ?? false
+
     const materials = cdMaterialListModal({
         artifacts: cdMaterialsResult.ci_artifacts,
         offset: offset ?? 0,
         artifactId: cdMaterialsResult.latest_wf_artifact_id,
         artifactStatus: cdMaterialsResult.latest_wf_artifact_status,
         disableDefaultSelection,
+        isApprovalConfigured,
+        isExceptionUser,
     })
-    const approvalInfo = processCDMaterialsApprovalInfo(
-        stage === DeploymentNodeType.CD || stage === DeploymentNodeType.APPROVAL,
-        cdMaterialsResult,
-    )
+
     const metaInfo = processCDMaterialsMetaInfo(cdMaterialsResult)
     const imagePromotionInfo = processImagePromotionInfo(cdMaterialsResult)
 
@@ -439,10 +460,12 @@ export function fetchChartTemplateVersions() {
 
 export const getDefaultConfig = (): Promise<ResponseType> => get(`${ROUTES.NOTIFIER}/channel/config`)
 
-export function getEnvironmentListMinPublic(includeAllowedDeploymentTypes?: boolean) {
-    return get(
-        `${ROUTES.ENVIRONMENT_LIST_MIN}?auth=false${includeAllowedDeploymentTypes ? '&showDeploymentOptions=true' : ''}`,
-    )
+export function getEnvironmentListMinPublic(includeAllowedDeploymentTypes?: boolean, options?: APIOptions) {
+    const url = getUrlWithSearchParams(ROUTES.ENVIRONMENT_LIST_MIN, {
+        auth: false,
+        ...(includeAllowedDeploymentTypes ? { showDeploymentOptions: true } : {}),
+    })
+    return get(url, options)
 }
 
 export function getClusterListMin() {
@@ -453,7 +476,10 @@ export function getClusterListMin() {
 export const getResourceGroupListRaw = (clusterId: string): Promise<ResponseType<ApiResourceType>> =>
     get(`${ROUTES.API_RESOURCE}/${ROUTES.GVK}/${clusterId}`)
 
-export function getNamespaceListMin(clusterIdsCsv: string, abortControllerRef?: APIOptions['abortControllerRef']): Promise<EnvironmentListHelmResponse> {
+export function getNamespaceListMin(
+    clusterIdsCsv: string,
+    abortControllerRef?: APIOptions['abortControllerRef'],
+): Promise<EnvironmentListHelmResponse> {
     const URL = `${ROUTES.NAMESPACE}/autocomplete?ids=${clusterIdsCsv}`
     return get(URL, { abortControllerRef })
 }

src/Assets/Illustration/img-mechanical-operation.svg

@@ -189,7 +189,7 @@ const Body = ({
     style = {},
     autoWidth = false,
     preventWheelDisable = false,
-    noBackDrop,
+    noBackDrop = true,
 }: PopupMenuBodyType) => {
     const { handleClose, popupPosition, opacity, callbackRef, buttonWidth } = usePopupContext()
     return popupPosition ? (

src/Common/Common.service.ts

@@ -493,6 +493,8 @@ export interface CDMaterialListModalServiceUtilProps {
     artifactId?: number
     artifactStatus?: string
     disableDefaultSelection?: boolean
+    isExceptionUser: boolean
+    isApprovalConfigured: boolean
 }
 
 export interface CDMaterialType {

src/Common/PopupMenu.tsx

@@ -2,13 +2,15 @@
 
 import ImgCode from '@Illustrations/img-code.webp'
 import ImgManOnRocket from '@Illustrations/img-man-on-rocket.webp'
+import { ReactComponent as ImgMechanicalOperation } from '@Illustrations/img-mechanical-operation.svg'
 import ImgNoResult from '@Illustrations/img-no-result.webp'
 
 // eslint-disable-next-line no-restricted-imports
 import { IllustrationBase } from './IllustrationBase'
 import { IllustrationBaseProps } from './types'
 
 export const illustrationMap = {
+    'img-mechanical-operation': ImgMechanicalOperation,
     'img-code': ImgCode,
     'img-man-on-rocket': ImgManOnRocket,
     'img-no-result': ImgNoResult,