Skip to content

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

Update AccessApprovalRequest.tsx

varonix427887c69ec3
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 f04fc672b2..df3355ec9e 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -1,7 +1,7 @@
/* eslint-disable no-nested-ternary */
/* eslint-disable react/jsx-no-useless-fragment */
import { useCallback, useEffect, useMemo, useState } from "react";
-import { useSearch } from "@tanstack/react-router";
+import { useNavigate, useSearch } from "@tanstack/react-router";
import { format, formatDistance } from "date-fns";
import {
BanIcon,
@@ -146,7 +146,9 @@ export const AccessApprovalRequest = ({
ProjectPermissionMemberActions.Read,
ProjectPermissionSub.Member
);
-
+ const navigate = useNavigate({
+ from: ROUTE_PATHS.SecretManager.ApprovalPage.path
+ });
const searchParams = useSearch({
from: ROUTE_PATHS.SecretManager.ApprovalPage.id
});
@@ -484,6 +486,8 @@ export const AccessApprovalRequest = ({
const details = generateRequestDetails(request);
const memberUser = membersGroupById?.[request.requestedByUserId]?.user;
+ navigate({ search: (prev) => ({ ...prev, requestId: request.id }) });
+
setSelectedRequest({
...request,
user: details.isRequestedByCurrentUser
@@ -511,13 +515,13 @@ export const AccessApprovalRequest = ({
);
useEffect(() => {
- if (requestId && !selectedRequest) {
- const foundRequest = filteredRequests.find((r) => r.id === requestId);
+ if (requestId && !selectedRequest && requests?.length) {
+ const foundRequest = requests.find((r) => r.id === requestId);
if (foundRequest) {
handleSelectRequest(foundRequest);
}
}
- }, [requestId, filteredRequests]);
+ }, [requestId, requests]);
return (
<>
@@ -958,7 +962,11 @@ export const AccessApprovalRequest = ({
request={selectedRequest}
members={members || []}
isOpen={popUp.reviewRequest.isOpen}
- onOpenChange={() => {
+ onOpenChange={(open) => {
+ if (!open) {
+ navigate({ search: (prev) => ({ ...prev, requestId: "" }) });
+ }
+
handlePopUpClose("reviewRequest");
setSelectedRequest(null);
refetchRequests();