From b8fa4d5255a8c35d143d1629064b5fc0b751c24c Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Wed, 13 Aug 2025 09:13:26 -0700
Subject: [PATCH] improvements: address feedback

---
 .../access-approval-request-service.ts                   | 9 ++++++---
 frontend/src/hooks/api/accessApproval/mutation.tsx       | 2 +-
 frontend/src/hooks/api/accessApproval/queries.tsx        | 2 +-
 frontend/src/hooks/api/accessApproval/types.ts           | 2 +-
 .../AccessApprovalRequest/AccessApprovalRequest.tsx      | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
index 607373be4..850e1d3a2 100644
--- a/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
+++ b/backend/src/ee/services/access-approval-request/access-approval-request-service.ts
@@ -380,9 +380,12 @@ export const accessApprovalRequestServiceFactory = ({
       );
 
       // reset review progress
-      await accessApprovalRequestReviewerDAL.delete({
-        requestId
-      });
+      await accessApprovalRequestReviewerDAL.delete(
+        {
+          requestId
+        },
+        tx
+      );
 
       const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`;
       const editorFullName = `${editedByUser.firstName} ${editedByUser.lastName}`;
diff --git a/frontend/src/hooks/api/accessApproval/mutation.tsx b/frontend/src/hooks/api/accessApproval/mutation.tsx
index 539f7dbad..a31ec11a0 100644
--- a/frontend/src/hooks/api/accessApproval/mutation.tsx
+++ b/frontend/src/hooks/api/accessApproval/mutation.tsx
@@ -149,7 +149,7 @@ export const useUpdateAccessRequest = () => {
     },
     onSuccess: (_, { projectSlug }) => {
       queryClient.invalidateQueries({
-        queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
+        queryKey: accessApprovalKeys.getAccessApprovalRequests(projectSlug)
       });
     }
   });
diff --git a/frontend/src/hooks/api/accessApproval/queries.tsx b/frontend/src/hooks/api/accessApproval/queries.tsx
index c53f9d013..44f260f66 100644
--- a/frontend/src/hooks/api/accessApproval/queries.tsx
+++ b/frontend/src/hooks/api/accessApproval/queries.tsx
@@ -24,7 +24,7 @@ export const accessApprovalKeys = {
     envSlug?: string,
     requestedBy?: string,
     bypassReason?: string
-  ) => [{ projectSlug, envSlug, requestedBy, bypassReason }, "access-approvals-requests"] as const,
+  ) => ["access-approvals-requests", projectSlug, envSlug, requestedBy, bypassReason] as const,
   getAccessApprovalRequestCount: (projectSlug: string, policyId?: string) =>
     [{ projectSlug }, "access-approval-request-count", ...(policyId ? [policyId] : [])] as const
 };
diff --git a/frontend/src/hooks/api/accessApproval/types.ts b/frontend/src/hooks/api/accessApproval/types.ts
index fa0b47450..0e4c01350 100644
--- a/frontend/src/hooks/api/accessApproval/types.ts
+++ b/frontend/src/hooks/api/accessApproval/types.ts
@@ -104,7 +104,7 @@ export type TAccessApprovalRequest = {
 
   note?: string;
   editNote?: string;
-  editedByUserId: string;
+  editedByUserId?: string;
 };
 
 export type TAccessApproval = {
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 c55ff8cb2..957091fe5 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/AccessApprovalRequest.tsx
@@ -597,7 +597,7 @@ export const AccessApprovalRequest = ({
               // we shouldn't be using state like this...
               handleSelectRequest({
                 ...selectedRequest,
-                isTemporary: true,
+                isTemporary: request.isTemporary,
                 temporaryRange: request.temporaryRange,
                 reviewers: []
               });