From 7403385e7c38a9ca46a527a4660bff6eb0489c12 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Mon, 21 Oct 2024 09:45:56 -0700
Subject: [PATCH 1/3] fix: fix select all rows checkbox being checked if no
 folders/secrets

---
 frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
index b7c3727f49..71410e327a 100644
--- a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
+++ b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
@@ -524,6 +524,8 @@ export const SecretOverviewPage = () => {
   );
 
   const allRowsSelectedOnPage = useMemo(() => {
+    if (!secrets?.length && !folders?.length) return { isChecked: false, isIndeterminate: false };
+
     if (
       (!secrets?.length ||
         secrets?.every((secret) => selectedEntries[EntryType.SECRET][secret.key])) &&

From ca0241bb513c0e9db20768dcc4bca91d63bc7d70 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Mon, 21 Oct 2024 10:20:43 -0700
Subject: [PATCH 2/3] improvement: improve empty table labeling for org
 group/users

---
 .../components/OrgGroupsSection/OrgGroupsTable.tsx       | 7 ++++++-
 .../components/OrgMembersSection/OrgMembersTable.tsx     | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
index 669be471c3..21582805c3 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
@@ -335,7 +335,12 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
               })}
           </TBody>
         </Table>
-        {groups?.length === 0 && <EmptyState title="No groups found" icon={faUsers} />}
+        {filteredGroups?.length === 0 && (
+          <EmptyState
+            title={groups?.length === 0 ? "No groups found" : "No groups match search"}
+            icon={faUsers}
+          />
+        )}
       </TableContainer>
     </div>
   );
diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 35758f9cef..ae879e88c3 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -377,7 +377,14 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
           </TBody>
         </Table>
         {!isLoading && filterdUser?.length === 0 && (
-          <EmptyState title="No organization members found" icon={faUsers} />
+          <EmptyState
+            title={
+              members?.length === 0
+                ? "No organization members found"
+                : "No organization members match search"
+            }
+            icon={faUsers}
+          />
         )}
       </TableContainer>
     </div>

From 14e92f895aeb326f9ea46c1781f83b12c238ef08 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Mon, 21 Oct 2024 10:55:39 -0700
Subject: [PATCH 3/3] fix: only override secret value/id by key if same
 environment

---
 frontend/src/hooks/api/secrets/queries.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/hooks/api/secrets/queries.tsx b/frontend/src/hooks/api/secrets/queries.tsx
index ca26b96caf..1568930c6d 100644
--- a/frontend/src/hooks/api/secrets/queries.tsx
+++ b/frontend/src/hooks/api/secrets/queries.tsx
@@ -48,7 +48,7 @@ export const fetchProjectSecrets = async ({
 };
 
 export const mergePersonalSecrets = (rawSecrets: SecretV3Raw[]) => {
-  const personalSecrets: Record<string, { id: string; value?: string }> = {};
+  const personalSecrets: Record<string, { id: string; value?: string; env: string }> = {};
   const secrets: SecretV3RawSanitized[] = [];
   rawSecrets.forEach((el) => {
     const decryptedSecret: SecretV3RawSanitized = {
@@ -69,7 +69,8 @@ export const mergePersonalSecrets = (rawSecrets: SecretV3Raw[]) => {
     if (el.type === SecretType.Personal) {
       personalSecrets[decryptedSecret.key] = {
         id: el.id,
-        value: el.secretValue
+        value: el.secretValue,
+        env: el.environment
       };
     } else {
       secrets.push(decryptedSecret);
@@ -77,9 +78,10 @@ export const mergePersonalSecrets = (rawSecrets: SecretV3Raw[]) => {
   });
 
   secrets.forEach((sec) => {
-    if (personalSecrets?.[sec.key]) {
-      sec.idOverride = personalSecrets[sec.key].id;
-      sec.valueOverride = personalSecrets[sec.key].value;
+    const personalSecret = personalSecrets?.[sec.key];
+    if (personalSecret && personalSecret.env === sec.env) {
+      sec.idOverride = personalSecret.id;
+      sec.valueOverride = personalSecret.value;
       sec.overrideAction = "modified";
     }
   });