@streamoid/settings 0.7.4 → 0.7.5

package/dist/index.d.mts

@@ -366,6 +366,14 @@ interface OrganizationWorkspaceItem {
     imageUrl?: string;
     orgVisibility: "private" | "shared";
 }
+/** A shared workspace in the organization that the viewer isn't in yet. */
+interface OrganizationJoinableWorkspace {
+    _id: string;
+    name: string;
+    imageUrl?: string;
+    /** Who created it, shown under the name. */
+    ownerName?: string;
+}
 interface OrganizationJoinRequest {
     _id: string;
     workspace: {
@@ -455,6 +463,15 @@ interface SettingsOrganizationAdapter {
         canClaimEmailDomain?: boolean;
     }>;
     fetchWorkspaces: () => Promise<OrganizationWorkspaceItem[]>;
+    /**
+     * Optional: the organization's shared workspaces the viewer isn't in yet —
+     * the workspace picker's list. When given (with `joinWorkspaces`), org
+     * members see them under Organization › Workspaces and can join any of them
+     * as a member at any time, not only at first sign-in.
+     */
+    fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
+    /** Optional: join those workspaces as a member. Resolves to the ids joined. */
+    joinWorkspaces?: (workspaceIds: string[]) => Promise<string[]>;
     fetchJoinRequests: () => Promise<OrganizationJoinRequest[]>;
     approveJoinRequest: (requestId: string) => Promise<void>;
     rejectJoinRequest: (requestId: string) => Promise<void>;
@@ -1468,4 +1485,4 @@ declare function SettingsAdaptersProvider({ adapters, children, }: {
  */
 declare function useSettingsAdapters(): SettingsAdapters;
 
-export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type CreatedToken, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, countLabel, groupWorkspaceList, loadWorkspaceOrganization, resolveSettingsTabFromPath, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel };
+export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type CreatedToken, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, countLabel, groupWorkspaceList, loadWorkspaceOrganization, resolveSettingsTabFromPath, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel };

package/dist/index.d.ts

@@ -366,6 +366,14 @@ interface OrganizationWorkspaceItem {
     imageUrl?: string;
     orgVisibility: "private" | "shared";
 }
+/** A shared workspace in the organization that the viewer isn't in yet. */
+interface OrganizationJoinableWorkspace {
+    _id: string;
+    name: string;
+    imageUrl?: string;
+    /** Who created it, shown under the name. */
+    ownerName?: string;
+}
 interface OrganizationJoinRequest {
     _id: string;
     workspace: {
@@ -455,6 +463,15 @@ interface SettingsOrganizationAdapter {
         canClaimEmailDomain?: boolean;
     }>;
     fetchWorkspaces: () => Promise<OrganizationWorkspaceItem[]>;
+    /**
+     * Optional: the organization's shared workspaces the viewer isn't in yet —
+     * the workspace picker's list. When given (with `joinWorkspaces`), org
+     * members see them under Organization › Workspaces and can join any of them
+     * as a member at any time, not only at first sign-in.
+     */
+    fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
+    /** Optional: join those workspaces as a member. Resolves to the ids joined. */
+    joinWorkspaces?: (workspaceIds: string[]) => Promise<string[]>;
     fetchJoinRequests: () => Promise<OrganizationJoinRequest[]>;
     approveJoinRequest: (requestId: string) => Promise<void>;
     rejectJoinRequest: (requestId: string) => Promise<void>;
@@ -1468,4 +1485,4 @@ declare function SettingsAdaptersProvider({ adapters, children, }: {
  */
 declare function useSettingsAdapters(): SettingsAdapters;
 
-export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type CreatedToken, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, countLabel, groupWorkspaceList, loadWorkspaceOrganization, resolveSettingsTabFromPath, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel };
+export { APP_KEYS, type ApiToken, type AppKey, type AvailableCreditsResponse, BillingContent, type BillingEventPayload, type BillingProduct, type BillingSubscription, BuyCreditsModal, type BuyCreditsPayload, type BuyCreditsResponse, ConfirmDeleteModal, ConfirmLeaveModal, type CreatedToken, type CustomCreditInfo, type CustomCreditResponse, DEFAULT_PERMISSIONS, DEFAULT_USER_LANGUAGE, ExportDateModal, InviteUpdateModal, type InvoicePdfResponse, MemberListFrame, type MemberListFrameProps, type MemberListTab, MemberListToolbar, type MemberListToolbarProps, type MemberPermissionsPayload, OrganizationContent, type OrganizationData, type OrganizationInvite, type OrganizationJoinRequest, type OrganizationJoinableWorkspace, type OrganizationMember, OrganizationMemberModal, type OrganizationMemberModalProps, OrganizationModal, type OrganizationView, type OrganizationWorkspaceItem, type Price, type PriceMetadata, type ProductsResponse, ProfileAvatar, ProfileTab, ReferralTab, SCOPE_LABELS, ScopeHeader, type ScopeHeaderProps, type ServiceItem, type SettingsAdapters, SettingsAdaptersProvider, type SettingsApiAdapter, type SettingsAuthAdapter, type SettingsAuthUser, SettingsContent, type SettingsContentProps, type SettingsImageUploadAdapter, type SettingsNavigationAdapter, type SettingsOrganizationAdapter, type SettingsOrganizationCurrent, type SettingsOrganizationListItem, type SettingsScope, type SettingsTab, type SettingsToastAdapter, SettingsTooltip, type SettingsTooltipPlacement, type SettingsTooltipProps, type SettingsWorkspaceAdapter, type SettingsWorkspaceCurrent, type SettingsWorkspaceListItem, SiconKey, type StoreItem, type SubscriptionPlan, type SubscriptionResponse, TAB_DESCRIPTIONS, TAB_LABELS, TAB_SCOPE, TAB_TO_URL, type TeamMember, TeamsContent, type TokenExpiry, TokensContent, URL_TO_TAB, USER_LANGUAGES, type UpdateSubscriptionPayload, type UpdateSubscriptionResponse, type UsageHistoryItem, type UsageHistoryResponse, type UserLanguage, type UserPermissions, WORKSPACE_LIST_PAGE_SIZE, type WorkspaceData, WorkspaceGeneralTab, type WorkspaceGeneralTabProps, type WorkspaceInvite, type WorkspaceListOrganization, WorkspaceListTab, type WorkspaceMember, WorkspaceModal, type WorkspaceOrganization, type WorkspaceOrganizationRequest, WorkspacePicker, type WorkspacePickerItem, type WorkspacePickerProps, WorkspaceTab, type WorkspaceUsageResponse, countLabel, groupWorkspaceList, loadWorkspaceOrganization, resolveSettingsTabFromPath, useSettingsAdapters, useWorkspaceOrganization, userLanguageLabel };

package/dist/index.js

@@ -6174,6 +6174,79 @@ function WorkspaceRow({ workspace }) {
     }
   );
 }
+function JoinableWorkspaceRow({
+  workspace,
+  joining,
+  onJoin
+}) {
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
+    "div",
+    {
+      className: "flex items-center self-stretch shrink-0",
+      style: {
+        borderBottom: `1px solid ${T11.borderSubtle}`,
+        padding: `${T11.spXl} ${T11.sp3xl}`,
+        gap: T11.sp6xl
+      },
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { className: "flex items-center min-w-0", style: { flex: 1, gap: T11.spMd }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+            ProfileAvatar,
+            {
+              name: workspace.name,
+              profileImage: workspace.imageUrl,
+              size: 28,
+              borderRadius: "var(--radius-lg)"
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { className: "flex flex-col min-w-0", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+              "span",
+              {
+                className: "truncate",
+                style: {
+                  fontFamily: T11.font,
+                  fontSize: T11.fsSm,
+                  fontWeight: 500,
+                  lineHeight: T11.lhSm,
+                  color: T11.primary
+                },
+                children: workspace.name
+              }
+            ),
+            workspace.ownerName && /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
+              "span",
+              {
+                className: "truncate",
+                style: {
+                  fontFamily: T11.font,
+                  fontSize: T11.fsXs,
+                  fontWeight: 400,
+                  lineHeight: T11.lhXs,
+                  color: T11.muted
+                },
+                children: [
+                  "Created by ",
+                  workspace.ownerName
+                ]
+              }
+            )
+          ] })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+          import_ui8.ScButton,
+          {
+            text: joining ? "Joining\u2026" : "Join",
+            variant: "secondary",
+            size: "sm",
+            state: joining ? "disabled" : "default",
+            onClick: joining ? void 0 : onJoin
+          }
+        )
+      ]
+    }
+  );
+}
 function JoinRequestRow({
   request,
   onApprove,
@@ -6293,10 +6366,13 @@ function OrganizationContent({
   embedded = false,
   view = "people"
 } = {}) {
-  const { organization, toast } = useSettingsAdapters();
+  const { organization, workspace: workspaceAdapter, toast } = useSettingsAdapters();
   const current = organization.current;
   const [members, setMembers] = (0, import_react12.useState)([]);
   const [workspaces, setWorkspaces] = (0, import_react12.useState)([]);
+  const canJoinShared = current?.role === "member" && !!organization.fetchJoinableWorkspaces && !!organization.joinWorkspaces;
+  const [joinable, setJoinable] = (0, import_react12.useState)([]);
+  const [joiningId, setJoiningId] = (0, import_react12.useState)(null);
   const [joinRequests, setJoinRequests] = (0, import_react12.useState)([]);
   const [highestRole, setHighestRole] = (0, import_react12.useState)("guest");
   const [searchQuery, setSearchQuery] = (0, import_react12.useState)("");
@@ -6306,12 +6382,20 @@ function OrganizationContent({
     if (!organization.current) return;
     setLoadingData(true);
     try {
-      const [membersRes, workspacesRes, joinRequestsRes, highestRoleRes] = await Promise.all([
+      const [
+        membersRes,
+        workspacesRes,
+        joinRequestsRes,
+        highestRoleRes,
+        joinableRes
+      ] = await Promise.all([
         organization.fetchMembers().catch(() => null),
         organization.fetchWorkspaces().catch(() => null),
         organization.fetchJoinRequests().catch(() => null),
-        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null)
+        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null),
+        canJoinShared ? organization.fetchJoinableWorkspaces().catch(() => null) : Promise.resolve(null)
       ]);
+      if (joinableRes) setJoinable(joinableRes);
       if (highestRoleRes?.role) setHighestRole(highestRoleRes.role);
       if (membersRes) setMembers(membersRes.filter((m) => m?.user));
       if (workspacesRes) setWorkspaces(workspacesRes);
@@ -6320,10 +6404,30 @@ function OrganizationContent({
     } finally {
       setLoadingData(false);
     }
-  }, [organization]);
+  }, [organization, canJoinShared]);
   (0, import_react12.useEffect)(() => {
     fetchData();
   }, [fetchData]);
+  const handleJoinWorkspace = async (target) => {
+    if (!organization.joinWorkspaces) return;
+    setJoiningId(target._id);
+    try {
+      const joined = await organization.joinWorkspaces([target._id]);
+      if (!joined.includes(target._id)) {
+        toast.error(`Couldn't join ${target.name}. Try again.`);
+        return;
+      }
+      toast.success(`Joined ${target.name}`);
+      await workspaceAdapter.refresh?.().catch(() => void 0);
+      await fetchData();
+    } catch (err) {
+      toast.error(
+        err instanceof Error ? err.message : `Couldn't join ${target.name}`
+      );
+    } finally {
+      setJoiningId(null);
+    }
+  };
   const [manageModalOpen, setManageModalOpen] = (0, import_react12.useState)(false);
   const handleUpdateOrganization = async (name, imageFile) => {
     if (!current) return false;
@@ -6552,6 +6656,23 @@ function OrganizationContent({
         children: workspaces.map((ws) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(WorkspaceRow, { workspace: ws }, ws._id))
       }
     ),
+    canJoinShared && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+      Section,
+      {
+        title: "Shared workspaces you can join",
+        empty: joinable.length === 0,
+        emptyText: "You're in every shared workspace in this organization",
+        children: joinable.map((ws) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+          JoinableWorkspaceRow,
+          {
+            workspace: ws,
+            joining: joiningId === ws._id,
+            onJoin: () => void handleJoinWorkspace(ws)
+          },
+          ws._id
+        ))
+      }
+    ),
     (isOrgAdmin || joinRequests.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
       Section,
       {

package/dist/index.mjs

@@ -6151,6 +6151,79 @@ function WorkspaceRow({ workspace }) {
     }
   );
 }
+function JoinableWorkspaceRow({
+  workspace,
+  joining,
+  onJoin
+}) {
+  return /* @__PURE__ */ jsxs14(
+    "div",
+    {
+      className: "flex items-center self-stretch shrink-0",
+      style: {
+        borderBottom: `1px solid ${T11.borderSubtle}`,
+        padding: `${T11.spXl} ${T11.sp3xl}`,
+        gap: T11.sp6xl
+      },
+      children: [
+        /* @__PURE__ */ jsxs14("div", { className: "flex items-center min-w-0", style: { flex: 1, gap: T11.spMd }, children: [
+          /* @__PURE__ */ jsx17(
+            ProfileAvatar,
+            {
+              name: workspace.name,
+              profileImage: workspace.imageUrl,
+              size: 28,
+              borderRadius: "var(--radius-lg)"
+            }
+          ),
+          /* @__PURE__ */ jsxs14("div", { className: "flex flex-col min-w-0", children: [
+            /* @__PURE__ */ jsx17(
+              "span",
+              {
+                className: "truncate",
+                style: {
+                  fontFamily: T11.font,
+                  fontSize: T11.fsSm,
+                  fontWeight: 500,
+                  lineHeight: T11.lhSm,
+                  color: T11.primary
+                },
+                children: workspace.name
+              }
+            ),
+            workspace.ownerName && /* @__PURE__ */ jsxs14(
+              "span",
+              {
+                className: "truncate",
+                style: {
+                  fontFamily: T11.font,
+                  fontSize: T11.fsXs,
+                  fontWeight: 400,
+                  lineHeight: T11.lhXs,
+                  color: T11.muted
+                },
+                children: [
+                  "Created by ",
+                  workspace.ownerName
+                ]
+              }
+            )
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx17(
+          ScButton5,
+          {
+            text: joining ? "Joining\u2026" : "Join",
+            variant: "secondary",
+            size: "sm",
+            state: joining ? "disabled" : "default",
+            onClick: joining ? void 0 : onJoin
+          }
+        )
+      ]
+    }
+  );
+}
 function JoinRequestRow({
   request,
   onApprove,
@@ -6270,10 +6343,13 @@ function OrganizationContent({
   embedded = false,
   view = "people"
 } = {}) {
-  const { organization, toast } = useSettingsAdapters();
+  const { organization, workspace: workspaceAdapter, toast } = useSettingsAdapters();
   const current = organization.current;
   const [members, setMembers] = useState10([]);
   const [workspaces, setWorkspaces] = useState10([]);
+  const canJoinShared = current?.role === "member" && !!organization.fetchJoinableWorkspaces && !!organization.joinWorkspaces;
+  const [joinable, setJoinable] = useState10([]);
+  const [joiningId, setJoiningId] = useState10(null);
   const [joinRequests, setJoinRequests] = useState10([]);
   const [highestRole, setHighestRole] = useState10("guest");
   const [searchQuery, setSearchQuery] = useState10("");
@@ -6283,12 +6359,20 @@ function OrganizationContent({
     if (!organization.current) return;
     setLoadingData(true);
     try {
-      const [membersRes, workspacesRes, joinRequestsRes, highestRoleRes] = await Promise.all([
+      const [
+        membersRes,
+        workspacesRes,
+        joinRequestsRes,
+        highestRoleRes,
+        joinableRes
+      ] = await Promise.all([
         organization.fetchMembers().catch(() => null),
         organization.fetchWorkspaces().catch(() => null),
         organization.fetchJoinRequests().catch(() => null),
-        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null)
+        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null),
+        canJoinShared ? organization.fetchJoinableWorkspaces().catch(() => null) : Promise.resolve(null)
       ]);
+      if (joinableRes) setJoinable(joinableRes);
       if (highestRoleRes?.role) setHighestRole(highestRoleRes.role);
       if (membersRes) setMembers(membersRes.filter((m) => m?.user));
       if (workspacesRes) setWorkspaces(workspacesRes);
@@ -6297,10 +6381,30 @@ function OrganizationContent({
     } finally {
       setLoadingData(false);
     }
-  }, [organization]);
+  }, [organization, canJoinShared]);
   useEffect10(() => {
     fetchData();
   }, [fetchData]);
+  const handleJoinWorkspace = async (target) => {
+    if (!organization.joinWorkspaces) return;
+    setJoiningId(target._id);
+    try {
+      const joined = await organization.joinWorkspaces([target._id]);
+      if (!joined.includes(target._id)) {
+        toast.error(`Couldn't join ${target.name}. Try again.`);
+        return;
+      }
+      toast.success(`Joined ${target.name}`);
+      await workspaceAdapter.refresh?.().catch(() => void 0);
+      await fetchData();
+    } catch (err) {
+      toast.error(
+        err instanceof Error ? err.message : `Couldn't join ${target.name}`
+      );
+    } finally {
+      setJoiningId(null);
+    }
+  };
   const [manageModalOpen, setManageModalOpen] = useState10(false);
   const handleUpdateOrganization = async (name, imageFile) => {
     if (!current) return false;
@@ -6529,6 +6633,23 @@ function OrganizationContent({
         children: workspaces.map((ws) => /* @__PURE__ */ jsx17(WorkspaceRow, { workspace: ws }, ws._id))
       }
     ),
+    canJoinShared && /* @__PURE__ */ jsx17(
+      Section,
+      {
+        title: "Shared workspaces you can join",
+        empty: joinable.length === 0,
+        emptyText: "You're in every shared workspace in this organization",
+        children: joinable.map((ws) => /* @__PURE__ */ jsx17(
+          JoinableWorkspaceRow,
+          {
+            workspace: ws,
+            joining: joiningId === ws._id,
+            onJoin: () => void handleJoinWorkspace(ws)
+          },
+          ws._id
+        ))
+      }
+    ),
     (isOrgAdmin || joinRequests.length > 0) && /* @__PURE__ */ jsx17(
       Section,
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamoid/settings",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",