feat: refactor organization membership logic and simplify admin role checks

frontend/src/app/agents/[agentId]/page.tsx

@@ -22,10 +22,7 @@ import {
   type listBoardsApiV1BoardsGetResponse,
   useListBoardsApiV1BoardsGet,
 } from "@/api/generated/boards/boards";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type {
   ActivityEventRead,
   AgentRead,
@@ -84,19 +81,7 @@ export default function AgentDetailPage() {
   const agentIdParam = params?.agentId;
   const agentId = Array.isArray(agentIdParam) ? agentIdParam[0] : agentIdParam;
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [deleteOpen, setDeleteOpen] = useState(false);
   const [deleteError, setDeleteError] = useState<string | null>(null);

frontend/src/app/agents/new/page.tsx

@@ -13,10 +13,7 @@ import {
   useListBoardsApiV1BoardsGet,
 } from "@/api/generated/boards/boards";
 import { useCreateAgentApiV1AgentsPost } from "@/api/generated/agents/agents";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { BoardRead } from "@/api/generated/model";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
@@ -86,19 +83,7 @@ export default function NewAgentPage() {
   const router = useRouter();
   const { isSignedIn } = useAuth();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [name, setName] = useState("");
   const [boardId, setBoardId] = useState<string>("");

frontend/src/app/agents/page.tsx

@@ -42,10 +42,7 @@ import {
   getListBoardsApiV1BoardsGetQueryKey,
   useListBoardsApiV1BoardsGet,
 } from "@/api/generated/boards/boards";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { AgentRead } from "@/api/generated/model";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
@@ -94,19 +91,7 @@ export default function AgentsPage() {
   const queryClient = useQueryClient();
   const router = useRouter();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [sorting, setSorting] = useState<SortingState>([
     { id: "name", desc: false },

frontend/src/app/boards/[boardId]/edit/page.tsx

@@ -22,10 +22,7 @@ import {
   type listGatewaysApiV1GatewaysGetResponse,
   useListGatewaysApiV1GatewaysGet,
 } from "@/api/generated/gateways/gateways";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type {
   BoardGroupRead,
   BoardRead,
@@ -65,19 +62,7 @@ export default function EditBoardPage() {
   const boardIdParam = params?.boardId;
   const boardId = Array.isArray(boardIdParam) ? boardIdParam[0] : boardIdParam;
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const mainRef = useRef<HTMLElement | null>(null);
 

frontend/src/app/boards/new/page.tsx

@@ -18,10 +18,7 @@ import {
   type listGatewaysApiV1GatewaysGetResponse,
   useListGatewaysApiV1GatewaysGet,
 } from "@/api/generated/gateways/gateways";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { BoardGroupRead } from "@/api/generated/model";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
@@ -42,19 +39,7 @@ export default function NewBoardPage() {
   const router = useRouter();
   const { isSignedIn } = useAuth();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [name, setName] = useState("");
   const [gatewayId, setGatewayId] = useState<string>("");

frontend/src/app/boards/page.tsx

@@ -25,10 +25,7 @@ import {
   type listBoardGroupsApiV1BoardGroupsGetResponse,
   useListBoardGroupsApiV1BoardGroupsGet,
 } from "@/api/generated/board-groups/board-groups";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { BoardGroupRead, BoardRead } from "@/api/generated/model";
 import { DashboardSidebar } from "@/components/organisms/DashboardSidebar";
 import { DashboardShell } from "@/components/templates/DashboardShell";
@@ -62,19 +59,7 @@ export default function BoardsPage() {
   const { isSignedIn } = useAuth();
   const queryClient = useQueryClient();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
   const [deleteTarget, setDeleteTarget] = useState<BoardRead | null>(null);
 
   const boardsKey = getListBoardsApiV1BoardsGetQueryKey();

frontend/src/app/gateways/[gatewayId]/edit/page.tsx

@@ -13,10 +13,7 @@ import {
   useGetGatewayApiV1GatewaysGatewayIdGet,
   useUpdateGatewayApiV1GatewaysGatewayIdPatch,
 } from "@/api/generated/gateways/gateways";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { GatewayUpdate } from "@/api/generated/model";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
@@ -40,19 +37,7 @@ export default function EditGatewayPage() {
     ? gatewayIdParam[0]
     : gatewayIdParam;
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [name, setName] = useState<string | undefined>(undefined);
   const [gatewayUrl, setGatewayUrl] = useState<string | undefined>(undefined);

frontend/src/app/gateways/[gatewayId]/page.tsx

@@ -18,10 +18,7 @@ import {
   type listAgentsApiV1AgentsGetResponse,
   useListAgentsApiV1AgentsGet,
 } from "@/api/generated/agents/agents";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
 import { DashboardSidebar } from "@/components/organisms/DashboardSidebar";
@@ -55,19 +52,7 @@ export default function GatewayDetailPage() {
     ? gatewayIdParam[0]
     : gatewayIdParam;
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const gatewayQuery = useGetGatewayApiV1GatewaysGatewayIdGet<
     getGatewayApiV1GatewaysGatewayIdGetResponse,

frontend/src/app/gateways/new/page.tsx

@@ -9,10 +9,7 @@ import { SignedIn, SignedOut, useAuth } from "@/auth/clerk";
 
 import { ApiError } from "@/api/mutator";
 import { useCreateGatewayApiV1GatewaysPost } from "@/api/generated/gateways/gateways";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
 import { GatewayForm } from "@/components/gateways/GatewayForm";
@@ -30,19 +27,7 @@ export default function NewGatewayPage() {
   const { isSignedIn } = useAuth();
   const router = useRouter();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
 
   const [name, setName] = useState("");
   const [gatewayUrl, setGatewayUrl] = useState("");

frontend/src/app/gateways/page.tsx

@@ -35,10 +35,7 @@ import {
   useDeleteGatewayApiV1GatewaysGatewayIdDelete,
   useListGatewaysApiV1GatewaysGet,
 } from "@/api/generated/gateways/gateways";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import type { GatewayRead } from "@/api/generated/model";
 import { AdminOnlyNotice } from "@/components/auth/AdminOnlyNotice";
 import { SignedOutPanel } from "@/components/auth/SignedOutPanel";
@@ -65,19 +62,7 @@ export default function GatewaysPage() {
   const { isSignedIn } = useAuth();
   const queryClient = useQueryClient();
 
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
   const [sorting, setSorting] = useState<SortingState>([
     { id: "name", desc: false },
   ]);

frontend/src/components/organisms/DashboardSidebar.tsx

@@ -15,10 +15,7 @@ import {
 
 import { useAuth } from "@/auth/clerk";
 import { ApiError } from "@/api/mutator";
-import {
+import { useOrganizationMembership } from "@/lib/use-organization-membership";
-  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-  useGetMyMembershipApiV1OrganizationsMeMemberGet,
-} from "@/api/generated/organizations/organizations";
 import {
   type healthzHealthzGetResponse,
   useHealthzHealthzGet,
@@ -28,19 +25,7 @@ import { cn } from "@/lib/utils";
 export function DashboardSidebar() {
   const pathname = usePathname();
   const { isSignedIn } = useAuth();
-  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+  const { isAdmin } = useOrganizationMembership(isSignedIn);
-    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
-    ApiError
-  >({
-    query: {
-      enabled: Boolean(isSignedIn),
-      refetchOnMount: "always",
-      retry: false,
-    },
-  });
-  const member =
-    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
-  const isAdmin = member ? ["owner", "admin"].includes(member.role) : false;
   const healthQuery = useHealthzHealthzGet<healthzHealthzGetResponse, ApiError>(
     {
       query: {

frontend/src/lib/use-organization-membership.ts

@@ -0,0 +1,33 @@
+import { ApiError } from "@/api/mutator";
+import {
+  type getMyMembershipApiV1OrganizationsMeMemberGetResponse,
+  useGetMyMembershipApiV1OrganizationsMeMemberGet,
+} from "@/api/generated/organizations/organizations";
+
+export const isOrganizationAdminRole = (
+  role: string | null | undefined,
+): boolean => role === "owner" || role === "admin";
+
+export function useOrganizationMembership(
+  isSignedIn: boolean | null | undefined,
+) {
+  const membershipQuery = useGetMyMembershipApiV1OrganizationsMeMemberGet<
+    getMyMembershipApiV1OrganizationsMeMemberGetResponse,
+    ApiError
+  >({
+    query: {
+      enabled: Boolean(isSignedIn),
+      refetchOnMount: "always",
+      retry: false,
+    },
+  });
+
+  const member =
+    membershipQuery.data?.status === 200 ? membershipQuery.data.data : null;
+
+  return {
+    membershipQuery,
+    member,
+    isAdmin: isOrganizationAdminRole(member?.role),
+  };
+}