@vc-shell/framework 1.0.71 → 1.0.72

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.0.72](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.71...v1.0.72) (2023-06-07)
+
+
+### Bug Fixes
+
+* authData length check ([bd04284](https://github.com/VirtoCommerce/vc-shell/commit/bd04284fd91887a41ba99f52bd37d844a13c2e8a))
+* vc-app-bar mobile styles ([75955d4](https://github.com/VirtoCommerce/vc-shell/commit/75955d4cb9692a3430395f8dbf5943b5c2eb8f36))
+* vc-select dropdown closing ([ecde06f](https://github.com/VirtoCommerce/vc-shell/commit/ecde06ffd679d06f7d8f75304437510f4e46063c))
+
+
+### Features
+
+* blade nav last state, permissions ([d98144a](https://github.com/VirtoCommerce/vc-shell/commit/d98144a2e5f2b4241543f7624fc7d811aa3f951f))
+
+
+
 ## [1.0.71](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.70...v1.0.71) (2023-06-02)
 
 

package/core/composables/usePermissions/index.ts

@@ -1,32 +1,45 @@
+import { Ref, ref } from "vue";
 import { useUser } from "./../useUser";
-import { computed, ComputedRef } from "vue";
 
 interface IUsePermissions {
-  readonly userPermissions: ComputedRef<string[]>;
   checkPermission(permissions: string | string[]): boolean;
+  fetchUserPermissions(): Promise<void>;
 }
-
+const userPermissions: Ref<string[]> = ref([]);
 export function usePermissions(): IUsePermissions {
-  const { user } = useUser();
+  const { user, loadUser } = useUser();
+
+  async function fetchUserPermissions() {
+    if (user.value?.permissions) {
+      userPermissions.value = user.value?.permissions;
+    } else {
+      try {
+        const userData = await loadUser();
+        userPermissions.value = userData.permissions;
+      } catch (e) {
+        throw new Error("Unable to load user permissions");
+      }
+    }
+  }
 
   function checkPermission(permissions: string | string[] | undefined) {
     if (!permissions) {
       return true;
     } else if (permissions || (permissions && permissions instanceof Array)) {
       if (typeof permissions === "string") {
-        return user.value?.permissions.includes(permissions);
+        return userPermissions.value?.includes(permissions);
       } else if (permissions.length > 0) {
-        return user.value?.permissions.some((role) => {
+        return userPermissions.value?.some((role) => {
           return permissions.includes(role);
         });
       }
     } else {
-      console.error("Permissions must be a string or strings array");
+      throw new Error("Permissions must be a string or strings array");
     }
   }
 
   return {
-    userPermissions: computed(() => user.value?.permissions),
     checkPermission,
+    fetchUserPermissions,
   };
 }

package/core/composables/useUser/index.ts

@@ -156,8 +156,8 @@ export function useUser(): IUseUser {
 
   async function getAccessToken(): Promise<string | null> {
     console.debug(`[@vc-shell/framework#useUser:getAccessToken] - Entry point`);
-    if (!authData.value) {
-      authData.value = readAuthData();
+    if (!authData.value || Object.keys(authData.value).length === 0) {
+      authData.value = await readAuthData();
     }
 
     if (authData.value && Date.now() >= (authData.value.expiresAt ?? 0)) {
@@ -166,6 +166,7 @@ export function useUser(): IUseUser {
         authData.value.refreshToken ?? "",
         {}
       );
+
       console.log("[useUser]: an access token is expired, using refresh token to receive a new");
       try {
         const newToken = await token.refresh();
@@ -190,8 +191,8 @@ export function useUser(): IUseUser {
   function storeAuthData(authData: AuthData) {
     localStorage.setItem(VC_AUTH_DATA_KEY, JSON.stringify({ ...(authData || {}) }));
   }
-  function readAuthData(): AuthData {
-    return JSON.parse(localStorage.getItem(VC_AUTH_DATA_KEY) || "{}") as AuthData;
+  async function readAuthData(): Promise<AuthData> {
+    return (await JSON.parse(localStorage.getItem(VC_AUTH_DATA_KEY) || "{}")) as AuthData;
   }
 
   function addOffsetToCurrentDate(offsetInSeconds: number): number {

package/core/plugins/modularity/index.ts

@@ -1,5 +1,8 @@
 import { App } from "vue";
 import { i18n } from "./../i18n";
+import { Router } from "vue-router";
+import { BladeConstructor } from "./../../../shared/components/blade-navigation/types";
+import { kebabToPascal } from "./../../utilities";
 
 export const createModule = (components: unknown, locales?: unknown) => ({
   install(app: App): void {
@@ -21,10 +24,22 @@ export const createAppModule = (pages: unknown, locales?: unknown, notificationT
   const module = createModule(pages, locales);
 
   return {
-    install(app: App): void {
+    install(app: App, options: { router: Router }): void {
+      const { router } = options;
       // Register pages
-      Object.entries(pages).forEach(([, page]) => {
+      Object.entries(pages).forEach(([, page]: [string, BladeConstructor]) => {
         app.config.globalProperties.pages?.push(page);
+
+        // Dynamically add pages to vue router
+        if (page.url) {
+          const mainRouteName = router.getRoutes().find((r) => r.meta?.root)?.name;
+
+          router.addRoute(mainRouteName, {
+            name: kebabToPascal(page.url.substring(1)),
+            path: page.url.substring(1),
+            component: page,
+          });
+        }
       });
 
       if (notificationTemplates) {

package/core/utilities/index.ts

@@ -1 +1,2 @@
 export * from "./camelToSnake";
+export * from "./kebabToCamel";

package/core/utilities/kebabToCamel.ts

@@ -0,0 +1,7 @@
+const kebabToCamel = (str: string) => str.replace(/-./g, (x) => x[1].toUpperCase());
+
+export function kebabToPascal(str: string) {
+  const camelCase = kebabToCamel(str);
+  const pascalCase = camelCase[0].toUpperCase() + camelCase.substr(1);
+  return pascalCase;
+}

package/dist/core/composables/usePermissions/index.d.ts

@@ -1,7 +1,6 @@
-import { ComputedRef } from "vue";
 interface IUsePermissions {
-    readonly userPermissions: ComputedRef<string[]>;
     checkPermission(permissions: string | string[]): boolean;
+    fetchUserPermissions(): Promise<void>;
 }
 export declare function usePermissions(): IUsePermissions;
 export {};

package/dist/core/composables/usePermissions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/usePermissions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,WAAW,EAAE,MAAM,KAAK,CAAC;AAE5C,UAAU,eAAe;IACvB,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;CAC1D;AAED,wBAAgB,cAAc,IAAI,eAAe,CAuBhD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/usePermissions/index.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;IACzD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wBAAgB,cAAc,IAAI,eAAe,CAoChD"}

package/dist/core/composables/useUser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,GAAG,EAAO,WAAW,EAAmC,MAAM,KAAK,CAAC;AAEvF,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAmB/E,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACnG,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC/E,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,yBAAyB,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAC3D,cAAc,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAClG,eAAe,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACnE,aAAa,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,sBAAsB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,qBAAqB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAED,wBAAgB,OAAO,IAAI,QAAQ,CA2UlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useUser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,GAAG,EAAO,WAAW,EAAmC,MAAM,KAAK,CAAC;AAEvF,OAAO,EACL,UAAU,EAGV,cAAc,EAEd,cAAc,EACf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAY,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAmB/E,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACvE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAChE,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IACnG,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC/E,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,yBAAyB,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAC3D,cAAc,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAClG,eAAe,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IACnE,aAAa,EAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,sBAAsB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,qBAAqB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAED,wBAAgB,OAAO,IAAI,QAAQ,CA4UlC"}

package/dist/core/plugins/modularity/index.d.ts

@@ -1,8 +1,11 @@
 import { App } from "vue";
+import { Router } from "vue-router";
 export declare const createModule: (components: unknown, locales?: unknown) => {
     install(app: App): void;
 };
 export declare const createAppModule: (pages: unknown, locales?: unknown, notificationTemplates?: unknown) => {
-    install(app: App): void;
+    install(app: App, options: {
+        router: Router;
+    }): void;
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/core/plugins/modularity/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/modularity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAG1B,eAAO,MAAM,YAAY,eAAgB,OAAO,YAAY,OAAO;iBACpD,GAAG,GAAG,IAAI;CAavB,CAAC;AAEH,eAAO,MAAM,eAAe,UAAW,OAAO,YAAY,OAAO,0BAA0B,OAAO;iBAIjF,GAAG,GAAG,IAAI;CAe1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/modularity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAIpC,eAAO,MAAM,YAAY,eAAgB,OAAO,YAAY,OAAO;iBACpD,GAAG,GAAG,IAAI;CAavB,CAAC;AAEH,eAAO,MAAM,eAAe,UAAW,OAAO,YAAY,OAAO,0BAA0B,OAAO;iBAIjF,GAAG,WAAW;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CA2BvD,CAAC"}

package/dist/core/utilities/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./camelToSnake";
+export * from "./kebabToCamel";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/utilities/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/utilities/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/utilities/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC"}

package/dist/core/utilities/kebabToCamel.d.ts

@@ -0,0 +1,2 @@
+export declare function kebabToPascal(str: string): string;
+//# sourceMappingURL=kebabToCamel.d.ts.map

package/dist/core/utilities/kebabToCamel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kebabToCamel.d.ts","sourceRoot":"","sources":["../../../core/utilities/kebabToCamel.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,UAIxC"}