@7365admin1/layer-common 3.2.2-staging.194 → 3.2.2-staging.195

package/components/RolePermissionFormCreate.vue

@@ -88,10 +88,9 @@
                       @update:model-value="
                         toggleCategory(String(resourceKey), $event)
                       "
-                      color="accent"
+                      class="app-switch"
                       density="compact"
                       hide-details
-                      inset
                     />
                   </template>
                 </v-list-item>

package/components/RolePermissionFormPreviewUpdate.vue

@@ -47,10 +47,9 @@
                     <v-switch
                       :model-value="isCategoryEnabled(String(resourceKey))"
                       :disabled="!edit"
-                      color="accent"
+                      class="app-switch"
                       density="compact"
                       hide-details
-                      inset
                       @update:model-value="
                         toggleCategory(String(resourceKey), $event)
                       "

package/components/RolePermissionMain.vue

@@ -84,6 +84,7 @@
         :permissions="props.permissions"
         :org="props.orgId"
         :site-id="props.siteId"
+        :site-state="siteFieldShown"
         :web-only-resources="props.webOnlyResources"
         @success="success()"
         :type="props.type"
@@ -184,6 +185,9 @@
 </template>
 
 <script setup lang="ts">
+// Relative import: this layer's `utils/` is not auto-imported into consumers.
+import { showSiteField } from "../utils/role";
+
 const props = defineProps({
   orgId: {
     type: String,
@@ -197,6 +201,18 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  /*
+   * Whether the Create-role dialog shows its (read-only) Site field.
+   * The dialog defaulted this to `true` but this component never declared or
+   * forwarded it, and its root is a `<div>`, so a fallthrough `site-state`
+   * attribute landed on that div instead of the dialog - no consuming app
+   * could switch the field off. Admin roles are never site-scoped, so the
+   * field drew permanently disabled and empty there (QA, admin PR #18).
+   */
+  siteState: {
+    type: Boolean,
+    default: true,
+  },
   type: {
     type: String,
     required: true,
@@ -296,6 +312,10 @@ function tableRowClickHandler(_: any, data: any) {
 
 const createDialog = ref(false);
 
+const siteFieldShown = computed(() =>
+  showSiteField(props.siteState, props.type)
+);
+
 function success() {
   createDialog.value = false;
   getRoles();

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.2-staging.194",
+  "version": "3.2.2-staging.195",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/role.test.ts

@@ -0,0 +1,69 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { test } from "node:test";
+
+import { showSiteField } from "./role.ts";
+
+/**
+ * QA on the admin app (PR #18) reported "no site options" on Create Role. The
+ * Site field is read-only by design - it shows the site a role belongs to -
+ * but an admin role has no site, so it drew permanently disabled and empty.
+ * `RolePermissionFormCreate` defaulted `siteState` to `true` and
+ * `RolePermissionMain` neither declared nor forwarded it, and its root is a
+ * `<div>`, so a fallthrough attribute could not reach the dialog either: no
+ * consuming app could switch the field off.
+ */
+test("an admin role never shows the site field", () => {
+  assert.equal(showSiteField(true, "admin"), false);
+  assert.equal(showSiteField(false, "admin"), false);
+});
+
+test("every other role type keeps what the app asked for", () => {
+  for (const type of [
+    "app",
+    "organization",
+    "security_agency",
+    "cleaning_services",
+  ]) {
+    assert.equal(showSiteField(true, type), true, type);
+    assert.equal(showSiteField(false, type), false, type);
+  }
+});
+
+test("RolePermissionMain declares site-state and forwards it to the dialog", () => {
+  const src = readFileSync(
+    new URL("../components/RolePermissionMain.vue", import.meta.url),
+    "utf8"
+  );
+
+  assert.match(src, /siteState:\s*\{/, "site-state must be a declared prop");
+  assert.match(
+    src,
+    /:site-state="siteFieldShown"/,
+    "the dialog must receive the resolved value, not a fallthrough attribute"
+  );
+});
+
+/**
+ * The category expand toggle carried no class, so it fell back to raw Vuetify
+ * `inset` styling: a white thumb on a white card, measured 1.02:1 light /
+ * 1.04:1 dark against the dialog surface. `.app-switch` (primitives.css) is
+ * this layer's switch shape and is what makes the thumb visible. `inset` is
+ * removed with it - Vuetify's inset dimensions beat the `.app-switch` rules on
+ * source order and collapse the control to zero width.
+ */
+for (const file of [
+  "RolePermissionFormCreate.vue",
+  "RolePermissionFormPreviewUpdate.vue",
+]) {
+  test(`${file} styles its category toggle with .app-switch`, () => {
+    const src = readFileSync(
+      new URL(`../components/${file}`, import.meta.url),
+      "utf8"
+    );
+    const sw = src.slice(src.indexOf("<v-switch"), src.indexOf("/>", src.indexOf("<v-switch")));
+
+    assert.ok(sw.includes('class="app-switch"'), "missing .app-switch");
+    assert.ok(!/\binset\b/.test(sw), "inset fights the .app-switch dimensions");
+  });
+}

package/utils/role.ts

@@ -0,0 +1,10 @@
+/**
+ * Whether the Create-role dialog should show its (read-only) Site field.
+ *
+ * An admin role is org-wide, never site-scoped, so there is no site to show -
+ * the field could only ever render empty and permanently disabled, which is
+ * what QA reported on the admin app. Every other role type keeps whatever the
+ * consuming app asked for.
+ */
+export const showSiteField = (siteState: boolean, type: string): boolean =>
+  siteState && type !== "admin";