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

feat: permission changes

Browse Source
This commit is contained in:
=
2025-02-26 20:45:38 +05:30
parent 55b1fbdf52
commit afd444cad6
11 changed files with 105 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx
+15 -4
View File
@@ -5,6 +5,7 @@ import {
faBookOpen,
faEdit,
faEllipsisV,
faInfoCircle,
faMagnifyingGlass,
faPlug,
faSearch,
@@ -125,8 +126,18 @@ export const GatewayListPage = withPermission(
<THead>
<Tr>
<Th className="w-1/3">Name</Th>
<Th>Issued At</Th>
<Th>Cert Issued At</Th>
<Th>Identity</Th>
<Th>
Health Check
<Tooltip
asChild={false}
className="normal-case"
content="The last known healthcheck. Triggers every 1 hour."
>
<FontAwesomeIcon icon={faInfoCircle} className="ml-2" />
</Tooltip>
</Th>
<Th className="w-5" />
</Tr>
</THead>
@@ -140,8 +151,8 @@ export const GatewayListPage = withPermission(
<Td>{format(new Date(el.issuedAt), "yyyy-MM-dd hh:mm:ss aaa")}</Td>
<Td>{el.identity.name}</Td>
<Td>
{el.heartbeart
? formatRelative(new Date(), new Date(el.heartbeart))
{el.heartbeat
? formatRelative(new Date(el.heartbeat), new Date())
: "-"}
</Td>
<Td className="w-5">
@@ -159,7 +170,7 @@ export const GatewayListPage = withPermission(
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<OrgPermissionCan
I={OrgGatewayPermissionActions.Edit}
I={OrgGatewayPermissionActions.EditGateways}
a={OrgPermissionSubjects.Gateway}
>
{(isAllowed: boolean) => (
frontend/src/pages/organization/RoleByIDPage/components/OrgRoleModifySection.utils.ts
+4 -4
View File
@@ -37,10 +37,10 @@ const kmipPermissionSchema = z
const orgGatewayPermissionSchema = z
.object({
[OrgGatewayPermissionActions.Read]: z.boolean().optional(),
[OrgGatewayPermissionActions.Edit]: z.boolean().optional(),
[OrgGatewayPermissionActions.Delete]: z.boolean().optional(),
[OrgGatewayPermissionActions.Create]: z.boolean().optional()
[OrgGatewayPermissionActions.ListGateways]: z.boolean().optional(),
[OrgGatewayPermissionActions.EditGateways]: z.boolean().optional(),
[OrgGatewayPermissionActions.DeleteGateways]: z.boolean().optional(),
[OrgGatewayPermissionActions.CreateGateways]: z.boolean().optional()
})
.optional();
frontend/src/pages/organization/RoleByIDPage/components/RolePermissionsSection/OrgPermissionGatewayRow.tsx
+17 -17
View File
@@ -24,10 +24,10 @@ enum Permission {
}
const PERMISSION_ACTIONS = [
{ action: OrgGatewayPermissionActions.Read, label: "Read" },
{ action: OrgGatewayPermissionActions.Create, label: "Create" },
{ action: OrgGatewayPermissionActions.Edit, label: "Modify" },
{ action: OrgGatewayPermissionActions.Delete, label: "Remove" }
{ action: OrgGatewayPermissionActions.ListGateways, label: "List Gateways" },
{ action: OrgGatewayPermissionActions.CreateGateways, label: "Create Gateways" },
{ action: OrgGatewayPermissionActions.EditGateways, label: "Edit Gateways" },
{ action: OrgGatewayPermissionActions.DeleteGateways, label: "Delete Gateways" }
] as const;
export const OrgGatewayPermissionRow = ({ isEditable, control, setValue }: Props) => {
@@ -47,7 +47,7 @@ export const OrgGatewayPermissionRow = ({ isEditable, control, setValue }: Props
if (isCustom) return Permission.Custom;
if (score === 0) return Permission.NoAccess;
if (score === totalActions) return Permission.FullAccess;
if (score === 1 && rule?.[OrgGatewayPermissionActions.Read]) return Permission.ReadOnly;
if (score === 1 && rule?.[OrgGatewayPermissionActions.ListGateways]) return Permission.ReadOnly;
return Permission.Custom;
}, [rule, isCustom]);
@@ -78,10 +78,10 @@ export const OrgGatewayPermissionRow = ({ isEditable, control, setValue }: Props
setValue(
"permissions.gateway",
{
[OrgGatewayPermissionActions.Read]: true,
[OrgGatewayPermissionActions.Edit]: true,
[OrgGatewayPermissionActions.Create]: true,
[OrgGatewayPermissionActions.Delete]: true
[OrgGatewayPermissionActions.ListGateways]: true,
[OrgGatewayPermissionActions.EditGateways]: true,
[OrgGatewayPermissionActions.CreateGateways]: true,
[OrgGatewayPermissionActions.DeleteGateways]: true
},
{ shouldDirty: true }
);
@@ -90,10 +90,10 @@ export const OrgGatewayPermissionRow = ({ isEditable, control, setValue }: Props
setValue(
"permissions.gateway",
{
[OrgGatewayPermissionActions.Read]: true,
[OrgGatewayPermissionActions.Edit]: false,
[OrgGatewayPermissionActions.Create]: false,
[OrgGatewayPermissionActions.Delete]: false
[OrgGatewayPermissionActions.ListGateways]: true,
[OrgGatewayPermissionActions.EditGateways]: false,
[OrgGatewayPermissionActions.CreateGateways]: false,
[OrgGatewayPermissionActions.DeleteGateways]: false
},
{ shouldDirty: true }
);
@@ -104,10 +104,10 @@ export const OrgGatewayPermissionRow = ({ isEditable, control, setValue }: Props
setValue(
"permissions.gateway",
{
[OrgGatewayPermissionActions.Read]: false,
[OrgGatewayPermissionActions.Edit]: false,
[OrgGatewayPermissionActions.Create]: false,
[OrgGatewayPermissionActions.Delete]: false
[OrgGatewayPermissionActions.ListGateways]: false,
[OrgGatewayPermissionActions.EditGateways]: false,
[OrgGatewayPermissionActions.CreateGateways]: false,
[OrgGatewayPermissionActions.DeleteGateways]: false
},
{ shouldDirty: true }
);