@7365admin1/layer-common 1.11.44 → 1.11.46

package/components/TableV3.vue

@@ -0,0 +1,179 @@
+<template>
+  <v-card
+    width="100%"
+    variant="outlined"
+    border="thin"
+    rounded="lg"
+    :loading="loading"
+    class="table-v3"
+  >
+    <v-toolbar density="compact" color="grey-lighten-5">
+      <template #prepend>
+        <v-btn
+          icon
+          variant="text"
+          density="comfortable"
+          class="table-v3__refresh-btn"
+          @click="emit('refresh')"
+        >
+          <v-icon size="28" color="black">mdi-history</v-icon>
+        </v-btn>
+      </template>
+
+      <template #append>
+        <v-row no-gutters justify="end" align="center">
+          <span class="mr-2 text-caption text-fontgray">
+            {{ pageRange }}
+          </span>
+          <v-btn
+            icon="mdi-chevron-left"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoPrev"
+            @click="goPrev"
+          />
+          <v-btn
+            icon="mdi-chevron-right"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoNext"
+            @click="goNext"
+          />
+        </v-row>
+      </template>
+    </v-toolbar>
+
+    <v-data-table
+      :headers="headers"
+      :items="items"
+      :item-value="itemValue"
+      :items-per-page="itemsPerPage"
+      fixed-header
+      hide-default-footer
+      :style="`max-height: calc(100vh - (${offset}px))`"
+      @click:row="(_: any, data: any) => emit('row-click', data.item)"
+    >
+      <template v-for="(_, slotName) in $slots" #[slotName]="slotProps">
+        <slot :name="slotName" v-bind="slotProps" />
+      </template>
+    </v-data-table>
+
+    <v-toolbar density="compact" color="grey-lighten-5" class="table-v3__footer">
+      <template #append>
+        <v-row no-gutters justify="end" align="center">
+          <span class="mr-2 text-caption text-fontgray">
+            {{ pageRange }}
+          </span>
+          <v-btn
+            icon="mdi-chevron-left"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoPrev"
+            @click="goPrev"
+          />
+          <v-btn
+            icon="mdi-chevron-right"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoNext"
+            @click="goNext"
+          />
+        </v-row>
+      </template>
+    </v-toolbar>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  headers: {
+    type: Array as PropType<Array<Record<string, any>>>,
+    required: true,
+  },
+  items: {
+    type: Array as PropType<Array<Record<string, any>>>,
+    default: () => [],
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  itemValue: {
+    type: String,
+    default: "_id",
+  },
+  itemsPerPage: {
+    type: Number,
+    default: 20,
+  },
+  page: {
+    type: Number,
+    default: 1,
+  },
+  pages: {
+    type: Number,
+    default: 0,
+  },
+  pageRange: {
+    type: String,
+    default: "-- - -- of --",
+  },
+  offset: {
+    type: Number,
+    default: 220,
+  },
+});
+
+const emit = defineEmits(["refresh", "update:page", "row-click"]);
+
+const internalPage = ref(props.page);
+const canGoPrev = computed(() => internalPage.value > 1);
+const canGoNext = computed(
+  () => props.pages > 0 && internalPage.value < props.pages
+);
+
+function goPrev() {
+  if (!canGoPrev.value) {
+    return;
+  }
+  internalPage.value -= 1;
+  emit("update:page", internalPage.value);
+}
+
+function goNext() {
+  if (!canGoNext.value) {
+    return;
+  }
+  internalPage.value += 1;
+  emit("update:page", internalPage.value);
+}
+
+watch(
+  () => props.page,
+  (val) => {
+    internalPage.value = val;
+  }
+);
+</script>
+
+<style scoped>
+.table-v3 :deep(thead th) {
+  background-color: #f5f5f5;
+  color: #6b7280;
+  font-weight: 600 !important;
+  font-size: 12px;
+}
+
+.table-v3 :deep(tbody td) {
+  height: 54px;
+}
+
+.table-v3__footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+.table-v3__refresh-btn {
+  width: 38px;
+  height: 38px;
+}
+</style>

package/composables/useAccessManagement.ts

@@ -299,7 +299,15 @@ export default function useAccessManagement() {
     );
   }
 
+  function getResidents(params: { orgId: string; siteId: string; unitId: string }) {
+    return useNuxtApp().$api<{ data: Record<string, any>[] }>(
+      `/api/access-management/residents`,
+      { method: "GET", query: params }
+    );
+  }
+
   return {
+    getResidents,
     getDoorAccessLevels,
     getLiftAccessLevels,
     getAccessGroups,

package/composables/useOrg.ts

@@ -171,7 +171,14 @@ export default function useOrg() {
         ) as TOrg;
       });
   }
-
+  function getOrgsByEmail(email = "") {
+    return useNuxtApp().$api<TOrg[]>(
+      `/api/organizations/orgs/${email}`,
+      {
+        method: "GET",
+      }
+    );
+  }
 
   return {
     org,
@@ -189,5 +196,6 @@ export default function useOrg() {
     add,
     addOnboardingOrg,
     updateOrg,
+    getOrgsByEmail
   };
 }

package/composables/useOrganizationSwitcher.ts

@@ -0,0 +1,11 @@
+export default function useOrganizationSwitcher() {
+  const selectedOrg = useState<any | null>('selected-org', () => null)
+  const selectedApp = useState<string>('selected-app', () => '')
+
+  function setOrganization({ org, app }: { org: any; app: string }) {
+    selectedOrg.value = org
+    selectedApp.value = app || org?.nature || ''
+  }
+
+  return { selectedOrg, selectedApp, setOrganization }
+}

package/composables/usePeople.ts

@@ -14,7 +14,18 @@ export default function () {
   } = {}) {
     return await useNuxtApp().$api<Record<string, any>>("/api/people", {
       method: "GET",
-      query: { page, limit, sort, search, org, site, dateTo, dateFrom, type, status },
+      query: {
+        page,
+        limit,
+        sort,
+        search,
+        org,
+        site,
+        dateTo,
+        dateFrom,
+        type,
+        status,
+      },
     });
   }
 
@@ -26,12 +37,10 @@ export default function () {
     });
   }
 
-    async function findPersonByNRICMultipleResult(
-    nric: string, site: string
-  ){
+  async function findPersonByNRICMultipleResult(nric: string, site: string) {
     return await $fetch<Record<any, any>>(`/api/people/all-nric`, {
       method: "GET",
-      query: { nric, site }
+      query: { nric, site },
     });
   }
 
@@ -98,6 +107,15 @@ export default function () {
       }
     );
   }
+  async function reviewResidentPerson(
+    _id: string,
+    payload: Partial<TPeoplePayload>
+  ) {
+    return await useNuxtApp().$api<Record<string, any>>(`/api/people/${_id}`, {
+      method: "PATCH",
+      body: payload,
+    });
+  }
 
   return {
     create,
@@ -110,5 +128,6 @@ export default function () {
     getPeopleByUnit,
     searchCompanyList,
     findUsersByPlateNumber,
+    reviewResidentPerson,
   };
 }

package/composables/useUser.ts

@@ -14,36 +14,36 @@ export default function useUser() {
     });
   }
 
-function inviteUserClient({
-  email = '',
-  app = [],
-  role = '',
-  name = '',
-  org = '',
-  site = '',
-  siteName = ''
-}: {
-  email?: string
-  app?: string[]
-  role?: string
-  name?: string
-  org?: string
-  site?: string
-  siteName?: string
-} = {}) {
-  return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
-    method: 'POST',
-    body: {
-      email,
-      app,
-      role,
-      name,
-      org,
-      ...(site && { siteId: site }),
-      ...(siteName && { siteName })
-    }
-  })
-}
+  function inviteUserClient({
+    email = '',
+    app = [],
+    role = '',
+    name = '',
+    org = '',
+    site = '',
+    siteName = ''
+  }: {
+    email?: string
+    app?: string[]
+    role?: string
+    name?: string
+    org?: string
+    site?: string
+    siteName?: string
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
+      method: 'POST',
+      body: {
+        email,
+        app,
+        role,
+        name,
+        org,
+        ...(site && { siteId: site }),
+        ...(siteName && { siteName })
+      }
+    })
+  }
 
   function inviteMemberClient({
     email = "",
@@ -168,6 +168,11 @@ function inviteUserClient({
       method: "GET"
     });
   }
+  function getUserByEmailV2(email = "") {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/user/${email}`, {
+      method: "GET"
+    });
+  }
 
   return {
     inviteUser,
@@ -183,6 +188,7 @@ function inviteUserClient({
     getById,
     createUserByVerification,
     getUserByEmail,
+    getUserByEmailV2,
     inviteUserClient,
     inviteMemberClient
   };

package/package.json

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

package/types/people.d.ts

@@ -25,6 +25,6 @@ declare type TPeople = {
 declare type TPlateNumber = { plateNumber: string, recNo: string, _id?: string, status: "active" | "deleted" | "pending", type: TVehicleType };
 
 
-declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> 
+declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> & { status?: string }
 
 declare type TPeopleType = "guest" | "resident" | "tenant"