@iservice365/layer-common 1.0.9 → 1.0.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.0.10
+
+### Patch Changes
+
+- 4cdf32b: Invitation form - revise app selection
+
 ## 1.0.9
 
 ### Patch Changes

package/components/InvitationForm.vue

@@ -48,14 +48,13 @@
                   :items="roles"
                   item-title="name"
                   item-value="_id"
-                   :rules="[requiredRule]"
+                  :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" />
@@ -176,13 +175,13 @@ const props = defineProps({
 const emit = defineEmits(["cancel", "success", "success:create-more"]);
 
 const validForm = ref(false);
-const form = ref<HTMLFormElement | null>(null)
+const form = ref<HTMLFormElement | null>(null);
 const app = computed(() => useRuntimeConfig().public.APP ?? "");
 
 const loading = reactive({
   submittingForm: false,
-  verifyingEmail: false
-})
+  verifyingEmail: false,
+});
 
 const invite = ref<Record<string, any>>({
   email: "",
@@ -203,27 +202,36 @@ if (props.mode === "edit") {
 }
 
 const { natureOfBusiness } = useLocal();
+const { orgNature } = useLocalSetup();
 
 const apps = computed(() => {
   const items = [];
   items.unshift({ title: "Organization", value: "organization" });
 
-  if (props.app === "security_agency") {
-    items.push({ title: "Security Agency", value: "security_agency" });
+  const _org = "security_agency";
+
+  if (props.app === _org || orgNature.value === _org) {
+    items.push({ title: "Security Agency", value: _org });
   }
 
-  if (props.app === "cleaning_agency") {
-    items.push({ title: "Cleaning Agency", value: "cleaning_agency" });
+  const _cleaning = "cleaning_agency";
+
+  if (props.app === _cleaning || orgNature.value === _cleaning) {
+    items.push({ title: "Cleaning Agency", value: _cleaning });
   }
 
-  if (props.app === "property_manager") {
-    items.push({ title: "Property Manager", value: "property_manager" });
+  const _property = "property_manager";
+
+  if (props.app === _property || orgNature.value === _property) {
+    items.push({ title: "Property Manager", value: _property });
   }
 
-  if (props.app === "mechanical_electrical_services") {
+  const _mechanical = "mechanical_electrical_services";
+
+  if (props.app === _mechanical || orgNature.value === _mechanical) {
     items.push({
       title: "Mechanical & Electrical Services",
-      value: "mechanical_electrical_services",
+      value: _mechanical,
     });
   }
 
@@ -240,8 +248,7 @@ const { getAll: getAllCustomerSite } = useCustomerSite();
 
 const { data: siteData, refresh: refreshSiteData } = await useLazyAsyncData(
   "get-sites-by-org",
-  async () => await getAllCustomerSite({ org: props.org, limit: 50 }),
-  {  }
+  async () => await getAllCustomerSite({ org: props.org, limit: 50 })
 );
 
 watchEffect(() => {
@@ -275,13 +282,12 @@ watchEffect(() => {
   }
 });
 
-function handleUpdateApp(value: string){
+function handleUpdateApp(value: string) {
   invite.value.role = "";
   invite.value.site = "";
   refreshRoles();
 }
 
-
 const createMore = ref(false);
 const disable = ref(false);
 
@@ -296,14 +302,13 @@ function resetInvite() {
   message.value = "";
 }
 
-function handleUpdateSite(siteId: string){
-  const obj = sites.value.find( x => x?.value === siteId)
-  invite.value.siteName = obj?.title || ""
+function handleUpdateSite(siteId: string) {
+  const obj = sites.value.find((x) => x?.value === siteId);
+  invite.value.siteName = obj?.title || "";
 }
 
 const { inviteUser } = useUser();
 
-
 async function submit() {
   loading.submittingForm = true;
   try {

package/package.json

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