@data-fair/lib-vuetify 1.9.2 → 1.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vuetify",
-  "version": "1.9.2",
+  "version": "1.10.1",
   "description": "Components based on the Vuetify 3 UI lib for the data-fair stack.",
   "main": "index.js",
   "files": [
@@ -23,7 +23,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@data-fair/lib-common-types": "^1.1.0",
+    "@data-fair/lib-common-types": "^1.10.4",
     "@mdi/js": "^7.4.47"
   }
 }

package/personal-menu.vue

@@ -49,8 +49,8 @@
           <v-list-item-title>
             {{ account.type === 'user' ? t('personalAccount') : account.name }}
           </v-list-item-title>
-          <v-list-item-subtitle v-if="account.department">
-            {{ account.departmentName || account.department }}
+          <v-list-item-subtitle v-if="account.department || organization?.roleLabel">
+            {{ account.departmentName || account.department }} {{ organization?.roleLabel }}
           </v-list-item-subtitle>
           <v-list-item-subtitle>{{ user.name }}</v-list-item-subtitle>
         </v-list-item>
@@ -102,7 +102,7 @@
             v-for="organization in switchableOrganizations"
             :id="'toolbar-menu-switch-orga-' + organization.id"
             :key="organization.id"
-            @click="session.switchOrganization(organization.id , organization.department)"
+            @click="session.switchOrganization(organization.id , organization.department, organization.role)"
           >
             <template #prepend>
               <v-avatar
@@ -113,8 +113,8 @@
             <v-list-item-title>
               {{ organization.name }}
             </v-list-item-title>
-            <v-list-item-subtitle v-if="organization.department">
-              {{ organization.departmentName || organization.department }}
+            <v-list-item-subtitle v-if="organization.department || organization.roleLabel">
+              {{ organization.departmentName || organization.department }} {{ organization.roleLabel }}
             </v-list-item-subtitle>
           </v-list-item>
         </template>
@@ -208,11 +208,11 @@ import { mdiAlert, mdiShieldAlert, mdiLogout, mdiAccountSwitchOutline } from '@m
 const session = useSession()
 
 const { t } = useI18n({ useScope: 'local' })
-const { user, account } = toRefs(session.state)
+const { user, account, organization } = toRefs(session.state)
 const switchableOrganizations = computed(() => {
-  const { user, account } = session.state
+  const { user, account, accountRole } = session.state
   if (!user || !account) return
-  return user.organizations.filter(o => account.type === 'user' || account.id !== o.id || (account.department || null) !== (o.department || null))
+  return user.organizations.filter(o => account.type === 'user' || account.id !== o.id || (account.department || null) !== (o.department || null) || (accountRole || null) !== (o.role || null))
 })
 </script>
 

package/personal-menu.vue.js

@@ -7,12 +7,12 @@ import { mdiAlert, mdiShieldAlert, mdiLogout, mdiAccountSwitchOutline } from '@m
 const { defineProps, defineSlots, defineEmits, defineExpose, defineModel, defineOptions, withDefaults, } = await import('vue');
 const session = useSession();
 const { t } = useI18n({ useScope: 'local' });
-const { user, account } = toRefs(session.state);
+const { user, account, organization } = toRefs(session.state);
 const switchableOrganizations = computed(() => {
-    const { user, account } = session.state;
+    const { user, account, accountRole } = session.state;
     if (!user || !account)
         return;
-    return user.organizations.filter(o => account.type === 'user' || account.id !== o.id || (account.department || null) !== (o.department || null));
+    return user.organizations.filter(o => account.type === 'user' || account.id !== o.id || (account.department || null) !== (o.department || null) || (accountRole || null) !== (o.role || null));
 });
 const __VLS_fnComponent = (await import('vue')).defineComponent({});
 ;
@@ -104,13 +104,14 @@ function __VLS_template() {
         (__VLS_ctx.account.type === 'user' ? __VLS_ctx.t('personalAccount') : __VLS_ctx.account.name);
         __VLS_nonNullable(__VLS_57.slots).default;
         const __VLS_57 = __VLS_pickFunctionalComponentCtx(__VLS_52, __VLS_54);
-        if (__VLS_ctx.account.department) {
+        if (__VLS_ctx.account.department || __VLS_ctx.organization?.roleLabel) {
             const __VLS_58 = __VLS_resolvedLocalAndGlobalComponents.VListItemSubtitle;
             /** @type { [typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, ] } */
             // @ts-ignore
             const __VLS_59 = __VLS_asFunctionalComponent(__VLS_58, new __VLS_58({}));
             const __VLS_60 = __VLS_59({}, ...__VLS_functionalComponentArgsRest(__VLS_59));
             (__VLS_ctx.account.departmentName || __VLS_ctx.account.department);
+            (__VLS_ctx.organization?.roleLabel);
             __VLS_nonNullable(__VLS_63.slots).default;
             const __VLS_63 = __VLS_pickFunctionalComponentCtx(__VLS_58, __VLS_60);
         }
@@ -180,7 +181,7 @@ function __VLS_template() {
                             return;
                         if (!((__VLS_ctx.user.organizations.length > 1 || (__VLS_ctx.user.organizations.length === 1 && (!__VLS_ctx.user.ipa || __VLS_ctx.account.type === 'user')))))
                             return;
-                        __VLS_ctx.session.switchOrganization(organization.id, organization.department);
+                        __VLS_ctx.session.switchOrganization(organization.id, organization.department, organization.role);
                     }
                 };
                 let __VLS_99;
@@ -202,13 +203,14 @@ function __VLS_template() {
                 (organization.name);
                 __VLS_nonNullable(__VLS_115.slots).default;
                 const __VLS_115 = __VLS_pickFunctionalComponentCtx(__VLS_110, __VLS_112);
-                if (organization.department) {
+                if (organization.department || organization.roleLabel) {
                     const __VLS_116 = __VLS_resolvedLocalAndGlobalComponents.VListItemSubtitle;
                     /** @type { [typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, typeof __VLS_components.VListItemSubtitle, typeof __VLS_components.vListItemSubtitle, ] } */
                     // @ts-ignore
                     const __VLS_117 = __VLS_asFunctionalComponent(__VLS_116, new __VLS_116({}));
                     const __VLS_118 = __VLS_117({}, ...__VLS_functionalComponentArgsRest(__VLS_117));
                     (organization.departmentName || organization.department);
+                    (organization.roleLabel);
                     __VLS_nonNullable(__VLS_121.slots).default;
                     const __VLS_121 = __VLS_pickFunctionalComponentCtx(__VLS_116, __VLS_118);
                 }
@@ -368,6 +370,7 @@ const __VLS_self = (await import('vue')).defineComponent({
             t: t,
             user: user,
             account: account,
+            organization: organization,
             switchableOrganizations: switchableOrganizations,
         };
     },