From 62910e93ca18e3facaccbb0859abcfaf73423683 Mon Sep 17 00:00:00 2001 From: Scott Wilson Date: Fri, 29 Nov 2024 10:52:49 -0800 Subject: [PATCH] fix: remove labels for options(outdated) --- backend/src/ee/services/license/license-fns.ts | 2 +- .../components/AccessPolicyModal.tsx | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts index 70c299564..ad49c4119 100644 --- a/backend/src/ee/services/license/license-fns.ts +++ b/backend/src/ee/services/license/license-fns.ts @@ -37,7 +37,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ status: null, trial_end: null, has_used_trial: true, - secretApproval: false, + secretApproval: true, secretRotation: true, caCrl: false, instanceUserManagement: false, diff --git a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx index a00790a89..9f5aeec5a 100644 --- a/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx +++ b/frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx @@ -213,13 +213,9 @@ export const AccessPolicyForm = ({ const memberOptions = useMemo( () => - members.map(({ inviteEmail, user: { firstName, lastName, id: userId, username } }) => ({ - id: userId, - type: ApproverType.User, - label: - firstName || lastName - ? `${firstName ?? ""} ${lastName ?? ""}`.trim() - : username || inviteEmail + members.map((member) => ({ + id: member.user.id, + type: ApproverType.User })), [members] ); @@ -228,8 +224,7 @@ export const AccessPolicyForm = ({ () => groups?.map(({ group }) => ({ id: group.id, - type: ApproverType.Group, - label: group.name + type: ApproverType.Group })), [groups] );