fix: fix isAcessible query join/filter and clear sub org query cache when org changes

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 query
-          void qb.on(`${TableName.Membership}.scope`, AccessScope.Organization);
+          .leftJoin(`${TableName.Membership}`, `${TableName.Membership}.scopeOrgId`, `${TableName.Organization}.id`)
-          if (dto.actorType === ActorType.IDENTITY) {
+          .where((qb) => {
-            void qb.andOn(`${TableName.Membership}.actorIdentityId`, dto.actorId);
+            void qb.where(`${TableName.Membership}.scope`, AccessScope.Organization);
-          } else {
+            if (dto.actorType === ActorType.IDENTITY) {
-            void qb.andOn(`${TableName.Membership}.actorUserId`, dto.actorId);
+              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);

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();

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;