@7365admin1/layer-common 1.11.53 → 1.11.54

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.54
+
+### Patch Changes
+
+- 4eeaa88: add member site and org query params
+
 ## 1.11.53
 
 ### 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/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/package.json

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