@vc-shell/framework 1.0.148 → 1.0.149

package/dist/ui/components/organisms/vc-app/_internal/vc-app-bar/vc-app-bar.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-app-bar.vue.d.ts","sourceRoot":"","sources":["../../../../../../../ui/components/organisms/vc-app/_internal/vc-app-bar/vc-app-bar.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,MAAM,WAAW,KAAK;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAClC,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;CACpD;;;;;;;;;;;;;;;AAyPD,wBAAwG;AACxG,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAAE,QAAO;QAClD,MAAM,EAAE,CAAC,CAAC;KACT,CAAA;CAAE,CAAC"}
+{"version":3,"file":"vc-app-bar.vue.d.ts","sourceRoot":"","sources":["../../../../../../../ui/components/organisms/vc-app/_internal/vc-app-bar/vc-app-bar.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,MAAM,WAAW,KAAK;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAClC,CAAC,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;CACpD;;;;;;;;;;;;;;;AA2OD,wBAAwG;AACxG,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAAE,QAAO;QAClD,MAAM,EAAE,CAAC,CAAC;KACT,CAAA;CAAE,CAAC"}

package/dist/ui/components/organisms/vc-app/vc-app.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-app.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-app/vc-app.vue.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAibD,wBAAwG;AACxG,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAAE,QAAO;QAClD,MAAM,EAAE,CAAC,CAAC;KACT,CAAA;CAAE,CAAC"}
+{"version":3,"file":"vc-app.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-app/vc-app.vue.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4aD,wBAAwG;AACxG,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAAE,QAAO;QAClD,MAAM,EAAE,CAAC,CAAC;KACT,CAAA;CAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.148",
+  "version": "1.0.149",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -38,13 +38,14 @@
     "@vueuse/integrations": "^10.7.1",
     "ace-builds": "^1.32.2",
     "core-js": "^3.35.0",
+    "iso-639-1": "^3.1.0",
     "moment": "^2.30.1",
     "normalize.css": "^8.0.1",
     "quill": "^1.3.7",
     "quill-image-uploader": "^1.3.0",
     "swiper": "^6.8.4",
     "vee-validate": "^4.12.4",
-    "vue": "^3.4.7",
+    "vue": "^3.4.14",
     "vue-currency-input": "^3.0.5",
     "vue-i18n": "^9.8.0",
     "vue-router": "^4.2.5",
@@ -52,9 +53,9 @@
     "whatwg-fetch": "^3.6.19"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.148",
-    "@vc-shell/config-generator": "^1.0.148",
-    "@vc-shell/ts-config": "^1.0.148",
+    "@vc-shell/api-client-generator": "^1.0.149",
+    "@vc-shell/config-generator": "^1.0.149",
+    "@vc-shell/ts-config": "^1.0.149",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "typescript": "^5.3.3",

package/shared/components/app-switcher/composables/useAppSwitcher/index.ts

@@ -2,6 +2,7 @@ import { computed, Ref, ref } from "vue";
 import { AppDescriptor, AppsClient } from "../../../../../core/api/platform";
 import { usePermissions } from "../../../../../core/composables";
 import { notification } from "./../../../notifications";
+import { i18n } from "../../../../../core/plugins";
 
 interface IUseAppSwitcher {
   readonly appsList: Ref<AppDescriptor[]>;
@@ -37,7 +38,7 @@ export function useAppSwitcher(): IUseAppSwitcher {
         window.location.href = window.location.origin + app.relativeUrl;
       }
     } else {
-      notification.error("Access restricted", {
+      notification.error(i18n.global.t("PERMISSION_MESSAGES.ACCESS_RESTRICTED"), {
         timeout: 3000,
       });
     }

package/shared/components/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue

@@ -1,32 +1,24 @@
 <template>
   <div class="tw-w-full tw-overflow-hidden tw-flex tw-grow tw-basis-0 tw-relative">
     <ErrorInterceptor
-      v-for="(blade, key, index) in blades?.components"
+      v-for="(bladeVNode, index) in blades"
       v-slot="{ error, reset }"
-      :key="key"
+      :key="index"
       capture
     >
-      <router-view
-        v-show="index >= quantity - ($isMobile.value ? 1 : 2)"
-        v-slot="{ Component }"
-        :key="key"
-        :name="key"
-      >
+      <router-view v-show="index >= quantity - ($isMobile.value ? 1 : 2)">
         <VcBladeView
-          v-slot="{ blade }"
-          :key="blade.type?.name || key"
-          :blade="Component as BladeVNode"
-          :name="key"
-          :idx="index"
+          v-slot="{ Component }"
+          :key="bladeVNode.type?.name || `blade_${index}`"
+          :blade="bladeVNode"
         >
           <component
-            :is="blade"
+            :is="Component"
             :ref="refs.set"
-            :key="blade.props.navigation?.uniqueRouteKey ?? 0"
             :error="error"
             :closable="index >= 1"
-            :expandable="Object.keys(blades?.components || {}).length > 1"
-            :expanded="index === Object.keys(blades?.components || {}).length - 1"
+            :expandable="quantity > 1"
+            :expanded="index === quantity - 1"
             @close:blade="closeBlade(index)"
             @parent:call="onParentCall(refs[index - 1], $event)"
             @vue:before-unmount="reset"
@@ -40,22 +32,16 @@
 
 <script lang="ts" setup>
 import { computed } from "vue";
-import { useRouter } from "vue-router";
-import { BladeVNode, useBladeNavigation } from "./../../../../../shared";
+import { RouterView } from "vue-router";
+import { useBladeNavigation } from "./../../../../../shared";
 import { ErrorInterceptor } from "./../../../error-interceptor";
 import { VcBladeView } from "./../vc-blade-view/vc-blade-view";
 import { useTemplateRefsList } from "@vueuse/core";
 
 const { blades, closeBlade, onParentCall } = useBladeNavigation();
 
-const router = useRouter();
-
 const quantity = computed(() => {
-  return (
-    (router.currentRoute.value.matched[1]?.components &&
-      Object.keys(router.currentRoute.value.matched[1].components).length) ||
-    0
-  );
+  return blades.value.length || 0;
 });
 
 const refs = useTemplateRefsList<HTMLDivElement>();

package/shared/components/blade-navigation/components/vc-blade-view/vc-blade-view.ts

@@ -1,6 +1,7 @@
-import { Slot, defineComponent, h, provide, ref, VNode, PropType, Component } from "vue";
+import { Slot, defineComponent, h, provide, ref, VNode, PropType, Component, watch } from "vue";
 import { navigationViewLocation } from "./../../injectionKeys";
-import { BladeVNode } from "../../types";
+import { BladeVNode, CoreBladeExposed } from "../../types";
+import { toRef } from "@vueuse/core";
 
 export const VcBladeView = defineComponent({
   name: "BladeView",
@@ -9,17 +10,22 @@ export const VcBladeView = defineComponent({
     blade: {
       type: Object as PropType<BladeVNode>,
     },
-    name: {
-      type: String,
-    },
-
-    idx: {
-      type: Number,
-    },
   },
   setup(props, { attrs, slots }) {
     provide(navigationViewLocation, props.blade!);
 
+    const viewRef = ref<CoreBladeExposed>();
+
+    watch(
+      () => [viewRef.value, props.blade] as const,
+      ([instance, blade]) => {
+        if (blade && blade.props?.navigation) {
+          blade.props.navigation.instance = toRef(instance);
+        }
+      },
+      { flush: "post" },
+    );
+
     return () => {
       /**
        * Callback function onClose, which is passed while opening blade, called when a BladeVNode is unmounted.
@@ -59,6 +65,7 @@ export const VcBladeView = defineComponent({
         const component = h(
           props.blade as Component,
           Object.assign({}, attrs, {
+            ref: viewRef,
             onVnodeUnmounted,
             onVnodeMounted,
             "onExpand:blade": onExpand,
@@ -67,14 +74,14 @@ export const VcBladeView = defineComponent({
           }),
         );
 
-        return normalizeSlot(slots.default, { blade: component });
+        return normalizeSlot(slots.default, { Component: component });
       }
       return null;
     };
   },
 });
 
-function normalizeSlot(slot: Slot | undefined, data: { blade: VNode }) {
+function normalizeSlot(slot: Slot | undefined, data: { Component: VNode }) {
   if (!slot) return null;
   const slotContent = slot(data);
   return slotContent.length === 1 ? slotContent[0] : slotContent;