@jskit-ai/workspaces-web 0.1.5 → 0.1.6

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/workspaces-web",
-  version: "0.1.5",
+  version: "0.1.6",
   kind: "runtime",
   description: "Workspace web module: workspace selector, tools widget, workspace surfaces, and members/settings UI.",
   dependsOn: [
@@ -57,13 +57,7 @@ export default Object.freeze({
             host: "admin-settings",
             position: "primary-menu",
             surfaces: ["admin"],
-            source: "templates/src/pages/admin/workspace/settings/index.vue"
-          },
-          {
-            host: "admin-settings",
-            position: "forms",
-            surfaces: ["admin"],
-            source: "templates/src/pages/admin/workspace/settings/index.vue"
+            source: "templates/src/pages/admin/workspace/settings.vue"
           }
         ],
         contributions: [
@@ -115,13 +109,13 @@ export default Object.freeze({
             source: "mutations.text#users-web-placement-block"
           },
           {
-            id: "users.workspace.settings.form",
+            id: "users.workspace.settings.general",
             host: "admin-settings",
-            position: "forms",
+            position: "primary-menu",
             surfaces: ["admin"],
             order: 100,
-            componentToken: "users.web.workspace-settings.element",
-            source: "mutations.text#users-web-workspace-settings-form-placement"
+            componentToken: "users.web.shell.surface-aware-menu-link-item",
+            source: "mutations.text#users-web-workspace-settings-general-placement"
           }
         ]
       }
@@ -130,8 +124,8 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/workspaces-core": "0.1.5",
-        "@jskit-ai/users-web": "0.1.44"
+        "@jskit-ai/workspaces-core": "0.1.6",
+        "@jskit-ai/users-web": "0.1.45"
       },
       dev: {}
     },
@@ -234,11 +228,23 @@ export default Object.freeze({
           in: ["personal", "workspaces"]
         }
       },
+      {
+        from: "templates/src/pages/admin/workspace/settings.vue",
+        toSurface: "admin",
+        toSurfacePath: "workspace/settings.vue",
+        reason: "Install workspace settings shell route scaffold for workspaces-web workspace admin UI.",
+        category: "workspaces-web",
+        id: "users-web-page-admin-workspace-settings-shell",
+        when: {
+          config: "tenancyMode",
+          in: ["personal", "workspaces"]
+        }
+      },
       {
         from: "templates/src/pages/admin/workspace/settings/index.vue",
         toSurface: "admin",
         toSurfacePath: "workspace/settings/index.vue",
-        reason: "Install workspace settings page scaffold for workspaces-web workspace admin UI.",
+        reason: "Install workspace settings landing page scaffold for workspaces-web workspace admin UI.",
         category: "workspaces-web",
         id: "users-web-page-admin-workspace-settings",
         when: {
@@ -287,12 +293,12 @@ export default Object.freeze({
         op: "append-text",
         file: "src/placement.js",
         position: "bottom",
-        skipIfContains: "id: \"users.workspace.settings.form\"",
+        skipIfContains: "id: \"users.workspace.settings.general\"",
         value:
-          "\naddPlacement({\n  id: \"users.workspace.settings.form\",\n  host: \"admin-settings\",\n  position: \"forms\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"users.web.workspace-settings.element\"\n});\n",
-        reason: "Append workspace settings form placement into app-owned placement registry.",
+          "\naddPlacement({\n  id: \"users.workspace.settings.general\",\n  host: \"admin-settings\",\n  position: \"primary-menu\",\n  surfaces: [\"admin\"],\n  order: 100,\n  componentToken: \"users.web.shell.surface-aware-menu-link-item\",\n  props: {\n    label: \"General\",\n    surface: \"admin\",\n    workspaceSuffix: \"/workspace/settings\",\n    nonWorkspaceSuffix: \"/workspace/settings\"\n  },\n  when: ({ auth }) => Boolean(auth?.authenticated)\n});\n",
+        reason: "Append workspace settings general-page placement into app-owned placement registry.",
         category: "workspaces-web",
-        id: "users-web-workspace-settings-form-placement",
+        id: "users-web-workspace-settings-general-placement",
         when: {
           config: "tenancyMode",
           in: ["personal", "workspaces"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/workspaces-web",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -10,6 +10,6 @@
     "./client/providers/WorkspacesWebClientProvider": "./src/client/providers/WorkspacesWebClientProvider.js"
   },
   "dependencies": {
-    "@jskit-ai/users-web": "0.1.44"
+    "@jskit-ai/users-web": "0.1.45"
   }
 }

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

@@ -1,17 +1,7 @@
-<template>
-  <section class="settings-page">
-    <ShellOutlet host="admin-settings" position="primary-menu" />
-    <ShellOutlet host="admin-settings" position="forms" />
-  </section>
-</template>
-
 <script setup>
-import ShellOutlet from "@jskit-ai/shell-web/client/components/ShellOutlet";
+import WorkspaceSettingsClientElement from "@jskit-ai/users-web/client/components/WorkspaceSettingsClientElement";
 </script>
 
-<style scoped>
-.settings-page {
-  display: grid;
-  gap: 1rem;
-}
-</style>
+<template>
+  <WorkspaceSettingsClientElement />
+</template>

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

@@ -0,0 +1,29 @@
+<script setup>
+import ShellOutlet from "@jskit-ai/shell-web/client/components/ShellOutlet";
+import { RouterView } from "vue-router";
+</script>
+
+<template>
+  <section class="settings-shell d-flex flex-column ga-4">
+    <v-card rounded="lg" elevation="1" border>
+      <v-card-item>
+        <v-card-title>Workspace settings</v-card-title>
+        <v-card-subtitle>Configure the current workspace and its members.</v-card-subtitle>
+      </v-card-item>
+      <v-divider />
+      <v-card-text class="pt-4">
+        <v-row no-gutters>
+          <v-col cols="12" md="3" lg="2" class="pr-md-4 mb-4 mb-md-0">
+            <v-list nav density="comfortable" rounded="lg" border>
+              <ShellOutlet host="admin-settings" position="primary-menu" />
+            </v-list>
+          </v-col>
+
+          <v-col cols="12" md="9" lg="10">
+            <RouterView />
+          </v-col>
+        </v-row>
+      </v-card-text>
+    </v-card>
+  </section>
+</template>

package/test/settingsPlacementContract.test.js

@@ -24,15 +24,14 @@ function findContribution(id) {
 
 test("workspaces-web admin settings template exposes surface-derived settings outlets", async () => {
   const source = await readFile(
-    path.join(PACKAGE_DIR, "templates", "src", "pages", "admin", "workspace", "settings", "index.vue"),
+    path.join(PACKAGE_DIR, "templates", "src", "pages", "admin", "workspace", "settings.vue"),
     "utf8"
   );
 
   assert.match(source, /<ShellOutlet host="admin-settings" position="primary-menu" \/>/);
-  assert.match(source, /<ShellOutlet host="admin-settings" position="forms" \/>/);
 });
 
-test("workspaces-web descriptor metadata advertises admin settings outlets and form placement on the derived host", () => {
+test("workspaces-web descriptor metadata advertises admin settings outlets and general-page placement on the derived host", () => {
   assert.deepEqual(
     readSettingsOutlets(),
     [
@@ -40,24 +39,18 @@ test("workspaces-web descriptor metadata advertises admin settings outlets and f
         host: "admin-settings",
         position: "primary-menu",
         surfaces: ["admin"],
-        source: "templates/src/pages/admin/workspace/settings/index.vue"
-      },
-      {
-        host: "admin-settings",
-        position: "forms",
-        surfaces: ["admin"],
-        source: "templates/src/pages/admin/workspace/settings/index.vue"
+        source: "templates/src/pages/admin/workspace/settings.vue"
       }
     ]
   );
 
-  assert.deepEqual(findContribution("users.workspace.settings.form"), {
-    id: "users.workspace.settings.form",
+  assert.deepEqual(findContribution("users.workspace.settings.general"), {
+    id: "users.workspace.settings.general",
     host: "admin-settings",
-    position: "forms",
+    position: "primary-menu",
     surfaces: ["admin"],
     order: 100,
-    componentToken: "users.web.workspace-settings.element",
-    source: "mutations.text#users-web-workspace-settings-form-placement"
+    componentToken: "users.web.shell.surface-aware-menu-link-item",
+    source: "mutations.text#users-web-workspace-settings-general-placement"
   });
 });