@vc-shell/framework 1.0.148 → 1.0.149

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [1.0.149](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.148...v1.0.149) (2024-01-24)
+
+
+### Bug Fixes
+
+* **dynamic:** fixed overrides remove order ([a3e5980](https://github.com/VirtoCommerce/vc-shell/commit/a3e59801c1d8fd963cb5f4fe4e445dab0e2d5d32))
+* **framework:** fix ui styling issues in multiple components ([61f56d6](https://github.com/VirtoCommerce/vc-shell/commit/61f56d603b15f385c32d0270c939d539b606b37c))
+
+
+### Features
+
+* **dynamic:** updateActiveWidgetCount event ([808d31d](https://github.com/VirtoCommerce/vc-shell/commit/808d31df475e3c29386d7742fbc5f6ee7645a9bc))
+* **framework:** updated localization setup, i18n locales config, dynamic modules localization ([209b92f](https://github.com/VirtoCommerce/vc-shell/commit/209b92fe2bf95379d908064d553ab59e16928569))
+* **framework:** updated navigation, added routable config for blades ([7c538c6](https://github.com/VirtoCommerce/vc-shell/commit/7c538c6dfab70cc6c85dd453e516d84395e1166c))
+
+
+
 ## [1.0.148](https://github.com/VirtoCommerce/vc-shell/compare/v1.0.147...v1.0.148) (2024-01-16)
 
 

package/core/composables/index.ts

@@ -1,5 +1,4 @@
 export * from "./useFunctions";
-export * from "./useI18n";
 export * from "./useUser";
 export * from "./useNotifications";
 export * from "./useSettings";
@@ -11,3 +10,4 @@ export * from "./useErrorHandler";
 export { useAssets } from "./useAssets";
 export { useMenuService } from "./useMenuService";
 export { useBeforeUnload } from "./useBeforeUnload";
+export { useLanguages } from "./useLanguages";

package/core/composables/useLanguages/index.ts

@@ -0,0 +1,52 @@
+import * as veeValidate from "vee-validate";
+import { i18n } from "../../plugins/i18n";
+import { setLocale as setVeeI18nLocale, localize } from "@vee-validate/i18n";
+import { createSharedComposable, useLocalStorage } from "@vueuse/core";
+import { ComputedRef, computed } from "vue";
+import ISO6391 from "iso-639-1";
+
+export interface IUseLanguages {
+  setLocale: (locale: string) => void;
+  currentLocale: ComputedRef<string>;
+  getLocaleByTag: (localeTag: string) => string | undefined;
+}
+
+export const useLanguages = createSharedComposable(() => {
+  const defaultLanguage = i18n.global.locale.value;
+  const savedLocale = useLocalStorage("VC_LANGUAGE_SETTINGS", "");
+
+  const currentLocale = computed(() => {
+    let locale = defaultLanguage;
+
+    if (i18n.global.availableLocales.includes(savedLocale.value)) {
+      locale = savedLocale.value;
+    }
+
+    return locale;
+  });
+
+  function setLocale(locale: string) {
+    i18n.global.locale.value = locale;
+    veeValidate.configure({
+      generateMessage: localize(locale, {
+        messages: (i18n.global.getLocaleMessage(locale) as { messages: Record<string, string> }).messages,
+      }),
+    });
+    setVeeI18nLocale(locale);
+    savedLocale.value = locale;
+  }
+
+  function getLocaleByTag(localeTag: string) {
+    if (!localeTag) return;
+
+    const twoLetterLanguageName = localeTag.split("-")[0];
+
+    return ISO6391.getNativeName(twoLetterLanguageName);
+  }
+
+  return {
+    setLocale,
+    currentLocale,
+    getLocaleByTag,
+  };
+});

package/core/plugins/i18n/index.ts

@@ -3,7 +3,7 @@ import { createI18n } from "vue-i18n";
 const i18n = createI18n({
   legacy: false,
   globalInjection: true,
-  locale: navigator.language.split("-")[0],
+  locale: "en",
   fallbackLocale: "en",
   formatFallbackMessages: true,
 });

package/core/plugins/modularity/index.ts

@@ -38,6 +38,13 @@ export const createAppModule = (
 
       // Register pages
       Object.values(pages).forEach((page) => {
+        if (!("routable" in page)) {
+          page.routable = true;
+        }
+
+        // all components registered through this plugin are blades
+        page.isBlade = true;
+
         if (!page.url) {
           app.config.globalProperties.pages?.push(page);
 
@@ -62,7 +69,9 @@ export const createAppModule = (
 
           const BladeInstanceConstructor = Object.assign({}, page, { name: routeName });
 
-          const bladeVNode = h(BladeInstanceConstructor);
+          const bladeVNode = h(BladeInstanceConstructor, {
+            navigation: {},
+          });
 
           if (routerInstance && mainRouteName) {
             routerInstance.addRoute(mainRouteName, {

package/core/plugins/validation/index.ts

@@ -1,12 +1 @@
-import { localize } from "@vee-validate/i18n";
-import en from "@vee-validate/i18n/dist/locale/en.json";
-import * as veeValidate from "vee-validate";
-
-veeValidate.configure({
-  generateMessage: localize({ en }),
-});
-
-/** @deprecated Use `useForm` directly from `vee-validate` */
-export const useForm = veeValidate.useForm;
-
 export * from "./rules";

package/core/plugins/validation/rules.ts

@@ -1,3 +1,4 @@
+import { i18n } from "..";
 import { defineRule } from "vee-validate";
 import * as AllRules from "@vee-validate/rules";
 
@@ -25,7 +26,7 @@ export const mindimensions = (images: HTMLInputElement, [width, height]: [string
         if (isValid) {
           resolve(true);
         } else {
-          resolve(`Image dimensions must be greater than ${height}*${width}`);
+          resolve(i18n.global.t("messages.min_dimensions.error", { width, height }));
         }
       };
 
@@ -36,7 +37,7 @@ export const mindimensions = (images: HTMLInputElement, [width, height]: [string
   const fileList = images.files;
   for (let i = 0; i < fileList.length; i++) {
     if (!/\.(jpg|svg|jpeg|png|bmp|gif)$/i.test(fileList[i].name)) {
-      return Promise.resolve("Not image file");
+      return Promise.resolve(i18n.global.t("messages.min_dimensions.not_image_error"));
     }
 
     list.push(fileList[i]);
@@ -76,7 +77,7 @@ export const fileWeight = (file: HTMLInputElement, [size]: [number]) => {
 
   const isInvalid = checker.find((x) => x === true);
   if (isInvalid) {
-    return `File size must be maximum ${size} kb`;
+    return i18n.global.t("messages.file_weight", { size });
   } else {
     return true;
   }
@@ -124,12 +125,12 @@ const compare = (
 
 // before
 export const before = (value: string, [target]: string[]) =>
-  compare(value, [target], (first, second) => first < second, "End date must be earlier than start date");
+  compare(value, [target], (first, second) => first < second, i18n.global.t("messages.before"));
 defineRule("before", before);
 
 // after
 export const after = (value: string, [target]: string[]) =>
-  compare(value, [target], (first, second) => first > second, "End date must be later than start date");
+  compare(value, [target], (first, second) => first > second, i18n.global.t("messages.after"));
 
 defineRule("after", after);
 
@@ -137,7 +138,7 @@ export const bigInt = (value: string) => {
   if (Number.isSafeInteger(parseInt(value))) {
     return true;
   } else {
-    return "Unsupported number";
+    return i18n.global.t("messages.bigint");
   }
 };
 

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

@@ -1,5 +1,4 @@
 export * from "./useFunctions";
-export * from "./useI18n";
 export * from "./useUser";
 export * from "./useNotifications";
 export * from "./useSettings";
@@ -11,4 +10,5 @@ export * from "./useErrorHandler";
 export { useAssets } from "./useAssets";
 export { useMenuService } from "./useMenuService";
 export { useBeforeUnload } from "./useBeforeUnload";
+export { useLanguages } from "./useLanguages";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/composables/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../core/composables/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

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

@@ -0,0 +1,12 @@
+import { ComputedRef } from "vue";
+export interface IUseLanguages {
+    setLocale: (locale: string) => void;
+    currentLocale: ComputedRef<string>;
+    getLocaleByTag: (localeTag: string) => string | undefined;
+}
+export declare const useLanguages: () => {
+    setLocale: (locale: string) => void;
+    currentLocale: ComputedRef<string>;
+    getLocaleByTag: (localeTag: string) => string | undefined;
+};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/composables/useLanguages/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAY,MAAM,KAAK,CAAC;AAG5C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,cAAc,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC3D;AAED,eAAO,MAAM,YAAY;wBAcI,MAAM;;gCAWE,MAAM;CAazC,CAAC"}

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,SAAS,EAAK,MAAM,KAAK,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,qDAAqD,CAAC;AAI/F,eAAO,MAAM,YAAY;;aAAuE,OAAO;iBACxF,GAAG,GAAG,IAAI;CAavB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;iBAOX,GAAG,YAAY;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CA4FxD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/modularity/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAK,MAAM,KAAK,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,qDAAqD,CAAC;AAI/F,eAAO,MAAM,YAAY;;aAAuE,OAAO;iBACxF,GAAG,GAAG,IAAI;CAavB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;iBAOX,GAAG,YAAY;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAqGxD,CAAC"}

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

@@ -1,5 +1,2 @@
-import * as veeValidate from "vee-validate";
-/** @deprecated Use `useForm` directly from `vee-validate` */
-export declare const useForm: typeof veeValidate.useForm;
 export * from "./rules";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/validation/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAM5C,6DAA6D;AAC7D,eAAO,MAAM,OAAO,4BAAsB,CAAC;AAE3C,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../core/plugins/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}

package/dist/core/plugins/validation/rules.d.ts

@@ -8,5 +8,5 @@ export declare const mindimensions: (images: HTMLInputElement, [width, height]:
 export declare const fileWeight: (file: HTMLInputElement, [size]: [number]) => string | true;
 export declare const before: (value: string, [target]: string[]) => string | boolean;
 export declare const after: (value: string, [target]: string[]) => string | boolean;
-export declare const bigInt: (value: string) => true | "Unsupported number";
+export declare const bigInt: (value: string) => string | true;
 //# sourceMappingURL=rules.d.ts.map

package/dist/core/plugins/validation/rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../../core/plugins/validation/rules.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,eAAO,MAAM,aAAa,WAAY,gBAAgB,mBAAmB,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,qCAwC1G,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,UAAU,SAAU,gBAAgB,UAAU,CAAC,MAAM,CAAC,kBAwBlE,CAAC;AA2CF,eAAO,MAAM,MAAM,UAAW,MAAM,YAAY,MAAM,EAAE,qBACiD,CAAC;AAI1G,eAAO,MAAM,KAAK,UAAW,MAAM,YAAY,MAAM,EAAE,qBACgD,CAAC;AAIxG,eAAO,MAAM,MAAM,UAAW,MAAM,gCAMnC,CAAC"}
+{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../../core/plugins/validation/rules.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,eAAO,MAAM,aAAa,WAAY,gBAAgB,mBAAmB,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,qCAwC1G,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,UAAU,SAAU,gBAAgB,UAAU,CAAC,MAAM,CAAC,kBAwBlE,CAAC;AA2CF,eAAO,MAAM,MAAM,UAAW,MAAM,YAAY,MAAM,EAAE,qBACuC,CAAC;AAIhG,eAAO,MAAM,KAAK,UAAW,MAAM,YAAY,MAAM,EAAE,qBACuC,CAAC;AAI/F,eAAO,MAAM,MAAM,UAAW,MAAM,kBAMnC,CAAC"}