Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

refac: remove the edit request button and backend call

adilson23800b6df219
diff --git a/frontend/src/hooks/api/accessApproval/mutation.tsx b/frontend/src/hooks/api/accessApproval/mutation.tsx
index f89300c1a5..2452bc7f8a 100644
--- a/frontend/src/hooks/api/accessApproval/mutation.tsx
+++ b/frontend/src/hooks/api/accessApproval/mutation.tsx
@@ -7,12 +7,10 @@ import { ApiErrorTypes } from "../types";
import { accessApprovalKeys } from "./queries";
import {
TAccessApproval,
- TAccessApprovalRequest,
TCreateAccessPolicyDTO,
TCreateAccessRequestDTO,
TDeleteSecretPolicyDTO,
- TUpdateAccessPolicyDTO,
- TUpdateAccessRequestDTO
+ TUpdateAccessPolicyDTO
} from "./types";
export const useCreateAccessApprovalPolicy = () => {
@@ -164,25 +162,6 @@ export const useCreateAccessRequest = () => {
});
};
-export const useUpdateAccessRequest = () => {
- const queryClient = useQueryClient();
- return useMutation<TAccessApprovalRequest, object, TUpdateAccessRequestDTO>({
- mutationFn: async ({ requestId, ...payload }) => {
- const { data } = await apiRequest.patch<{ approval: TAccessApprovalRequest }>(
- `/api/v1/access-approvals/requests/${requestId}`,
- payload
- );
-
- return data.approval;
- },
- onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalRequestsAllForProject(projectSlug)
- });
- }
- });
-};
-
export const useRevokeAccessRequest = () => {
const queryClient = useQueryClient();
return useMutation<
diff --git a/frontend/src/hooks/api/accessApproval/types.ts b/frontend/src/hooks/api/accessApproval/types.ts
index 8e9b6dc554..51f57aff34 100644
--- a/frontend/src/hooks/api/accessApproval/types.ts
+++ b/frontend/src/hooks/api/accessApproval/types.ts
@@ -200,13 +200,6 @@ export type TCreateAccessRequestDTO = {
note?: string;
} & Omit<TProjectUserPrivilege, "id" | "createdAt" | "updatedAt" | "slug" | "projectMembershipId">;
-export type TUpdateAccessRequestDTO = {
- requestId: string;
- editNote: string;
- temporaryRange: string;
- projectSlug: string;
-};
-
export type TGetAccessApprovalRequestsDTO = {
projectSlug: string;
policyId?: string;
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
index 78b315d287..284090ab9e 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -971,16 +971,6 @@ export const AccessApprovalRequest = ({
setSelectedRequest(null);
refetchRequests();
}}
- onUpdate={(request) => {
- // scott: this isn't ideal but our current use of state makes this complicated...
- // we shouldn't be using state like this...
- handleSelectRequest({
- ...selectedRequest,
- isTemporary: request.isTemporary,
- temporaryRange: request.temporaryRange,
- reviewers: []
- });
- }}
canBypass={generateRequestDetails(selectedRequest).canBypass}
/>
)}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/EditAccessRequestModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/EditAccessRequestModal.tsx
deleted file mode 100644
index f145672ddc..0000000000
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/EditAccessRequestModal.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import { Controller, useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useQueryClient } from "@tanstack/react-query";
-import { TriangleAlertIcon } from "lucide-react";
-import ms from "ms";
-import { z } from "zod";
-
-import { TtlFormLabel } from "@app/components/features";
-import { createNotification } from "@app/components/notifications";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
- Button,
- Dialog,
- DialogClose,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
- Field,
- FieldDescription,
- FieldError,
- FieldLabel,
- Input,
- TextArea
-} from "@app/components/v3";
-import { useUpdateAccessRequest } from "@app/hooks/api/accessApproval/mutation";
-import { accessApprovalKeys } from "@app/hooks/api/accessApproval/queries";
-import { TAccessApprovalRequest } from "@app/hooks/api/accessApproval/types";
-
-type ContentProps = {
- accessRequest: TAccessApprovalRequest;
- onComplete: (request: TAccessApprovalRequest) => void;
- projectSlug: string;
-};
-
-const EditSchema = z.object({
- temporaryRange: z
- .string()
- .nonempty("Required")
- .transform((val, ctx) => {
- const parsedMs = ms(val);
-
- if (typeof parsedMs !== "number" || parsedMs <= 0) {
- ctx.addIssue({
- code: z.ZodIssueCode.custom,
- message:
- "Invalid time period format or value. Must be a positive duration (e.g., '1h', '30m', '2d')."
- });
- return z.NEVER;
- }
- return val;
- }),
- editNote: z.string().nonempty("Required")
-});
-
-type FormData = z.infer<typeof EditSchema>;
-
-const Content = ({ accessRequest, onComplete, projectSlug }: ContentProps) => {
- const update = useUpdateAccessRequest();
- const queryClient = useQueryClient();
- const {
- handleSubmit,
- control,
- formState: { isSubmitting }
- } = useForm({
- resolver: zodResolver(EditSchema),
- defaultValues: {
- temporaryRange: accessRequest.temporaryRange ?? "1h",
- editNote: ""
- }
- });
-
- const onSubmit = async (form: FormData) => {
- const request = await update.mutateAsync({
- requestId: accessRequest.id,
- projectSlug,
- ...form
- });
- await queryClient.refetchQueries({
- queryKey: accessApprovalKeys.getAccessApprovalRequestsAllForProject(projectSlug)
- });
-
- createNotification({
- type: "success",
- text: "Access request updated successfully."
- });
- onComplete(request);
- };
-
- return (
- <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-4">
- <Alert variant="warning">
- <TriangleAlertIcon />
- <AlertTitle>Updating restarts the review process</AlertTitle>
- <AlertDescription>
- All approvers will be required to re-approve this access request.
- </AlertDescription>
- </Alert>
- <Controller
- control={control}
- defaultValue="1h"
- name="temporaryRange"
- render={({ field, fieldState: { error } }) => (
- <Field>
- <FieldLabel htmlFor="temporaryRange">
- <TtlFormLabel label="Access Duration" />
- </FieldLabel>
- <Input id="temporaryRange" {...field} isError={Boolean(error?.message)} />
- {!error && (
- <FieldDescription>
- Must be less than current access duration:{" "}
- {accessRequest.isTemporary ? accessRequest.temporaryRange : "Permanent"}
- </FieldDescription>
- )}
- <FieldError errors={[error]} />
- </Field>
- )}
- />
- <Controller
- control={control}
- name="editNote"
- render={({ field, fieldState: { error } }) => (
- <Field>
- <FieldLabel htmlFor="editNote">Reason for Editing</FieldLabel>
- <TextArea
- id="editNote"
- className="resize-none!"
- rows={4}
- {...field}
- isError={Boolean(error?.message)}
- placeholder="Provide a reason for updating this request..."
- />
- <FieldError errors={[error]} />
- </Field>
- )}
- />
- <DialogFooter>
- <DialogClose asChild>
- <Button variant="outline">Cancel</Button>
- </DialogClose>
- <Button type="submit" variant="project" isPending={isSubmitting} isDisabled={isSubmitting}>
- Update Request
- </Button>
- </DialogFooter>
- </form>
- );
-};
-
-type Props = {
- isOpen: boolean;
- onOpenChange: (isOpen: boolean) => void;
- accessRequest?: TAccessApprovalRequest;
- onComplete: (request: TAccessApprovalRequest) => void;
- projectSlug: string;
-};
-
-export const EditAccessRequestModal = ({
- isOpen,
- onOpenChange,
- accessRequest,
- onComplete,
- projectSlug
-}: Props) => {
- if (!accessRequest) return null;
-
- return (
- <Dialog open={isOpen} onOpenChange={onOpenChange}>
- <DialogContent className="sm:max-w-lg">
- <DialogHeader>
- <DialogTitle>Edit Access Request</DialogTitle>
- <DialogDescription>Modify this access request for re-approval.</DialogDescription>
- </DialogHeader>
- <Content
- projectSlug={projectSlug}
- accessRequest={accessRequest}
- onComplete={(request) => {
- onComplete(request);
- onOpenChange(false);
- }}
- />
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
index a9979eee5f..ac379a1667 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
@@ -7,7 +7,6 @@ import {
HourglassIcon,
InfoIcon,
ShieldAlertIcon,
- SquarePenIcon,
TimerIcon,
TriangleAlertIcon,
UserIcon,
@@ -40,7 +39,6 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
- IconButton,
Input,
Item,
ItemActions,
@@ -101,7 +99,6 @@ import {
getActionLabelsForSubject,
PROJECT_PERMISSION_OBJECT
} from "@app/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils";
-import { EditAccessRequestModal } from "@app/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/EditAccessRequestModal";
import { getAccessDurationLabel } from "../AccessApprovalRequest.utils";
@@ -180,8 +177,7 @@ export const ReviewAccessRequestModal = ({
projectSlug,
canBypass,
policies = [],
- members = [],
- onUpdate
+ members = []
}: {
isOpen: boolean;
onOpenChange: (isOpen: boolean) => void;
@@ -195,7 +191,6 @@ export const ReviewAccessRequestModal = ({
canBypass: boolean;
policies: TAccessApprovalPolicy[];
members: TWorkspaceUser[];
- onUpdate: (request: TAccessApprovalRequest) => void;
}) => {
const [isLoading, setIsLoading] = useState<"approved" | "rejected" | "revoked" | null>(null);
const [bypassApproval, setBypassApproval] = useState(false);
@@ -207,10 +202,7 @@ export const ReviewAccessRequestModal = ({
const { user } = useUser();
const { permission } = useProjectPermission();
- const { popUp, handlePopUpToggle, handlePopUpOpen } = usePopUp([
- "editRequest",
- "revokeConfirm"
- ] as const);
+ const { popUp, handlePopUpToggle, handlePopUpOpen } = usePopUp(["revokeConfirm"] as const);
const isSoftEnforcement = request.policy.enforcementLevel === EnforcementLevel.Soft;
@@ -805,32 +797,6 @@ export const ReviewAccessRequestModal = ({
accessDetails.temporaryAccess.isTemporary,
accessDetails.temporaryAccess.temporaryRange
)}
- {request.isApprover && request.status === ApprovalStatus.PENDING && (
- <>
- <EditAccessRequestModal
- isOpen={popUp.editRequest.isOpen}
- onOpenChange={(open) => handlePopUpToggle("editRequest", open)}
- accessRequest={request}
- onComplete={onUpdate}
- projectSlug={projectSlug}
- />
- <Tooltip>
- <TooltipTrigger asChild>
- <IconButton
- onClick={() => handlePopUpOpen("editRequest")}
- variant="ghost"
- size="xs"
- tabIndex={-1}
- aria-label="Edit access duration"
- className="-my-1"
- >
- <SquarePenIcon />
- </IconButton>
- </TooltipTrigger>
- <TooltipContent>Edit Access Duration</TooltipContent>
- </Tooltip>
- </>
- )}
</div>
</DetailValue>
</Detail>