@jskit-ai/users-web 0.1.37 → 0.1.40

package/src/client/providers/UsersWebClientProvider.js

@@ -1,13 +1,7 @@
-import UsersWorkspaceSelector from "../components/UsersWorkspaceSelector.vue";
-import UsersWorkspaceToolsWidget from "../components/UsersWorkspaceToolsWidget.vue";
 import UsersShellMenuLinkItem from "../components/UsersShellMenuLinkItem.vue";
 import UsersSurfaceAwareMenuLinkItem from "../components/UsersSurfaceAwareMenuLinkItem.vue";
 import UsersProfileSurfaceSwitchMenuItem from "../components/UsersProfileSurfaceSwitchMenuItem.vue";
-import UsersWorkspaceSettingsMenuItem from "../components/UsersWorkspaceSettingsMenuItem.vue";
-import UsersWorkspaceMembersMenuItem from "../components/UsersWorkspaceMembersMenuItem.vue";
 import ProfileClientElement from "../components/ProfileClientElement.vue";
-import MembersAdminClientElement from "../components/MembersAdminClientElement.vue";
-import WorkspaceSettingsClientElement from "../components/WorkspaceSettingsClientElement.vue";
 import {
   createBootstrapPlacementRuntime
 } from "../runtime/bootstrapPlacementRuntime.js";
@@ -21,16 +15,10 @@ class UsersWebClientProvider {
       throw new Error("UsersWebClientProvider requires application singleton().");
     }
 
-    app.singleton("users.web.workspace.selector", () => UsersWorkspaceSelector);
-    app.singleton("users.web.workspace.tools.widget", () => UsersWorkspaceToolsWidget);
     app.singleton("users.web.shell.menu-link-item", () => UsersShellMenuLinkItem);
     app.singleton("users.web.shell.surface-aware-menu-link-item", () => UsersSurfaceAwareMenuLinkItem);
     app.singleton("users.web.profile.menu.surface-switch-item", () => UsersProfileSurfaceSwitchMenuItem);
-    app.singleton("users.web.workspace-settings.menu-item", () => UsersWorkspaceSettingsMenuItem);
-    app.singleton("users.web.workspace-members.menu-item", () => UsersWorkspaceMembersMenuItem);
     app.singleton("users.web.profile.element", () => ProfileClientElement);
-    app.singleton("users.web.members-admin.element", () => MembersAdminClientElement);
-    app.singleton("users.web.workspace-settings.element", () => WorkspaceSettingsClientElement);
     app.singleton("users.web.bootstrap-placement.runtime", (scope) => createBootstrapPlacementRuntime({ app: scope }));
   }
 

package/src/client/providers/UsersWorkspacesClientProvider.js

@@ -0,0 +1,26 @@
+import UsersWorkspaceSelector from "../components/UsersWorkspaceSelector.vue";
+import UsersWorkspaceToolsWidget from "../components/UsersWorkspaceToolsWidget.vue";
+import UsersWorkspaceSettingsMenuItem from "../components/UsersWorkspaceSettingsMenuItem.vue";
+import UsersWorkspaceMembersMenuItem from "../components/UsersWorkspaceMembersMenuItem.vue";
+import MembersAdminClientElement from "../components/MembersAdminClientElement.vue";
+import WorkspaceSettingsClientElement from "../components/WorkspaceSettingsClientElement.vue";
+
+class UsersWorkspacesClientProvider {
+  static id = "workspaces.web.client";
+  static dependsOn = ["users.web.client"];
+
+  register(app) {
+    if (!app || typeof app.singleton !== "function") {
+      throw new Error("UsersWorkspacesClientProvider requires application singleton().");
+    }
+
+    app.singleton("users.web.workspace.selector", () => UsersWorkspaceSelector);
+    app.singleton("users.web.workspace.tools.widget", () => UsersWorkspaceToolsWidget);
+    app.singleton("users.web.workspace-settings.menu-item", () => UsersWorkspaceSettingsMenuItem);
+    app.singleton("users.web.workspace-members.menu-item", () => UsersWorkspaceMembersMenuItem);
+    app.singleton("users.web.members-admin.element", () => MembersAdminClientElement);
+    app.singleton("users.web.workspace-settings.element", () => WorkspaceSettingsClientElement);
+  }
+}
+
+export { UsersWorkspacesClientProvider };

package/src/client/support/menuLinkTarget.js

@@ -0,0 +1,93 @@
+import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { surfaceRequiresWorkspaceFromPlacementContext } from "../lib/workspaceSurfaceContext.js";
+
+function normalizeMenuLinkPathname(pathname = "") {
+  const source = String(pathname || "").trim();
+  if (!source) {
+    return "";
+  }
+
+  const queryIndex = source.indexOf("?");
+  const hashIndex = source.indexOf("#");
+  const cutoff =
+    queryIndex < 0
+      ? hashIndex
+      : hashIndex < 0
+        ? queryIndex
+        : Math.min(queryIndex, hashIndex);
+
+  return cutoff < 0 ? source : source.slice(0, cutoff);
+}
+
+function resolveMenuLinkSurfaceId(surface = "", fallbackSurfaceId = "") {
+  const explicitSurface = normalizeText(surface).toLowerCase();
+  if (explicitSurface && explicitSurface !== "*") {
+    return explicitSurface;
+  }
+
+  return normalizeText(fallbackSurfaceId).toLowerCase();
+}
+
+function interpolateBracketParams(pathTemplate = "", params = {}) {
+  const source = String(pathTemplate || "").trim();
+  if (!source) {
+    return "";
+  }
+
+  return source.replace(/\[([^\]]+)\]/g, (_match, rawKey) => {
+    const key = String(rawKey || "").trim();
+    if (!key) {
+      return "";
+    }
+
+    const value = params?.[key];
+    return value == null ? `[${key}]` : encodeURIComponent(String(value));
+  });
+}
+
+function isRelativeMenuLinkTarget(target = "") {
+  const normalizedTarget = normalizeText(target);
+  return normalizedTarget.startsWith("./") || normalizedTarget.startsWith("../");
+}
+
+function resolveMenuLinkTarget({
+  to = "",
+  surface = "",
+  currentSurfaceId = "",
+  placementContext = null,
+  workspaceSuffix = "/",
+  nonWorkspaceSuffix = "/",
+  routeParams = {},
+  resolvePagePath = null
+} = {}) {
+  const explicitTarget = normalizeText(to);
+  const targetSurfaceId = resolveMenuLinkSurfaceId(surface, currentSurfaceId);
+  const workspaceRequired = surfaceRequiresWorkspaceFromPlacementContext(placementContext, targetSurfaceId);
+  const suffixTemplate = normalizeText(workspaceRequired ? workspaceSuffix : nonWorkspaceSuffix) || "/";
+  const interpolatedSuffix = interpolateBracketParams(suffixTemplate, routeParams);
+  const resolvedSuffixTarget =
+    typeof resolvePagePath === "function" &&
+    targetSurfaceId &&
+    interpolatedSuffix &&
+    !interpolatedSuffix.includes("[")
+      ? normalizeText(resolvePagePath(interpolatedSuffix, {
+          surface: targetSurfaceId,
+          mode: "auto"
+        }))
+      : "";
+
+  if (!explicitTarget) {
+    return resolvedSuffixTarget;
+  }
+
+  if (isRelativeMenuLinkTarget(explicitTarget)) {
+    return resolvedSuffixTarget;
+  }
+
+  return explicitTarget;
+}
+
+export {
+  normalizeMenuLinkPathname,
+  resolveMenuLinkTarget
+};

package/templates/src/components/account/settings/AccountSettingsClientElement.vue

@@ -12,17 +12,24 @@ const runtime = useAccountSettingsRuntime();
 const route = useRoute();
 const router = useRouter();
 
-const sections = Object.freeze([
-  { title: "Profile", value: "profile" },
-  { title: "Preferences", value: "preferences" },
-  { title: "Notifications", value: "notifications" },
-  { title: "Invites", value: "invites" }
-]);
-const sectionValues = Object.freeze(sections.map((section) => section.value));
+const sections = computed(() => {
+  const nextSections = [
+    { title: "Profile", value: "profile" },
+    { title: "Preferences", value: "preferences" },
+    { title: "Notifications", value: "notifications" }
+  ];
+
+  if (runtime.invites.isAvailable.value) {
+    nextSections.push({ title: "Invites", value: "invites" });
+  }
+
+  return Object.freeze(nextSections);
+});
+const sectionValues = computed(() => Object.freeze(sections.value.map((section) => section.value)));
 
 function normalizeSection(value) {
   const source = Array.isArray(value) ? value[0] : value;
-  return normalizeOneOf(source, sectionValues, "profile");
+  return normalizeOneOf(source, sectionValues.value, "profile");
 }
 
 function readRouteSection() {
@@ -61,7 +68,7 @@ const activeTab = computed({
     <v-card class="panel-card" rounded="lg" elevation="1" border>
       <v-card-item>
         <v-card-title class="panel-title">Account settings</v-card-title>
-        <v-card-subtitle>Global profile, preferences, notifications, and invitation controls.</v-card-subtitle>
+        <v-card-subtitle>Global profile, preferences, notifications, and account controls.</v-card-subtitle>
         <template #append>
           <v-btn
             variant="text"

package/templates/src/pages/console/settings/index.vue

@@ -1,5 +1,6 @@
 <template>
   <section class="settings-page">
+    <ShellOutlet host="console-settings" position="primary-menu" />
     <ShellOutlet host="console-settings" position="forms" />
   </section>
 </template>

package/test/addEditUiRuntime.test.js

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import { ref } from "vue";
-import { createAddEditUiRuntime } from "../src/client/composables/addEditUiRuntime.js";
+import { createAddEditUiRuntime } from "../src/client/composables/runtime/addEditUiRuntime.js";
 
 test("createAddEditUiRuntime resolves api/list/cancel paths from route params", () => {
   const runtime = createAddEditUiRuntime({

package/test/crudBindingSupport.test.js

@@ -0,0 +1,110 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { ref } from "vue";
+import {
+  CRUD_BINDING_MODE_ROUTE,
+  CRUD_BINDING_MODE_MERGE,
+  CRUD_BINDING_MODE_EXPLICIT,
+  CRUD_BINDING_MODE_NONE,
+  normalizeCrudBindingMode,
+  resolveCrudBoundValues
+} from "../src/client/composables/crud/crudBindingSupport.js";
+
+test("normalizeCrudBindingMode defaults invalid values to route", () => {
+  assert.equal(normalizeCrudBindingMode(""), CRUD_BINDING_MODE_ROUTE);
+  assert.equal(normalizeCrudBindingMode("unknown"), CRUD_BINDING_MODE_ROUTE);
+  assert.equal(normalizeCrudBindingMode("merge"), CRUD_BINDING_MODE_MERGE);
+  assert.equal(normalizeCrudBindingMode("explicit"), CRUD_BINDING_MODE_EXPLICIT);
+  assert.equal(normalizeCrudBindingMode("none"), CRUD_BINDING_MODE_NONE);
+});
+
+test("resolveCrudBoundValues returns route values in route mode", () => {
+  const values = resolveCrudBoundValues({
+    binding: {
+      mode: "route",
+      values: {
+        contactId: "22"
+      }
+    },
+    routeValues: {
+      contactId: "11"
+    }
+  });
+
+  assert.deepEqual(values, {
+    contactId: "11"
+  });
+});
+
+test("resolveCrudBoundValues merges explicit values over route values in merge mode", () => {
+  const values = resolveCrudBoundValues({
+    binding: {
+      mode: "merge",
+      values: {
+        contactId: "22",
+        serviceId: "4"
+      }
+    },
+    routeValues: {
+      contactId: "11"
+    }
+  });
+
+  assert.deepEqual(values, {
+    contactId: "22",
+    serviceId: "4"
+  });
+});
+
+test("resolveCrudBoundValues uses only explicit values in explicit mode", () => {
+  const values = resolveCrudBoundValues({
+    binding: {
+      mode: "explicit",
+      values: {
+        serviceId: "4"
+      }
+    },
+    routeValues: {
+      contactId: "11"
+    }
+  });
+
+  assert.deepEqual(values, {
+    serviceId: "4"
+  });
+});
+
+test("resolveCrudBoundValues disables automatic binding in none mode", () => {
+  const values = resolveCrudBoundValues({
+    binding: {
+      mode: "none",
+      values: {
+        serviceId: "4"
+      }
+    },
+    routeValues: {
+      contactId: "11"
+    }
+  });
+
+  assert.deepEqual(values, {});
+});
+
+test("resolveCrudBoundValues unwraps reactive binding config and values", () => {
+  const values = resolveCrudBoundValues({
+    binding: ref({
+      mode: "merge",
+      values: ref({
+        serviceId: "4"
+      })
+    }),
+    routeValues: {
+      contactId: "11"
+    }
+  });
+
+  assert.deepEqual(values, {
+    contactId: "11",
+    serviceId: "4"
+  });
+});

package/test/crudLookupFieldRuntime.test.js

@@ -4,7 +4,7 @@ import {
   resolveLookupItemLabel,
   resolveLookupFieldDisplayValue,
   resolveRecordTitle
-} from "../src/client/composables/crudLookupFieldLabelSupport.js";
+} from "../src/client/composables/crud/crudLookupFieldLabelSupport.js";
 
 test("resolveLookupItemLabel composes name + surname", () => {
   assert.equal(

package/test/errorMessageHelpers.test.js

@@ -1,6 +1,6 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import { toQueryErrorMessage, toUiErrorMessage } from "../src/client/composables/errorMessageHelpers.js";
+import { toQueryErrorMessage, toUiErrorMessage } from "../src/client/composables/support/errorMessageHelpers.js";
 
 test("toQueryErrorMessage returns empty when query has no error", () => {
   assert.equal(toQueryErrorMessage(null, "Unable to load list."), "");

package/test/exportsContract.test.js

@@ -13,7 +13,16 @@ test("users-web exports are explicit and aligned with production/template usage"
     repoRoot: REPO_ROOT,
     packageDir: PACKAGE_DIR,
     packageId: "@jskit-ai/users-web",
-    requiredExports: ["./client"]
+    requiredExports: [
+      "./client",
+      "./client/composables/useAddEdit",
+      "./client/composables/useList",
+      "./client/composables/useView",
+      "./client/composables/useCrudAddEdit",
+      "./client/composables/useCrudList",
+      "./client/composables/useCrudView",
+      "./client/support/menuLinkTarget"
+    ]
   });
 
   assert.deepEqual(

package/test/listQueryParamSupport.test.js

@@ -12,7 +12,7 @@ import {
   buildRouteQueryCompareToken,
   mergeManagedQueryParamKeyHistory,
   resolveRouteSyncManagedKeys
-} from "../src/client/composables/listQueryParamSupport.js";
+} from "../src/client/composables/support/listQueryParamSupport.js";
 
 test("normalizeListSyncToRouteConfig defaults", () => {
   assert.deepEqual(

package/test/listUiRuntime.test.js

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import { ref } from "vue";
-import { createListUiRuntime } from "../src/client/composables/listUiRuntime.js";
+import { createListUiRuntime } from "../src/client/composables/runtime/listUiRuntime.js";
 
 test("createListUiRuntime resolves row keys and relative route templates from string record ids", () => {
   const items = ref([{ uuid: "abc 123" }]);

package/test/menuLinkTarget.test.js

@@ -0,0 +1,116 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  normalizeMenuLinkPathname,
+  resolveMenuLinkTarget
+} from "../src/client/support/menuLinkTarget.js";
+
+const WORKSPACE_PLACEMENT_CONTEXT = Object.freeze({
+  surfaceConfig: {
+    enabledSurfaceIds: ["admin"],
+    surfacesById: {
+      admin: {
+        id: "admin",
+        requiresWorkspace: true
+      }
+    }
+  }
+});
+
+const MIXED_PLACEMENT_CONTEXT = Object.freeze({
+  surfaceConfig: {
+    enabledSurfaceIds: ["app", "admin"],
+    surfacesById: {
+      app: {
+        id: "app",
+        requiresWorkspace: false
+      },
+      admin: {
+        id: "admin",
+        requiresWorkspace: true
+      }
+    }
+  }
+});
+
+function createPageResolver() {
+  return function resolvePagePath(relativePath = "", options = {}) {
+    return `page:${String(options.surface || "")}:${String(relativePath || "")}`;
+  };
+}
+
+test("resolveMenuLinkTarget resolves suffix targets when no explicit to is provided", () => {
+  assert.equal(
+    resolveMenuLinkTarget({
+      surface: "admin",
+      placementContext: WORKSPACE_PLACEMENT_CONTEXT,
+      workspaceSuffix: "/practice/vets",
+      nonWorkspaceSuffix: "/practice/vets",
+      resolvePagePath: createPageResolver()
+    }),
+    "page:admin:/practice/vets"
+  );
+});
+
+test("resolveMenuLinkTarget resolves relative targets through suffix templates", () => {
+  assert.equal(
+    resolveMenuLinkTarget({
+      to: "./notes",
+      surface: "admin",
+      placementContext: WORKSPACE_PLACEMENT_CONTEXT,
+      workspaceSuffix: "/contacts/[contactId]/notes",
+      nonWorkspaceSuffix: "/contacts/[contactId]/notes",
+      routeParams: {
+        contactId: 42
+      },
+      resolvePagePath: createPageResolver()
+    }),
+    "page:admin:/contacts/42/notes"
+  );
+});
+
+test("resolveMenuLinkTarget returns empty string for unresolved relative targets", () => {
+  assert.equal(
+    resolveMenuLinkTarget({
+      to: "./notes",
+      surface: "admin",
+      placementContext: WORKSPACE_PLACEMENT_CONTEXT,
+      workspaceSuffix: "/contacts/[contactId]/notes",
+      nonWorkspaceSuffix: "/contacts/[contactId]/notes",
+      resolvePagePath: createPageResolver()
+    }),
+    ""
+  );
+});
+
+test("resolveMenuLinkTarget keeps absolute targets unchanged", () => {
+  assert.equal(
+    resolveMenuLinkTarget({
+      to: "/practice/vets",
+      surface: "admin",
+      placementContext: WORKSPACE_PLACEMENT_CONTEXT,
+      workspaceSuffix: "/ignored",
+      nonWorkspaceSuffix: "/ignored",
+      resolvePagePath: createPageResolver()
+    }),
+    "/practice/vets"
+  );
+});
+
+test("resolveMenuLinkTarget uses non-workspace suffix for non-workspace surfaces", () => {
+  assert.equal(
+    resolveMenuLinkTarget({
+      surface: "app",
+      currentSurfaceId: "admin",
+      placementContext: MIXED_PLACEMENT_CONTEXT,
+      workspaceSuffix: "/workspace-only",
+      nonWorkspaceSuffix: "/public-page",
+      resolvePagePath: createPageResolver()
+    }),
+    "page:app:/public-page"
+  );
+});
+
+test("normalizeMenuLinkPathname removes query strings and hashes", () => {
+  assert.equal(normalizeMenuLinkPathname("/practice/vets?tab=all#section"), "/practice/vets");
+});

package/test/permissions.test.js

@@ -30,6 +30,6 @@ test("arePermissionListsEqual returns false for different permission sets", () =
 });
 
 test("hasPermission supports namespace wildcard matches", () => {
-  assert.equal(hasPermission(["crud_contacts.*"], "crud_contacts.update"), true);
-  assert.equal(hasPermission(["crud_contacts.*"], "crud_projects.update"), false);
+  assert.equal(hasPermission(["crud.contacts.*"], "crud.contacts.update"), true);
+  assert.equal(hasPermission(["crud.contacts.*"], "crud.projects.update"), false);
 });

package/test/refValueHelpers.test.js

@@ -1,7 +1,7 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 import { computed, ref } from "vue";
-import { resolveEnabledRef } from "../src/client/composables/refValueHelpers.js";
+import { resolveEnabledRef } from "../src/client/composables/support/refValueHelpers.js";
 
 test("resolveEnabledRef unwraps refs", () => {
   assert.equal(resolveEnabledRef(ref(true)), true);

package/test/resourceLoadStateHelpers.test.js

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import { ref } from "vue";
-import { hasResolvedQueryData } from "../src/client/composables/resourceLoadStateHelpers.js";
+import { hasResolvedQueryData } from "../src/client/composables/support/resourceLoadStateHelpers.js";
 
 test("hasResolvedQueryData returns true when the query succeeded", () => {
   const query = {

package/test/routeTemplateHelpers.test.js

@@ -4,7 +4,7 @@ import {
   extractRouteParamNames,
   resolveScopedRoutePathname,
   resolveRouteParamNamesInOrder
-} from "../src/client/composables/routeTemplateHelpers.js";
+} from "../src/client/composables/support/routeTemplateHelpers.js";
 
 test("extractRouteParamNames reads dynamic params from route templates", () => {
   assert.deepEqual(

package/test/scopeHelpers.test.js

@@ -6,7 +6,7 @@ import {
   normalizeOwnershipFilter,
   resolveApiSuffix,
   resolveResourceMessages
-} from "../src/client/composables/scopeHelpers.js";
+} from "../src/client/composables/support/scopeHelpers.js";
 
 test("resolveResourceMessages merges defaults with resource messages", () => {
   const messages = resolveResourceMessages(

package/test/settingsPlacementContract.test.js

@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import path from "node:path";
+import test from "node:test";
+import { readFile } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import descriptor from "../package.descriptor.mjs";
+
+const TEST_DIRECTORY = path.dirname(fileURLToPath(import.meta.url));
+const PACKAGE_DIR = path.resolve(TEST_DIRECTORY, "..");
+
+function readSettingsOutlets() {
+  const outlets = descriptor?.metadata?.ui?.placements?.outlets;
+  return Array.isArray(outlets)
+    ? outlets.filter((entry) => String(entry?.host || "").trim() === "console-settings")
+    : [];
+}
+
+test("users-web console settings template exposes surface-derived settings outlets", async () => {
+  const source = await readFile(path.join(PACKAGE_DIR, "templates", "src", "pages", "console", "settings", "index.vue"), "utf8");
+
+  assert.match(source, /<ShellOutlet host="console-settings" position="primary-menu" \/>/);
+  assert.match(source, /<ShellOutlet host="console-settings" position="forms" \/>/);
+});
+
+test("users-web descriptor metadata advertises console settings outlets with standard positions", () => {
+  const outlets = readSettingsOutlets();
+  assert.deepEqual(
+    outlets,
+    [
+      {
+        host: "console-settings",
+        position: "primary-menu",
+        surfaces: ["console"],
+        source: "templates/src/pages/console/settings/index.vue"
+      },
+      {
+        host: "console-settings",
+        position: "forms",
+        surfaces: ["console"],
+        source: "templates/src/pages/console/settings/index.vue"
+      }
+    ]
+  );
+});