@iservice365/layer-common 1.0.3 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.0.5
+
+### Patch Changes
+
+- f7ff2ae: Revision - member only data request adjustment
+
+## 1.0.4
+
+### Patch Changes
+
+- 789ece4: Revamp service provider site management
+
 ## 1.0.3
 
 ### Patch Changes

package/composables/useCustomerSite.ts

@@ -0,0 +1,36 @@
+export default function useCustomerSite() {
+  function add(payload: TCustomerSite) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/customer-sites`, {
+      method: "POST",
+      body: payload,
+    });
+  }
+
+  async function getAll({
+    page = 1,
+    search = "",
+    limit = 10,
+    org = "",
+    status = "active",
+    sort = "",
+    order = "asc",
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    org?: string;
+    status?: string;
+    sort?: string;
+    order?: string;
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/customer-sites", {
+      method: "GET",
+      query: { page, search, limit, sort, order, status, org },
+    });
+  }
+
+  return {
+    add,
+    getAll,
+  };
+}

package/composables/useLocal.ts

@@ -31,6 +31,10 @@ export default function useLocal() {
   const headerSearch = useState("headerSearch", () => "");
 
   const natureOfBusiness = [
+    {
+      title: "Real Estate Developer",
+      value: "real_estate_developer",
+    },
     {
       title: "Property Management Agency",
       value: "property_management_agency",

package/composables/useLocalSetup.ts

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

package/composables/useOrg.ts

@@ -91,17 +91,27 @@ export default function useOrg() {
     }
   });
 
-  function getAll({ page = 1, search = "", limit = 20 } = {}) {
+  function getAll({ page = 1, search = "", limit = 20, nature = "" } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/organizations", {
       method: "GET",
       query: {
         page,
         search,
         limit,
+        nature,
       },
     });
   }
 
+  function add(
+    value: Partial<Pick<TOrg, "name" | "email" | "nature" | "contact">>
+  ) {
+    return useNuxtApp().$api<TOrg>("/api/organizations", {
+      method: "POST",
+      body: value,
+    });
+  }
+
   return {
     org,
     getOrgs,
@@ -114,5 +124,6 @@ export default function useOrg() {
     currentOrg,
     getById,
     getAll,
+    add,
   };
 }

package/package.json

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

package/plugins/secure-member.client.ts

@@ -2,21 +2,33 @@ export default defineNuxtPlugin(() => {
   const router = useRouter();
   const { getByUserType } = useMember();
   const { getRoleById } = useRole();
+  const { getById } = useOrg();
 
-  const { userAppRole, id } = useLocalSetup();
+  const { userAppRole, id, orgNature } = useLocalSetup();
 
   router.afterEach((to) => {
     const isMember = to.meta?.memberOnly;
-    if (!isMember) return;
+
+    if (typeof isMember === "boolean" && !isMember) {
+      navigateTo(
+        {
+          name: "index",
+        },
+        { replace: true }
+      );
+    }
 
     const APP = useRuntimeConfig().public.APP;
-    const org = (to.params.org as string) ?? "";
+    const org = computed(
+      () =>
+        (to.params.org as string) || (to.params.organization as string) || ""
+    );
 
     const userId = computed(() => useCookie("user").value ?? "");
 
     const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
       "get-member-by-id",
-      () => getByUserType(userId.value, APP, org),
+      () => getByUserType(userId.value, APP, org.value),
       { watch: [userId] }
     );
 
@@ -37,6 +49,18 @@ export default defineNuxtPlugin(() => {
       }
     });
 
+    const { data: getOrgByIdReq } = useLazyAsyncData(
+      "get-org-by-id",
+      () => getById(org.value),
+      { watch: [org] }
+    );
+
+    watchEffect(() => {
+      if (getOrgByIdReq.value) {
+        orgNature.value = getOrgByIdReq.value.nature ?? "";
+      }
+    });
+
     const roleId = computed(() => userMemberData.value?.role ?? "");
 
     const { data: getRoleByIdReq } = useLazyAsyncData(

package/types/customer.d.ts

@@ -13,3 +13,15 @@ declare type TCustomerCreate = Pick<
   TCustomer,
   "name" | "orgId" | "siteName" | "siteDescription"
 >;
+
+declare type TCustomerSite = {
+  name: string;
+  site?: string;
+  siteOrg: string;
+  siteOrgName: string;
+  org: string;
+  status?: string;
+  createdAt?: string;
+  updatedAt?: string;
+  deletedAt?: string;
+};

package/types/site.d.ts

@@ -1,7 +1,7 @@
 declare type TSite = {
   _id?: string;
   name: string;
-  description: string;
+  description?: string;
   orgId: string;
   blocks?: number;
   customerOrgId: string;
@@ -11,6 +11,7 @@ declare type TSite = {
   deletedAt?: string;
   metadata?: {
     block?: number; // Number of blocks in the site
-  }} ;
+  };
+};
 
 declare type TSiteCreate = Pick<TSite, "name" | "description" | "orgId">;