fix: review comments

Elessar1802 · Elessar1802 · commit 782339ffb39c · 2025-01-08T02:18:12.000+05:30
diff --git a/src/Common/Common.service.ts b/src/Common/Common.service.ts
@@ -16,7 +16,7 @@
 
 import { MutableRefObject } from 'react'
 import moment from 'moment'
-import { sanitizeApprovalConfigData, sanitizeUserApprovalConfig, sanitizeUserApprovalList } from '@Shared/Helpers'
+import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'
 import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { get, post } from './Api'
 import { GitProviderType, ROUTES } from './Constants'
@@ -228,14 +228,12 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
         return {
             canApproverDeploy: cdMaterialsResult?.canApproverDeploy ?? false,
             deploymentApprovalInfo: null,
-            userApprovalConfig: null,
         }
     }
 
     return {
         canApproverDeploy: cdMaterialsResult.canApproverDeploy ?? false,
         deploymentApprovalInfo: sanitizeDeploymentApprovalInfo(cdMaterialsResult.deploymentApprovalInfo),
-        userApprovalConfig: sanitizeUserApprovalConfig(cdMaterialsResult.userApprovalConfig)
     }
 }
 
diff --git a/src/Common/Hooks/useUrlFilters/index.ts b/src/Common/Hooks/useUrlFilters/index.ts
@@ -16,4 +16,3 @@
 
 export { default as useUrlFilters } from './useUrlFilters'
 export type { UseUrlFiltersProps, UseUrlFiltersReturnType } from './types'
-export { parseAllSearchParamsForUseUrlFilters } from './utils'
diff --git a/src/Common/Hooks/useUrlFilters/utils.tsx b/src/Common/Hooks/useUrlFilters/utils.tsx
@@ -3,9 +3,3 @@ export const setItemInLocalStorageIfKeyExists = (localStorageKey: string, value:
         localStorage.setItem(localStorageKey, value)
     }
 }
-
-export const parseAllSearchParamsForUseUrlFilters = <T,>(params: URLSearchParams) =>
-    Array.from(params.entries()).reduce((acc, [key, value]) => {
-        acc[key] = value
-        return acc
-    }, {} as T)
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
@@ -744,7 +744,6 @@ export interface DeploymentApprovalInfoType {
 export interface CDMaterialsApprovalInfo {
     canApproverDeploy: boolean
     deploymentApprovalInfo: DeploymentApprovalInfoType
-    userApprovalConfig: UserApprovalConfigType | null
 }
 
 export interface CDMaterialsMetaInfo {
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/constants.ts b/src/Pages/Applications/DevtronApps/Details/CDPipeline/constants.ts
@@ -1,6 +1,8 @@
+import { DeploymentNodeType } from '@Common/Types'
+
 export const STAGE_MAP = {
-    PRECD: 'PRE',
-    CD: 'DEPLOY',
-    POSTCD: 'POST',
-    APPROVAL: 'APPROVAL',
-}
+    [DeploymentNodeType.PRECD]: 'PRE',
+    [DeploymentNodeType.CD]: 'DEPLOY',
+    [DeploymentNodeType.POSTCD]: 'POST',
+    [DeploymentNodeType.APPROVAL]: 'APPROVAL',
+} as const
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/index.ts b/src/Pages/Applications/DevtronApps/Details/CDPipeline/index.ts
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx b/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
@@ -1,8 +1,8 @@
 import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
-import { DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
+import { APIOptions, DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
+import { STAGE_MAP } from '@Pages/index'
 import { DeploymentStrategy } from '@Shared/Components'
 import { EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
-import { MutableRefObject } from 'react'
 
 interface ConfigSecretType {
     label: string
@@ -107,14 +107,13 @@ export interface SelectedResourceType {
     clusterName?: string
 }
 
-export interface TriggerCDNodeServiceProps {
+export interface TriggerCDNodeServiceProps extends Pick<APIOptions, 'abortControllerRef'> {
     pipelineId: number
     ciArtifactId: number
     appId: number
     stageType: DeploymentNodeType
     deploymentWithConfig?: string
     wfrId?: number
-    abortControllerRef?: MutableRefObject<AbortController>
     /**
      * Would be available only case of PRE/POST CD
      */
@@ -126,6 +125,6 @@ export interface TriggerCDPipelinePayloadType
         TriggerCDNodeServiceProps,
         'pipelineId' | 'appId' | 'ciArtifactId' | 'runtimeParamsPayload' | 'deploymentWithConfig'
     > {
-    cdWorkflowType: string
+    cdWorkflowType: (typeof STAGE_MAP)[keyof typeof STAGE_MAP]
     wfrIdForDeploymentWithSpecificTrigger?: number
 }
diff --git a/src/Pages/ResourceBrowser/service.ts b/src/Pages/ResourceBrowser/service.ts
@@ -1,7 +1,6 @@
 import { post, trash } from '@Common/Api'
 import { ROUTES } from '@Common/Constants'
-import { ResponseType } from '@Common/Types'
-import { MutableRefObject } from 'react'
+import { APIOptions, ResponseType } from '@Common/Types'
 import {
     CreateResourceDTO,
     CreateResourcePayload,
@@ -26,10 +25,10 @@ export const createNewResource = (
 
 export const deleteResource = (
     resourceListPayload: ResourceListPayloadType,
-    abortControllerRef?: MutableRefObject<AbortController>,
+    abortControllerRef?: APIOptions['abortControllerRef'],
 ): Promise<ResponseType<ResourceType[]>> => post(ROUTES.DELETE_RESOURCE, resourceListPayload, { abortControllerRef })
 
 export const deleteNodeCapacity = (
     requestPayload: NodeActionRequest,
-    abortControllerRef?: MutableRefObject<AbortController>,
+    abortControllerRef?: APIOptions['abortControllerRef'],
 ): Promise<ResponseType> => trash(ROUTES.NODE_CAPACITY, requestPayload, { abortControllerRef })
diff --git a/src/Shared/Components/BulkOperations/BulkOperations.component.tsx b/src/Shared/Components/BulkOperations/BulkOperations.component.tsx
@@ -170,22 +170,20 @@ const BulkOperations = ({
 
     const renderConfirmationDialog = () => (
         <ConfirmationModal
-            {...{
-                ...confirmationModalConfig,
-                handleClose: handleModalClose,
-                showConfirmationModal: true,
-                buttonConfig: {
-                    primaryButtonConfig: {
-                        ...confirmationModalConfig.buttonConfig.primaryButtonConfig,
-                        onClick: handleBulkOperations,
-                        disabled: apiCallInProgress,
-                        isLoading: apiCallInProgress,
-                    },
-                    secondaryButtonConfig: {
-                        ...confirmationModalConfig.buttonConfig.secondaryButtonConfig,
-                        onClick: handleModalClose,
-                        disabled: apiCallInProgress,
-                    },
+            {...confirmationModalConfig}
+            handleClose={handleModalClose}
+            showConfirmationModal
+            buttonConfig={{
+                primaryButtonConfig: {
+                    ...confirmationModalConfig.buttonConfig.primaryButtonConfig,
+                    onClick: handleBulkOperations,
+                    disabled: apiCallInProgress,
+                    isLoading: apiCallInProgress,
+                },
+                secondaryButtonConfig: {
+                    ...confirmationModalConfig.buttonConfig.secondaryButtonConfig,
+                    onClick: handleModalClose,
+                    disabled: apiCallInProgress,
                 },
             }}
         />
diff --git a/src/Shared/Components/BulkOperations/BulkOperationsResultModal.tsx b/src/Shared/Components/BulkOperations/BulkOperationsResultModal.tsx
@@ -118,7 +118,7 @@ const BulkOperationsResultModal = ({
                     />
                 </header>
                 <div className="flexbox-col dc__gap-16 dc__overflow-hidden pt-20 flex-grow-1 bulk-operations__results-modal__content">
-                    <div className="bulk-operations__results-modal__bar-chart ml-20 mr-20 flexbox-col">
+                    <div className="bulk-operations__results-modal__bar-chart br-8 flexbox-col dc__align-start dc__align-self-stretch dc__border bcn-0 ml-20 mr-20">
                         <SegmentedBarChart
                             entities={resultsStore.getBarChartEntities()}
                             rootClassName="p-16 fs-13 dc__border-bottom-n1"
@@ -137,7 +137,7 @@ const BulkOperationsResultModal = ({
                     </div>
                     <div className="flexbox-col lh-20 dc__overflow-hidden">
                         <div
-                            className="dc__grid dc__border-bottom-n1 py-10 fs-12 fw-6 cn-7 ml-20 mr-20 dc__gap-16"
+                            className="dc__grid dc__border-bottom-n1 py-8 fs-12 fw-6 cn-7 ml-20 mr-20 dc__gap-16"
                             style={{ gridTemplateColumns }}
                         >
                             {modalHeaders.map((header) => (
diff --git a/src/Shared/Components/BulkOperations/constants.ts b/src/Shared/Components/BulkOperations/constants.ts
@@ -1,9 +1,9 @@
 import { BulkOperationResultType } from './types'
 
 export const COLOR_MAPPING = {
-    Completed: '#1DAD70',
-    Pending: '#B1B7BC',
-    Failed: '#F33E3E',
+    Completed: 'var(--G500)',
+    Pending: 'var(--N300)',
+    Failed: 'var(--R500)',
 }
 
 export const RESULTS_MODAL_HEADERS: { label: string; isSortable: boolean; width: string }[] = [
diff --git a/src/Shared/Components/BulkOperations/styles.scss b/src/Shared/Components/BulkOperations/styles.scss
@@ -1,13 +1,6 @@
 .bulk-operations {
     &__results-modal {
         &__bar-chart {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-            align-self: stretch;
-            border-radius: 8px;
-            border: 1px solid var(--N200, #d0d4d9);
-            background: var(--N0, #fff);
             box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
         }
 
diff --git a/src/Shared/Components/BulkOperations/types.ts b/src/Shared/Components/BulkOperations/types.ts
@@ -1,6 +1,6 @@
 import { SegmentedBarChartProps } from '@Common/SegmentedBarChart'
-import { MutableRefObject, ReactNode } from 'react'
-import { DrawerProps } from '@Common/index'
+import { ReactNode } from 'react'
+import { APIOptions, DrawerProps } from '@Common/index'
 import { getProgressingStateForStatus } from '../Security'
 import { ConfirmationModalProps } from '../ConfirmationModal/types'
 
@@ -20,7 +20,7 @@ export interface BulkOperation {
      * Would show these keys beside the name
      */
     additionalKeys?: BulkOperationAdditionalKeysType[]
-    operation: (abortControllerRef: MutableRefObject<AbortController>, data?: unknown) => Promise<unknown | void>
+    operation: (abortControllerRef: APIOptions['abortControllerRef'], data?: unknown) => Promise<unknown | void>
     renderContentAtResultRowEnd?: (data: Awaited<ReturnType<BulkOperation['operation']>>) => ReactNode
 }
 
diff --git a/src/Shared/Helpers.tsx b/src/Shared/Helpers.tsx
@@ -833,19 +833,6 @@ export const sanitizeApprovalConfigData = (
     },
 })
 
-export const sanitizeUserApprovalConfig = (userApprovalConfig: UserApprovalConfigType): UserApprovalConfigType => ({
-    requiredCount: userApprovalConfig?.requiredCount ?? 0,
-    type: userApprovalConfig?.type ?? ManualApprovalType.notConfigured,
-    specificUsers: {
-        identifiers: userApprovalConfig?.specificUsers?.identifiers ?? [],
-        requiredCount: userApprovalConfig?.specificUsers?.identifiers?.length ?? 0,
-    },
-    userGroups: (userApprovalConfig?.userGroups ?? []).map((userGroup) => ({
-        identifier: userGroup.identifier,
-        requiredCount: userGroup.requiredCount ?? 0,
-    })),
-})
-
 /**
  * Manual approval is considered configured only if the type is not notConfigured
  */
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
@@ -15,8 +15,7 @@
  */
 
 import { Dayjs } from 'dayjs'
-import { ApprovalConfigDataType } from '@Common/Types'
-import { MutableRefObject } from 'react'
+import { APIOptions, ApprovalConfigDataType } from '@Common/Types'
 import {
     OptionType,
     CommonNodeAttr,
@@ -269,11 +268,6 @@ export enum Severity {
     UNKNOWN = 'unknown',
 }
 
-export enum ImagePromotionTabs {
-    REQUEST = 'request',
-    PENDING = 'pending',
-}
-
 export interface ArtifactPromotionMetadata {
     isConfigured: boolean
     isApprovalPendingForPromotion: boolean
@@ -918,10 +912,9 @@ export interface PolicyConsequencesDTO {
     ci: PipelineStageBlockInfo
 }
 
-export interface GetPolicyConsequencesProps {
+export interface GetPolicyConsequencesProps extends Pick<APIOptions, 'abortControllerRef'> {
     appId: number
     envId: number
-    abortControllerRef?: MutableRefObject<AbortController>
 }
 export interface UploadFileDTO {
     id: number

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`import { MutableRefObject } from 'react'`
`18`	`18`	`import moment from 'moment'`
`19`		`-import { sanitizeApprovalConfigData, sanitizeUserApprovalConfig, sanitizeUserApprovalList } from '@Shared/Helpers'`
	`19`	`+import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'`
`20`	`20`	`import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'`
`21`	`21`	`import { get, post } from './Api'`
`22`	`22`	`import { GitProviderType, ROUTES } from './Constants'`
`@@ -228,14 +228,12 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu`
`228`	`228`	`return {`
`229`	`229`	`canApproverDeploy: cdMaterialsResult?.canApproverDeploy ?? false,`
`230`	`230`	`deploymentApprovalInfo: null,`
`231`		`- userApprovalConfig: null,`
`232`	`231`	`}`
`233`	`232`	`}`
`234`	`233`
`235`	`234`	`return {`
`236`	`235`	`canApproverDeploy: cdMaterialsResult.canApproverDeploy ?? false,`
`237`	`236`	`deploymentApprovalInfo: sanitizeDeploymentApprovalInfo(cdMaterialsResult.deploymentApprovalInfo),`
`238`		`- userApprovalConfig: sanitizeUserApprovalConfig(cdMaterialsResult.userApprovalConfig)`
`239`	`237`	`}`
`240`	`238`	`}`
`241`	`239`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@`
`16`	`16`
`17`	`17`	`export { default as useUrlFilters } from './useUrlFilters'`
`18`	`18`	`export type { UseUrlFiltersProps, UseUrlFiltersReturnType } from './types'`
`19`		`-export { parseAllSearchParamsForUseUrlFilters } from './utils'`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,3 @@ export const setItemInLocalStorageIfKeyExists = (localStorageKey: string, value:`
`3`	`3`	`localStorage.setItem(localStorageKey, value)`
`4`	`4`	`}`
`5`	`5`	`}`
`6`		`-`
`7`		`-export const parseAllSearchParamsForUseUrlFilters = <T,>(params: URLSearchParams) =>`
`8`		`- Array.from(params.entries()).reduce((acc, [key, value]) => {`
`9`		`- acc[key] = value`
`10`		`- return acc`
`11`		`- }, {} as T)`
Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,6 @@ export interface DeploymentApprovalInfoType {`
`744`	`744`	`export interface CDMaterialsApprovalInfo {`
`745`	`745`	`canApproverDeploy: boolean`
`746`	`746`	`deploymentApprovalInfo: DeploymentApprovalInfoType`
`747`		`- userApprovalConfig: UserApprovalConfigType \| null`
`748`	`747`	`}`
`749`	`748`
`750`	`749`	`export interface CDMaterialsMetaInfo {`