@7365admin1/layer-common 1.11.52 → 1.11.54

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @iservice365/layer-common
 
+## 1.11.54
+
+### Patch Changes
+
+- 4eeaa88: add member site and org query params
+
+## 1.11.53
+
+### Patch Changes
+
+- bb3d683: update endpoint for customer site
+- bb3d683: update layer common
+
 ## 1.11.52
 
 ### Patch Changes

package/components/InvitationMain.vue

@@ -195,20 +195,27 @@ const props = defineProps({
 const { authenticate } = useLocalAuth();
 authenticate();
 
-const headers = [
-  {
-    title: "Date",
-    value: "createdAt",
-  },
-  {
-    title: "E-mail",
-    value: "email",
-  },
-  {
-    title: "Action",
-    value: "action-table",
-  },
-];
+const headers = computed(() => {
+  const baseHeaders = [
+    {
+      title: "Date",
+      value: "createdAt",
+    },
+    {
+      title: "E-mail",
+      value: "email",
+    },
+  ];
+
+  if (props.status === "pending" && props.cancelInvitation) {
+    baseHeaders.push({
+      title: "Action",
+      value: "action-table",
+    });
+  }
+
+  return baseHeaders;
+});
 
 const { getVerifications: _getVerifications, cancelUserInvitation } =
   useVerification();
@@ -239,16 +246,21 @@ const {
   items: TMiniVerification[];
   pages: number;
   pageRange: string;
-}>("get-verifications" + props.status, () =>
-  _getVerifications({
-    page: page.value,
-    status: props.status,
-    search: headerSearch.value,
-    type: "user-invite,member-invite",
-    app: props.app,
-    orgId: props.org,
-    siteId: props.siteId,
-  })
+}>(
+  `get-verifications-${props.app}-${props.org}-${props.siteId}-${props.status}`,
+  () =>
+    _getVerifications({
+      page: page.value,
+      status: props.status,
+      search: headerSearch.value,
+      type: "user-invite,member-invite",
+      app: props.app,
+      orgId: props.org,
+      siteId: props.siteId,
+    }),
+  {
+    watch: [() => props.status]
+  }
 );
 
 const loading = computed(() => getVerificationsStatus.value === "pending");
@@ -261,7 +273,8 @@ watchEffect(() => {
   }
 });
 
-watch([headerSearch], () => {
+watch([headerSearch, () => props.status], () => {
+  page.value = 1;
   getVerifications();
 });
 

package/components/MemberMain.vue

@@ -159,8 +159,8 @@
           @click="handleUpdateMemberStatus"
           :loading="updateLoading"
         >
-          {{ updateActionText }} Member
-        </v-btn>
+          {{ updateActionText }} Member </v-btn
+        >r
       </template>
     </ConfirmDialog>
 
@@ -375,7 +375,7 @@ const {
   refresh: getAll,
   status: getAllReqStatus,
 } = useAsyncData(
-  () => `get-all-members-${props.status}-${props.orgId}`,
+  `get-all-members-${props.type}-${props.orgId}-${props.siteId}-${props.status}`,
   () =>
     _getAll({
       status: props.status,
@@ -383,14 +383,23 @@ const {
       search: headerSearch.value,
       page: page.value,
       type: props.type,
+      siteId: props.siteId,
     }),
   {
-    watch: [() => props.status, headerSearch],
+    watch: [() => props.status, () => props.orgId, () => props.siteId, headerSearch],
   }
 );
 
 const loading = computed(() => getAllReqStatus.value === "pending");
 
+watch(headerSearch, () => {
+  page.value = 1;
+});
+
+watch([() => props.orgId, () => props.siteId], () => {
+  page.value = 1;
+});
+
 watchEffect(() => {
   if (getAllReq.value) {
     items.value = getAllReq.value.items;
@@ -425,7 +434,7 @@ function setMember({
 
 const roles = ref<Array<Record<string, any>>>([]);
 const { getRoles } = useRole();
-const { data: getAllRoleReq } = useLazyAsyncData("get-roles", () =>
+const { data: getAllRoleReq } = useLazyAsyncData(`get-roles-${props.type}-${props.orgId}`, () =>
   getRoles({ org: props.orgId, type: props.type, limit: 20 })
 );
 

package/components/OnlineFormConfigurationForm.vue

@@ -38,7 +38,7 @@
     <v-card-text style="max-height: 100vh; overflow-y: auto" class="pa-0">
       <v-form v-model="validForm" :disabled="disable">
         <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize" title="Attachment" />
+          <InputLabel class="text-capitalize" title="Attachment (Optional)" />
 
           <div v-if="onlineForm.attachment" class="d-flex align-center" style="gap:8px">
             <v-card
@@ -91,7 +91,7 @@
         <v-col cols="12" class="px-6">
           <InputLabel class="text-capitalize" title="Name" />
           <v-text-field
-            v-model.trim="onlineForm.name"
+            v-model.trim="onlineForm.formType"
             density="comfortable"
           ></v-text-field>
         </v-col>
@@ -202,7 +202,7 @@
             color="black"
             class="text-none"
             size="48"
-            :disabled="!validForm || disable || onlineForm.name == ''"
+            :disabled="!validForm || disable || onlineForm.formType == ''"
             @click="submit"
             :loading="disable"
           >
@@ -215,7 +215,7 @@
 </template>
 <script setup lang="ts">
 import useFile from "../composables/useFile";
-import useOnlineForm from "../composables/useOnlineForm";
+import useOnlineFormConfiguration from "../composables/useOnlineFormConfiguration";
 import useOnlineFormTemplates from "../composables/useOnlineFormTemplates";
 
 const prop = defineProps({
@@ -254,7 +254,7 @@ function applyTemplate(name: string | null) {
   if (!name) return;
   const template = formTemplates[name];
   if (!template) return;
-  onlineForm.value.name = name;
+  onlineForm.value.formType = name;
   onlineForm.value.inputs = template.map((f) => ({ ...f }));
 }
 
@@ -263,15 +263,15 @@ const siteId = route.params.site as string;
 const orgId = route.params.org as string;
 
 const { addFile, getFileUrl } = useFile();
-const { add: _add, updateOnlineFormById: _update, getAllBySiteId: _getAllBySiteId } = useOnlineForm();
+const { create: _add, updateById: _update, getAll: _getAll } = useOnlineFormConfiguration();
 
 const { data: existingFormsData } = useLazyAsyncData(
-  `online-forms-template-filter-${siteId}`,
-  () => _getAllBySiteId(siteId, { limit: 100 })
+  `online-form-configurations-filter-${siteId}-${Date.now()}`,
+  () => _getAll({ site: siteId, org: orgId, limit: 100 })
 );
 
 const availableTemplateNames = computed(() => {
-  const existing = new Set(existingFormsData.value?.items?.map((f: any) => f.name) ?? []);
+  const existing = new Set(existingFormsData.value?.items?.map((f: any) => f.formType) ?? []);
   return templateNames.filter((name) => !existing.has(name));
 });
 
@@ -282,7 +282,7 @@ const attachmentFileName = ref("");
 const fileInputRef = ref<HTMLInputElement | null>(null);
 
 const onlineForm = ref<Record<string, any>>({
-  name: "",
+  formType: "",
   attachment: "",
   inputs: [
     {
@@ -305,7 +305,7 @@ const dataTypes = ref([
 
 if (prop.mode === "edit") {
   onlineForm.value.attachment = prop.onlineForm.attachment;
-  onlineForm.value.name = prop.onlineForm.name;
+  onlineForm.value.formType = prop.onlineForm.formType;
   onlineForm.value.inputs = prop.onlineForm.inputs;
 }
 
@@ -360,26 +360,32 @@ async function submit() {
   disable.value = true;
   try {
     if (prop.mode === "add") {
-      const payload = {
-        name: onlineForm.value.name,
-        attachment: onlineForm.value.attachment,
-        inputs: onlineForm.value.inputs,
+      const fields: Record<string, string> = Object.fromEntries(
+        onlineForm.value.inputs.map((input: any, i: number) => [String(i), JSON.stringify(input)])
+      );
+      if (onlineForm.value.attachment) fields["attachment"] = onlineForm.value.attachment;
+
+      await _add({
+        formType: onlineForm.value.formType,
+        fields,
         status: "active",
         org: orgId,
         site: siteId,
-      };
-
-      await _add(payload);
+      });
     }
 
     if (prop.mode === "edit") {
-      const payload = {
-        name: onlineForm.value.name,
-        attachment: onlineForm.value.attachment,
-        inputs: onlineForm.value.inputs,
-      };
-
-      await _update(prop.onlineForm._id ?? "", payload);
+      const fields: Record<string, string> = Object.fromEntries(
+        onlineForm.value.inputs.map((input: any, i: number) => [String(i), JSON.stringify(input)])
+      );
+      if (onlineForm.value.attachment) fields["attachment"] = onlineForm.value.attachment;
+
+      await _update(prop.onlineForm._id ?? "", {
+        _id: prop.onlineForm._id ?? "",
+        formType: onlineForm.value.formType,
+        fields,
+        status: onlineForm.value.status || "active",
+      });
     }
 
     emit("success");

package/components/OnlineFormRenderPreview.vue

@@ -8,7 +8,7 @@
     <v-card max-height="85vh" class="d-flex flex-column">
       <v-toolbar color="grey-darken-3" class="flex-grow-0">
         <v-toolbar-title class="text-subtitle-1 font-weight-bold text-white text-uppercase">
-          {{ form?.name }}
+          {{ form?.formType }}
         </v-toolbar-title>
       </v-toolbar>
 

package/components/OnlineFormsConfiguration.vue

@@ -92,7 +92,7 @@
         <v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
           <v-row no-gutters class="mb-4">
             <v-col cols="12">
-              <strong>Name:</strong> {{ selectedOnlineForm?.name ?? "N/A" }}
+              <strong>Name:</strong> {{ selectedOnlineForm?.formType ?? "N/A" }}
             </v-col>
             <v-col v-if="selectedOnlineForm?.attachment" cols="12">
               <strong>Document: </strong>
@@ -274,7 +274,7 @@ const props = defineProps({
     default: () => [
       {
         title: "Name",
-        value: "name",
+        value: "formType",
       },
       { title: "Date Created", value: "createdAt" },
       { title: "Status", value: "status" },
@@ -372,8 +372,22 @@ const deleteLoading = ref(false);
 const confirmDialog = ref(false);
 const selectedOnlineFormId = ref<string | null>(null);
 
+function parseFieldsToInputs(fields: Record<string, string>): any[] {
+  return Object.keys(fields)
+    .filter((key) => key !== "attachment")
+    .sort((a, b) => Number(a) - Number(b))
+    .map((key) => {
+      try { return JSON.parse(fields[key]); } catch { return fields[key]; }
+    });
+}
+
 function tableRowClickHandler(_: any, data: any) {
-  selectedOnlineForm.value = data.item as TOnlineForm;
+  const item = data.item;
+  selectedOnlineForm.value = {
+    ...item,
+    inputs: parseFieldsToInputs(item.fields ?? {}),
+    attachment: item.fields?.["attachment"] ?? "",
+  } as TOnlineForm;
   previewDialog.value = true;
 }
 
@@ -422,10 +436,12 @@ async function handleDeleteOnlineFormConfiguration() {
     selectedOnlineFormId.value = null;
     confirmDialog.value = false;
     previewDialog.value = false;
+    showMessage("Online form configuration deleted successfully!", "success");
   } catch (error: any) {
-    message.value =
-      error?.response?._data?.message ||
-      "Failed to delete online form configuration";
+    showMessage(
+      error?.response?._data?.message || "Failed to delete online form configuration",
+      "error"
+    );
   } finally {
     deleteLoading.value = false;
   }

package/composables/useCustomerSite.ts

@@ -56,12 +56,44 @@ export default function useCustomerSite() {
       }
     )
   }
+  async function getById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/customer-sites/${id}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+  async function updateById(
+  id: string,
+  payload: Partial<TCustomerSite>,
+) {
+  return useNuxtApp().$api<Record<string, any>>(
+    `/api/customer-sites/${id}`,
+    {
+      method: "PUT",
+      body: payload,
+    }
+  );
+}
+
+async function deleteById(id: string) {
+  return useNuxtApp().$api<Record<string, any>>(
+    `/api/customer-sites/${id}`,
+    {
+      method: "DELETE",
+    }
+  );
+}
 
   return {
     add,
     getAll,
     addViaInvite,
     getBySiteAsServiceProvider,
-    getCustomerSites
+    getCustomerSites,
+    getById,
+    updateById,
+    deleteById,
   };
 }

package/composables/useMember.ts

@@ -51,10 +51,11 @@ export default function useMember() {
     org = "",
     type = "",
     status = "active",
+    siteId = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
-      query: { page, limit, search, user, org, type, status },
+      query: { page, limit, search, user, org, type, status, siteId },
     });
   }
   function createUserByVerification(
@@ -109,35 +110,24 @@ export default function useMember() {
     siteId?: string;
     siteName?: string;
   }) {
-    return useNuxtApp().$api<TMember>('/api/members/direct', {
-      method: 'POST',
+    return useNuxtApp().$api<TMember>("/api/members/direct", {
+      method: "POST",
       body: payload,
-    })
+    });
   }
-  
-  function updateMemberSite(
-    id: string,
-    siteId: string,
-    siteName: string,
-  ) {
-    return useNuxtApp().$api(
-      `/api/members/site`,
-      {
-        method: "PUT",
-        body: {
-          id,
-          siteId,
-          siteName,
-        },
-      }
-    )
+
+  function updateMemberSite(id: string, siteId: string, siteName: string) {
+    return useNuxtApp().$api(`/api/members/site`, {
+      method: "PUT",
+      body: {
+        id,
+        siteId,
+        siteName,
+      },
+    });
   }
 
-  function getByUserTypeOrg(
-    user: string,
-    type: string,
-    org: string
-  ) {
+  function getByUserTypeOrg(user: string, type: string, org: string) {
     return useNuxtApp().$api<TMember>(
       `/api/members/user/${user}/app/${type}/org`,
       {
@@ -165,6 +155,6 @@ export default function useMember() {
     createMemberDirect,
     updateMemberSite,
     getAllByUserId,
-    getByUserTypeOrg
+    getByUserTypeOrg,
   };
 }

package/composables/useOnlineFormConfiguration.ts

@@ -1,3 +1,31 @@
+export type TFormEntryFields = Record<string | number, string | number | boolean | null>;
+
+export type TFormEntryCreate = {
+  _id?: string;
+  formType: string;
+  block?: string;
+  level?: string;
+  unit?: string;
+  name?: string;
+  phoneNumber?: string;
+  fields: TFormEntryFields;
+  status?: string;
+  org?: string;
+  site?: string;
+  createdAt?: string;
+  updatedAt?: string | null;
+  deletedAt?: string | null;
+};
+
+export type TFormEntryUpdate = {
+  _id?: string;
+  formType: string;
+  fields: Record<string, string | number | boolean | null>;
+  status?: string;
+  updatedAt?: string | null;
+  deletedAt?: string | null;
+};
+
 export default function useOnlineFormConfiguration() {
   function getAll({
     page = 1,
@@ -19,7 +47,14 @@ export default function useOnlineFormConfiguration() {
     });
   }
 
-  function updateById(id: string, value: any) {
+  function create(value: TFormEntryCreate) {
+    return useNuxtApp().$api<Record<string, any>>("/api/online-form-configurations", {
+      method: "POST",
+      body: value,
+    });
+  }
+
+  function updateById(id: string, value: TFormEntryUpdate) {
     return useNuxtApp().$api<Record<string, any>>(`/api/online-form-configurations/id/${id}`, {
       method: "PUT",
       body: value,
@@ -32,5 +67,5 @@ export default function useOnlineFormConfiguration() {
     });
   }
 
-  return { getAll, getById, updateById, deleteById };
+  return { getAll, getById, create, updateById, deleteById };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.52",
+  "version": "1.11.54",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {