awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 07:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: failing tests

Browse Source
This commit is contained in:
Daniel Hougaard
2025-08-13 02:19:22 +04:00
parent 2501c57030
commit c8f124e4c5
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/access-approval-request/access-approval-request-types.ts
-1
View File
@@ -84,7 +84,6 @@ export interface TAccessApprovalRequestServiceFactory {
allowedSelfApprovals: boolean; allowedSelfApprovals: boolean;
envId: string; envId: string;
deletedAt: Date | null | undefined; deletedAt: Date | null | undefined;
isOrgMembershipActive: boolean;
}; };
projectId: string; projectId: string;
environment: string; environment: string;
backend/src/ee/services/license/license-fns.ts
+4 -4
View File
@@ -31,16 +31,16 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
auditLogsRetentionDays: 0, auditLogsRetentionDays: 0,
auditLogStreams: false, auditLogStreams: false,
auditLogStreamLimit: 3, auditLogStreamLimit: 3,
samlSSO: true, samlSSO: false,
hsm: false, hsm: false,
oidcSSO: false, oidcSSO: false,
scim: true, scim: false,
ldap: false, ldap: false,
groups: true, groups: false,
status: null, status: null,
trial_end: null, trial_end: null,
has_used_trial: true, has_used_trial: true,
secretApproval: true, secretApproval: false,
secretRotation: false, secretRotation: false,
caCrl: false, caCrl: false,
instanceUserManagement: false, instanceUserManagement: false,
frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
+6 -2
View File
@@ -234,7 +234,9 @@ const Form = ({
...data, ...data,
approvers: sequenceApprovers?.flatMap((approvers, index) => approvers: sequenceApprovers?.flatMap((approvers, index) =>
approvers.user approvers.user
.map((el) => ({ ...el, sequence: index + 1 }) as Approver) .map(
(el) => ({ ...el, sequence: index + 1 }) as Omit<Approver, "isOrgMembershipActive">
)
.concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 }))) .concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 })))
), ),
approvalsRequired: sequenceApprovers?.map((el, index) => ({ approvalsRequired: sequenceApprovers?.map((el, index) => ({
@@ -290,7 +292,9 @@ const Form = ({
...data, ...data,
approvers: sequenceApprovers?.flatMap((approvers, index) => approvers: sequenceApprovers?.flatMap((approvers, index) =>
approvers.user approvers.user
.map((el) => ({ ...el, sequence: index + 1 }) as Approver) .map(
(el) => ({ ...el, sequence: index + 1 }) as Omit<Approver, "isOrgMembershipActive">
)
.concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 }))) .concat(approvers.group.map((el) => ({ ...el, sequence: index + 1 })))
), ),
approvalsRequired: sequenceApprovers?.map((el, index) => ({ approvalsRequired: sequenceApprovers?.map((el, index) => ({
frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx
+1 -1
View File
@@ -215,7 +215,7 @@ export const ApprovalPolicyRow = ({
<GenericFieldLabel className="col-span-2" icon={faUser} label="Users"> <GenericFieldLabel className="col-span-2" icon={faUser} label="Users">
{Boolean(el.users.length) && ( {Boolean(el.users.length) && (
<div className="flex flex-row flex-wrap gap-2"> <div className="flex flex-row flex-wrap gap-2">
{el.users.map((u, i) => { {el.users.map((u) => {
return u.user.isOrgMembershipActive ? ( return u.user.isOrgMembershipActive ? (
<span key={u.id}>{getMemberLabel(u)}</span> <span key={u.id}>{getMemberLabel(u)}</span>
) : ( ) : (