@jskit-ai/workspaces-web 0.1.28 → 0.1.30

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-web",
-  version: "0.1.28",
+  version: "0.1.30",
   kind: "runtime",
   description: "Workspace web module: workspace selector, tools widget, workspace surfaces, and members/settings UI.",
   dependsOn: [
@@ -37,6 +37,10 @@ export default Object.freeze({
           subpath: "./client",
           summary: "Exports workspaces-web client provider registration surface."
         },
+        {
+          subpath: "./client/components/AccountSettingsInvitesSection",
+          summary: "Exports the default account invites section component used by multihoming installs."
+        },
         {
           subpath: "./client/providers/WorkspacesWebClientProvider",
           summary: "Exports workspaces-web client provider class."
@@ -56,8 +60,7 @@ export default Object.freeze({
           "workspaces.web.workspace-members.menu-item",
           "workspaces.web.members-admin.element",
           "workspaces.web.bootstrap-placement.runtime",
-          "workspaces.web.scope-support",
-          "workspaces.web.account-settings.section.invites"
+          "workspaces.web.scope-support"
         ]
       }
     },
@@ -69,6 +72,12 @@ export default Object.freeze({
             defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item",
             surfaces: ["admin"],
             source: "templates/src/pages/admin/workspace/settings.vue"
+          },
+          {
+            target: "admin-cog:primary-menu",
+            defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item",
+            surfaces: ["admin"],
+            source: "src/client/components/UsersWorkspaceToolsWidget.vue"
           }
         ],
         contributions: [
@@ -117,6 +126,15 @@ export default Object.freeze({
             when: "auth.authenticated === true",
             source: "mutations.text#workspaces-web-placement-block"
           },
+          {
+            id: "workspaces.account.settings.invites",
+            target: "account-settings:sections",
+            surfaces: ["account"],
+            order: 400,
+            componentToken: "local.main.account-settings.section.invites",
+            when: "auth.authenticated === true && workspaceInvitesEnabled === true",
+            source: "mutations.text#workspaces-web-account-settings-placement"
+          },
           {
             id: "workspaces.workspace.tools.widget",
             target: "shell-layout:top-right",
@@ -127,7 +145,7 @@ export default Object.freeze({
           },
           {
             id: "workspaces.workspace.menu.workspace-settings",
-            target: "workspace-tools:primary-menu",
+            target: "admin-cog:primary-menu",
             surfaces: ["admin"],
             order: 100,
             componentToken: "workspaces.web.workspace-settings.menu-item",
@@ -135,7 +153,7 @@ export default Object.freeze({
           },
           {
             id: "workspaces.workspace.menu.members",
-            target: "workspace-tools:primary-menu",
+            target: "admin-cog:primary-menu",
             surfaces: ["admin"],
             order: 200,
             componentToken: "workspaces.web.workspace-members.menu-item",
@@ -148,8 +166,8 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/workspaces-core": "0.1.28",
-        "@jskit-ai/users-web": "0.1.67",
+        "@jskit-ai/workspaces-core": "0.1.30",
+        "@jskit-ai/users-web": "0.1.69",
         "vuetify": "^4.0.0"
       },
       dev: {}
@@ -171,6 +189,13 @@ export default Object.freeze({
         category: "workspaces-web",
         id: "users-web-main-component-account-pending-invites-cue"
       },
+      {
+        from: "templates/packages/main/src/client/components/AccountSettingsInvitesSection.vue",
+        to: "packages/main/src/client/components/AccountSettingsInvitesSection.vue",
+        reason: "Install app-owned account invites section scaffold for multihoming account settings.",
+        category: "workspaces-web",
+        id: "users-web-main-component-account-settings-invites-section"
+      },
       {
         from: "templates/src/components/WorkspaceNotFoundCard.vue",
         to: "src/components/WorkspaceNotFoundCard.vue",
@@ -299,7 +324,7 @@ export default Object.freeze({
         file: "src/placement.js",
         position: "bottom",
         skipIfContains: "id: \"workspaces.workspace.selector\"",
-        value: "\naddPlacement({\n  id: \"workspaces.workspace.menu.app\",\n  target: \"shell-layout:primary-menu\",\n  surfaces: [\"app\"],\n  order: 50,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Home\",\n    surface: \"app\",\n    scopedSuffix: \"/\",\n    unscopedSuffix: \"/\",\n    exact: true\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.admin\",\n  target: \"shell-layout:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 60,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Home\",\n    surface: \"admin\",\n    scopedSuffix: \"/\",\n    unscopedSuffix: \"/\",\n    exact: true\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.selector\",\n  target: \"shell-layout:top-left\",\n  surfaces: [\"*\"],\n  order: 200,\n  componentToken: \"workspaces.web.workspace.selector\",\n  props: {\n    allowOnNonWorkspaceSurface: true,\n    targetSurfaceId: \"app\"\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.account.invites.cue\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"*\"],\n  order: 850,\n  componentToken: \"local.main.account.pending-invites.cue\",\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.tools.widget\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"admin\"],\n  order: 900,\n  componentToken: \"workspaces.web.workspace.tools.widget\"\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.workspace-settings\",\n  target: \"workspace-tools:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"workspaces.web.workspace-settings.menu-item\"\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.members\",\n  target: \"workspace-tools:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 200,\n  componentToken: \"workspaces.web.workspace-members.menu-item\"\n});\n",
+        value: "\naddPlacement({\n  id: \"workspaces.workspace.menu.app\",\n  target: \"shell-layout:primary-menu\",\n  surfaces: [\"app\"],\n  order: 50,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Home\",\n    surface: \"app\",\n    scopedSuffix: \"/\",\n    unscopedSuffix: \"/\",\n    exact: true\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.admin\",\n  target: \"shell-layout:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 60,\n  componentToken: \"local.main.ui.surface-aware-menu-link-item\",\n  props: {\n    label: \"Home\",\n    surface: \"admin\",\n    scopedSuffix: \"/\",\n    unscopedSuffix: \"/\",\n    exact: true\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.selector\",\n  target: \"shell-layout:top-left\",\n  surfaces: [\"*\"],\n  order: 200,\n  componentToken: \"workspaces.web.workspace.selector\",\n  props: {\n    allowOnNonWorkspaceSurface: true,\n    targetSurfaceId: \"app\"\n  },\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.account.invites.cue\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"*\"],\n  order: 850,\n  componentToken: \"local.main.account.pending-invites.cue\",\n  when: ({ auth }) => auth?.authenticated === true\n});\n\naddPlacement({\n  id: \"workspaces.workspace.tools.widget\",\n  target: \"shell-layout:top-right\",\n  surfaces: [\"admin\"],\n  order: 900,\n  componentToken: \"workspaces.web.workspace.tools.widget\"\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.workspace-settings\",\n  target: \"admin-cog:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"workspaces.web.workspace-settings.menu-item\"\n});\n\naddPlacement({\n  id: \"workspaces.workspace.menu.members\",\n  target: \"admin-cog:primary-menu\",\n  surfaces: [\"admin\"],\n  order: 200,\n  componentToken: \"workspaces.web.workspace-members.menu-item\"\n});\n",
         reason: "Append workspace placement entries into app-owned placement registry.",
         category: "workspaces-web",
         id: "workspaces-web-placement-block",
@@ -308,6 +333,21 @@ export default Object.freeze({
           in: ["personal", "workspaces"]
         }
       },
+      {
+        op: "append-text",
+        file: "src/placement.js",
+        position: "bottom",
+        skipIfContains: "id: \"workspaces.account.settings.invites\"",
+        value:
+          "\naddPlacement({\n  id: \"workspaces.account.settings.invites\",\n  target: \"account-settings:sections\",\n  surfaces: [\"account\"],\n  order: 400,\n  componentToken: \"local.main.account-settings.section.invites\",\n  props: {\n    title: \"Invites\",\n    value: \"invites\",\n    usesSharedRuntime: false\n  },\n  when: ({ auth, workspaceInvitesEnabled }) => auth?.authenticated === true && workspaceInvitesEnabled === true\n});\n",
+        reason: "Append workspaces-web account settings invites section placement into app-owned placement registry.",
+        category: "workspaces-web",
+        id: "workspaces-web-account-settings-placement",
+        when: {
+          config: "tenancyMode",
+          in: ["personal", "workspaces"]
+        }
+      },
       {
         op: "append-text",
         file: "packages/main/src/client/providers/MainClientProvider.js",
@@ -318,6 +358,17 @@ export default Object.freeze({
         category: "workspaces-web",
         id: "users-web-main-client-provider-account-invites-import"
       },
+      {
+        op: "append-text",
+        file: "packages/main/src/client/providers/MainClientProvider.js",
+        position: "top",
+        skipIfContains: "import AccountSettingsInvitesSection from \"../components/AccountSettingsInvitesSection.vue\";",
+        value:
+          "import AccountSettingsInvitesSection from \"../components/AccountSettingsInvitesSection.vue\";\n",
+        reason: "Bind app-owned account invites section component into local main client provider imports.",
+        category: "workspaces-web",
+        id: "users-web-main-client-provider-account-settings-section-import"
+      },
       {
         op: "append-text",
         file: "packages/main/src/client/providers/MainClientProvider.js",
@@ -328,6 +379,18 @@ export default Object.freeze({
         reason: "Bind app-owned account pending invites cue component token into local main client provider registry.",
         category: "workspaces-web",
         id: "users-web-main-client-provider-account-invites-register"
+      },
+      {
+        op: "append-text",
+        file: "packages/main/src/client/providers/MainClientProvider.js",
+        position: "bottom",
+        skipIfContains:
+          "registerMainClientComponent(\"local.main.account-settings.section.invites\", () => AccountSettingsInvitesSection);",
+        value:
+          "\nregisterMainClientComponent(\"local.main.account-settings.section.invites\", () => AccountSettingsInvitesSection);\n",
+        reason: "Bind app-owned account invites section component token into local main client provider registry.",
+        category: "workspaces-web",
+        id: "users-web-main-client-provider-account-settings-section-register"
       }
     ]
   }

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@jskit-ai/workspaces-web",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "type": "module",
   "scripts": {
     "test": "node --test"
   },
   "exports": {
     "./client": "./src/client/index.js",
+    "./client/components/AccountSettingsInvitesSection": "./src/client/components/AccountSettingsInvitesSection.vue",
     "./client/providers/WorkspacesWebClientProvider": "./src/client/providers/WorkspacesWebClientProvider.js",
     "./client/components/WorkspaceMembersClientElement": "./src/client/components/WorkspaceMembersClientElement.vue",
     "./client/composables/useWorkspaceRouteContext": "./src/client/composables/useWorkspaceRouteContext.js"
@@ -14,12 +15,12 @@
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.51",
-    "@jskit-ai/kernel": "0.1.52",
-    "@jskit-ai/shell-web": "0.1.51",
-    "@jskit-ai/users-core": "0.1.62",
-    "@jskit-ai/users-web": "0.1.67",
-    "@jskit-ai/workspaces-core": "0.1.28",
+    "@jskit-ai/http-runtime": "0.1.53",
+    "@jskit-ai/kernel": "0.1.54",
+    "@jskit-ai/shell-web": "0.1.53",
+    "@jskit-ai/users-core": "0.1.64",
+    "@jskit-ai/users-web": "0.1.69",
+    "@jskit-ai/workspaces-core": "0.1.30",
     "vuetify": "^4.0.0"
   }
 }

package/src/client/components/UsersWorkspaceToolsWidget.vue

@@ -1,12 +1,12 @@
 <script setup>
 import ShellOutletMenuWidget from "@jskit-ai/shell-web/client/components/ShellOutletMenuWidget";
-import { WORKSPACE_TOOLS_OUTLET } from "../../shared/toolsOutletContracts.js";
+import { ADMIN_COG_OUTLET } from "../../shared/toolsOutletContracts.js";
 </script>
 
 <template>
   <ShellOutletMenuWidget
-    :target="WORKSPACE_TOOLS_OUTLET.target"
-    :default-link-component-token="WORKSPACE_TOOLS_OUTLET.defaultLinkComponentToken"
-    :aria-label="WORKSPACE_TOOLS_OUTLET.ariaLabel"
+    :target="ADMIN_COG_OUTLET.target"
+    :default-link-component-token="ADMIN_COG_OUTLET.defaultLinkComponentToken"
+    :aria-label="ADMIN_COG_OUTLET.ariaLabel"
   />
 </template>

package/src/client/providers/WorkspacesWebClientProvider.js

@@ -1,5 +1,3 @@
-import { ACCOUNT_SETTINGS_SECTION_REGISTRY_TAG } from "@jskit-ai/users-web/client/account-settings/sections";
-import AccountSettingsInvitesSection from "../components/AccountSettingsInvitesSection.vue";
 import UsersProfileSurfaceSwitchMenuItem from "../components/UsersProfileSurfaceSwitchMenuItem.vue";
 import UsersWorkspaceSelector from "../components/UsersWorkspaceSelector.vue";
 import UsersWorkspaceToolsWidget from "../components/UsersWorkspaceToolsWidget.vue";
@@ -29,16 +27,6 @@ class WorkspacesWebClientProvider {
     app.singleton("workspaces.web.members-admin.element", () => MembersAdminClientElement);
     app.singleton("workspaces.web.bootstrap-placement.runtime", (scope) => createBootstrapPlacementRuntime({ app: scope }));
     app.singleton("workspaces.web.scope-support", () => createWorkspaceScopeSupport());
-    app.singleton("workspaces.web.account-settings.section.invites", () =>
-      Object.freeze({
-        title: "Invites",
-        value: "invites",
-        order: 400,
-        component: AccountSettingsInvitesSection,
-        usesSharedRuntime: false
-      })
-    );
-    app.tag("workspaces.web.account-settings.section.invites", ACCOUNT_SETTINGS_SECTION_REGISTRY_TAG);
   }
 
   async boot(app) {

package/src/shared/toolsOutletContracts.js

@@ -1,9 +1,9 @@
-const DEFAULT_TOOLS_LINK_COMPONENT_TOKEN = "local.main.ui.surface-aware-menu-link-item";
+const DEFAULT_COG_LINK_COMPONENT_TOKEN = "local.main.ui.surface-aware-menu-link-item";
 
-const WORKSPACE_TOOLS_OUTLET = Object.freeze({
-  target: "workspace-tools:primary-menu",
-  defaultLinkComponentToken: DEFAULT_TOOLS_LINK_COMPONENT_TOKEN,
-  ariaLabel: "Workspace tools"
+const ADMIN_COG_OUTLET = Object.freeze({
+  target: "admin-cog:primary-menu",
+  defaultLinkComponentToken: DEFAULT_COG_LINK_COMPONENT_TOKEN,
+  ariaLabel: "Admin cog"
 });
 
-export { DEFAULT_TOOLS_LINK_COMPONENT_TOKEN, WORKSPACE_TOOLS_OUTLET };
+export { DEFAULT_COG_LINK_COMPONENT_TOKEN, ADMIN_COG_OUTLET };

package/templates/packages/main/src/client/components/AccountSettingsInvitesSection.vue

@@ -0,0 +1,7 @@
+<script setup>
+import WorkspacesWebAccountSettingsInvitesSection from "@jskit-ai/workspaces-web/client/components/AccountSettingsInvitesSection";
+</script>
+
+<template>
+  <WorkspacesWebAccountSettingsInvitesSection />
+</template>

package/templates/src/pages/admin/workspace/settings/index.vue

@@ -1,7 +1,8 @@
 <script setup>
 // To redirect this settings shell to a child page, uncomment and edit the example below.
+// import { redirectToChild } from "@jskit-ai/kernel/client/pageRedirects";
 // definePage({
-//   redirect: (to) => `${to.path}/your_child_segment`
+//   redirect: redirectToChild("your_child_segment")
 // });
 </script>
 

package/test/exportsContract.test.js

@@ -15,6 +15,7 @@ test("workspaces-web exports are explicit and aligned with production usage", ()
     packageId: "@jskit-ai/workspaces-web",
     requiredExports: [
       "./client",
+      "./client/components/AccountSettingsInvitesSection",
       "./client/providers/WorkspacesWebClientProvider",
       "./client/composables/useWorkspaceRouteContext"
     ]

package/test/settingsPlacementContract.test.js

@@ -8,10 +8,11 @@ import descriptor from "../package.descriptor.mjs";
 const TEST_DIRECTORY = path.dirname(fileURLToPath(import.meta.url));
 const PACKAGE_DIR = path.resolve(TEST_DIRECTORY, "..");
 
-function readSettingsOutlets() {
+function readOutlets(target = "") {
   const outlets = descriptor?.metadata?.ui?.placements?.outlets;
+  const normalizedTarget = String(target || "").trim();
   return Array.isArray(outlets)
-    ? outlets.filter((entry) => String(entry?.target || "").trim() === "admin-settings:primary-menu")
+    ? outlets.filter((entry) => String(entry?.target || "").trim() === normalizedTarget)
     : [];
 }
 
@@ -47,6 +48,25 @@ test("workspaces-web admin settings template exposes surface-derived settings ou
   assert.match(source, /<RouterView \/>/);
 });
 
+test("workspaces-web installs an app-owned account invites section wrapper", async () => {
+  const source = await readFile(
+    path.join(PACKAGE_DIR, "templates", "packages", "main", "src", "client", "components", "AccountSettingsInvitesSection.vue"),
+    "utf8"
+  );
+
+  assert.match(
+    source,
+    /@jskit-ai\/workspaces-web\/client\/components\/AccountSettingsInvitesSection/
+  );
+  assert.deepEqual(findFileMutation("users-web-main-component-account-settings-invites-section"), {
+    from: "templates/packages/main/src/client/components/AccountSettingsInvitesSection.vue",
+    to: "packages/main/src/client/components/AccountSettingsInvitesSection.vue",
+    reason: "Install app-owned account invites section scaffold for multihoming account settings.",
+    category: "workspaces-web",
+    id: "users-web-main-component-account-settings-invites-section"
+  });
+});
+
 test("workspaces-web admin settings index template is a simple developer-owned stub", async () => {
   const source = await readFile(
     path.join(PACKAGE_DIR, "templates", "src", "pages", "admin", "workspace", "settings", "index.vue"),
@@ -59,7 +79,7 @@ test("workspaces-web admin settings index template is a simple developer-owned s
 
 test("workspaces-web descriptor metadata advertises admin settings outlets", () => {
   assert.deepEqual(
-    readSettingsOutlets(),
+    readOutlets("admin-settings:primary-menu"),
     [
       {
         target: "admin-settings:primary-menu",
@@ -69,6 +89,17 @@ test("workspaces-web descriptor metadata advertises admin settings outlets", ()
       }
     ]
   );
+  assert.deepEqual(
+    readOutlets("admin-cog:primary-menu"),
+    [
+      {
+        target: "admin-cog:primary-menu",
+        defaultLinkComponentToken: "local.main.ui.surface-aware-menu-link-item",
+        surfaces: ["admin"],
+        source: "src/client/components/UsersWorkspaceToolsWidget.vue"
+      }
+    ]
+  );
   assert.equal(findContribution("workspaces.workspace.settings.general"), null);
   assert.deepEqual(findContribution("workspaces.workspace.menu.app"), {
     id: "workspaces.workspace.menu.app",
@@ -108,6 +139,18 @@ test("workspaces-web descriptor metadata advertises admin settings outlets", ()
     when: "auth.authenticated === true",
     source: "mutations.text#workspaces-web-placement-block"
   });
+  assert.deepEqual(findContribution("workspaces.account.settings.invites"), {
+    id: "workspaces.account.settings.invites",
+    target: "account-settings:sections",
+    surfaces: ["account"],
+    order: 400,
+    componentToken: "local.main.account-settings.section.invites",
+    when: "auth.authenticated === true && workspaceInvitesEnabled === true",
+    source: "mutations.text#workspaces-web-account-settings-placement"
+  });
+  assert.match(findTextMutation("workspaces-web-account-settings-placement")?.value || "", /id: "workspaces\.account\.settings\.invites"/);
+  assert.match(findTextMutation("workspaces-web-account-settings-placement")?.value || "", /target: "account-settings:sections"/);
+  assert.match(findTextMutation("workspaces-web-account-settings-placement")?.value || "", /componentToken: "local\.main\.account-settings\.section\.invites"/);
   assert.deepEqual(findFileMutation("users-web-page-admin-workspace-settings"), {
     from: "templates/src/pages/admin/workspace/settings/index.vue",
     toSurface: "admin",
@@ -120,4 +163,12 @@ test("workspaces-web descriptor metadata advertises admin settings outlets", ()
       in: ["personal", "workspaces"]
     }
   });
+  assert.match(
+    findTextMutation("users-web-main-client-provider-account-settings-section-import")?.value || "",
+    /import AccountSettingsInvitesSection from "\.\.\/components\/AccountSettingsInvitesSection\.vue";/
+  );
+  assert.match(
+    findTextMutation("users-web-main-client-provider-account-settings-section-register")?.value || "",
+    /registerMainClientComponent\("local\.main\.account-settings\.section\.invites", \(\) => AccountSettingsInvitesSection\);/
+  );
 });