diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts b/backend/src/ee/services/access-approval-request/access-approval-request-types.ts index 0d318c6c4..d56c64bfd 100644 --- a/backend/src/ee/services/access-approval-request/access-approval-request-types.ts +++ b/backend/src/ee/services/access-approval-request/access-approval-request-types.ts @@ -84,7 +84,6 @@ export interface TAccessApprovalRequestServiceFactory { allowedSelfApprovals: boolean; envId: string; deletedAt: Date | null | undefined; - isOrgMembershipActive: boolean; }; projectId: string; environment: string; diff --git a/backend/src/ee/services/license/license-fns.ts b/backend/src/ee/services/license/license-fns.ts index be300c0e4..bd3949a7e 100644 --- a/backend/src/ee/services/license/license-fns.ts +++ b/backend/src/ee/services/license/license-fns.ts @@ -31,16 +31,16 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({ auditLogsRetentionDays: 0, auditLogStreams: false, auditLogStreamLimit: 3, - samlSSO: true, + samlSSO: false, hsm: false, oidcSSO: false, - scim: true, + scim: false, ldap: false, - groups: true, + groups: false, status: null, trial_end: null, has_used_trial: true, - secretApproval: true, + secretApproval: false, secretRotation: false, caCrl: false, instanceUserManagement: false, diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx index b254b8ac7..7ece7d29a 100644 --- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx +++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx @@ -234,7 +234,9 @@ const Form = ({ ...data, approvers: sequenceApprovers?.flatMap((approvers, index) => approvers.user - .map((el) => ({ ...el, sequence: index + 1 }) as Approver) + .map( + (el) => ({ ...el, sequence: index + 1 }) as Omit + ) .concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 }))) ), approvalsRequired: sequenceApprovers?.map((el, index) => ({ @@ -290,7 +292,9 @@ const Form = ({ ...data, approvers: sequenceApprovers?.flatMap((approvers, index) => approvers.user - .map((el) => ({ ...el, sequence: index + 1 }) as Approver) + .map( + (el) => ({ ...el, sequence: index + 1 }) as Omit + ) .concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 }))) ), approvalsRequired: sequenceApprovers?.map((el, index) => ({ diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx index 8e25397dc..410593f12 100644 --- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx +++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx @@ -215,7 +215,7 @@ export const ApprovalPolicyRow = ({ {Boolean(el.users.length) && (
- {el.users.map((u, i) => { + {el.users.map((u) => { return u.user.isOrgMembershipActive ? ( {getMemberLabel(u)} ) : (