@7365admin1/layer-common 4.63.0 → 4.63.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.63.1
+
+### Patch Changes
+
+- c3912eb: Worker nouns: fall back to the deployment's `APP` code when the app sets no `appSlug` (hygiene, M&E, pest, pool, landscape), so hygiene shows Cleaners instead of the neutral Staff.
+
 ## 4.63.0
 
 ### Minor Changes
@@ -1685,11 +1691,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                            GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                            GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                              GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                              GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                            owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                            staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                              owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                              staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/InventoryReportsTab.vue

@@ -133,7 +133,7 @@
 
 <script setup lang="ts">
 import useInventory, { saveBlob } from "../composables/useInventory";
-import useWorkerTerm from "../composables/useWorkerTerm";
+import useWorkerTerm, { workerAppKey } from "../composables/useWorkerTerm";
 import useUtils from "../composables/useUtils";
 import useFile from "../composables/useFile";
 
@@ -152,7 +152,7 @@ const usagePhotos = (row: any) => [
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const worker = useWorkerTerm({ providers: true });
-const appSlug = useRuntimeConfig().public?.appSlug as string | undefined;
+const appSlug = workerAppKey();
 
 const now = new Date();
 const month = ref(`${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`);

package/composables/useWorkerTerm.ts

@@ -3,8 +3,15 @@ import { workerTerm } from "../utils/worker-terms";
 /**
  * The worker noun for the app this page runs in ("Cleaner" in Hygiene,
  * "Security officer" in Security, ...). See utils/worker-terms.ts.
- * Apps without `runtimeConfig.public.appSlug` get the neutral "Staff".
+ * Keyed by `runtimeConfig.public.appSlug`, else the deployment's `APP` code
+ * ("cleaning_services", "security_agency", ...) - hygiene, M&E, pest, pool and
+ * landscape set only `APP`. Neither = the neutral "Staff".
  */
+export function workerAppKey(): string | undefined {
+  const pub = useRuntimeConfig().public ?? {};
+  return (pub.appSlug || pub.APP || undefined) as string | undefined;
+}
+
 export default function useWorkerTerm(opts?: { providers?: boolean }) {
-  return workerTerm(useRuntimeConfig().public?.appSlug as string | undefined, opts);
+  return workerTerm(workerAppKey(), opts);
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.63.0",
+  "version": "4.63.1",
   "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/worker-terms.ts

@@ -4,8 +4,8 @@
  * A cleaning company's workers are cleaners, not technicians. Every screen,
  * export and mobile app takes the noun from here, keyed by the app it runs in
  * (`appSlug`, e.g. "iservice365-web-app-hygiene" or
- * "iservice365-hygiene-mobile-app"); a service-type code ("hygiene",
- * "security_agency", ...) resolves the same way. Only the words change -
+ * "iservice365-hygiene-mobile-app"); a service-type or deployment `APP` code
+ * ("cleaning_services", "security_agency", ...) resolves the same way. Only the words change -
  * field names and API keys (`technician`, `usedByTechnicians`,
  * `/reports/technicians`) stay as they are.
  *