@goweekdays/layer-common 1.2.3 → 1.2.5

package/plugins/API.ts

@@ -48,7 +48,7 @@ export default defineNuxtPlugin(() => {
     return useFetch(path, options);
   };
 
-  // Expose to useNuxtApp().$api
+  // Expose to $fetch
   return {
     provide: {
       api,

package/plugins/member.client.ts

@@ -1,10 +1,10 @@
 export default defineNuxtPlugin(() => {
   const router = useRouter();
   const { getByUserType } = useMember();
-  const { getRoleById } = useRole();
+  const { getById: getRoleById } = useRole();
   const { membership, permissions } = useLocalAuth();
 
-  router.afterEach((to) => {
+  router.afterEach(async (to) => {
     const isSecured = to.meta?.member;
     if (!isSecured) return;
 
@@ -17,7 +17,7 @@ export default defineNuxtPlugin(() => {
       data: userMemberData,
       error: userMemberError,
       refresh: refreshUserMemberData,
-    } = useLazyAsyncData(
+    } = await useLazyAsyncData(
       "plugin-get-member-by-id" + userId,
       () => getByUserType(userId, APP, org),
       { immediate: false }
@@ -43,7 +43,7 @@ export default defineNuxtPlugin(() => {
 
     const roleId = computed(() => membership.value?.role ?? "");
 
-    const { data: roleData, refresh: refreshRoleData } = useLazyAsyncData(
+    const { data: roleData, refresh: refreshRoleData } = await useLazyAsyncData(
       "plugin-get-role-by-id" + roleId.value,
       () => getRoleById(roleId.value),
       { immediate: false }

package/plugins/secure.client.ts

@@ -3,7 +3,7 @@ export default defineNuxtPlugin(() => {
   const { cookieConfig } = useRuntimeConfig().public;
   const { currentUser } = useLocalAuth();
 
-  router.afterEach((to) => {
+  router.afterEach(async (to) => {
     const isSecured = to.meta?.secured;
     if (!isSecured) return;
 
@@ -14,8 +14,8 @@ export default defineNuxtPlugin(() => {
     }
 
     const { data: getCurrentUserReq, error: getCurrentUserErr } =
-      useLazyAsyncData("get-current-user", () =>
-        useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+      await useLazyAsyncData("get-current-user", () =>
+        $fetch<TUser>(`/api/users/id/${user}`)
       );
 
     watchEffect(() => {

package/types/local.d.ts

@@ -34,3 +34,9 @@ declare type TApp = {
   updatedAt?: string | Date;
   deletedAt?: string | Date;
 };
+
+declare type TListGroup = {
+  title: string;
+  key: string;
+  children: { title: string; key: string; description: string }[];
+};

package/types/permission.d.ts

@@ -16,9 +16,11 @@ declare type TPermissions = {
 declare type TPerm = {
   _id?: string;
   app: string;
+  name: string;
   key: string;
   group: string;
   description: string;
+  status?: string;
   createdAt?: string | Date;
   updatedAt?: string | Date;
   deletedAt?: string | Date;

package/types/role.d.ts

@@ -4,6 +4,7 @@ declare type TRole = {
   permissions?: Array<string>;
   type?: string;
   org?: string;
+  description?: string;
   status?: string;
   default?: boolean;
   createdBy?: string;