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

chore: Refactor and remove new tables

Browse Source
This commit is contained in:
Meet
2024-09-23 10:26:58 +05:30
parent 12ecefa832
commit e150673de4
31 changed files with 386 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/api/accessApproval/mutation.tsx
+1 -4
View File
@@ -21,7 +21,6 @@ export const useCreateAccessApprovalPolicy = () => {
projectSlug,
approvals,
approvers,
groupApprovers,
name,
secretPath,
enforcementLevel
@@ -31,7 +30,6 @@ export const useCreateAccessApprovalPolicy = () => {
projectSlug,
approvals,
approvers,
groupApprovers,
secretPath,
name,
enforcementLevel
@@ -48,11 +46,10 @@ export const useUpdateAccessApprovalPolicy = () => {
const queryClient = useQueryClient();
return useMutation<{}, {}, TUpdateAccessPolicyDTO>({
mutationFn: async ({ id, approvers, groupApprovers, approvals, name, secretPath, enforcementLevel }) => {
mutationFn: async ({ id, approvers, approvals, name, secretPath, enforcementLevel }) => {
const { data } = await apiRequest.patch(`/api/v1/access-approvals/policies/${id}`, {
approvals,
approvers,
groupApprovers,
secretPath,
name,
enforcementLevel
frontend/src/hooks/api/accessApproval/types.ts
+13 -7
View File
@@ -11,15 +11,23 @@ export type TAccessApprovalPolicy = {
workspace: string;
environment: WorkspaceEnv;
projectId: string;
approvers: string[];
policyType: PolicyType;
approversRequired: boolean;
enforcementLevel: EnforcementLevel;
updatedAt: Date;
userApprovers?: { userId: string }[];
groupApprovers?: { groupId: string }[];
approvers?: Approver[];
};
export enum ApproverType{
User = "user",
Group = "group"
}
export type Approver ={
id: string;
type: ApproverType;
}
export type TAccessApprovalRequest = {
id: string;
policyId: string;
@@ -131,8 +139,7 @@ export type TCreateAccessPolicyDTO = {
projectSlug: string;
name?: string;
environment: string;
approvers?: string[];
groupApprovers?: string[];
approvers?: Approver[];
approvals?: number;
secretPath?: string;
enforcementLevel?: EnforcementLevel;
@@ -141,8 +148,7 @@ export type TCreateAccessPolicyDTO = {
export type TUpdateAccessPolicyDTO = {
id: string;
name?: string;
approvers?: string[];
groupApprovers?: string[];
approvers?: Approver[];
secretPath?: string;
environment?: string;
approvals?: number;
frontend/src/hooks/api/secretApproval/mutation.tsx
+1 -4
View File
@@ -14,7 +14,6 @@ export const useCreateSecretApprovalPolicy = () => {
workspaceId,
approvals,
approvers,
groupApprovers,
secretPath,
name,
enforcementLevel
@@ -24,7 +23,6 @@ export const useCreateSecretApprovalPolicy = () => {
workspaceId,
approvals,
approvers,
groupApprovers,
secretPath,
name,
enforcementLevel
@@ -41,11 +39,10 @@ export const useUpdateSecretApprovalPolicy = () => {
const queryClient = useQueryClient();
return useMutation<{}, {}, TUpdateSecretPolicyDTO>({
mutationFn: async ({ id, approvers, groupApprovers, approvals, secretPath, name, enforcementLevel }) => {
mutationFn: async ({ id, approvers, approvals, secretPath, name, enforcementLevel }) => {
const { data } = await apiRequest.patch(`/api/v1/secret-approvals/${id}`, {
approvals,
approvers,
groupApprovers,
secretPath,
name,
enforcementLevel
frontend/src/hooks/api/secretApproval/types.ts
+13 -6
View File
@@ -9,12 +9,21 @@ export type TSecretApprovalPolicy = {
environment: WorkspaceEnv;
secretPath?: string;
approvals: number;
userApprovers: { userId: string }[];
groupApprovers: { groupId: string }[];
approvers: Approver[];
updatedAt: Date;
enforcementLevel: EnforcementLevel;
};
export enum ApproverType{
User = "user",
Group = "group"
}
export type Approver ={
id: string;
type: ApproverType;
}
export type TGetSecretApprovalPoliciesDTO = {
workspaceId: string;
};
@@ -30,8 +39,7 @@ export type TCreateSecretPolicyDTO = {
name?: string;
environment: string;
secretPath?: string | null;
approvers?: string[];
groupApprovers?: string[];
approvers?: Approver[];
approvals?: number;
enforcementLevel: EnforcementLevel;
};
@@ -39,8 +47,7 @@ export type TCreateSecretPolicyDTO = {
export type TUpdateSecretPolicyDTO = {
id: string;
name?: string;
approvers?: string[];
groupApprovers?: string[];
approvers?: Approver[];
secretPath?: string | null;
approvals?: number;
enforcementLevel?: EnforcementLevel;
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
+13 -14
View File
@@ -27,7 +27,7 @@ import {
useCreateAccessApprovalPolicy,
useUpdateAccessApprovalPolicy
} from "@app/hooks/api/accessApproval";
import { TAccessApprovalPolicy } from "@app/hooks/api/accessApproval/types";
import { ApproverType, TAccessApprovalPolicy } from "@app/hooks/api/accessApproval/types";
import { EnforcementLevel, PolicyType } from "@app/hooks/api/policies/enums";
import { TWorkspaceUser } from "@app/hooks/api/users/types";
@@ -45,13 +45,12 @@ const formSchema = z
name: z.string().optional(),
secretPath: z.string().optional(),
approvals: z.number().min(1),
approvers: z.string().array().optional(),
groupApprovers: z.string().array().optional(),
approvers: z.object({type: z.nativeEnum(ApproverType), id: z.string()}).array().min(1).default([]),
policyType: z.nativeEnum(PolicyType),
enforcementLevel: z.nativeEnum(EnforcementLevel)
})
.refine((data) => data.approvers || data.groupApprovers, {
path: ["approvers", "groupApprovers"],
.refine((data) => data.approvers, {
path: ["approvers"],
message: "At least one approver should be provided."
});
@@ -76,8 +75,7 @@ export const AccessPolicyForm = ({
? {
...editValues,
environment: editValues.environment.slug,
approvers: editValues?.userApprovers?.map((user) => user.userId) || editValues?.approvers,
groupApprovers: editValues?.groupApprovers?.map((group) => group.groupId),
approvers: editValues?.approvers || [],
approvals: editValues?.approvals
}
: undefined
@@ -291,15 +289,15 @@ export const AccessPolicyForm = ({
</DropdownMenuLabel>
{members.map(({ user }) => {
const { id: userId } = user;
const isChecked = value?.includes(userId);
const isChecked = value?.filter((el: {id: string, type: ApproverType}) => el.id === userId && el.type === ApproverType.User).length > 0;
return (
<DropdownMenuItem
onClick={(evt) => {
evt.preventDefault();
onChange(
isChecked
? value?.filter((el: string) => el !== userId)
: [...(value || []), userId]
? value?.filter((el: {id: string, type: ApproverType}) => el.id !== userId && el.type !== ApproverType.User)
: [...(value || []), {id:userId, type: ApproverType.User}]
);
}}
key={`create-policy-members-${userId}`}
@@ -317,7 +315,7 @@ export const AccessPolicyForm = ({
/>
<Controller
control={control}
name="groupApprovers"
name="approvers"
render={({ field: { value, onChange }, fieldState: { error } }) => (
<FormControl
label="Required Group Approvers"
@@ -341,15 +339,16 @@ export const AccessPolicyForm = ({
</DropdownMenuLabel>
{groups && groups.map(({ group }) => {
const { id } = group;
const isChecked = value?.includes(id);
const isChecked = value?.includes({id, type: ApproverType.Group});
return (
<DropdownMenuItem
onClick={(evt) => {
evt.preventDefault();
onChange(
isChecked
? value?.filter((el: string) => el !== id)
: [...(value || []), id]
? value?.filter((el: {id: string, type: ApproverType}) => el.id !== id && el.type !== ApproverType.Group)
: [...(value || []), {id, type: ApproverType.Group}]
);
}}
key={`create-policy-members-${id}`}
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx
+53 -48
View File
@@ -18,6 +18,7 @@ import { Badge } from "@app/components/v2/Badge";
import { ProjectPermissionActions, ProjectPermissionSub, useProjectPermission } from "@app/context";
import { policyDetails } from "@app/helpers/policies";
import { useUpdateAccessApprovalPolicy, useUpdateSecretApprovalPolicy } from "@app/hooks/api";
import { Approver, ApproverType } from "@app/hooks/api/accessApproval/types";
import { TGroupMembership } from "@app/hooks/api/groups/types";
import { EnforcementLevel, PolicyType } from "@app/hooks/api/policies/enums";
import { WorkspaceEnv } from "@app/hooks/api/types";
@@ -30,9 +31,7 @@ interface IPolicy {
projectId?: string;
secretPath?: string;
approvals: number;
approvers?: string[];
userApprovers?: { userId: string }[];
groupApprovers?: { groupId: string }[];
approvers?: Approver[];
updatedAt: Date;
policyType: PolicyType;
enforcementLevel: EnforcementLevel;
@@ -57,8 +56,8 @@ export const ApprovalPolicyRow = ({
onEdit,
onDelete
}: Props) => {
const [selectedApprovers, setSelectedApprovers] = useState<string[]>(policy.userApprovers?.map(({ userId }) => userId) || policy.approvers || []);
const [selectedGroupApprovers, setSelectedGroupApprovers] = useState<string[]>(policy.groupApprovers?.map(({ groupId }) => groupId) || []);
const [selectedApprovers, setSelectedApprovers] = useState<Approver[]>(policy.approvers?.filter((approver) => approver.type === ApproverType.User) || []);
const [selectedGroupApprovers, setSelectedGroupApprovers] = useState<Approver[]>(policy.approvers?.filter((approver) => approver.type === ApproverType.Group) || []);
const { mutate: updateAccessApprovalPolicy, isLoading: isAccessApprovalPolicyLoading } = useUpdateAccessApprovalPolicy();
const { mutate: updateSecretApprovalPolicy, isLoading: isSecretApprovalPolicyLoading } = useUpdateSecretApprovalPolicy();
const isLoading = isAccessApprovalPolicyLoading || isSecretApprovalPolicyLoading;
@@ -79,27 +78,30 @@ export const ApprovalPolicyRow = ({
{
projectSlug,
id: policy.id,
approvers: selectedApprovers,
groupApprovers: selectedGroupApprovers
approvers: selectedApprovers.concat(selectedGroupApprovers),
},
{ onSettled: () => { } }
{
onError: () => {
setSelectedApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.User) || []);
}
}
);
} else {
updateSecretApprovalPolicy(
{
workspaceId,
id: policy.id,
approvers: selectedApprovers,
groupApprovers: selectedGroupApprovers
approvers: selectedApprovers.concat(selectedGroupApprovers),
},
{ onSettled: () => { } }
{
onError: () => {
setSelectedApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.User) || []);
}
}
);
}
} else {
setSelectedApprovers(policy.policyType === PolicyType.ChangePolicy
? policy?.userApprovers?.map(({ userId }) => userId) || []
: policy?.approvers || []
);
setSelectedApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.User) || []);
}
}}
>
@@ -125,13 +127,13 @@ export const ApprovalPolicyRow = ({
</DropdownMenuLabel>
{members?.map(({ user }) => {
const userId = user.id;
const isChecked = selectedApprovers.includes(userId);
const isChecked = selectedApprovers?.filter((el: { id: string, type: ApproverType }) => el.id === userId && el.type === ApproverType.User).length > 0;
return (
<DropdownMenuItem
onClick={(evt) => {
evt.preventDefault();
setSelectedApprovers((state) =>
isChecked ? state.filter((el) => el !== userId) : [...state, userId]
isChecked ? state.filter((el) => el.id !== userId || el.type !== ApproverType.User) : [...state, { id: userId, type: ApproverType.User }]
);
}}
key={`create-policy-members-${userId}`}
@@ -147,36 +149,39 @@ export const ApprovalPolicyRow = ({
</Td>
<Td>
<DropdownMenu
onOpenChange={(isOpen) => {
if (!isOpen) {
if (policy.policyType === PolicyType.AccessPolicy) {
updateAccessApprovalPolicy(
{
projectSlug,
id: policy.id,
approvers: selectedApprovers,
groupApprovers: selectedGroupApprovers
},
{ onSettled: () => { } }
);
onOpenChange={(isOpen) => {
if (!isOpen) {
if (policy.policyType === PolicyType.AccessPolicy) {
updateAccessApprovalPolicy(
{
projectSlug,
id: policy.id,
approvers: selectedApprovers.concat(selectedGroupApprovers),
},
{
onError: () => {
setSelectedGroupApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.Group) || []);
}
},
);
} else {
updateSecretApprovalPolicy(
{
workspaceId,
id: policy.id,
approvers: selectedApprovers.concat(selectedGroupApprovers),
},
{
onError: () => {
setSelectedGroupApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.Group) || []);
}
}
);
}
} else {
updateSecretApprovalPolicy(
{
workspaceId,
id: policy.id,
approvers: selectedApprovers,
groupApprovers: selectedGroupApprovers
},
{ onSettled: () => { } }
);
setSelectedGroupApprovers(policy?.approvers?.filter((approver) => approver.type === ApproverType.Group) || []);
}
} else {
setSelectedGroupApprovers(policy.policyType === PolicyType.ChangePolicy
? policy?.groupApprovers?.map(({ groupId }) => groupId) || []
: policy?.groupApprovers?.map(({groupId}) => groupId) || []
);
}
}}
}}
>
<DropdownMenuTrigger asChild>
<Input
@@ -194,15 +199,15 @@ export const ApprovalPolicyRow = ({
</DropdownMenuLabel>
{groups && groups.map(({ group }) => {
const { id } = group;
const isChecked = selectedGroupApprovers?.includes(id);
const isChecked = selectedGroupApprovers?.filter((el: { id: string, type: ApproverType }) => el.id === id && el.type === ApproverType.Group).length > 0;
return (
<DropdownMenuItem
onClick={(evt) => {
evt.preventDefault();
setSelectedGroupApprovers(
isChecked
? selectedGroupApprovers?.filter((el: string) => el !== id)
: [...(selectedGroupApprovers || []), id]
? selectedGroupApprovers?.filter((el) => el.id !== id || el.type !== ApproverType.Group)
: [...(selectedGroupApprovers || []), { id, type: ApproverType.Group }]
);
}}
key={`create-policy-groups-${id}`}