From db0b4a5ad13df058774f04292564fdfa3fea0178 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:49:22 -0700
Subject: [PATCH] Feat: Request access

---
 backend/scripts/generate-schema-types.ts                      | 2 +-
 .../access-approval-policy/access-approval-policy-service.ts  | 2 --
 frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx  | 4 ++++
 .../AccessApprovalPolicyList/components/AccessPolicyForm.tsx  | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/scripts/generate-schema-types.ts b/backend/scripts/generate-schema-types.ts
index 8c913991f..28b736152 100644
--- a/backend/scripts/generate-schema-types.ts
+++ b/backend/scripts/generate-schema-types.ts
@@ -5,7 +5,7 @@ import knex from "knex";
 import { writeFileSync } from "fs";
 
 dotenv.config({
-  path: path.join(__dirname, "../../.env.migration")
+  path: path.join(__dirname, "../../.env")
 });
 
 const db = knex({
diff --git a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
index f14380869..50e1b04b4 100644
--- a/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
+++ b/backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts
@@ -155,7 +155,6 @@ export const accessApprovalPolicyServiceFactory = ({
       actorAuthMethod,
       actorOrgId
     );
-
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Edit, ProjectPermissionSub.SecretApproval);
 
     const updatedPolicy = await accessApprovalPolicyDAL.transaction(async (tx) => {
@@ -179,7 +178,6 @@ export const accessApprovalPolicyServiceFactory = ({
         );
 
         await verifyApprovers({
-          projectId: accessApprovalPolicy.projectId,
           orgId: actorOrgId,
           envSlug: accessApprovalPolicy.environment.slug,
           secretPath: doc.secretPath!,
diff --git a/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx b/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
index 9c273848f..b3e0b62ca 100644
--- a/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
+++ b/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
@@ -65,6 +65,10 @@ export const SecretApprovalPage = () => {
         <TabPanel value={TabSection.ResourcePolicies}>
           <AccessApprovalPolicyList workspaceId={projectId} />
         </TabPanel>
+
+        <TabPanel value={TabSection.ResourcePolicies}>
+          <AccessApprovalPolicyList workspaceId={workspaceId} />
+        </TabPanel>
       </Tabs>
     </div>
   );
diff --git a/frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/components/AccessPolicyForm.tsx b/frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/components/AccessPolicyForm.tsx
index dd51ea53d..081556041 100644
--- a/frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/components/AccessPolicyForm.tsx
+++ b/frontend/src/views/SecretApprovalPage/components/AccessApprovalPolicyList/components/AccessPolicyForm.tsx
@@ -177,7 +177,6 @@ export const AccessPolicyForm = ({
           />
 
           <Controller
-            control={control}
             name="secretPath"
             render={({ field, fieldState: { error } }) => (
               <FormControl label="Secret Path" isError={Boolean(error)} errorText={error?.message}>
@@ -187,8 +186,6 @@ export const AccessPolicyForm = ({
           />
 
           <Controller
-            control={control}
-            name="approvers"
             render={({ field: { value, onChange }, fieldState: { error } }) => (
               <FormControl
                 label="Approvers Required"