@goweekdays/layer-common 1.4.0 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @goweekdays/layer-common
 
+## 1.4.3
+
+### Patch Changes
+
+- 2baee76: Update role and permission components for dynamic app context
+
+## 1.4.2
+
+### Patch Changes
+
+- 273fab2: Enhance member fetching and UI improvements
+
+## 1.4.1
+
+### Patch Changes
+
+- b7afd94: Improve organization requirement page UX and messaging
+
 ## 1.4.0
 
 ### Minor Changes

package/components/Layout/NavigationDrawer.vue

@@ -26,6 +26,9 @@
     <template #append>
       <slot name="append"></slot>
     </template>
+    <template #prepend>
+      <slot name="prepend"></slot>
+    </template>
   </v-navigation-drawer>
 </template>
 

package/components/RoleForm.vue

@@ -268,12 +268,15 @@ const {
   status: permissionsReqStatus,
   refresh: refreshPermissions,
 } = await useLazyAsyncData(
-  `role-form-get-all-permission-${localProps.app}`,
+  `role-form-get-all-permission-${role.value.app}`,
   () =>
     getAllPerm({
-      app: localProps.app,
+      app: role.value.app,
       limit: 200,
-    })
+    }),
+  {
+    watch: [() => role.value.app],
+  }
 );
 
 const loadingPermissions = computed(

package/components/RolePermissionMain.vue

@@ -188,7 +188,7 @@ function setRole({
     JSON.parse(
       JSON.stringify({
         ...data,
-        app: mode === "admin" ? props.app : data.app,
+        app: mode === "admin" || mode === "add" ? props.app : data.app,
       })
     )
   );
@@ -221,16 +221,15 @@ const {
   refresh: getRoles,
   status: getRoleReqStatus,
 } = useLazyAsyncData(
-  "roles-permissions-get-all",
+  `roles-permissions-get-all-by-${props.app}-${props.org}-page-${page.value}`,
   () =>
     _getRoles({
       page: page.value,
-      search: headerSearch.value,
       org: props.org,
       app: isOrg.value ? "" : props.app,
     }),
   {
-    watch: [page, headerSearch],
+    watch: [page],
   }
 );
 

package/components/SwitchContext.vue

@@ -25,7 +25,7 @@
 
     <v-card width="300px" rounded="lg" class="pa-4">
       <span class="text-subtitle-2 font-weight-bold">
-        Switch {{ prop.title }} context
+        {{ prop.title }}
       </span>
       <v-text-field
         v-model="search"
@@ -65,8 +65,7 @@
 const prop = defineProps({
   title: {
     type: String,
-    required: true,
-    default: "app",
+    default: "Switch Context",
   },
   items: {
     type: Array as PropType<Array<Record<string, any>>>,

package/composables/useLocalAuth.ts

@@ -48,7 +48,7 @@ export default function useLocalAuth() {
   }
 
   function verify(id: string) {
-    return $fetch<TKeyValuePair>(`/api/auth/verify/${id}`, {
+    return $fetch<Record<string, any>>(`/api/auth/verify/${id}`, {
       method: "GET",
     });
   }

package/composables/useMember.ts

@@ -33,6 +33,22 @@ export default function useMember() {
     });
   }
 
+  function getAllByAppUser({
+    app = "",
+    user = "",
+    limit = 10,
+    page = 1,
+    search = "",
+  } = {}) {
+    return $fetch<Record<string, any>>(
+      `/api/members/orgs/app/${app}/user/${user}`,
+      {
+        method: "GET",
+        query: { page, limit, search },
+      }
+    );
+  }
+
   async function getAll({
     page = 1,
     search = "",
@@ -104,5 +120,6 @@ export default function useMember() {
     updateRoleById,
     updateStatusById,
     deleteById,
+    getAllByAppUser,
   };
 }

package/middleware/org.ts

@@ -8,6 +8,6 @@ export default defineNuxtRouteMiddleware((to) => {
   const org = (to.params.org as string) ?? "";
 
   if (org && !hexSchema.safeParse(org).success) {
-    return navigateTo({ name: "require-organization" }, { replace: true });
+    return navigateTo({ name: "require-organization" });
   }
 });

package/package.json

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

package/pages/index.vue

@@ -64,7 +64,7 @@ const isPartnerApp = computed(() =>
   [
     "org",
     "marketplace",
-    "services",
+    "service",
     "stay",
     "ride",
     "eat",

package/pages/login.vue

@@ -158,7 +158,10 @@ async function submit({ email = "", password = "" } = {}) {
       message.value = "An unexpected error occurred. Please try again.";
     }
 
-    if (error.response.status === 404) {
+    if (
+      error.response.status === 404 &&
+      error.response.url.includes("/api/members/app")
+    ) {
       navigateTo({ name: "index" });
     }
   } finally {

package/pages/require-organization.vue

@@ -7,21 +7,45 @@
     </v-col>
 
     <span class="text-subtitle-2">
-      You must have an organization to access this page.
+      You must be part of an organization to access this app. Please contact
+      your organization administrator or create a new organization.
     </span>
 
     <v-col cols="12" class="mt-6">
       <v-row no-gutters justify="center">
-        <v-btn
-          size="large"
-          class="text-none"
-          variant="flat"
-          color="black"
-          rounded
-          @click="createOrg()"
-        >
-          Create Organization
-        </v-btn>
+        <v-col cols="2">
+          <v-btn
+            block
+            size="large"
+            class="text-none"
+            variant="flat"
+            color="black"
+            rounded
+            @click="createOrg()"
+          >
+            Create Organization
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-col>
+
+    <v-col cols="12" class="text-center font-weight-bold my-2"> or </v-col>
+
+    <v-col cols="12">
+      <v-row no-gutters justify="center">
+        <v-col cols="2">
+          <v-btn
+            block
+            size="large"
+            class="text-none"
+            variant="flat"
+            color="black"
+            rounded
+            :to="{ name: 'index' }"
+          >
+            Return to landing page
+          </v-btn>
+        </v-col>
       </v-row>
     </v-col>
   </v-row>
@@ -34,7 +58,7 @@ definePageMeta({
 
 function createOrg() {
   const { APP, APP_ORG } = useRuntimeConfig().public;
-  if (APP === "organization") {
+  if (APP === "org") {
     navigateTo({ name: "organizations-create" });
   } else {
     navigateTo(`${APP_ORG}/organizations/create`, { external: true });

package/pages/sign-up/[id].vue

@@ -139,7 +139,9 @@ const loading = ref(false);
 
 async function validate() {
   try {
-    await verify(id);
+    const result = await verify(id);
+
+    type.value = result.type;
 
     validInvitation.value = true;
     message.value = "";