@7365admin1/layer-common 1.11.40 → 1.11.42

package/components/InvitationClientForm.vue

@@ -21,6 +21,9 @@
               :rules="[requiredRule, emailRule]"
               :loading="loading.verifyingEmail"
             />
+            <div v-if="existingUserMessage" class="text-subtitle-2 text-error mt-n3 mb-2">
+              {{ existingUserMessage }}
+            </div>
           </v-col>
 
           <!-- APP MULTI SELECT -->
@@ -37,7 +40,35 @@
               density="comfortable"
               :rules="[requiredRule]"
               @update:model-value="handleUpdateApp"
-            />
+            >
+              <template #item="{ props: itemProps, item }">
+                <v-list-item
+                  v-bind="itemProps"
+                  :disabled="item.raw.disabled"
+                >
+                  <template #prepend>
+                    <v-checkbox-btn
+                      :model-value="invite.app.includes(item.raw.value)"
+                      :disabled="item.raw.disabled"
+                      color="black"
+                      density="comfortable"
+                    />
+                  </template>
+
+                  <template #title>
+                    <span :class="item.raw.disabled ? 'text-disabled' : ''">
+                      {{ item.raw.title }}
+                    </span>
+                  </template>
+
+                  <template #subtitle>
+                    <span v-if="item.raw.disabled" class="text-error text-caption">
+                      Already a member
+                    </span>
+                  </template>
+                </v-list-item>
+              </template>
+            </v-autocomplete>
           </v-col>
 
           <!-- ROLE -->
@@ -65,21 +96,11 @@
             />
           </v-col>
 
-          <!-- CREATE MORE -->
-          <v-col cols="12" class="mt-2">
-            <v-checkbox v-model="createMore" density="comfortable" hide-details>
-              <template #label>
-                <span class="text-subtitle-2 font-weight-bold">
-                  Create more
-                </span>
-              </template>
-            </v-checkbox>
-          </v-col>
 
           <!-- ERROR -->
           <v-col cols="12" class="my-2 text-center">
             <span class="text-subtitle-2 text-error">
-              {{ message }}
+              {{ submitError }}
             </span>
           </v-col>
 
@@ -116,14 +137,14 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, reactive, watchEffect } from 'vue'
+import { computed, ref, reactive, watchEffect, watch } from 'vue'
 import useCustomerSite from '../composables/useCustomerSite'
 import useLocal from '../composables/useLocal'
 import useRole from '../composables/useRole'
 import useUser from '../composables/useUser'
 import useUtils from '../composables/useUtils'
 import useOrg from '../composables/useOrg'
-import { watch } from 'vue'
+import useMember from '../composables/useMember'
 
 const APP = useRuntimeConfig().public.APP
 
@@ -156,7 +177,6 @@ const invite = ref({
   isMemberInvite: false,
 })
 
-/* default app */
 if (props.mode === "create") {
   invite.value.app = props.app ? [props.app] : []
 }
@@ -168,11 +188,14 @@ const APP_LIST = [
   { title: "Cleaning Services", value: "cleaning_services" },
   { title: "Mechanical & Electrical Services", value: "mechanical_electrical_services" },
   { title: "Pest Control Services", value: "pest_control_services" },
+  { title: "Landscaping Services", value: "landscaping_services" },
   { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
 ]
+
 const { getByName } = useOrg()
 const org = ref<any>(null)
-  watch(
+
+watch(
   () => props.org,
   async (name) => {
     if (!name) return
@@ -181,7 +204,14 @@ const org = ref<any>(null)
   { immediate: true }
 )
 
-const apps = computed(() => APP_LIST)
+const apps = computed(() => {
+  return APP_LIST.map(app => {
+    const disabled = userAccess.value.some(
+      (a: any) => a.type === app.value
+    )
+    return { ...app, disabled }
+  })
+})
 
 /* ================= SITE ================= */
 const { natureOfBusiness } = useLocal()
@@ -221,18 +251,14 @@ const { getRoles } = useRole()
 
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () =>
-  getRoles({
-    org: org.value?._id,
-    type: props.app,
-    limit: 50,
-  }),
+  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
   { watch: [() => props.app] }
 )
 
 watchEffect(() => {
   if (roleData.value) roles.value = roleData.value.items
 })
+
 watch(
   () => org.value?._id,
   async (id) => {
@@ -240,6 +266,7 @@ watch(
     await refreshRoles()
   }
 )
+
 /* ================= EVENTS ================= */
 async function handleUpdateApp(value: string[]) {
   invite.value.role = ""
@@ -252,59 +279,86 @@ function handleUpdateSite(id: string) {
   invite.value.siteName = obj?.title || ""
 }
 
-/* ================= SUBMIT ================= */
-const { inviteUserClient } = useUser()
+/* ================= EMAIL CHECK ================= */
+const { inviteUserClient, getUserByEmail } = useUser()
+const { getAllByUserId } = useMember()
 const { requiredRule, emailRule } = useUtils()
 
-const message = ref("")
-const createMore = ref(false)
+const existingUserMessage = ref("")
+const submitError = ref("")
 const disable = ref(false)
+const existingUser = ref<any>(null)
+const userAccess = ref<any[]>([])
 
-async function submit() {
-  loading.submittingForm = true
+let timeout: any = null
+
+watch(
+  () => invite.value.email,
+  (email) => {
+    clearTimeout(timeout)
+    existingUserMessage.value = ""
+    existingUser.value = null
+    userAccess.value = []
+
+    if (!email || email.length < 3) return
+
+    timeout = setTimeout(async () => {
+      await checkEmail(email)
+    }, 400)
+  }
+)
+
+async function checkEmail(email: string) {
+  loading.verifyingEmail = true
+  existingUserMessage.value = ""
 
   try {
-    const apps = invite.value.app || []
-
-    await Promise.all(
-      apps.map(app =>
-        inviteUserClient({
-          email: invite.value.email,
-          app,
-          role: invite.value.role,
-          // org: invite.value.org,
-          org: org.value?._id,
-          site: invite.value.site,
-          siteName: invite.value.siteName,
-          // isMemberInvite: invite.value.isMemberInvite,
-        })
-      )
-    )
+    const user = await getUserByEmail(email)
+
+    if (user?._id) {
+      existingUser.value = user
+      existingUserMessage.value = `User already exists: ${email}`
+
+     const memberRes = await getAllByUserId(user._id)
 
-    if (createMore.value) {
-      form.value?.reset()
-      invite.value = {
-        email: "",
-        app: [],
-        role: "",
-        org: org.value?._id || "",
-        site: "",
-        siteName: "",
-        isMemberInvite: false,
-      }
-      emit("success", false)
+userAccess.value = memberRes?.items || []
     } else {
-      emit("success", true)
+      existingUser.value = null
+      userAccess.value = []
     }
+  } catch (e) {
+    existingUser.value = null
+    userAccess.value = []
+  } finally {
+    loading.verifyingEmail = false
+  }
+}
+
+/* ================= SUBMIT ================= */
+async function submit() {
+  loading.submittingForm = true
+  submitError.value = ""
+
+  try {
+    await inviteUserClient({
+      email: invite.value.email,
+      app: invite.value.app,
+      role: invite.value.role,
+      org: org.value?._id,
+      site: invite.value.site,
+      siteName: invite.value.siteName,
+    })
+
+    emit("success", true)
 
   } catch (e: any) {
-    message.value = e?.response?._data?.message || "Error"
+    submitError.value = e?.response?._data?.message || "Error"
   } finally {
     loading.submittingForm = false
   }
 }
-
 function cancel() {
   emit("cancel")
 }
 </script>
+

package/components/InvitationForm.vue

@@ -190,6 +190,10 @@ const props = defineProps({
   hideApp: {
     type: Boolean,
     default: false
+  },
+  inviteMember: {
+  type: Boolean,
+  default: false
   }
 });
 
@@ -377,20 +381,27 @@ function handleUpdateSite(siteId: string) {
   invite.value.siteName = obj?.title || "";
 }
 
-const { inviteUser } = useUser();
+const { inviteUser, inviteMemberClient } = useUser();
 
 async function submit() {
   loading.submittingForm = true;
+
   try {
-    await inviteUser(invite.value);
+    if (props.inviteMember) {
+      await inviteMemberClient(invite.value);
+    } else {
+      await inviteUser(invite.value);
+    }
 
     if (createMore.value) {
       form.value?.reset();
       resetInvite();
       emit("success", false);
-    } else emit("success", true);
+    } else {
+      emit("success", true);
+    }
   } catch (error: any) {
-    message.value = error.response._data.message;
+    message.value = error.response?._data?.message || error.message;
   } finally {
     loading.submittingForm = false;
   }

package/components/Layout/NavigationDrawer.vue

@@ -1,11 +1,6 @@
 <!-- LayoutNavigationDrawer.vue -->
 <template>
-  <v-navigation-drawer
-    v-model="drawer"
-    permanent
-    floating
-    class="bg-primary"
-  >
+  <v-navigation-drawer v-model="drawer" permanent floating class="bg-primary">
     <v-list>
       <v-list-item>
         <v-list-item-title class="text-h6 text-white">
@@ -28,9 +23,10 @@
               :title="item.title"
               :icon="item.icon"
               :route="item.route"
+              :children="item.children"
               :link="item.link"
               :class="{
-                'opacity-50 pointer-events-none': item.disabled
+                'opacity-50 pointer-events-none': item.disabled,
               }"
               @click="() => handleClick(item)"
             />
@@ -49,16 +45,16 @@
 <script setup lang="ts">
 const props = defineProps({
   navigationItems: { type: Array, required: true },
-  title: { type: String, default: "" }
-})
+  title: { type: String, default: "" },
+});
 
-const emit = defineEmits(['navigate'])
+const emit = defineEmits(["navigate"]);
 
-const { drawer } = useLocal()
-const { APP_NAME } = useRuntimeConfig().public
+const { drawer } = useLocal();
+const { APP_NAME } = useRuntimeConfig().public;
 
 const handleClick = (item: any) => {
-  if (item.disabled) return
-  emit('navigate', item)
-}
+  if (item.disabled) return;
+  emit("navigate", item);
+};
 </script>

package/components/MemberMain.vue

@@ -49,9 +49,9 @@
               class="w-100"
             >
               <v-tab
-                v-for="tab in tabOptions"
+                v-for="(tab, i) in tabOptions"
                 :value="tab.status"
-                :key="tab.status"
+                :key="i"
                 class="text-capitalize"
               >
                 {{ tab.name }}
@@ -356,7 +356,7 @@ function toRoute(status: any) {
   page.value = 1;
   navigateTo({
     name: routeName,
-    params: setRouteParams(normalizedRouteParams.value, { status: obj.status }),
+    params: setRouteParams(normalizedRouteParams.value, { status }),
   });
 }
 
@@ -366,25 +366,26 @@ watch(
     if (status && status !== selectedStatus.value) {
       selectedStatus.value = status;
     }
-  }
+  },
+  { immediate: true }
 );
 
 const {
   data: getAllReq,
   refresh: getAll,
   status: getAllReqStatus,
-} = useLazyAsyncData(
-  "get-all-members",
+} = useAsyncData(
+  () => `get-all-members-${props.status}-${props.orgId}`,
   () =>
     _getAll({
-      status: currentStatus.value,
+      status: props.status,
       org: props.orgId,
       search: headerSearch.value,
       page: page.value,
       type: props.type,
     }),
   {
-    watch: [page, currentStatus],
+    watch: [() => props.status, headerSearch],
   }
 );
 
@@ -398,10 +399,6 @@ watchEffect(() => {
   }
 });
 
-watch(headerSearch, () => {
-  getAll();
-});
-
 const confirmDialog = ref(false);
 const selectedMemberId = ref<string | null>(null);
 const updateLoading = ref(false);

package/components/TableMain.vue

@@ -5,7 +5,7 @@
       <v-row no-gutters>
         <slot name="actions">
           <v-col cols="12">
-            <v-row no-gutters>
+            <v-row no-gutters class="ga-2">
               <v-btn
                 v-if="canCreate"
                 class="text-none"

package/components/VehicleForm.vue

@@ -53,14 +53,15 @@
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
             <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]"
-              :disabled="disablePrefilledInputs && type !== 'blocklist'" />
+              :disabled="disablePrefilledInputs && type !== 'blocklist' && prop.mode !== 'edit'" />
           </v-col>
 
           <v-col v-if="shouldShowField('name')" cols="12">
             <v-row>
               <v-col cols="12">
                 <InputLabel class="text-capitalize" title="Full Name" required />
-                <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]" />
+                <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]"
+                  :disabled="disablePrefilledInputs && type !== 'blocklist' && prop.mode !== 'edit'" />
               </v-col>
             </v-row>
           </v-col>
@@ -777,6 +778,7 @@ onMounted(() => {
       vehicle.start = prop.vehicleData.start || '';
       vehicle.plateNumber = prop.vehicleData.plateNumber
       vehicle.peopleId = prop.vehicleData.peopleId || '';
+      vehicle.block = prop.vehicleData.block === 0 ? null  : prop.vehicleData.block || null;
 
       if(prop.type === "seasonpass"){
         showSubscriptionDateOptions.value = true;