synced/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2025-03-23 03:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: add priv conflict info and improve back button

Browse Source
This commit is contained in:
Scott Wilson
2024-10-22 16:46:45 -07:00
committed by =
parent 4e6ebcc8d9
commit 833398ef39
2 changed files with 26 additions and 18 deletions
frontend/src/views/Project
IdentityDetailsPage/components/IdentityProjectAdditionalPrivilegeSection
IdentityProjectAdditionalPrivilegeModifySection.tsx
MemberDetailsPage/components/MemberProjectAdditionalPrivilegeSection
MembershipProjectAdditionalPrivilegeModifySection.tsx

22
frontend/src/views/Project/IdentityDetailsPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeModifySection.tsx

@ -19,7 +19,6 @@ import {
Button,
FormControl,
FormLabel,
IconButton,
Input,
Modal,
ModalContent,
@ -202,12 +201,14 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({
>
<FormProvider {...form}>
<div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
<div className="flex space-x-2">
<IconButton ariaLabel="go-back" variant="plain" onClick={onGoBack}>
<FontAwesomeIcon icon={faChevronLeft} />
</IconButton>
<h3 className="text-lg font-semibold text-mineshaft-100">Back</h3>
</div>
<Button
leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
className="text-lg font-semibold text-mineshaft-100"
variant="link"
onClick={onGoBack}
>
Back
</Button>
<div className="flex items-center space-x-4">
{isDirty && (
<Button
@ -252,8 +253,11 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({
</div>
</div>
</div>
<div className="mt-2 border-b border-gray-800 p-4 first:rounded-t-md last:rounded-b-md">
<div className="mb-2 text-lg">Overview</div>
<div className="mt-2 border-b border-gray-800 p-4 pt-2 first:rounded-t-md last:rounded-b-md">
<div className="text-lg">Overview</div>
<p className="mb-4 text-sm text-mineshaft-300">
Additional privileges take precedence over roles when permissions conflict
</p>
<div className=" flex items-end space-x-6">
<div className="w-full max-w-md">
<Controller

22
frontend/src/views/Project/MemberDetailsPage/components/MemberProjectAdditionalPrivilegeSection/MembershipProjectAdditionalPrivilegeModifySection.tsx

@ -19,7 +19,6 @@ import {
Button,
FormControl,
FormLabel,
IconButton,
Input,
Modal,
ModalContent,
@ -200,12 +199,14 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
>
<FormProvider {...form}>
<div className="flex items-center justify-between border-b border-mineshaft-400 pb-2">
<div className="flex space-x-2">
<IconButton ariaLabel="go-back" variant="plain" onClick={onGoBack}>
<FontAwesomeIcon icon={faChevronLeft} />
</IconButton>
<h3 className="text-lg font-semibold text-mineshaft-100">Back</h3>
</div>
<Button
leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
className="text-lg font-semibold text-mineshaft-100"
variant="link"
onClick={onGoBack}
>
Back
</Button>
<div className="flex items-center space-x-4">
{isDirty && (
<Button
@ -250,8 +251,11 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
</div>
</div>
</div>
<div className="mt-2 border-b border-gray-800 p-4 first:rounded-t-md last:rounded-b-md">
<div className="mb-2 text-lg">Overview</div>
<div className="mt-2 border-b border-gray-800 p-4 pt-2 first:rounded-t-md last:rounded-b-md">
<div className="text-lg">Overview</div>
<p className="mb-4 text-sm text-mineshaft-300">
Additional privileges take precedence over roles when permissions conflict
</p>
<div className=" flex items-end space-x-6">
<div className="w-full max-w-md">
<Controller