fix(loops): scope creator member lookups

Generated-By: PostHog Code
Task-Id: 9edb68e1-a82b-48f8-9d42-f3c635939c09

Author: MattPua

packages/api-client/src/posthog-client.ts

@@ -2589,6 +2589,14 @@ export class PostHogAPIClient {
   // Everyone in the current organization — the pool of taggable teammates for
   // thread @-mentions. Membership churn is slow, so callers cache aggressively.
   async listOrganizationMembers(): Promise<OrganizationMemberBasic[]> {
+    const result = await this.listOrganizationMembersWithStatus();
+    return result.members;
+  }
+
+  async listOrganizationMembersWithStatus(): Promise<{
+    members: OrganizationMemberBasic[];
+    isComplete: boolean;
+  }> {
     const ORG_MEMBERS_MAX_PAGES = 20;
     const ORG_MEMBERS_PAGE_SIZE = 200;
     const all: OrganizationMemberBasic[] = [];
@@ -2609,15 +2617,15 @@ export class PostHogAPIClient {
         next: string | null;
       };
       all.push(...page.results);
-      if (!page.next) return all;
+      if (!page.next) return { members: all, isComplete: true };
       const nextUrl = new URL(page.next);
       urlPath = `${nextUrl.pathname}${nextUrl.search}`;
     }
     log.warn(
       `listOrganizationMembers hit MAX_PAGES (${ORG_MEMBERS_MAX_PAGES}); returning partial results`,
       { returned: all.length },
     );
-    return all;
+    return { members: all, isComplete: false };
   }
 
   async sendRunCommand(

packages/ui/src/features/canvas/hooks/useOrgMembers.ts

@@ -1,34 +1,43 @@
 import type { UserBasic } from "@posthog/shared/domain-types";
+import { useAuthStateValue } from "@posthog/ui/features/auth/store";
 import { userDisplayName } from "@posthog/ui/features/canvas/utils/userDisplay";
 import { useAuthenticatedQuery } from "@posthog/ui/hooks/useAuthenticatedQuery";
 import { useMemo } from "react";
 
 // Membership churn is slow; one fetch per session window is plenty.
 const ORG_MEMBERS_STALE_MS = 5 * 60_000;
 
-export const ORG_MEMBERS_QUERY_KEY = ["org-members"] as const;
+export const orgMembersQueryKey = (orgId: string | null) =>
+  ["org-members", orgId] as const;
 
 /** Members of the current organization, sorted by display name. */
 export function useOrgMembers(options?: { enabled?: boolean }): {
   members: UserBasic[];
   isLoading: boolean;
   isError: boolean;
+  isComplete: boolean;
 } {
+  const currentOrgId = useAuthStateValue((state) => state.currentOrgId);
   const query = useAuthenticatedQuery(
-    ORG_MEMBERS_QUERY_KEY,
-    (client) => client.listOrganizationMembers(),
+    orgMembersQueryKey(currentOrgId),
+    (client) => client.listOrganizationMembersWithStatus(),
     {
       enabled: options?.enabled ?? true,
       staleTime: ORG_MEMBERS_STALE_MS,
     },
   );
   const members = useMemo(
     () =>
-      (query.data ?? [])
+      (query.data?.members ?? [])
         .map((member) => member.user)
         .filter((user) => !!user?.email)
         .sort((a, b) => userDisplayName(a).localeCompare(userDisplayName(b))),
     [query.data],
   );
-  return { members, isLoading: query.isLoading, isError: query.isError };
+  return {
+    members,
+    isLoading: query.isLoading,
+    isError: query.isError,
+    isComplete: query.data?.isComplete ?? false,
+  };
 }

packages/ui/src/features/loops/components/LoopDetailView.tsx

@@ -247,6 +247,7 @@ function ConfigSummarySection({ loop }: { loop: LoopSchemas.Loop }) {
     members,
     isLoading: membersLoading,
     isError: membersError,
+    isComplete: membersComplete,
   } = useOrgMembers({ enabled: loop.visibility === "team" });
   const creator = members.find((member) => member.id === loop.created_by_id);
   let creatorContent: React.ReactNode = null;
@@ -261,8 +262,10 @@ function ConfigSummarySection({ loop }: { loop: LoopSchemas.Loop }) {
         {userDisplayName(creator)}
       </Flex>
     );
-  } else if (loop.visibility === "team") {
+  } else if (loop.visibility === "team" && membersComplete) {
     creatorContent = "Former organization member";
+  } else if (loop.visibility === "team") {
+    creatorContent = "Creator unavailable";
   }
   const notificationDestinations = summarizeNotificationDestinations(
     loop.notifications,

packages/ui/src/features/loops/components/LoopRow.tsx

@@ -16,11 +16,13 @@ export function LoopRow({
   creator,
   creatorLoading = false,
   creatorError = false,
+  creatorLookupComplete = true,
 }: {
   loop: LoopSchemas.Loop;
   creator?: UserBasic;
   creatorLoading?: boolean;
   creatorError?: boolean;
+  creatorLookupComplete?: boolean;
 }) {
   const description = loop.description.trim();
   const triggerLabel = loop.triggers.length === 1 ? "trigger" : "triggers";
@@ -32,6 +34,12 @@ export function LoopRow({
   let creatorLabel: string | null = null;
   if (loop.visibility === "team" && creatorError) {
     creatorLabel = "Creator unavailable";
+  } else if (
+    loop.visibility === "team" &&
+    !creatorLoading &&
+    !creatorLookupComplete
+  ) {
+    creatorLabel = "Creator unavailable";
   } else if (loop.visibility === "team" && !creatorLoading) {
     creatorLabel = creator
       ? `Created by ${userDisplayName(creator)}`

packages/ui/src/features/loops/components/LoopsListView.tsx

@@ -64,6 +64,7 @@ export function LoopsListView() {
     members,
     isLoading: membersLoading,
     isError: membersError,
+    isComplete: membersComplete,
   } = useOrgMembers({ enabled: teamLoops.length > 0 });
 
   return (
@@ -75,6 +76,7 @@ export function LoopsListView() {
       members={members}
       membersLoading={membersLoading}
       membersError={membersError}
+      membersComplete={membersComplete}
       onStartBlank={startBlankLoop}
       onStartFromTemplate={startLoopFromTemplate}
     />
@@ -89,6 +91,7 @@ interface LoopsListViewPresentationProps {
   members?: UserBasic[];
   membersLoading?: boolean;
   membersError?: boolean;
+  membersComplete?: boolean;
   onStartBlank: () => void;
   onStartFromTemplate: (template: LoopTemplate) => void;
 }
@@ -101,6 +104,7 @@ export function LoopsListViewPresentation({
   members = EMPTY_MEMBERS,
   membersLoading = false,
   membersError = false,
+  membersComplete = true,
   onStartBlank,
   onStartFromTemplate,
 }: LoopsListViewPresentationProps) {
@@ -175,6 +179,7 @@ export function LoopsListViewPresentation({
                   members={members}
                   membersLoading={membersLoading}
                   membersError={membersError}
+                  membersComplete={membersComplete}
                 />
               ) : null}
             </Flex>
@@ -205,12 +210,14 @@ function LoopListSection({
   members = EMPTY_MEMBERS,
   membersLoading = false,
   membersError = false,
+  membersComplete = true,
 }: {
   title: string;
   loops: LoopSchemas.Loop[];
   members?: UserBasic[];
   membersLoading?: boolean;
   membersError?: boolean;
+  membersComplete?: boolean;
 }) {
   return (
     <Flex direction="column" gap="3">
@@ -225,6 +232,7 @@ function LoopListSection({
             creator={members.find((member) => member.id === loop.created_by_id)}
             creatorLoading={membersLoading}
             creatorError={membersError}
+            creatorLookupComplete={membersComplete}
           />
         ))}
       </Flex>