feat: sanitize user approval config in processCDMaterialsApprovalInfo

Author: AbhishekA1509

src/Common/Common.service.ts

@@ -34,6 +34,8 @@ import {
     EnvironmentListHelmResponse,
     UserGroupApproverType,
     ImageApprovalPolicyUserGroupDataType,
+    ManualApprovalType,
+    UserApprovalConfigType,
 } from './Types'
 import { ApiResourceType } from '../Pages'
 
@@ -185,6 +187,16 @@ const VALID_GROUPS = [
     'developers',
 ]
 
+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 ?? [],
+})
+
 const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResult): CDMaterialsApprovalInfo => {
     if (!enableApproval || !cdMaterialsResult) {
         return {
@@ -197,8 +209,7 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
 
     return {
         approvalUsers: cdMaterialsResult.approvalUsers,
-        // TODO: use sanitizeUserApprovalConfig
-        userApprovalConfig: cdMaterialsResult.userApprovalConfig,
+        userApprovalConfig: sanitizeUserApprovalConfig(cdMaterialsResult.userApprovalConfig),
         canApproverDeploy: cdMaterialsResult.canApproverDeploy ?? false,
         imageApprovalPolicyDetails: {
             isPolicyConfigured: true,

src/Common/Types.ts

@@ -351,6 +351,7 @@ export interface UserApprovalConfigType {
     requiredCount: number
     specificUsers: {
         identifiers: string[]
+        requiredCount: number
     }
     userGroups: (Pick<UserGroupDTO, 'identifier'> & {
         requiredCount: number
@@ -375,13 +376,15 @@ interface ApprovalUserDataType {
     userEmail: string
     userId: number
     userResponse: number
+    userGroups?: Pick<UserGroupDTO, 'identifier' | 'name'>[]
 }
 
 export interface UserApprovalMetadataType {
     approvalRequestId: number
     approvalRuntimeState: number
     approvedUsersData: ApprovalUserDataType[]
     requestedUserData: ApprovalUserDataType
+    approvalConfig?: UserApprovalConfigType
 }
 
 export enum FilterStates {