Skip to content

Commit bcc6d69

Browse files
committed
refactor: migrate sanitizeUserApprovalConfig from fe-lib & re-use in processCDMaterialsApprovalInfo
1 parent c96156b commit bcc6d69

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/Common/Common.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import { MutableRefObject } from 'react'
1818
import moment from 'moment'
19-
import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'
19+
import { sanitizeApprovalConfigData, sanitizeUserApprovalConfig, sanitizeUserApprovalList } from '@Shared/Helpers'
2020
import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
2121
import { get, post } from './Api'
2222
import { GitProviderType, ROUTES } from './Constants'
@@ -235,7 +235,7 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
235235
return {
236236
canApproverDeploy: cdMaterialsResult.canApproverDeploy ?? false,
237237
deploymentApprovalInfo: sanitizeDeploymentApprovalInfo(cdMaterialsResult.deploymentApprovalInfo),
238-
userApprovalConfig: cdMaterialsResult.userApprovalConfig ?? null
238+
userApprovalConfig: sanitizeUserApprovalConfig(cdMaterialsResult.userApprovalConfig)
239239
}
240240
}
241241

src/Shared/Helpers.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,19 @@ export const sanitizeApprovalConfigData = (
833833
},
834834
})
835835

836+
export const sanitizeUserApprovalConfig = (userApprovalConfig: UserApprovalConfigType): UserApprovalConfigType => ({
837+
requiredCount: userApprovalConfig?.requiredCount ?? 0,
838+
type: userApprovalConfig?.type ?? ManualApprovalType.notConfigured,
839+
specificUsers: {
840+
identifiers: userApprovalConfig?.specificUsers?.identifiers ?? [],
841+
requiredCount: userApprovalConfig?.specificUsers?.identifiers?.length ?? 0,
842+
},
843+
userGroups: (userApprovalConfig?.userGroups ?? []).map((userGroup) => ({
844+
identifier: userGroup.identifier,
845+
requiredCount: userGroup.requiredCount ?? 0,
846+
})),
847+
})
848+
836849
/**
837850
* Manual approval is considered configured only if the type is not notConfigured
838851
*/

0 commit comments

Comments
 (0)