@iservice365/layer-common 1.5.0 → 1.5.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.5.2
+
+### Patch Changes
+
+- e76d332: Fix auth middleware
+
+## 1.5.1
+
+### Patch Changes
+
+- dbc4dc4: Fix service provider invite
+
 ## 1.5.0
 
 ### Minor Changes

package/components/Input/DateTimePicker.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="d-flex flex-column">
-        <v-text-field v-bind="$attrs" ref="dateTimePickerRef" :model-value="dateTimeFormattedReadOnly"
+        <v-text-field v-bind="$attrs" ref="dateTimePickerRef" :model-value="dateTimeFormattedReadOnly" autocomplete="off"
             :placeholder="placeholder" :rules="rules" style="z-index: 10" @click="openDatePicker">
             <template #append-inner>
                 <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />

package/components/ServiceProviderMain.vue

@@ -17,6 +17,10 @@
             rounded="pill"
             variant="tonal"
             size="large"
+            @click="
+              (createInviteDialog = true),
+                setServiceProvider({ mode: 'invite' })
+            "
           >
             Invite
           </v-btn>
@@ -99,16 +103,6 @@
   </v-row>
 
   <v-dialog v-model="createDialog" width="500" persistent>
-    <!-- <ServiceProviderFormCreate
-      @cancel="createDialog = false"
-      :org="props.orgId"
-      :type="props.type"
-      :site-id="props.siteId"
-      :service-provider-org-id="props.orgId"
-      @success="success()"
-      @success:create-more="_getAllServiceProvider()"
-      @notify="onNotify"
-    /> -->
     <v-card width="100%">
       <v-toolbar>
         <v-row no-gutters class="fill-height px-6" align="center">
@@ -238,6 +232,96 @@
     </v-card>
   </v-dialog>
 
+  <v-dialog v-model="createInviteDialog" width="500" persistent>
+    <v-card width="100%">
+      <v-toolbar>
+        <v-row no-gutters class="fill-height px-6" align="center">
+          <span class="font-weight-bold text-h5">
+            Invite Service Provider
+          </span>
+        </v-row>
+      </v-toolbar>
+      <v-card-text style="max-height: 100vh; overflow-y: auto">
+        <v-form
+          v-model="validServiceProvider"
+          :disabled="disableServiceProvider"
+        >
+          <v-row no-gutters class="px-4">
+            <v-col cols="12" class="mt-2">
+              <v-row no-gutters>
+                <InputLabel class="text-capitalize" title="Email" required />
+                <v-col cols="12">
+                  <v-text-field
+                    v-model="serviceProvider.email"
+                    density="comfortable"
+                    :rules="[requiredRule, emailRule]"
+                  ></v-text-field>
+                </v-col>
+              </v-row>
+            </v-col>
+
+            <v-col cols="12">
+              <v-checkbox
+                v-model="createMoreServiceProvider"
+                density="comfortable"
+                hide-details
+              >
+                <template #label>
+                  <span class="text-subtitle-2 font-weight-bold">
+                    Invite more
+                  </span>
+                </template>
+              </v-checkbox>
+            </v-col>
+
+            <v-col cols="12" class="my-2">
+              <v-row no-gutters>
+                <v-col cols="12" class="text-center">
+                  <span
+                    class="text-none text-subtitle-2 font-weight-medium text-error"
+                  >
+                    {{ messageServiceProvider }}
+                  </span>
+                </v-col>
+              </v-row>
+            </v-col>
+          </v-row>
+        </v-form>
+      </v-card-text>
+
+      <v-toolbar>
+        <v-row class="px-6">
+          <v-col cols="6">
+            <v-btn
+              block
+              variant="text"
+              class="text-none"
+              size="large"
+              @click="setServiceProvider({ mode: 'invite', dialog: false })"
+            >
+              Cancel
+            </v-btn>
+          </v-col>
+
+          <v-col cols="6">
+            <v-btn
+              block
+              variant="flat"
+              color="black"
+              class="text-none"
+              size="large"
+              :disabled="!validServiceProvider"
+              :loading="disableServiceProvider"
+              @click="submitServiceProviderInvite()"
+            >
+              Submit
+            </v-btn>
+          </v-col>
+        </v-row>
+      </v-toolbar>
+    </v-card>
+  </v-dialog>
+
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 </template>
 
@@ -349,6 +433,7 @@ watchEffect(() => {
 });
 
 const createDialog = ref(false);
+const createInviteDialog = ref(false);
 
 const success = () => {
   createDialog.value = false;
@@ -376,6 +461,7 @@ function setServiceProvider({
 } = {}) {
   if (mode === "invite") {
     // dialogServiceProviderInvite.value = dialog;
+    createInviteDialog.value = dialog;
   }
 
   if (mode === "add") {
@@ -422,4 +508,28 @@ async function submitServiceProviderAdd() {
     disableServiceProvider.value = false;
   }
 }
+
+async function submitServiceProviderInvite() {
+  disableServiceProvider.value = true;
+  messageServiceProvider.value = "";
+  try {
+    await inviteServiceProvider({
+      email: serviceProvider.value.email,
+      orgId: props.orgId,
+      siteId: props.siteId,
+      siteName: site.value?.name ?? "",
+    });
+    if (createMoreServiceProvider.value) {
+      serviceProvider.value.email = "";
+    } else {
+      await setServiceProvider({ mode: "invite", dialog: false });
+    }
+  } catch (error: any) {
+    messageServiceProvider.value =
+      error?.response?._data?.message ??
+      "An error occurred while inviting the service provider.";
+  } finally {
+    disableServiceProvider.value = false;
+  }
+}
 </script>

package/components/VisitorManagement.vue

@@ -272,6 +272,7 @@ function filterTypeSelectionLabel() {
 function toRoute(status: any) {
   const obj = tabOptions.find((x) => x.status === status);
   if (!obj) return;
+  page.value =1
   navigateTo({
     name: routeName,
     params: {

package/middleware/01.auth.ts

@@ -1,9 +1,18 @@
-export default defineNuxtRouteMiddleware(async () => {
+export default defineNuxtRouteMiddleware(async (route) => {
   const { cookieConfig } = useRuntimeConfig().public;
 
   // Get access token from cookies
   const sid = useCookie("sid", cookieConfig).value;
 
+  const serviceProviderEmail = (route.query.email as string) ?? "";
+
+  console.log(serviceProviderEmail);
+
+  if (serviceProviderEmail) {
+    useCookie("service-provider-email", cookieConfig).value =
+      serviceProviderEmail;
+  }
+
   if (!sid) {
     // Redirect to login page if no access token
     return navigateTo({ name: "index" });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@iservice365/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",