From f6885b239b4225c6dea8acdf6d61286cf37a6d3c Mon Sep 17 00:00:00 2001
From: = <akhilmhdh@gmail.com>
Date: Wed, 25 Sep 2024 21:37:59 +0530
Subject: [PATCH] feat: small text changes in kms permission

---
 .../ProjectRoleModifySection.utils.ts         |  9 +----
 .../components/SecretPermissionConditions.tsx | 37 +++++++++----------
 .../SecretOverviewPage/SecretOverviewPage.tsx |  2 +-
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
index 915509d60..84ffc85d1 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/ProjectRoleModifySection.utils.ts
@@ -259,16 +259,11 @@ export const PROJECT_PERMISSION_OBJECT: TProjectPermissionObject = {
   },
   [ProjectPermissionSub.SecretFolders]: {
     title: "Secret Folders",
-    actions: [{ label: "Read", value: "read" }]
+    actions: [{ label: "Read Only", value: "read" }]
   },
   [ProjectPermissionSub.Kms]: {
     title: "KMS",
-    actions: [
-      { label: "Read", value: "read" },
-      { label: "Create", value: "create" },
-      { label: "Modify", value: "edit" },
-      { label: "Remove", value: "delete" }
-    ]
+    actions: [{ label: "Modify", value: "edit" }]
   },
   [ProjectPermissionSub.Integrations]: {
     title: "Integrations",
diff --git a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
index 3e7574eb0..a4713cfbf 100644
--- a/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
+++ b/frontend/src/views/Project/RolePage/components/RolePermissionsSection/components/SecretPermissionConditions.tsx
@@ -44,7 +44,6 @@ export const SecretPermissionConditions = ({ position = 0 }: Props) => {
                     >
                       <SelectItem value="environment">Environment</SelectItem>
                       <SelectItem value="secretPath">Secret Path</SelectItem>
-                      <SelectItem value="secretName">Secret Name</SelectItem>
                     </Select>
                   </FormControl>
                 )}
@@ -69,11 +68,7 @@ export const SecretPermissionConditions = ({ position = 0 }: Props) => {
                       <SelectItem value={PermissionConditionOperators.$EQ}>Equal</SelectItem>
                       <SelectItem value={PermissionConditionOperators.$NEQ}>Not Equal</SelectItem>
                       <SelectItem value={PermissionConditionOperators.$GLOB}>Glob Match</SelectItem>
-                      <SelectItem value={PermissionConditionOperators.$REGEX}>
-                        Regex Match
-                      </SelectItem>
                       <SelectItem value={PermissionConditionOperators.$IN}>Contains</SelectItem>
-                      <SelectItem value={PermissionConditionOperators.$ALL}>All</SelectItem>
                     </Select>
                   </FormControl>
                 )}
@@ -107,21 +102,23 @@ export const SecretPermissionConditions = ({ position = 0 }: Props) => {
           </div>
         ))}
       </div>
-      <Button
-        leftIcon={<FontAwesomeIcon icon={faPlus} />}
-        variant="star"
-        size="xs"
-        className="mt-3"
-        onClick={() =>
-          items.append({
-            lhs: "environment",
-            operator: PermissionConditionOperators.$EQ,
-            rhs: ""
-          })
-        }
-      >
-        New Condition
-      </Button>
+      <div>
+        <Button
+          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+          variant="star"
+          size="xs"
+          className="mt-3"
+          onClick={() =>
+            items.append({
+              lhs: "environment",
+              operator: PermissionConditionOperators.$EQ,
+              rhs: ""
+            })
+          }
+        >
+          New Condition
+        </Button>
+      </div>
     </div>
   );
 };
diff --git a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
index 972210bdf..3e054e3d1 100644
--- a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
+++ b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
@@ -190,7 +190,6 @@ export const SecretOverviewPage = () => {
   }, [isWorkspaceLoading, workspaceId, router.isReady]);
 
   const userAvailableEnvs = currentWorkspace?.environments || [];
-
   const [visibleEnvs, setVisibleEnvs] = useState(userAvailableEnvs);
 
   useEffect(() => {
@@ -523,6 +522,7 @@ export const SecretOverviewPage = () => {
     []
   );
 
+  console.log(isWorkspaceLoading, isProjectV3, isOverviewLoading);
   if (isWorkspaceLoading || (isProjectV3 && isOverviewLoading)) {
     return (
       <div className="container mx-auto flex h-screen w-full items-center justify-center px-8 text-mineshaft-50 dark:[color-scheme:dark]">