@jskit-ai/workspaces-web 0.1.29 → 0.1.31

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-web",
-  version: "0.1.29",
+  version: "0.1.31",
   kind: "runtime",
   description: "Workspace web module: workspace selector, tools widget, workspace surfaces, and members/settings UI.",
   dependsOn: [
@@ -72,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: [
@@ -139,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",
@@ -147,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",
@@ -160,8 +166,8 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/workspaces-core": "0.1.29",
-        "@jskit-ai/users-web": "0.1.68",
+        "@jskit-ai/workspaces-core": "0.1.31",
+        "@jskit-ai/users-web": "0.1.70",
         "vuetify": "^4.0.0"
       },
       dev: {}
@@ -318,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-web",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -15,12 +15,12 @@
   "dependencies": {
     "@tanstack/vue-query": "5.92.12",
     "@mdi/js": "^7.4.47",
-    "@jskit-ai/http-runtime": "0.1.52",
-    "@jskit-ai/kernel": "0.1.53",
-    "@jskit-ai/shell-web": "0.1.52",
-    "@jskit-ai/users-core": "0.1.63",
-    "@jskit-ai/users-web": "0.1.68",
-    "@jskit-ai/workspaces-core": "0.1.29",
+    "@jskit-ai/http-runtime": "0.1.54",
+    "@jskit-ai/kernel": "0.1.55",
+    "@jskit-ai/shell-web": "0.1.54",
+    "@jskit-ai/users-core": "0.1.65",
+    "@jskit-ai/users-web": "0.1.70",
+    "@jskit-ai/workspaces-core": "0.1.31",
     "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/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/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/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)
     : [];
 }
 
@@ -78,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",
@@ -88,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",