Skip to content

Commit 6bff1cf

Browse files
committed
chore: rename user group data type
1 parent c38bc14 commit 6bff1cf

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/Common/Common.service.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
ImagePromotionMaterialInfo,
3434
EnvironmentListHelmResponse,
3535
UserGroupApproverType,
36-
UserGroupDataType,
36+
ImageApprovalPolicyUserGroupDataType,
3737
} from './Types'
3838
import { ApiResourceType } from '../Pages'
3939

@@ -197,6 +197,7 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
197197

198198
return {
199199
approvalUsers: cdMaterialsResult.approvalUsers,
200+
// TODO: use sanitizeUserApprovalConfig
200201
userApprovalConfig: cdMaterialsResult.userApprovalConfig,
201202
canApproverDeploy: cdMaterialsResult.canApproverDeploy ?? false,
202203
imageApprovalPolicyDetails: {
@@ -229,7 +230,8 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
229230
emails,
230231
}
231232
return acc
232-
}, {} as Record<string, UserGroupDataType>),
233+
}, {} as Record<string, ImageApprovalPolicyUserGroupDataType>),
234+
// TODO: getUserGroupList
233235
// TODO: Sort these arrays
234236
validGroups: VALID_GROUPS,
235237
}

src/Common/Types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ export interface UserGroupApproverType {
328328
hasAccess: boolean
329329
}
330330

331-
export interface UserGroupDataType {
331+
export interface ImageApprovalPolicyUserGroupDataType {
332332
// Mapping email to data
333333
dataStore: Record<string, UserGroupApproverType>
334334
requiredCount: number
@@ -337,8 +337,8 @@ export interface UserGroupDataType {
337337

338338
interface ImageApprovalPolicyType {
339339
isPolicyConfigured: boolean
340-
specificUsersData: UserGroupDataType
341-
userGroupData: Record<string, UserGroupDataType>
340+
specificUsersData: ImageApprovalPolicyUserGroupDataType
341+
userGroupData: Record<string, ImageApprovalPolicyUserGroupDataType>
342342
// Assuming name of groups are unique
343343
validGroups: string[]
344344
}

0 commit comments

Comments
 (0)