@7365admin1/layer-common 1.11.53 → 2.0.0

package/composables/useMember.ts

@@ -51,10 +51,11 @@ export default function useMember() {
     org = "",
     type = "",
     status = "active",
+    siteId = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
-      query: { page, limit, search, user, org, type, status },
+      query: { page, limit, search, user, org, type, status, siteId },
     });
   }
   function createUserByVerification(
@@ -109,35 +110,24 @@ export default function useMember() {
     siteId?: string;
     siteName?: string;
   }) {
-    return useNuxtApp().$api<TMember>('/api/members/direct', {
-      method: 'POST',
+    return useNuxtApp().$api<TMember>("/api/members/direct", {
+      method: "POST",
       body: payload,
-    })
+    });
   }
-  
-  function updateMemberSite(
-    id: string,
-    siteId: string,
-    siteName: string,
-  ) {
-    return useNuxtApp().$api(
-      `/api/members/site`,
-      {
-        method: "PUT",
-        body: {
-          id,
-          siteId,
-          siteName,
-        },
-      }
-    )
+
+  function updateMemberSite(id: string, siteId: string, siteName: string) {
+    return useNuxtApp().$api(`/api/members/site`, {
+      method: "PUT",
+      body: {
+        id,
+        siteId,
+        siteName,
+      },
+    });
   }
 
-  function getByUserTypeOrg(
-    user: string,
-    type: string,
-    org: string
-  ) {
+  function getByUserTypeOrg(user: string, type: string, org: string) {
     return useNuxtApp().$api<TMember>(
       `/api/members/user/${user}/app/${type}/org`,
       {
@@ -165,6 +155,6 @@ export default function useMember() {
     createMemberDirect,
     updateMemberSite,
     getAllByUserId,
-    getByUserTypeOrg
+    getByUserTypeOrg,
   };
 }

package/composables/useSecurityUtils.ts

@@ -3,9 +3,9 @@ export default function(){
     const formatLocation = ({block, level, unit}: {block: number, level: string, unit: string | TBuildingUnit}) => {
     const parts = [];
 
-    if (block) parts.push(`Block ${block}`);
-    if (level) parts.push(level);
-    if (unit) parts.push(unit);
+    if (block?.name) parts.push(`${block.name}`);
+    if (level?.name) parts.push(`${level.name}`);
+    if (unit?.name) parts.push(unit?.name);
 
     return parts.join(" / ");
     };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.53",
+  "version": "2.0.0",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/building.d.ts

@@ -3,7 +3,7 @@ declare type TBuilding = {
   site: string;
   name: string;
   block: number | null;
-  levels: string[];
+  levels: { _id: string; name: string }[];
   buildingFiles: { id: string, name: string }[] | string[];
 };
 
@@ -16,7 +16,7 @@ declare type TBuildingUnit = {
   building: string;
   buildingName?: string;
   block: number | null;
-  level: string | null;
+  level: { _id: string; name: string } | null;
   category: string;
   status: string;
   buildingUnitFiles: string[];
@@ -25,3 +25,15 @@ declare type TBuildingUnit = {
   leaseStart: string;
   leaseEnd: string;
 };
+
+
+declare type TBuildingPayload = Pick<TBuilding, "site" | "name" | "block" | "buildingFiles"> & {
+  levels: string[];
+};
+
+
+declare type TBuildingUpdatePayload = Pick<TBuilding, "name" | "buildingFiles"> & {
+  levels: string[];
+};
+
+declare type TBuildingUnitPayload = Pick<TBuildingUnit, "site" | "name" | "building" | "buildingName" | "block" | "category" | "status" | "buildingUnitFiles" | "companyName" | "companyRegistrationNumber" | "leaseStart" | "leaseEnd"> & { level?: string}

package/types/vehicle.d.ts

@@ -6,8 +6,14 @@ declare type TVehicle = {
   direction: "entry" | "exit" | "both" | "none";
   name: string;
   phoneNumber?: string;
-  block: number | "";
-  level: string;
+  block: { 
+    _id: string;
+    name: string;
+  }
+  level: {
+    _id: string;
+    name: string;
+  }
   unit: string;
   unitName?: string; // For display purposes, the API will return the unit name if available
   nric?: string | null;
@@ -33,8 +39,6 @@ declare type TVehiclePayload = Pick<
   | "direction"
   | "name"
   | "phoneNumber"
-  | "block"
-  | "level"
   | "unit"
   | "nric"
   | "remarks"
@@ -44,4 +48,4 @@ declare type TVehiclePayload = Pick<
   | "site"
   | "org"
   | "peopleId"
-> & { plateNumber?: string | string[] };
+> & { plateNumber?: string | string[], block?: string, level?: string };