@7365admin1/layer-common 3.0.18 → 3.0.20

package/components/MemberInformation.vue

@@ -1,164 +1,234 @@
 <template>
-    <v-row no-gutters class="w-100">
-        <v-card class="w-100">
-            <v-card-text>
-                <v-btn block color="primary-button" :height="40" text="Scan QR Code" class="text-capitalize"
-                    prepend-icon="mdi-qrcode" @click="handleScanQRPass" />
-                <v-form ref="formRef" v-model="validForm" :disabled="processing" @click="errorScanPassMessage = ''">
-                    <v-row no-gutters class="pt-5 ga-2">
-                        <v-col cols="12">
-                            <InputLabel class="text-capitalize" title="Full Name" required />
-                            <v-text-field v-model.trim="memberForm.name" density="compact" hide-details
-                                :rules="[requiredRule]" />
-                        </v-col>
-
-                        <v-col cols="12">
-                            <InputLabel class="text-capitalize" title="NRIC" required />
-                            <InputNRICNumber v-model.trim="memberForm.nric" density="compact" hide-details
-                                :rules="[requiredRule]" />
-                        </v-col>
-
-                        <v-col cols="12">
-                            <v-autocomplete v-model="selectedPass" v-model:search="passInput" :hide-no-data="false"
-                                class="mt-3" :items="passItemsFilteredFinal" item-title="prefixAndName" item-value="_id"
-                                label="Pass (optional)" variant="outlined"  density="compact" :error-messages="errorScanPassMessage"
-                                persistent-hint small-chips @click="fetchPasses">
-                                <template v-slot:no-data>
-                                    <v-list-item density="compact">
-                                        <v-list-item-title v-if="passInput">
-                                            No results matching "<strong>{{ passInput }}</strong>". This value will be
-                                            added as new
-                                            option.
-                                        </v-list-item-title>
-                                        <v-list-item v-else>No data available</v-list-item>
-                                    </v-list-item>
-                                </template>
-
-                                <template v-slot:chip="{ props, item }">
-                                    <v-chip v-if="selectedPass" v-bind="props" prepend-icon="mdi-card-bulleted-outline"
-                                        :text="item.raw?.prefixAndName"></v-chip>
-                                </template>
-                            </v-autocomplete>
-                        </v-col>
-
-                        <v-col cols="12">
-                            <InputLabel class="text-capitalize" title="Phone Number" required />
-                            <InputPhoneNumberV2 v-model="memberForm.contact" density="compact" default-country="SG"
-                                hide-details />
-                        </v-col>
-
-                        <v-row class="pt-3" justify="space-between">
-                            <v-col cols="6">
-                                <v-btn text="Add Member" :disabled="!validForm" prepend-icon="mdi-plus"
-                                    color="primary-button" class="text-capitalize" @click="handleAddMember" />
-                            </v-col>
-                            <v-col cols="6" align="end">
-                                <v-btn text="Clear Form" prepend-icon="mdi-refresh" color="primary-button"
-                                    class="text-capitalize" @click.stop="handleClearForm" />
-                            </v-col>
-                        </v-row>
-                    </v-row>
-                </v-form>
-            </v-card-text>
-        </v-card>
-        <visitor-pass-key-q-r-scanner :dialog="dialog.scanQRCode" v-model:scannedValue="scannedPassValue"
-        @close-dialog="dialog.scanQRCode = false" />
-        <v-divider class="my-3" />
-        <v-row v-if="committedMembers.length > 0" no-gutters class="w-100 mt-5 ga-3">
-            <template v-for="member, index in committedMembers" :key="member.nric">
-                <CardMemberInfoSummary :member="membersDisplayed[index]" @remove="handleRemoveMember(index)" />
-            </template>
-        </v-row>
-        <!-- <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" /> -->
+  <v-row no-gutters class="w-100">
+    <v-card class="w-100">
+      <v-card-text>
+        <v-btn
+          block
+          color="primary-button"
+          :height="40"
+          text="Scan QR Code"
+          class="text-capitalize"
+          prepend-icon="mdi-qrcode"
+          @click="handleScanQRPass"
+        />
+        <v-form
+          ref="formRef"
+          v-model="validForm"
+          :disabled="processing"
+          @click="errorScanPassMessage = ''"
+        >
+          <v-row no-gutters class="pt-5 ga-2">
+            <v-col cols="12">
+              <InputLabel class="text-capitalize" title="Full Name" required />
+              <v-text-field
+                v-model.trim="memberForm.name"
+                density="compact"
+                hide-details
+                :rules="[requiredRule]"
+              />
+            </v-col>
+
+            <v-col cols="12">
+              <InputLabel class="text-capitalize" title="NRIC" required />
+              <InputNRICNumber
+                v-model.trim="memberForm.nric"
+                density="compact"
+                hide-details
+                :rules="[requiredRule]"
+              />
+            </v-col>
+
+            <v-col cols="12">
+              <v-autocomplete
+                v-model="selectedPass"
+                v-model:search="passInput"
+                :hide-no-data="false"
+                class="mt-3"
+                :items="passItemsFilteredFinal"
+                item-title="prefixAndName"
+                item-value="_id"
+                label="Pass (optional)"
+                variant="outlined"
+                density="compact"
+                :error-messages="errorScanPassMessage"
+                persistent-hint
+                small-chips
+                :clearable="clearable"
+                @click="fetchPasses"
+              >
+                <template v-slot:no-data>
+                  <v-list-item density="compact">
+                    <v-list-item-title v-if="passInput">
+                      No results matching "<strong>{{ passInput }}</strong
+                      >". This value will be added as new option.
+                    </v-list-item-title>
+                    <v-list-item v-else>No data available</v-list-item>
+                  </v-list-item>
+                </template>
+
+                <template v-slot:chip="{ props, item }">
+                  <v-chip
+                    v-if="selectedPass"
+                    v-bind="props"
+                    prepend-icon="mdi-card-bulleted-outline"
+                    :text="item.raw?.prefixAndName"
+                  ></v-chip>
+                </template>
+              </v-autocomplete>
+            </v-col>
+
+            <v-col cols="12">
+              <InputLabel
+                class="text-capitalize"
+                title="Phone Number"
+                required
+              />
+              <InputPhoneNumberV2
+                v-model="memberForm.contact"
+                density="compact"
+                default-country="SG"
+                hide-details
+              />
+            </v-col>
+
+            <v-row class="pt-3" justify="space-between">
+              <v-col cols="6">
+                <v-btn
+                  text="Add Member"
+                  :disabled="!validForm"
+                  prepend-icon="mdi-plus"
+                  color="primary-button"
+                  class="text-capitalize"
+                  @click="handleAddMember"
+                />
+              </v-col>
+              <v-col cols="6" align="end">
+                <v-btn
+                  text="Clear Form"
+                  prepend-icon="mdi-refresh"
+                  color="primary-button"
+                  class="text-capitalize"
+                  @click.stop="handleClearForm"
+                />
+              </v-col>
+            </v-row>
+          </v-row>
+        </v-form>
+      </v-card-text>
+    </v-card>
+    <visitor-pass-key-q-r-scanner
+      :dialog="dialog.scanQRCode"
+      v-model:scannedValue="scannedPassValue"
+      @close-dialog="dialog.scanQRCode = false"
+    />
+    <v-divider class="my-3" />
+    <v-row
+      v-if="committedMembers.length > 0"
+      no-gutters
+      class="w-100 mt-5 ga-3"
+    >
+      <template v-for="(member, index) in committedMembers" :key="member.nric">
+        <CardMemberInfoSummary
+          :member="membersDisplayed[index]"
+          @remove="handleRemoveMember(index)"
+        />
+      </template>
     </v-row>
+    <!-- <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" /> -->
+  </v-row>
 </template>
 
 <script setup lang="ts">
-import type { PropType } from 'vue'
-import usePassKey from '../composables/usePassKey'
-import useUtils from '../composables/useUtils'
-
+import type { PropType } from "vue";
+import usePassKey from "../composables/usePassKey";
+import useUtils from "../composables/useUtils";
 
 const props = defineProps({
-    type: {
-        type: String,
-        required: true
-    },
-    contractorType: {
-        type: String,
-        required: false
-    },
-    site: {
-        type: String,
-        required: true
-    },
-    selectedVisitorPass: {
-        type: Array as PropType<TPassKeyPayload[]>,
-        default: () => []
-    }
-})
-
-const { requiredRule } = useUtils()
-const { getPassKeysByPageSearch } = usePassKey()
-
+  type: {
+    type: String,
+    required: true,
+  },
+  contractorType: {
+    type: String,
+    required: false,
+  },
+  site: {
+    type: String,
+    required: true,
+  },
+  selectedVisitorPass: {
+    type: Array as PropType<TPassKeyPayload[]>,
+    default: () => [],
+  },
+  clearable: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const { requiredRule } = useUtils();
+const { getPassKeysByPageSearch } = usePassKey();
 
 const memberForm = reactive<TMemberInfo>({
-    name: "",
-    nric: "",
-    visitorPass: [] as { keyId: string }[],
-    contact: ""
-})
-
-const validForm = ref(false)
-const formRef = ref<HTMLFormElement>()
+  name: "",
+  nric: "",
+  visitorPass: [] as { keyId: string }[],
+  contact: "",
+});
+
+const validForm = ref(false);
+const formRef = ref<HTMLFormElement>();
 const processing = ref(false);
-const errorScanPassMessage = ref('')
+const errorScanPassMessage = ref("");
 
 const message = ref("");
 const messageColor = ref("");
 const messageSnackbar = ref(false);
 
 function showMessage(msg: string, color: string) {
-    message.value = msg;
-    messageColor.value = color;
-    messageSnackbar.value = true;
+  message.value = msg;
+  messageColor.value = color;
+  messageSnackbar.value = true;
 }
 
 // pass
-const passInput = ref('')
-const passItems = ref<TPassKey[]>([])
-const scannedPassValue = ref<string>("")
+const passInput = ref("");
+const passItems = ref<TPassKey[]>([]);
+const scannedPassValue = ref<string>("");
 
 const dialog = reactive({
-    scanQRCode: false,
-})
+  scanQRCode: false,
+});
 
-const selectedPass = ref<string>('')
+const selectedPass = ref<string>("");
 
-const members = defineModel<TMemberInfo[]>({ required: true, default: [] })
-const committedMembers = ref<TMemberInfo[]>([])
+const members = defineModel<TMemberInfo[]>({ required: true, default: [] });
+const committedMembers = ref<TMemberInfo[]>([]);
 
 // Always keep the model in sync: committed members + current form draft
-watch(() => memberForm, (newForm) => {
+watch(
+  () => memberForm,
+  (newForm) => {
     if (memberForm.name && memberForm.nric && memberForm.contact) {
-        members.value = [...committedMembers.value, { ...newForm }]
+      members.value = [...committedMembers.value, { ...newForm }];
     } else {
-        members.value = [...committedMembers.value]
+      members.value = [...committedMembers.value];
     }
-}, { deep: true })
-
+  },
+  { deep: true }
+);
 
 const passTypesComputed = computed(() => {
-    if (props.type === 'contractor') {
-        if (props.contractorType === 'property-agent') {
-            return ["agent-pass"]
-        } else {
-            return ["contractor-pass"]
-        }
+  if (props.type === "contractor") {
+    if (props.contractorType === "property-agent") {
+      return ["agent-pass"];
     } else {
-        return ["visitor-pass"]
+      return ["contractor-pass"];
     }
-})
+  } else {
+    return ["visitor-pass"];
+  }
+});
 
 const isPassListLoading = ref(false);
 
@@ -184,60 +254,67 @@ async function fetchPasses() {
 }
 
 const passItemsFilteredFinal = computed(() => {
-    return passItems.value.filter((item: TPassKey) => {
-        return !props.selectedVisitorPass.some((pass: TPassKeyPayload) => pass.keyId === item._id) && !committedMembers.value.some((member: TMemberInfo) => member.visitorPass?.some((pass) => pass.keyId === item._id))
-    })
-})
+  return passItems.value.filter((item: TPassKey) => {
+    return (
+      !props.selectedVisitorPass.some(
+        (pass: TPassKeyPayload) => pass.keyId === item._id
+      ) &&
+      !committedMembers.value.some((member: TMemberInfo) =>
+        member.visitorPass?.some((pass) => pass.keyId === item._id)
+      )
+    );
+  });
+});
 
 const membersDisplayed = computed(() => {
-    return committedMembers.value.map((member: TMemberInfo) => {
-        return {
-            ...member,
-            visitorPass: passItems.value.find((item: TPassKey) => item._id === member.visitorPass?.[0]?.keyId)?.prefixAndName || ""
-        }
-    })
-})
+  return committedMembers.value.map((member: TMemberInfo) => {
+    return {
+      ...member,
+      visitorPass:
+        passItems.value.find(
+          (item: TPassKey) => item._id === member.visitorPass?.[0]?.keyId
+        )?.prefixAndName || "",
+    };
+  });
+});
 
 function handleScanQRPass() {
-    errorScanPassMessage.value = ""
-    dialog.scanQRCode = true
+  errorScanPassMessage.value = "";
+  dialog.scanQRCode = true;
 }
 
 watch(selectedPass, (newVal) => {
-    memberForm.visitorPass = [...(newVal ? [{ keyId: newVal }] : [])]
-})
+  memberForm.visitorPass = [...(newVal ? [{ keyId: newVal }] : [])];
+});
 
 watch(scannedPassValue, (newVal) => {
-    if (!newVal) return
+  if (!newVal) return;
 
-    const matchedPass = passItemsFilteredFinal.value.find((p) => p.prefixAndName === newVal)
-
-    if (matchedPass) {
-        selectedPass.value = matchedPass._id ?? ""
-        return
-    }
-
-    errorScanPassMessage.value = "Scanned pass not available"
-    showMessage("Scanned pass not available", "error")
-})
+  const matchedPass = passItemsFilteredFinal.value.find(
+    (p) => p.prefixAndName === newVal
+  );
 
+  if (matchedPass) {
+    selectedPass.value = matchedPass._id ?? "";
+    return;
+  }
 
+  errorScanPassMessage.value = "Scanned pass not available";
+  showMessage("Scanned pass not available", "error");
+});
 
 function handleClearForm() {
-    formRef.value?.reset()
+  formRef.value?.reset();
 }
 
 async function handleAddMember() {
-    committedMembers.value.push({ ...memberForm })
-    handleClearForm()
+  committedMembers.value.push({ ...memberForm });
+  handleClearForm();
 }
 
 function handleRemoveMember(index: number) {
-    committedMembers.value = committedMembers.value.filter((_, i) => i !== index)
+  committedMembers.value = committedMembers.value.filter((_, i) => i !== index);
 }
-
-
-
 </script>
 
-<style scoped></style>
+<style scoped></style>

package/components/PassInformation.vue

@@ -57,6 +57,7 @@
             density="compact"
             persistent-hint
             small-chips
+            closable-chips
             :clearable="props.clearable"
             @click="fetchKeys"
             :loading="isKeyListLoading"
@@ -182,7 +183,7 @@ const isPassListLoading = ref(false);
 
 async function fetchPasses() {
   // load pass list
-  passItems.value = [];
+
   isPassListLoading.value = true;
   try {
     const result = await getPassKeysByPageSearch({
@@ -204,7 +205,6 @@ async function fetchPasses() {
 const isKeyListLoading = ref(false);
 
 async function fetchKeys() {
-  keyItems.value = [];
   isKeyListLoading.value = true;
   try {
     const keys: any = await getPassKeysByPageSearch({
@@ -215,19 +215,21 @@ async function fetchKeys() {
       statuses: ["Available"],
       sortBy: { column: "prefixAndName", order: "1" },
     });
-    const selectedKeys = keyItems.value.filter((item: any) => {
+
+    const previouslySelectedKeys = keyItems.value.filter((item: any) => {
       if (Array.isArray(props?.passKeys) && props.passKeys.length) {
         return props.passKeys.includes(item._id);
       }
       return false;
     });
+
     const filteredArray = keys.items.filter((item: any) => {
       if (Array.isArray(props?.passKeys) && props.passKeys.length) {
         return !props.passKeys.includes(item._id);
       }
       return true;
     });
-    keyItems.value = [...selectedKeys, ...filteredArray];
+    keyItems.value = [...previouslySelectedKeys, ...filteredArray];
   } catch (error) {
     showMessage(errorConverter(error as string), "error");
   } finally {

package/components/ServiceProviderMain.vue

@@ -732,6 +732,7 @@ const {
   add: addServiceProvider,
   createServiceProviderInvite,
   updateStatus: updateServiceProviderStatus,
+  invite
 } = useServiceProvider();
 const { getAll: getAllMembers } = useMember();
 
@@ -759,9 +760,10 @@ const createInviteDialog = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
 const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
 
 async function checkExistingAccount(email: string) {
-  // existingAccount.value = null;
+  existingAccount.value = null;
 
   if (!email.trim() || emailRule(email) !== true) return;
 
@@ -772,19 +774,23 @@ async function checkExistingAccount(email: string) {
 
     if (!user?._id) return;
 
-const member = await getByUserType(user._id, "organization");
-    console.log("member raw:", member);
-    console.log("onboardingCompleted:", member?.onboardingCompleted);
+const orgs = await getOrgs({
+  user: user._id,
+});
+
+const matchedOrg = orgs.items?.find(
+  (org: any) => org.type === serviceProviderInvite.value.app
+);
+
+if (matchedOrg) {
+  existingAccount.value = {
+    _id: matchedOrg.value,
+    text: matchedOrg.text,
+    ...matchedOrg,
+  };
+}
 
-    if (member?.onboardingCompleted) {
-      existingAccount.value = {
-        _id: member.org,
-        text: member.orgName,
-        ...member,
-      };
-    }
   } catch (error) {
-    console.error(error);
     existingAccount.value = null;
   } finally {
     checkingExistingAccount.value = false;
@@ -799,6 +805,14 @@ watch(
     await checkExistingAccount(value);
   }
 );
+watch(
+  () => serviceProviderInvite.value.app,
+  () => {
+    if (serviceProviderInvite.value.email) {
+      checkExistingAccount(serviceProviderInvite.value.email);
+    }
+  }
+);
 
 const serviceProviderInviteApps = computed(() =>
   natureOfBusinessV3.map((item) => ({
@@ -1183,33 +1197,42 @@ async function submitServiceProviderAdd() {
     disableServiceProvider.value = false;
   }
 }
-
 async function submitServiceProviderInvite() {
   disableServiceProvider.value = true;
   messageServiceProvider.value = "";
+
   try {
-    const payload = {
+    await invite({
       email: serviceProviderInvite.value.email.trim(),
-      name: "",
-      app: serviceProviderInvite.value.app,
       orgId: props.orgId,
       siteId: serviceProviderInvite.value.siteId,
       siteName:
-        serviceProviderInvite.value.siteName || site.value?.name || props.siteName,
-    };
+        serviceProviderInvite.value.siteName ||
+        site.value?.name ||
+        props.siteName,
+
+      inviteType: existingAccount.value
+        ? "create-org"
+        : "organization-invite",
+    });
 
-    await createServiceProviderInvite(payload);
     showMessage("Invitation sent.", "success");
+
     if (createMoreServiceProvider.value) {
       serviceProviderInvite.value.email = "";
     } else {
-      await setServiceProvider({ mode: "invite", dialog: false });
+      await setServiceProvider({
+        mode: "invite",
+        dialog: false,
+      });
     }
+
     await loadList();
   } catch (error: any) {
     messageServiceProvider.value =
       error?.response?._data?.message ??
       "An error occurred while inviting the service provider.";
+
     showMessage(errorConverter(error), "error");
   } finally {
     disableServiceProvider.value = false;