@agent-native/toolkit 0.227.0 → 0.228.0-nightly-20261111004142

package/src/app/org/OrgSwitcher.spec.tsx

@@ -960,6 +960,49 @@ describe("OrgSwitcher (account menu)", () => {
     );
   });
 
+  it("hides Create organization when organization creation is closed", () => {
+    mocks.useOrg.mockReturnValue({
+      data: {
+        ...ownerOrg,
+        access: { signup: "invited", orgCreation: "closed" },
+      },
+      isLoading: false,
+    });
+
+    render(<OrgSwitcher />);
+    const menu = openMenu();
+
+    expect(menuItemLabels()).toEqual([
+      "Acme",
+      "Globex",
+      expect.stringMatching(/^Settings(⌘,|Ctrl\+,)$/),
+      "Usage",
+      "Log out",
+    ]);
+    for (const group of menu.querySelectorAll('[role="group"]')) {
+      expect(group.childElementCount).toBeGreaterThan(0);
+    }
+    expect(menu.querySelectorAll('[role="separator"]').length).toBe(2);
+  });
+
+  it("keeps the workspace link when organization creation is closed", () => {
+    const workspaceUrl = "https://agent-workspace.builder.io";
+    mocks.useOrg.mockReturnValue({
+      data: {
+        ...ownerOrg,
+        workspaceUrl,
+        access: { signup: "invited", orgCreation: "closed" },
+      },
+      isLoading: false,
+    });
+
+    render(<OrgSwitcher />);
+    const menu = openMenu();
+
+    expect(menu.querySelector(`a[href="${workspaceUrl}"]`)).not.toBeNull();
+    expect(menuItemLabels()).not.toContain("Create organization");
+  });
+
   it("hides Get apps and extensions unless the app passes utility links", () => {
     mocks.useOrg.mockReturnValue({ data: ownerOrg, isLoading: false });
 

package/src/app/org/OrgSwitcher.tsx

@@ -661,6 +661,7 @@ export function OrgSwitcher({
     shouldOfferWorkspace(window.location.href, org.workspaceUrl)
       ? org.workspaceUrl
       : null;
+  const canCreateOrg = org.access?.orgCreation !== "closed";
   const links = utilityLinks ?? [];
   const menuError = (switchOrg.error ||
     acceptInvitation.error ||
@@ -890,32 +891,36 @@ export function OrgSwitcher({
         </DropdownMenuGroup>
       )}
 
-      <DropdownMenuGroup>
-        {workspaceUrl && (
-          <DropdownMenuItem asChild className={ITEM_CLASS}>
-            <a href={workspaceUrl}>
+      {(workspaceUrl || canCreateOrg) && (
+        <DropdownMenuGroup>
+          {workspaceUrl && (
+            <DropdownMenuItem asChild className={ITEM_CLASS}>
+              <a href={workspaceUrl}>
+                <span className="flex-1">
+                  {t("agentChat.accountMenu.yourWorkspace")}
+                </span>
+              </a>
+            </DropdownMenuItem>
+          )}
+          {canCreateOrg && (
+            <DropdownMenuItem
+              className={ITEM_CLASS}
+              onSelect={() => {
+                // The menu restores focus to its trigger as it closes, which
+                // would pull focus out of the dialog opening in its place.
+                openingDialogRef.current = true;
+                createOrg.reset();
+                setNewName("");
+                setCreateOpen(true);
+              }}
+            >
               <span className="flex-1">
-                {t("agentChat.accountMenu.yourWorkspace")}
+                {t("agentChat.accountMenu.createOrganization")}
               </span>
-            </a>
-          </DropdownMenuItem>
-        )}
-        <DropdownMenuItem
-          className={ITEM_CLASS}
-          onSelect={() => {
-            // The menu restores focus to its trigger as it closes, which
-            // would pull focus out of the dialog opening in its place.
-            openingDialogRef.current = true;
-            createOrg.reset();
-            setNewName("");
-            setCreateOpen(true);
-          }}
-        >
-          <span className="flex-1">
-            {t("agentChat.accountMenu.createOrganization")}
-          </span>
-        </DropdownMenuItem>
-      </DropdownMenuGroup>
+            </DropdownMenuItem>
+          )}
+        </DropdownMenuGroup>
+      )}
 
       <DropdownMenuSeparator />
       <DropdownMenuGroup>