@7365admin1/layer-common 3.2.8-staging.212 → 3.2.8-staging.214

package/components/CameraForm.vue

@@ -130,6 +130,7 @@
 
 <script setup lang="ts">
 import useSiteSettings from "../composables/useSiteSettings";
+import { cameraErrorConverter } from "../utils/data";
 
 const prop = defineProps({
   title: {
@@ -298,11 +299,7 @@ async function submit() {
 
     emit("success", `${prop.title} added successfully!`);
   } catch (error: any) {
-    console.log(
-      "error",
-      error.response?._data?.message || "Failed to add camera"
-    );
-    emit("error", error.response?._data?.message || "Failed to add camera");
+    emit("error", cameraErrorConverter(error, prop.type));
   } finally {
     disable.value = false;
   }

package/components/CameraMain.vue

@@ -248,6 +248,7 @@
 <script setup lang="ts">
 import type { PropType } from "vue";
 import useSiteSettings from "../composables/useSiteSettings";
+import { cameraErrorConverter } from "../utils/data";
 
 const events = defineEmits(["update:value", "row-click"]);
 
@@ -363,8 +364,7 @@ function openDialogDelete() {
 }
 
 function handleError(msg: string) {
-  const text = prop.type === "ip" ? "CCTV camera already exist" : msg;
-  showMessage(text, "error");
+  showMessage(msg, "error");
 }
 
 function handleSuccess() {
@@ -416,10 +416,7 @@ async function submitDelete() {
     await getCameraRefresh();
     dialogDelete.value = false;
   } catch (error: any) {
-    showMessage(
-      error?.response?._data?.message || "Failed to delete camera.",
-      "error"
-    );
+    showMessage(cameraErrorConverter(error, prop.type), "error");
   }
 }
 </script>

package/components/RolePermissionMain.vue

@@ -348,7 +348,8 @@ const { getRoleById: _getRoleById, deleteRole } = useRole();
 
 const { data: role, refresh: getRoleById } = useLazyAsyncData(
   "role-permissions-get-by-id",
-  () => _getRoleById(roleId.value)
+  () => _getRoleById(roleId.value),
+  { immediate: false }
 );
 
 watchEffect(() => {

package/composables/useMember.ts

@@ -28,10 +28,6 @@ export default function useMember() {
   function getAllByUserId(user: string) {
     return useNuxtApp().$api<TMember>(`/api/members/users/${user}`);
   }
-  function getByMemberId(user: string) {
-    return useNuxtApp().$api<TMember>(`/api//user/${user}`);
-  }
-
   function getByUserIdType(user: string, type: string) {
     return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`);
   }
@@ -165,7 +161,6 @@ export default function useMember() {
     createUserByVerification,
     createMemberInvite,
     getByUserIdType,
-    getByMemberId,
     updateMemberStatus,
     updateMemberRole,
     createMemberDirect,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.8-staging.212",
+  "version": "3.2.8-staging.214",
   "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/data.test.ts

@@ -93,3 +93,87 @@ test("a non-array levels value is counted as zero, not as its own length", () =>
   assert.equal(levelCount({ levels: 7 as unknown as [] }), 0);
   assert.equal(levelCount({ levels: "12" as unknown as [] }), 0);
 });
+
+import { cameraErrorConverter } from "./data.ts";
+
+/** Shape of an ofetch failure: the status and body live under `response`. */
+const apiError = (status: number, message?: string) => ({
+  response: { status, _data: message === undefined ? {} : { message } },
+});
+
+test("a duplicate reads as a duplicate", () => {
+  assert.match(
+    cameraErrorConverter(apiError(400, "ANPR already exist."), "ip"),
+    /already exists on this site/
+  );
+  assert.match(
+    cameraErrorConverter(apiError(409), "ip"),
+    /already exists on this site/
+  );
+});
+
+test("a failure that is NOT a duplicate never says duplicate", () => {
+  const notDuplicate = [
+    cameraErrorConverter(apiError(401), "ip"),
+    cameraErrorConverter(apiError(403), "ip"),
+    cameraErrorConverter(apiError(404), "ip"),
+    cameraErrorConverter(apiError(429), "ip"),
+    cameraErrorConverter(apiError(500, "Failed to create ANPR."), "ip"),
+    cameraErrorConverter(new Error("Network request failed"), "ip"),
+  ];
+
+  for (const message of notDuplicate) {
+    assert.doesNotMatch(message, /already exist/i, message);
+  }
+});
+
+test("each cause gets its own message", () => {
+  assert.match(cameraErrorConverter(apiError(401), "ip"), /session has expired/);
+  assert.match(
+    cameraErrorConverter(apiError(403), "ip"),
+    /do not have permission/
+  );
+  assert.match(cameraErrorConverter(apiError(404), "ip"), /no longer exists/);
+  assert.match(cameraErrorConverter(apiError(429), "ip"), /Too many attempts/);
+  assert.match(
+    cameraErrorConverter(apiError(500, "Failed to create ANPR."), "ip"),
+    /could not save this CCTV camera/
+  );
+});
+
+test("no response at all reads as a connection problem, not a server refusal", () => {
+  assert.match(
+    cameraErrorConverter(new Error("Failed to fetch"), "ip"),
+    /Could not reach the server/
+  );
+});
+
+test("a rejected field is named the way the form names it", () => {
+  assert.equal(
+    cameraErrorConverter(apiError(400, '"host" is required'), "ip"),
+    "URL is required."
+  );
+  assert.equal(
+    cameraErrorConverter(apiError(400, '"name" is not allowed to be empty'), "ip"),
+    "Camera Name cannot be empty."
+  );
+  // A field with no friendly label still reads as a sentence.
+  assert.equal(
+    cameraErrorConverter(apiError(400, '"guardPost" must be a number'), "ip"),
+    "guardPost must be a number."
+  );
+});
+
+test("a plain 400 sentence from the API is passed through unchanged", () => {
+  assert.equal(
+    cameraErrorConverter(apiError(400, "Invalid _id format"), "ip"),
+    "Invalid _id format"
+  );
+});
+
+test("the camera type decides the wording", () => {
+  assert.match(cameraErrorConverter(apiError(404), "anpr"), /ANPR camera/);
+  assert.match(cameraErrorConverter(apiError(404), "ip"), /CCTV camera/);
+  // Unknown/absent type falls back to CCTV, which is what the panel defaults to.
+  assert.match(cameraErrorConverter(apiError(404)), /CCTV camera/);
+});

package/utils/data.ts

@@ -30,6 +30,98 @@ export const errorConverter = (data: any): string => {
   return error;
 };
 
+/**
+ * Field names the camera API validates, in the wording the camera form uses,
+ * so a rejection reads as the label the person is looking at.
+ */
+const CAMERA_FIELD_LABELS: Record<string, string> = {
+  host: "URL",
+  name: "Camera Name",
+  username: "User",
+  password: "Password",
+  direction: "Type",
+  category: "Category",
+  site: "Site",
+};
+
+/** Joi phrasing -> everyday phrasing. Anything unmapped is passed through. */
+const CAMERA_VALIDATION_PHRASES: Array<[RegExp, string]> = [
+  [/^is required$/, "is required."],
+  [/^is not allowed to be empty$/, "cannot be empty."],
+  [/^must be a string$/, "is not valid."],
+];
+
+/**
+ * Turns a save/delete failure on a site camera into a sentence the person
+ * setting up the camera can act on.
+ *
+ * The camera panel used to report every `type: "ip"` failure as "CCTV camera
+ * already exist", whatever actually went wrong - a signed-out session, a
+ * missing permission, a rejected field and a server outage all read as a
+ * duplicate. This maps the cases the API really returns instead.
+ */
+export const cameraErrorConverter = (error: any, type?: string): string => {
+  const camera = type === "anpr" ? "ANPR camera" : "CCTV camera";
+
+  const status =
+    error?.response?.status ?? error?.statusCode ?? error?.status ?? null;
+
+  const serverMessage = String(
+    error?.response?._data?.message ?? error?.data?.message ?? ""
+  ).trim();
+
+  // No response at all: the request never reached the API.
+  if (!status) {
+    return `Could not reach the server, so this ${camera} was not saved. Check your internet connection and try again.`;
+  }
+
+  if (status === 401) {
+    return `Your session has expired. Sign in again, then save this ${camera}.`;
+  }
+
+  if (status === 403) {
+    return `You do not have permission to change cameras on this site. Ask your iService365 administrator for access.`;
+  }
+
+  if (status === 404) {
+    return `This ${camera} no longer exists. Refresh the list and try again.`;
+  }
+
+  if (status === 429) {
+    return "Too many attempts in a short time. Wait a moment and try again.";
+  }
+
+  // The API reports a clash from the unique index as "ANPR already exist.",
+  // which is the same message for a CCTV record.
+  if (status === 409 || /already exist|duplicate/i.test(serverMessage)) {
+    return `A ${camera} with this URL already exists on this site. Check the list before adding it again.`;
+  }
+
+  if (status >= 500) {
+    return `The server could not save this ${camera}. Try again, and contact support if it keeps happening.`;
+  }
+
+  if (status === 400 && serverMessage) {
+    // Joi rejections arrive as `"host" is required`.
+    const field = serverMessage.match(/^"(\w+)"\s+(.+?)\.?$/);
+
+    if (field) {
+      const label = CAMERA_FIELD_LABELS[field[1]] ?? field[1];
+      const phrase =
+        CAMERA_VALIDATION_PHRASES.find(([pattern]) =>
+          pattern.test(field[2])
+        )?.[1] ?? `${field[2]}.`;
+
+      return `${label} ${phrase}`;
+    }
+
+    return serverMessage;
+  }
+
+  return errorConverter(error);
+};
+
+
 /**
  * A service-provider account can only be shown ITS OWN work orders, feedbacks
  * and key logs, so every one of those screens scopes its request by the