@iservice365/layer-common 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.0.8
+
+### Patch Changes
+
+- 2ba3c2e: Invitation revision - add site support
+
+## 1.0.7
+
+### Patch Changes
+
+- 09115c2: Fixed user and member invite
+
 ## 1.0.6
 
 ### Patch Changes

package/components/InvitationForm.vue

@@ -8,7 +8,7 @@
       </v-row>
     </v-toolbar>
     <v-card-text style="max-height: 100vh; overflow-y: auto">
-      <v-form v-model="validForm" :disabled="disable">
+      <v-form v-model="validForm" ref="form" :disabled="disable">
         <v-row no-gutters>
           <v-col cols="12" class="mt-2">
             <v-row no-gutters>
@@ -32,6 +32,7 @@
                   density="comfortable"
                   :rules="[requiredRule]"
                   :items="apps"
+                  @update:model-value="handleUpdateApp"
                 ></v-autocomplete>
               </v-col>
             </v-row>
@@ -46,12 +47,28 @@
                   :items="roles"
                   item-title="name"
                   item-value="_id"
+                   :rules="[requiredRule]"
                   density="comfortable"
                 ></v-autocomplete>
               </v-col>
             </v-row>
           </v-col>
 
+
+          <v-col v-if="hasSite" cols="12">
+            <v-row no-gutters>
+              <InputLabel class="text-capitalize" title="Site" />
+              <v-col cols="12">
+                <v-autocomplete
+                  v-model="invite.site"
+                  :items="sites"
+                  density="comfortable"
+                  :rules="[requiredRule]"
+                ></v-autocomplete>
+              </v-col>
+            </v-row>
+          </v-col>
+
           <v-col cols="12" class="mt-2">
             <v-checkbox v-model="createMore" density="comfortable" hide-details>
               <template #label>
@@ -101,6 +118,7 @@
             class="text-none"
             size="48"
             :disabled="!validForm"
+            :loading="submitting"
             @click="submit"
           >
             Submit
@@ -126,9 +144,9 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
-  type: {
+  app: {
     type: String,
-    default: "app",
+    default: "organization",
   },
   org: {
     type: String,
@@ -156,13 +174,22 @@ const props = defineProps({
 const emit = defineEmits(["cancel", "success", "success:create-more"]);
 
 const validForm = ref(false);
+const form = ref<HTMLFormElement | null>(null)
+const app = computed(() => useRuntimeConfig().public.APP ?? "");
+const submitting = ref(false);
 
 const invite = ref<Record<string, any>>({
   email: "",
-  app: "organization",
+  app: "",
   role: "",
+  org: "",
+  site: "",
+  siteName: "",
 });
 
+invite.value.app = props.app;
+invite.value.org = props.org ?? "";
+
 if (props.mode === "edit") {
   invite.value.email = props.invite.email;
   invite.value.app = props.invite.metadata?.app;
@@ -172,18 +199,65 @@ if (props.mode === "edit") {
 const { natureOfBusiness } = useLocal();
 
 const apps = computed(() => {
-  const items = natureOfBusiness.slice(1);
+  const items = [];
   items.unshift({ title: "Organization", value: "organization" });
+
+  if (props.app === "security_agency") {
+    items.push({ title: "Security Agency", value: "security_agency" });
+  }
+
+  if (props.app === "cleaning_agency") {
+    items.push({ title: "Cleaning Agency", value: "cleaning_agency" });
+  }
+
+  if (props.app === "property_manager") {
+    items.push({ title: "Property Manager", value: "property_manager" });
+  }
+
+  if (props.app === "mechanical_electrical_services") {
+    items.push({
+      title: "Mechanical & Electrical Services",
+      value: "mechanical_electrical_services",
+    });
+  }
+
   return items;
 });
 
+const hasSite = computed(() => {
+  return natureOfBusiness.map((i) => i.value).includes(invite.value.app);
+});
+
+const sites = ref<Array<Record<string, any>>>([]);
+
+const { getAll: getAllCustomerSite } = useCustomerSite();
+
+const { data: siteData, refresh: refreshSiteData } = await useLazyAsyncData(
+  "get-sites-by-org",
+  async () => await getAllCustomerSite({ org: props.org, limit: 50 }),
+  {  }
+);
+
+watchEffect(() => {
+  if (siteData.value) {
+    sites.value = siteData.value.items.map((i: any) => ({
+      title: i.name,
+      value: i.site,
+    }));
+  }
+});
+
+watchEffect(() => {
+  if (hasSite.value) {
+    refreshSiteData();
+  }
+});
+
 const roles = ref<Array<Record<string, any>>>([]);
 
 const { getRoles } = useRole();
 
-const app = computed(() => invite.value.metadata?.app ?? "");
-
-const { data: RolesData } = await useLazyAsyncData(
+const { data: RolesData, refresh: refreshRoles } = await useLazyAsyncData(
   "get-roles-by-type",
   () => getRoles({ org: props.org, type: app.value, limit: 50 }),
   { watch: [app] }
@@ -195,12 +269,12 @@ watchEffect(() => {
   }
 });
 
-watchEffect(() => {
-  if (invite.value.app) {
-    roles.value = [];
-    invite.value.role = "";
-  }
-});
+function handleUpdateApp(value: string){
+  invite.value.role = "";
+  invite.value.site = "";
+  refreshRoles();
+}
+
 
 const createMore = ref(false);
 const disable = ref(false);
@@ -219,15 +293,19 @@ function resetInvite() {
 const { inviteUser } = useUser();
 
 async function submit() {
+  submitting.value = true;
   try {
     await inviteUser(invite.value);
-    emit("success");
 
     if (createMore.value) {
+      form.value?.reset();
       resetInvite();
-    }
+      emit("success", false);
+    } else emit("success", true);
   } catch (error: any) {
     message.value = error.response._data.message;
+  } finally {
+    submitting.value = false;
   }
 }
 

package/components/InvitationMain.vue

@@ -142,7 +142,9 @@
         title="Invite member"
         :org="org"
         @cancel="dialogMember = false"
+        @success="handleSuccess"
         @invited="getVerifications()"
+        :app="props.app"
       />
     </v-dialog>
   </v-row>
@@ -150,6 +152,10 @@
 
 <script setup lang="ts">
 const props = defineProps({
+  app: {
+    type: String,
+    default: "organization",
+  },
   route: {
     type: String,
     default: "index",
@@ -282,6 +288,13 @@ async function onConfirmCancel() {
   cancelLoading.value = false;
 }
 
+function handleSuccess(closeForm: boolean) {
+  getVerifications();
+  if (closeForm) {
+    dialogMember.value = false;
+  }
+}
+
 watchEffect(() => {
   if (!props.viewInvitations) {
     useRouter().back();

package/composables/useLocalSetup.ts

@@ -3,7 +3,7 @@ export function useLocalSetup() {
 
   const id = useState<string | null>("memberShipOrgId", () => null);
 
-  const orgNature = useState<string | null>("orgNature", () => null);
+  const orgNature = useState<string>("orgNature", () => "");
 
   return {
     userAppRole,

package/composables/useUser.ts

@@ -1,8 +1,14 @@
 export default function useUser() {
-  function inviteUser({ email = "", app = "", role = "", name = "" } = {}) {
+  function inviteUser({
+    email = "",
+    app = "",
+    role = "",
+    name = "",
+    org = "",
+  } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
       method: "POST",
-      body: { email, app, role, name },
+      body: { email, app, role, name, org },
     });
   }
 

package/middleware/02.org.ts

@@ -4,12 +4,12 @@ const hexSchema = z
   .string()
   .regex(/^[0-9a-fA-F]{24}$/, "Invalid organization ID");
 
-export default defineNuxtRouteMiddleware(async (to) => {
+export default defineNuxtRouteMiddleware(async (to, from) => {
   if (import.meta.server) return;
 
   const { organization, org } = to.params;
 
-  if (!hexSchema.safeParse(organization ?? org).success) {
+  if (!hexSchema.safeParse(organization || org).success) {
     return navigateTo(
       { name: "require-organization-membership" },
       { replace: true }

package/package.json

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

package/plugins/secure-member.client.ts

@@ -6,7 +6,7 @@ export default defineNuxtPlugin(() => {
 
   const { userAppRole, id, orgNature } = useLocalSetup();
 
-  router.afterEach((to) => {
+  router.afterEach(async (to) => {
     const isMember = to.meta?.memberOnly;
 
     if (!isMember) return;
@@ -19,11 +19,12 @@ export default defineNuxtPlugin(() => {
 
     const userId = computed(() => useCookie("user").value ?? "");
 
-    const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
-      "get-member-by-id",
-      () => getByUserType(userId.value, APP, org.value),
-      { watch: [userId] }
-    );
+    const { data: userMemberData, error: userMemberError } =
+      await useLazyAsyncData(
+        "get-member-by-id",
+        () => getByUserType(userId.value, APP, org.value),
+        { watch: [userId] }
+      );
 
     watchEffect(() => {
       if (userMemberError.value) {
@@ -42,7 +43,7 @@ export default defineNuxtPlugin(() => {
       }
     });
 
-    const { data: getOrgByIdReq } = useLazyAsyncData(
+    const { data: getOrgByIdReq } = await useLazyAsyncData(
       "get-org-by-id",
       () => getById(org.value),
       { watch: [org] }
@@ -56,7 +57,7 @@ export default defineNuxtPlugin(() => {
 
     const roleId = computed(() => userMemberData.value?.role ?? "");
 
-    const { data: getRoleByIdReq } = useLazyAsyncData(
+    const { data: getRoleByIdReq } = await useLazyAsyncData(
       "get-role-by-id",
       () => getRoleById(roleId.value),
       { watch: [roleId], immediate: false }