@7365admin1/layer-common 4.43.0 → 4.43.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @iservice365/layer-common
 
+## 4.43.1
+
+### Patch Changes
+
+- 64e84bb: Service Providers screen: extracted the service-type code-to-label lookup (the one behind "security_agency" showing as "Security") into a tested pure function, with unit tests covering every known service type code.
+- 238f9be: Service Providers screen: the TYPE column still showed the raw code (e.g. "security_agency" instead of "Security") for every row, because the API's `nature` field is not free text - it mirrors the same raw code as `type` - and the label lookup treated any truthy `nature` as an override. Only treat `nature` as free text when it is not itself a known service type code.
+
 ## 4.43.0
 
 ### Minor Changes
@@ -1489,11 +1496,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/ServiceProviderMain.vue

@@ -720,6 +720,7 @@ import {
   sentInvitedLine,
   sentStatusLine,
   spDay,
+  spTypeLabel,
 } from "../utils/sp-inviter-row";
 
 type ListTab = "active" | "pending" | "inactive";
@@ -1237,17 +1238,7 @@ function rowActionLabel(row: TableRow) {
 }
 
 function typeDisplay(type: string, nature?: string) {
-  if (nature && String(nature).trim()) return String(nature);
-  // useLocal returns a plain array; reading `.value` off it was always
-  // undefined, so every row fell through to the raw stored slug
-  // ("security_agency") instead of "Security".
-  const source = natureOfBusinessV3 as any;
-  const list = (Array.isArray(source) ? source : source?.value) as Array<{
-    title?: string;
-    value?: string;
-  }>;
-  const hit = list?.find((x) => x.value === type);
-  return hit?.title ?? type ?? "-";
+  return spTypeLabel(type, nature, natureOfBusinessV3);
 }
 
 const providerDialog = ref(false);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.43.0",
+  "version": "4.43.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/sp-inviter-row.ts

@@ -29,6 +29,34 @@ const ANSWERED: Record<string, string> = {
   expired: "Expired",
 };
 
+type TNatureOption = { title?: string; value?: string };
+
+/**
+ * The service type in words: the org's free-text nature if it gave one,
+ * else the label from the nature-of-business list, else the raw stored code
+ * ("security_agency") as a last resort. `useLocal` can hand back a plain
+ * array or a ref-like `{ value }` wrapper - read whichever shape was passed.
+ *
+ * `nature` is NOT always free text: both `_getServiceProviders` and the
+ * `customer.sites`-derived `getServiceProvidersForSite` aggregations in
+ * @7365admin1/core set it to `organization.nature`, the SAME raw code `type`
+ * carries ("security_agency") - not a human-typed description. Treating it as
+ * free text made the raw code win over the label lookup for every row, since
+ * `nature` is truthy whenever it is set at all. Only trust it as an override
+ * when it is NOT itself one of the known codes.
+ */
+export function spTypeLabel(type: string, nature: string | undefined, source: unknown): string {
+  const list = (Array.isArray(source) ? source : (source as any)?.value) as
+    | TNatureOption[]
+    | undefined;
+  const codeMatch = (value?: string) => list?.find((x) => x.value === value);
+
+  if (nature && String(nature).trim() && !codeMatch(nature)) return String(nature);
+
+  const hit = codeMatch(type) ?? codeMatch(nature);
+  return hit?.title ?? type ?? nature ?? "-";
+}
+
 export function spDay(value?: string | null): string {
   if (!value) return "";
   const d = new Date(value);