mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-06 04:26:43 +00:00
failing tests
This commit is contained in:
+3
-3
@@ -432,14 +432,14 @@ export const ReviewAccessRequestModal = ({
|
|||||||
<GenericFieldLabel className="col-span-2" icon={faUser} label="Users">
|
<GenericFieldLabel className="col-span-2" icon={faUser} label="Users">
|
||||||
{Boolean(approver.user.length) && (
|
{Boolean(approver.user.length) && (
|
||||||
<div className="flex flex-row flex-wrap gap-2">
|
<div className="flex flex-row flex-wrap gap-2">
|
||||||
{approver?.user?.map((el, index) => {
|
{approver?.user?.map((el, idx) => {
|
||||||
const member = approverSequence?.membersGroupById?.[el.id]?.[0];
|
const member = approverSequence?.membersGroupById?.[el.id]?.[0];
|
||||||
if (!member) return null;
|
if (!member) return null;
|
||||||
|
|
||||||
return member.user.isOrgMembershipActive ? (
|
return member.user.isOrgMembershipActive ? (
|
||||||
<div className="flex items-center" key={member.user.id}>
|
<div className="flex items-center" key={member.user.id}>
|
||||||
<span>{member.user.username}</span>
|
<span>{member.user.username}</span>
|
||||||
{index < approver.user.length - 1 && ","}
|
{idx < approver.user.length - 1 && ","}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex items-center" key={member.user.id}>
|
<div className="flex items-center" key={member.user.id}>
|
||||||
@@ -456,7 +456,7 @@ export const ReviewAccessRequestModal = ({
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
{index < approver.user.length - 1 && ","}
|
{idx < approver.user.length - 1 && ","}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
+3
-3
@@ -215,11 +215,11 @@ 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, index) => {
|
{el.users.map((u, idx) => {
|
||||||
return u.user.isOrgMembershipActive ? (
|
return u.user.isOrgMembershipActive ? (
|
||||||
<div className="flex items-center" key={u.id}>
|
<div className="flex items-center" key={u.id}>
|
||||||
<span>{getMemberLabel(u)}</span>
|
<span>{getMemberLabel(u)}</span>
|
||||||
{index < el.users.length - 1 && ","}
|
{idx < el.users.length - 1 && ","}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex items-center" key={u.id}>
|
<div className="flex items-center" key={u.id}>
|
||||||
@@ -236,7 +236,7 @@ export const ApprovalPolicyRow = ({
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
{index < el.users.length - 1 && ","}
|
{idx < el.users.length - 1 && ","}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|||||||
+1
@@ -629,6 +629,7 @@ export const SecretApprovalRequestChanges = ({
|
|||||||
<Tooltip
|
<Tooltip
|
||||||
className="relative !z-[500]"
|
className="relative !z-[500]"
|
||||||
content={
|
content={
|
||||||
|
// eslint-disable-next-line no-nested-ternary
|
||||||
!isOrgMembershipActive
|
!isOrgMembershipActive
|
||||||
? "This user has been deactivated and no longer has an active organization membership."
|
? "This user has been deactivated and no longer has an active organization membership."
|
||||||
: `${reviewer.firstName || ""} ${reviewer.lastName || ""}`
|
: `${reviewer.firstName || ""} ${reviewer.lastName || ""}`
|
||||||
|
|||||||
Reference in New Issue
Block a user