@data-fair/lib-vue 1.18.2 → 1.20.0

package/format/bytes.js

@@ -8,7 +8,11 @@ export function formatBytes (bytes, locale = 'fr') {
   for (let i = 0; i < def.length; i++) {
     const step = def[i][0]
     if (bytesInt < step || i === def.length - 1) {
-      return (bytesInt / (def[i - 1][0] || 1)).toLocaleString(locale, { maximumFractionDigits: 0 }) + ' ' + def[i - 1][1]
+      const value = bytesInt / (def[i - 1][0] || 1)
+      let digits = 2
+      if (value > 1) { digits = 1 }
+      if (value > 10) { digits = 0 }
+      return value.toLocaleString(locale, { maximumFractionDigits: digits }) + ' ' + def[i - 1][1]
     }
   }
   return '' // this is only for strict typing, but the code cannot go there, the return in the loop is always called

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.18.2",
+  "version": "1.20.0",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "@data-fair/lib-common-types": "^1.5.3",
+    "@data-fair/lib-common-types": "^1.7.1",
     "@data-fair/lib-utils": "^1.0.0",
     "jwt-decode": "^4.0.0",
     "universal-cookie": "^7.2.0"

package/session.d.ts

@@ -68,6 +68,7 @@ export interface Session {
     organization: ComputedRef<SessionState['organization']>;
     account: ComputedRef<SessionState['account']>;
     accountRole: ComputedRef<SessionState['accountRole']>;
+    siteRole: ComputedRef<SessionState['siteRole']>;
     lang: ComputedRef<SessionState['lang']>;
     theme: Ref<null | Theme>;
     site: Ref<SiteInfo | null>;
@@ -101,6 +102,7 @@ export declare function createSession(initOptions: Partial<SessionOptions>): Pro
     organization: ComputedRef<SessionState["organization"]>;
     account: ComputedRef<SessionState["account"]>;
     accountRole: ComputedRef<SessionState["accountRole"]>;
+    siteRole: ComputedRef<SessionState["siteRole"]>;
     lang: ComputedRef<SessionState["lang"]>;
     theme: Ref<null | Theme>;
     site: Ref<SiteInfo | null>;

package/session.js

@@ -121,6 +121,14 @@ export async function getSession (initOptions) {
       }
       state.accountRole = 'admin'
     }
+    if (state.user?.siteOwner) {
+      if (state.user.siteOwner.type === 'user' && state.user.siteOwner.id === state.user.id) {
+        state.siteRole = 'admin'
+      }
+      if (state.user.siteOwner.type === 'organization' && state.user.siteOwner.id === state.organization?.id) {
+        state.siteRole = state.organization.role
+      }
+    }
   }
   readState()
   debug('initial state', state)
@@ -283,6 +291,7 @@ export async function getSession (initOptions) {
     user: computed(() => state.user),
     account: computed(() => state.account),
     accountRole: computed(() => state.accountRole),
+    siteRole: computed(() => state.siteRole),
     lang: computed(() => state.lang),
     theme: readonly(theme),
     site: shallowReadonly(site),