From 9bb0e2c401cf879df619016505f3245da0397020 Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Mon, 20 Oct 2025 18:18:21 -0700
Subject: [PATCH] fix: fix isAcessible query join/filter and clear sub org
 query cache when org changes

---
 backend/src/services/org/org-dal.ts            | 18 ++++++++++--------
 .../components/NavBar/Navbar.tsx               |  7 ++++---
 .../NavBar/NewSubOrganizationForm.tsx          |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/backend/src/services/org/org-dal.ts b/backend/src/services/org/org-dal.ts
index 114ff3790..c2565f36b 100644
--- a/backend/src/services/org/org-dal.ts
+++ b/backend/src/services/org/org-dal.ts
@@ -172,14 +172,16 @@ export const orgDALFactory = (db: TDbClient) => {
         .select(selectAllTableCols(TableName.Organization));
 
       if (dto.isAccessible) {
-        void query.leftJoin(`${TableName.Membership}`, (qb) => {
-          void qb.on(`${TableName.Membership}.scope`, AccessScope.Organization);
-          if (dto.actorType === ActorType.IDENTITY) {
-            void qb.andOn(`${TableName.Membership}.actorIdentityId`, dto.actorId);
-          } else {
-            void qb.andOn(`${TableName.Membership}.actorUserId`, dto.actorId);
-          }
-        });
+        void query
+          .leftJoin(`${TableName.Membership}`, `${TableName.Membership}.scopeOrgId`, `${TableName.Organization}.id`)
+          .where((qb) => {
+            void qb.where(`${TableName.Membership}.scope`, AccessScope.Organization);
+            if (dto.actorType === ActorType.IDENTITY) {
+              void qb.andWhere(`${TableName.Membership}.actorIdentityId`, dto.actorId);
+            } else {
+              void qb.andWhere(`${TableName.Membership}.actorUserId`, dto.actorId);
+            }
+          });
       }
       if (dto.limit) void query.limit(dto.limit);
       if (dto.offset) void query.offset(dto.offset);
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
index 31e2d1b4d..7e926d690 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
@@ -134,13 +134,13 @@ export const Navbar = () => {
   const { subscription } = useSubscription();
   const { currentOrg, isSubOrganization } = useOrganization();
 
-  console.log("current", currentOrg, isSubOrganization);
-
   const [showAdminsModal, setShowAdminsModal] = useState(false);
   const [showSubOrgForm, setShowSubOrgForm] = useState(false);
   const [showCardDeclinedModal, setShowCardDeclinedModal] = useState(false);
+
+  const subOrgQuery = subOrganizationsQuery.list({ limit: 500, isAccessible: true });
   const { data: subOrganizations = [] } = useQuery({
-    ...subOrganizationsQuery.list({ limit: 500, isAccessible: true }),
+    ...subOrgQuery,
     enabled: Boolean(subscription.subOrganization)
   });
 
@@ -183,6 +183,7 @@ export const Navbar = () => {
     }
     await router.invalidate();
     await navigateUserToOrg(navigate, orgId);
+    queryClient.removeQueries({ queryKey: subOrgQuery.queryKey });
   };
 
   const { mutateAsync } = useGetOrgTrialUrl();
diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx
index 6ffed5578..368b8e64b 100644
--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx
@@ -7,7 +7,7 @@ import { z } from "zod";
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input } from "@app/components/v2";
 import { useCreateSubOrganization } from "@app/hooks/api";
-import { GenericResourceNameSchema, slugSchema } from "@app/lib/schemas";
+import { slugSchema } from "@app/lib/schemas";
 
 type ContentProps = {
   onClose: () => void;