@7365admin1/layer-common 1.11.21 → 1.11.22

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.22
+
+### Patch Changes
+
+- 00a8179: Update Layer-common changes
+
 ## 1.11.21
 
 ### Patch Changes

package/components/AddPassKeyToVisitor.vue

@@ -123,7 +123,7 @@ const emit = defineEmits<{
 }>()
 
 const { getPassKeysByPageSearch } = usePassKey()
-const { updateVisitor } = useVisitor()
+const { updateVisitorPassKey } = useVisitor()
 
 const processing = ref(false)
 const errorMessage = ref('')
@@ -232,28 +232,28 @@ async function handleSubmit() {
     processing.value = true
 
     try {
-        const payload: Partial<TVisitorPayload> = {}
+        const payload: any = {}
 
         // Build final pass list: kept existing + newly selected
-        const finalPasses: { keyId: string; status: string }[] = []
+        const finalPasses: { keyId: string }[] = []
         if (existingPass.value) {
-            finalPasses.push({ keyId: existingPass.value.keyId, status: 'In Use' })
+            finalPasses.push({ keyId: existingPass.value.keyId })
         }
         if (selectedPass.value) {
-            finalPasses.push({ keyId: selectedPass.value, status: 'In Use' })
+            finalPasses.push({ keyId: selectedPass.value})
         }
         payload.visitorPass = finalPasses
 
         // Build final keys list: kept existing + newly selected
         if (showKeys.value) {
-            const finalKeys: { keyId: string; status: string }[] = [
-                ...existingKeys.value.map(k => ({ keyId: k.keyId, status: 'In Use' })),
-                ...selectedKeys.value.map(keyId => ({ keyId, status: 'In Use' })),
+            const finalKeys: { keyId: string}[] = [
+                ...existingKeys.value.map(k => ({ keyId: k.keyId })),
+                ...selectedKeys.value.map(keyId => ({ keyId })),
             ]
             payload.passKeys = finalKeys
         }
 
-        await updateVisitor(prop.visitor._id, payload)
+        await updateVisitorPassKey(prop.visitor._id, payload)
         emit('done')
         emit('close')
     } catch (error: any) {

package/components/AreaMain.vue

@@ -357,7 +357,6 @@
 import QrcodeVue from "qrcode.vue";
 import useAreas from "../composables/useAreas";
 import useUnits from "../composables/useUnits";
-import { useAreaPermission } from "../composables/useAreaPermission";
 import useSiteSettings from "../composables/useSiteSettings";
 import useUtils from "../composables/useUtils";
 
@@ -367,6 +366,11 @@ const props = defineProps({
   type: { type: String, default: "" },
   serviceType: { type: String, default: "" },
   scheduleRoute: { type: String, default: "cleaning-schedule" },
+  canViewAreas: { type: Boolean, default: true },
+  canCreateArea: { type: Boolean, default: false },
+  canUpdateArea: { type: Boolean, default: false },
+  canDeleteArea: { type: Boolean, default: false },
+  canImportArea: { type: Boolean, default: false },
 });
 
 const isCleanerArea = computed(() => {
@@ -553,13 +557,11 @@ function showMessage(msg: string, color: string = "error") {
   messageSnackbar.value = true;
 }
 
-const {
-  canCreateArea,
-  canUpdateArea,
-  canDeleteArea,
-  canImportArea,
-  canViewAreas,
-} = useAreaPermission();
+const canCreateArea = computed(() => props.canCreateArea);
+const canUpdateArea = computed(() => props.canUpdateArea);
+const canDeleteArea = computed(() => props.canDeleteArea);
+const canImportArea = computed(() => props.canImportArea);
+const canViewAreas = computed(() => props.canViewAreas);
 
 async function handleDownloadExcel() {
   try {

package/components/UnitMain.vue

@@ -209,7 +209,6 @@
 </template>
 
 <script setup lang="ts">
-import { useUnitPermission } from "../composables/useUnitPermission";
 import useUnits from "../composables/useUnits";
 import useUtils from "../composables/useUtils";
 
@@ -217,6 +216,11 @@ const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
   serviceType: { type: String, default: "", required: true },
+  canViewUnits: { type: Boolean, default: true },
+  canCreateUnit: { type: Boolean, default: false },
+  canUpdateUnit: { type: Boolean, default: false },
+  canDeleteUnit: { type: Boolean, default: false },
+  canImportUnit: { type: Boolean, default: false },
 });
 
 const items = ref<Array<Record<string, any>>>([]);
@@ -299,13 +303,11 @@ function showMessage(msg: string, color: string = "error") {
   messageSnackbar.value = true;
 }
 
-const {
-  canCreateUnit,
-  canUpdateUnit,
-  canDeleteUnit,
-  canViewUnits,
-  canImportUnit,
-} = useUnitPermission();
+const canViewUnits = computed(() => props.canViewUnits);
+const canCreateUnit = computed(() => props.canCreateUnit);
+const canUpdateUnit = computed(() => props.canUpdateUnit);
+const canDeleteUnit = computed(() => props.canDeleteUnit);
+const canImportUnit = computed(() => props.canImportUnit);
 
 async function handleDownloadExcel() {
   try {

package/components/VisitorForm.vue

@@ -1012,7 +1012,7 @@ const membersFieldIncomplete = computed(() => {
 });
 
 onMounted(() => {
-  contractorStep.value = 2;
+  contractorStep.value = 1;
   currentAutofillSource.value = null;
 
   if (prop.mode === 'register' && prop.visitorData) {

package/components/VisitorManagement.vue

@@ -169,32 +169,11 @@
           </span>
 
           <span
-            v-if="
-              !item.checkOut &&
-              (item?.status === 'registered' ||
-                item?.status === 'unregistered') &&
-              canCheckoutVisitor
-            "
-          >
-            <span
-              class="d-flex align-center ga-2"
-              v-bind="menuProps"
-              style="cursor: pointer"
-            >
-              <v-icon
-                icon="mdi-clock-time-eight-outline"
-                color="red"
-                size="20"
-              />
-              <v-btn
-                size="x-small"
-                class="text-capitalize"
-                color="red"
-                text="Checkout"
-                :loading="
-                  loading.checkingOut && item?._id === selectedVisitorId
-                "
-              />
+            v-if="!item.checkOut && (item?.status === 'registered' || item?.status === 'unregistered') && canCheckoutVisitor">
+            <span class="d-flex align-center ga-2" v-bind="menuProps" style="cursor:pointer">
+              <v-icon icon="mdi-clock-time-eight-outline" color="red" size="20" />
+              <v-btn size="x-small" class="text-capitalize" color="red" text="Checkout"
+                :loading="loading.checkingOut && item?._id === selectedVisitorId" @click.stop="handleCheckout(item._id)" />
             </span>
           </span>
           <span v-else class="d-flex align-center ga-2">
@@ -270,26 +249,12 @@
               </div>
             </template>
             <v-list density="compact">
-              <v-list-item
-                prepend-icon="mdi-logout"
-                title="Checkout"
-                @click.stop="handleCheckout(item._id)"
-              />
-              <v-list-item
-                v-if="
-                  (item.visitorPass?.length ?? 0) > 0 ||
-                  (item.passKeys?.length ?? 0) > 0
-                "
-                prepend-icon="mdi-card-bulleted-outline"
-                :title="item.checkOut ? 'View Pass/Key' : 'Edit Pass/Key'"
-                @click.stop="handleOpenEditPassKey(item)"
-              />
-              <v-list-item
-                v-if="showAddPassKeyButton(item)"
-                prepend-icon="mdi-plus"
-                title="Add Pass/Key"
-                @click.stop="handleOpenAddPassKey(item)"
-              />
+              <v-list-item v-if="!item?.checkOut" prepend-icon="mdi-logout" title="Checkout" @click.stop="handleCheckout(item._id)" />
+              <v-list-item v-if="(item.visitorPass?.length ?? 0) > 0 || (item.passKeys?.length ?? 0) > 0"
+                prepend-icon="mdi-card-bulleted-outline" :title="item.checkOut ?  'View Pass/Key' :'Edit Pass/Key'"
+                @click.stop="handleOpenEditPassKey(item)" />
+              <v-list-item v-if="showAddPassKeyButton(item)" prepend-icon="mdi-plus" title="Add Pass/Key"
+                @click.stop="handleOpenAddPassKey(item)" />
             </v-list>
           </v-menu>
         </v-row>

package/composables/useVisitor.ts

@@ -111,6 +111,17 @@ export default function () {
     );
   }
 
+  async function updateVisitorPassKey(_id: string, payload: TPassKeyPayload[]){
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/visitor-transactions/replace-keys/id/${_id}`,
+      {
+        method: "PUT",
+        body: payload,
+      }
+    );
+  }
+  
+
   return {
     typeFieldMap,
     visitorSelection,
@@ -119,5 +130,6 @@ export default function () {
     getVisitors,
     updateVisitor,
     deleteVisitor,
+    updateVisitorPassKey
   };
 }

package/package.json

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