@goweekdays/layer-common 1.2.5 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/layer-common
 
+## 1.3.0
+
+### Minor Changes
+
+- 598fcf3: Refactor org and member logic, update TOrg type
+
+## 1.2.6
+
+### Patch Changes
+
+- bcdc6ba: Fix setRole() to clear message
+
 ## 1.2.5
 
 ### Patch Changes

package/components/RolePermissionMain.vue

@@ -202,6 +202,7 @@ function setRole({
     )
   );
   modeRole.value = mode;
+  message.value = "";
 
   if (modeRole.value === "add") {
     dialogAdd.value = dialog;

package/composables/useLocalSetup.ts

@@ -19,7 +19,7 @@ export function useLocalSetup(type: string, org?: string) {
     }
   });
 
-  const { getRoleById } = useRole();
+  const { getById } = useRole();
 
   const roleId = computed(() => userMemberData.value?.role ?? "");
 
@@ -28,15 +28,15 @@ export function useLocalSetup(type: string, org?: string) {
     () => null
   );
 
-  const { data: getRoleByIdReq } = useLazyAsyncData(
+  const { data: getByIdReq } = useLazyAsyncData(
     "get-role-by-id",
-    () => getRoleById(roleId.value),
+    () => getById(roleId.value),
     { watch: [roleId], immediate: false }
   );
 
   watchEffect(() => {
-    if (getRoleByIdReq.value) {
-      userAppRole.value = getRoleByIdReq.value;
+    if (getByIdReq.value) {
+      userAppRole.value = getByIdReq.value;
     }
   });
 

package/composables/useOrg.ts

@@ -1,4 +1,11 @@
 export default function useOrg() {
+  function add(value: Pick<TOrg, "name" | "email" | "contact" | "createdBy">) {
+    return $fetch<Record<string, any>>("/api/organizations", {
+      method: "POST",
+      body: value,
+    });
+  }
+
   function getAll({ page = 1, search = "", limit = 20, status = "" } = {}) {
     return $fetch<Record<string, any>>("/api/organizations", {
       method: "GET",
@@ -28,73 +35,18 @@ export default function useOrg() {
     });
   }
 
-  const org = ref({
-    _id: "",
+  const org = ref<TOrg>({
     name: "",
-    email: "",
     contact: "",
-    busInst: "",
-    type: "",
-    status: "",
+    email: "",
+    createdBy: "",
   });
 
-  function reset() {
-    org.value._id = "";
-    org.value.name = "";
-    org.value.email = "";
-    org.value.contact = "";
-    org.value.busInst = "";
-    org.value.type = "";
-    org.value.status = "";
-  }
-
-  function set({
-    _id = "",
-    name = "",
-    email = "",
-    contact = "",
-    busInst = "",
-    type = "",
-    status = "",
-  } = {}) {
-    org.value._id = _id;
-    org.value.name = name;
-    org.value.email = email;
-    org.value.contact = contact;
-    org.value.busInst = busInst;
-    org.value.type = type;
-    org.value.status = status;
-  }
-
-  const perSeatPrice = 300;
-  const seats = useState("seats", () => 1);
-  const total = computed(() => seats.value * perSeatPrice);
-
-  function getByName(name = "") {
-    return $fetch<TOrg>(`/api/organizations/name/${name}`, {
-      method: "GET",
-    });
-  }
-
-  const { currentUser } = useLocalAuth();
-
-  const currentOrg = computed(
-    () =>
-      (useRoute().params.organization as string) ||
-      currentUser.value?.defaultOrg
-  );
-
   return {
     org,
+    add,
     getAll,
     getByUserId,
-    reset,
-    set,
-    perSeatPrice,
-    seats,
-    total,
-    getByName,
-    currentOrg,
     getById,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/plugins/member.client.ts

@@ -13,54 +13,18 @@ export default defineNuxtPlugin(() => {
 
     const userId = useCookie("user").value ?? "";
 
-    const {
-      data: userMemberData,
-      error: userMemberError,
-      refresh: refreshUserMemberData,
-    } = await useLazyAsyncData(
-      "plugin-get-member-by-id" + userId,
-      () => getByUserType(userId, APP, org),
-      { immediate: false }
-    );
-
     if (!membership.value) {
-      refreshUserMemberData();
-    }
+      try {
+        const member = await getByUserType(userId, APP, org);
+        membership.value = member;
 
-    watchEffect(() => {
-      if (userMemberError.value) {
+        const role = await getRoleById(member.role);
+        permissions.value = role.permissions ?? [];
+      } catch (error) {
         navigateTo({
           name: "index",
         });
       }
-    });
-
-    watchEffect(() => {
-      if (userMemberData.value) {
-        membership.value = userMemberData.value;
-      }
-    });
-
-    const roleId = computed(() => membership.value?.role ?? "");
-
-    const { data: roleData, refresh: refreshRoleData } = await useLazyAsyncData(
-      "plugin-get-role-by-id" + roleId.value,
-      () => getRoleById(roleId.value),
-      { immediate: false }
-    );
-
-    watchEffect(() => {
-      if (roleId.value) {
-        if (!permissions.value.length) {
-          refreshRoleData();
-        }
-      }
-    });
-
-    watchEffect(() => {
-      if (roleData.value) {
-        permissions.value = roleData.value.permissions ?? [];
-      }
-    });
+    }
   });
 });

package/plugins/secure.client.ts

@@ -13,22 +13,10 @@ export default defineNuxtPlugin(() => {
       return;
     }
 
-    const { data: getCurrentUserReq, error: getCurrentUserErr } =
-      await useLazyAsyncData("get-current-user", () =>
-        $fetch<TUser>(`/api/users/id/${user}`)
-      );
-
-    watchEffect(() => {
-      if (getCurrentUserReq.value) {
-        currentUser.value = getCurrentUserReq.value;
-      }
-    });
-
-    watchEffect(() => {
-      if (getCurrentUserErr.value) {
-        // Redirect to login page if user authentication fails
-        navigateTo({ name: "index" });
-      }
-    });
+    try {
+      currentUser.value = await $fetch<TUser>(`/api/users/id/${user}`);
+    } catch (error) {
+      navigateTo({ name: "index" });
+    }
   });
 });

package/types/org.d.ts

@@ -1,13 +1,12 @@
 declare type TOrg = {
   _id?: string;
   name: string;
-  email: string;
-  contact: string;
-  busInst: string;
-  type: string;
-  apps?: Array<string>;
+  description?: string;
+  email?: string;
+  contact?: string;
+  createdBy: string;
+  status?: string;
   createdAt?: string;
   updatedAt?: string;
-  status?: string;
   deletedAt?: string;
 };