@streamoid/settings 0.7.5 → 0.7.6

package/dist/index.d.mts

@@ -365,6 +365,10 @@ 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 {
@@ -464,13 +468,13 @@ interface SettingsOrganizationAdapter {
     }>;
     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.
+     * @deprecated Since 0.7.6 never called: `fetchWorkspaces()` lists every
+     * shared workspace for an org member, flagged with `joined`.
      */
     fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
-    /** Optional: join those workspaces as a member. Resolves to the ids joined. */
+    /** 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>;

package/dist/index.d.ts

@@ -365,6 +365,10 @@ 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 {
@@ -464,13 +468,13 @@ interface SettingsOrganizationAdapter {
     }>;
     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.
+     * @deprecated Since 0.7.6 never called: `fetchWorkspaces()` lists every
+     * shared workspace for an org member, flagged with `joined`.
      */
     fetchJoinableWorkspaces?: () => Promise<OrganizationJoinableWorkspace[]>;
-    /** Optional: join those workspaces as a member. Resolves to the ids joined. */
+    /** 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>;

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,80 +6173,19 @@ function WorkspaceRow({ workspace }) {
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(VisibilityBadge, { visibility: workspace.orgVisibility })
-      ]
-    }
-  );
-}
-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,
+        /* @__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,
             {
-              name: workspace.name,
-              profileImage: workspace.imageUrl,
-              size: 28,
-              borderRadius: "var(--radius-lg)"
+              text: joining ? "Joining\u2026" : "Join",
+              variant: "secondary",
+              size: "sm",
+              state: joining ? "disabled" : "default",
+              onClick: joining ? void 0 : onJoin
             }
-          ),
-          /* @__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
-          }
-        )
+          )
+        ] })
       ]
     }
   );
@@ -6370,8 +6313,7 @@ function OrganizationContent({
   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 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");
@@ -6382,20 +6324,12 @@ function OrganizationContent({
     if (!organization.current) return;
     setLoadingData(true);
     try {
-      const [
-        membersRes,
-        workspacesRes,
-        joinRequestsRes,
-        highestRoleRes,
-        joinableRes
-      ] = await Promise.all([
+      const [membersRes, workspacesRes, joinRequestsRes, highestRoleRes] = await Promise.all([
         organization.fetchMembers().catch(() => null),
         organization.fetchWorkspaces().catch(() => null),
         organization.fetchJoinRequests().catch(() => null),
-        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null),
-        canJoinShared ? organization.fetchJoinableWorkspaces().catch(() => null) : Promise.resolve(null)
+        organization.getHighestRole?.().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);
@@ -6404,7 +6338,7 @@ function OrganizationContent({
     } finally {
       setLoadingData(false);
     }
-  }, [organization, canJoinShared]);
+  }, [organization]);
   (0, import_react12.useEffect)(() => {
     fetchData();
   }, [fetchData]);
@@ -6653,21 +6587,12 @@ 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))
-      }
-    ),
-    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,
+        children: workspaces.map((ws) => /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+          WorkspaceRow,
           {
             workspace: ws,
             joining: joiningId === ws._id,
-            onJoin: () => void handleJoinWorkspace(ws)
+            onJoin: canJoinShared && ws.joined === false && ws.orgVisibility === "shared" ? () => void handleJoinWorkspace(ws) : void 0
           },
           ws._id
         ))

package/dist/index.mjs

@@ -6110,7 +6110,11 @@ function MemberRow({
     }
   );
 }
-function WorkspaceRow({ workspace }) {
+function WorkspaceRow({
+  workspace,
+  joining = false,
+  onJoin
+}) {
   return /* @__PURE__ */ jsxs14(
     "div",
     {
@@ -6146,80 +6150,19 @@ function WorkspaceRow({ workspace }) {
             }
           )
         ] }),
-        /* @__PURE__ */ jsx17(VisibilityBadge, { visibility: workspace.orgVisibility })
-      ]
-    }
-  );
-}
-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,
+        /* @__PURE__ */ jsxs14("div", { className: "flex items-center shrink-0", style: { gap: T11.spMd }, children: [
+          /* @__PURE__ */ jsx17(VisibilityBadge, { visibility: workspace.orgVisibility }),
+          onJoin && /* @__PURE__ */ jsx17(
+            ScButton5,
             {
-              name: workspace.name,
-              profileImage: workspace.imageUrl,
-              size: 28,
-              borderRadius: "var(--radius-lg)"
+              text: joining ? "Joining\u2026" : "Join",
+              variant: "secondary",
+              size: "sm",
+              state: joining ? "disabled" : "default",
+              onClick: joining ? void 0 : onJoin
             }
-          ),
-          /* @__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
-          }
-        )
+          )
+        ] })
       ]
     }
   );
@@ -6347,8 +6290,7 @@ function OrganizationContent({
   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 canJoinShared = current?.role === "member" && !!organization.joinWorkspaces;
   const [joiningId, setJoiningId] = useState10(null);
   const [joinRequests, setJoinRequests] = useState10([]);
   const [highestRole, setHighestRole] = useState10("guest");
@@ -6359,20 +6301,12 @@ function OrganizationContent({
     if (!organization.current) return;
     setLoadingData(true);
     try {
-      const [
-        membersRes,
-        workspacesRes,
-        joinRequestsRes,
-        highestRoleRes,
-        joinableRes
-      ] = await Promise.all([
+      const [membersRes, workspacesRes, joinRequestsRes, highestRoleRes] = await Promise.all([
         organization.fetchMembers().catch(() => null),
         organization.fetchWorkspaces().catch(() => null),
         organization.fetchJoinRequests().catch(() => null),
-        organization.getHighestRole?.().catch(() => null) ?? Promise.resolve(null),
-        canJoinShared ? organization.fetchJoinableWorkspaces().catch(() => null) : Promise.resolve(null)
+        organization.getHighestRole?.().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);
@@ -6381,7 +6315,7 @@ function OrganizationContent({
     } finally {
       setLoadingData(false);
     }
-  }, [organization, canJoinShared]);
+  }, [organization]);
   useEffect10(() => {
     fetchData();
   }, [fetchData]);
@@ -6630,21 +6564,12 @@ function OrganizationContent({
       {
         title: "Workspaces in this organization",
         empty: workspaces.length === 0,
-        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,
+        children: workspaces.map((ws) => /* @__PURE__ */ jsx17(
+          WorkspaceRow,
           {
             workspace: ws,
             joining: joiningId === ws._id,
-            onJoin: () => void handleJoinWorkspace(ws)
+            onJoin: canJoinShared && ws.joined === false && ws.orgVisibility === "shared" ? () => void handleJoinWorkspace(ws) : void 0
           },
           ws._id
         ))

package/package.json

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