@streamoid/settings 0.7.4 → 0.7.6

package/dist/index.d.mts

@@ -365,6 +365,18 @@ interface OrganizationWorkspaceItem {
     name: string;
     imageUrl?: string;
     orgVisibility: "private" | "shared";
+    /** Whether the viewer is in it. An org member is shown every shared
+     *  workspace; the ones with `joined: false` get a Join button (with
+     *  `joinWorkspaces`). Absent is treated as joined. */
+    joined?: boolean;
+}
+/** 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;
@@ -455,6 +467,15 @@ interface SettingsOrganizationAdapter {
         canClaimEmailDomain?: boolean;
     }>;
     fetchWorkspaces: () => Promise<OrganizationWorkspaceItem[]>;
+    /**
+     * @deprecated Since 0.7.6 never called: `fetchWorkspaces()` lists every
+     * shared workspace for an org member, flagged with `joined`.
+     */
+    fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
+    /** Optional: join workspaces as a member. Resolves to the ids joined. With
+     *  it, an org member gets a Join button on each shared workspace listed
+     *  under Organization › Workspaces with `joined: false`. */
+    joinWorkspaces?: (workspaceIds: string[]) => Promise<string[]>;
     fetchJoinRequests: () => Promise<OrganizationJoinRequest[]>;
     approveJoinRequest: (requestId: string) => Promise<void>;
     rejectJoinRequest: (requestId: string) => Promise<void>;
@@ -1468,4 +1489,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

@@ -365,6 +365,18 @@ interface OrganizationWorkspaceItem {
     name: string;
     imageUrl?: string;
     orgVisibility: "private" | "shared";
+    /** Whether the viewer is in it. An org member is shown every shared
+     *  workspace; the ones with `joined: false` get a Join button (with
+     *  `joinWorkspaces`). Absent is treated as joined. */
+    joined?: boolean;
+}
+/** 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;
@@ -455,6 +467,15 @@ interface SettingsOrganizationAdapter {
         canClaimEmailDomain?: boolean;
     }>;
     fetchWorkspaces: () => Promise<OrganizationWorkspaceItem[]>;
+    /**
+     * @deprecated Since 0.7.6 never called: `fetchWorkspaces()` lists every
+     * shared workspace for an org member, flagged with `joined`.
+     */
+    fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
+    /** Optional: join workspaces as a member. Resolves to the ids joined. With
+     *  it, an org member gets a Join button on each shared workspace listed
+     *  under Organization › Workspaces with `joined: false`. */
+    joinWorkspaces?: (workspaceIds: string[]) => Promise<string[]>;
     fetchJoinRequests: () => Promise<OrganizationJoinRequest[]>;
     approveJoinRequest: (requestId: string) => Promise<void>;
     rejectJoinRequest: (requestId: string) => Promise<void>;
@@ -1468,4 +1489,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

@@ -6133,7 +6133,11 @@ function MemberRow({
     }
   );
 }
-function WorkspaceRow({ workspace }) {
+function WorkspaceRow({
+  workspace,
+  joining = false,
+  onJoin
+}) {
   return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
     "div",
     {
@@ -6169,7 +6173,19 @@ function WorkspaceRow({ workspace }) {
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(VisibilityBadge, { visibility: workspace.orgVisibility })
+        /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { className: "flex items-center shrink-0", style: { gap: T11.spMd }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(VisibilityBadge, { visibility: workspace.orgVisibility }),
+          onJoin && /* @__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
+            }
+          )
+        ] })
       ]
     }
   );
@@ -6293,10 +6309,12 @@ 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.joinWorkspaces;
+  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)("");
@@ -6324,6 +6342,26 @@ function OrganizationContent({
   (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;
@@ -6549,7 +6587,15 @@ function OrganizationContent({
       {
         title: "Workspaces in this organization",
         empty: workspaces.length === 0,
-        children: workspaces.map((ws) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(WorkspaceRow, { workspace: ws }, ws._id))
+        children: workspaces.map((ws) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+          WorkspaceRow,
+          {
+            workspace: ws,
+            joining: joiningId === ws._id,
+            onJoin: canJoinShared && ws.joined === false && ws.orgVisibility === "shared" ? () => void handleJoinWorkspace(ws) : void 0
+          },
+          ws._id
+        ))
       }
     ),
     (isOrgAdmin || joinRequests.length > 0) && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(

package/dist/index.mjs

@@ -6110,7 +6110,11 @@ function MemberRow({
     }
   );
 }
-function WorkspaceRow({ workspace }) {
+function WorkspaceRow({
+  workspace,
+  joining = false,
+  onJoin
+}) {
   return /* @__PURE__ */ jsxs14(
     "div",
     {
@@ -6146,7 +6150,19 @@ function WorkspaceRow({ workspace }) {
             }
           )
         ] }),
-        /* @__PURE__ */ jsx17(VisibilityBadge, { visibility: workspace.orgVisibility })
+        /* @__PURE__ */ jsxs14("div", { className: "flex items-center shrink-0", style: { gap: T11.spMd }, children: [
+          /* @__PURE__ */ jsx17(VisibilityBadge, { visibility: workspace.orgVisibility }),
+          onJoin && /* @__PURE__ */ jsx17(
+            ScButton5,
+            {
+              text: joining ? "Joining\u2026" : "Join",
+              variant: "secondary",
+              size: "sm",
+              state: joining ? "disabled" : "default",
+              onClick: joining ? void 0 : onJoin
+            }
+          )
+        ] })
       ]
     }
   );
@@ -6270,10 +6286,12 @@ 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.joinWorkspaces;
+  const [joiningId, setJoiningId] = useState10(null);
   const [joinRequests, setJoinRequests] = useState10([]);
   const [highestRole, setHighestRole] = useState10("guest");
   const [searchQuery, setSearchQuery] = useState10("");
@@ -6301,6 +6319,26 @@ function OrganizationContent({
   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;
@@ -6526,7 +6564,15 @@ function OrganizationContent({
       {
         title: "Workspaces in this organization",
         empty: workspaces.length === 0,
-        children: workspaces.map((ws) => /* @__PURE__ */ jsx17(WorkspaceRow, { workspace: ws }, ws._id))
+        children: workspaces.map((ws) => /* @__PURE__ */ jsx17(
+          WorkspaceRow,
+          {
+            workspace: ws,
+            joining: joiningId === ws._id,
+            onJoin: canJoinShared && ws.joined === false && ws.orgVisibility === "shared" ? () => void handleJoinWorkspace(ws) : void 0
+          },
+          ws._id
+        ))
       }
     ),
     (isOrgAdmin || joinRequests.length > 0) && /* @__PURE__ */ jsx17(

package/package.json

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