@vc-shell/framework 1.0.95 → 1.0.97

package/dist/ui/components/organisms/vc-dynamic-property/index.d.ts

@@ -1,7 +1,7 @@
 export declare const VcDynamicProperty: <T>(__VLS_props: {
     property: T;
     modelValue: any;
-    optionsGetter: (property: T, keyword?: string, locale?: string) => unknown[] | Promise<unknown[]>;
+    optionsGetter: (property: T, keyword?: string, locale?: string) => any[] | Promise<any[]>;
     required: boolean;
     multivalue?: boolean;
     multilanguage?: boolean;
@@ -26,7 +26,7 @@ export declare const VcDynamicProperty: <T>(__VLS_props: {
     props: {
         property: T;
         modelValue: any;
-        optionsGetter: (property: T, keyword?: string, locale?: string) => unknown[] | Promise<unknown[]>;
+        optionsGetter: (property: T, keyword?: string, locale?: string) => any[] | Promise<any[]>;
         required: boolean;
         multivalue?: boolean;
         multilanguage?: boolean;
@@ -63,7 +63,7 @@ export declare const VcDynamicProperty: <T>(__VLS_props: {
     props: {
         property: T;
         modelValue: any;
-        optionsGetter: (property: T, keyword?: string, locale?: string) => unknown[] | Promise<unknown[]>;
+        optionsGetter: (property: T, keyword?: string, locale?: string) => any[] | Promise<any[]>;
         required: boolean;
         multivalue?: boolean;
         multilanguage?: boolean;
@@ -103,7 +103,7 @@ export declare const VcDynamicProperty: <T>(__VLS_props: {
         props: {
             property: T;
             modelValue: any;
-            optionsGetter: (property: T, keyword?: string, locale?: string) => unknown[] | Promise<unknown[]>;
+            optionsGetter: (property: T, keyword?: string, locale?: string) => any[] | Promise<any[]>;
             required: boolean;
             multivalue?: boolean;
             multilanguage?: boolean;

package/dist/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.d.ts

@@ -1,7 +1,7 @@
 declare const _default: <T>(__VLS_props: {
     property: T;
     modelValue: any;
-    optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<unknown[]> | unknown[];
+    optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<any[]> | any[];
     required: boolean;
     multivalue?: boolean;
     multilanguage?: boolean;
@@ -26,7 +26,7 @@ declare const _default: <T>(__VLS_props: {
     props: {
         property: T;
         modelValue: any;
-        optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<unknown[]> | unknown[];
+        optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<any[]> | any[];
         required: boolean;
         multivalue?: boolean;
         multilanguage?: boolean;
@@ -63,7 +63,7 @@ declare const _default: <T>(__VLS_props: {
     props: {
         property: T;
         modelValue: any;
-        optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<unknown[]> | unknown[];
+        optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<any[]> | any[];
         required: boolean;
         multivalue?: boolean;
         multilanguage?: boolean;
@@ -103,7 +103,7 @@ declare const _default: <T>(__VLS_props: {
         props: {
             property: T;
             modelValue: any;
-            optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<unknown[]> | unknown[];
+            optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<any[]> | any[];
             required: boolean;
             multivalue?: boolean;
             multilanguage?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.ts"],"names":[],"mappings":";;gBAgfgB,GAAG;2CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE;cACvF,OAAO;iBACJ,OAAO;oBACJ,OAAO;sBACL,MAAM;eACb,MAAM;iBACJ,OAAO;UACd,MAAM;mBACG,MAAM;mBACN,MAAM;mBACN;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,EAAE;YACK;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACf;eACU,OAAO;kBACJ,MAAM;;;;oBArBR,GAAG;+CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE;kBACvF,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;SACf;mBACU,OAAO;sBACJ,MAAM;;yBASe,IAAI;WACpC,GAAG;;;;;4BANwC,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;;;;oBAzB5F,GAAG;+CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE;kBACvF,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;SACf;mBACU,OAAO;sBACJ,MAAM;;yBASe,IAAI;WACpC,GAAG;;;;;4BANwC,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;;;;;;;wBAzB5F,GAAG;mDACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE;sBACvF,OAAO;yBACJ,OAAO;4BACJ,OAAO;8BACL,MAAM;uBACb,MAAM;yBACJ,OAAO;kBACd,MAAM;2BACG,MAAM;2BACN,MAAM;2BACN;gBACb,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,YAAY,CAAC,EAAE,MAAM,CAAC;aACvB,EAAE;oBACK;gBACN,GAAG,EAAE,MAAM,CAAC;gBACZ,GAAG,EAAE,MAAM,CAAC;gBACZ,KAAK,EAAE,MAAM,CAAC;aACf;uBACU,OAAO;0BACJ,MAAM;;6BASe,IAAI;eACpC,GAAG;;;;;gCANwC,GAAG;sCAAwB,GAAG,EAAE;kCAAoB,MAAM;;;;;AAlgB5G,wBA4gBkE"}
+{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.ts"],"names":[],"mappings":";;gBAgfgB,GAAG;2CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE;cAC/E,OAAO;iBACJ,OAAO;oBACJ,OAAO;sBACL,MAAM;eACb,MAAM;iBACJ,OAAO;UACd,MAAM;mBACG,MAAM;mBACN,MAAM;mBACN;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,EAAE;YACK;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACf;eACU,OAAO;kBACJ,MAAM;;;;oBArBR,GAAG;+CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE;kBAC/E,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;SACf;mBACU,OAAO;sBACJ,MAAM;;yBASe,IAAI;WACpC,GAAG;;;;;4BANwC,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;;;;oBAzB5F,GAAG;+CACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE;kBAC/E,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;SACf;mBACU,OAAO;sBACJ,MAAM;;yBASe,IAAI;WACpC,GAAG;;;;;4BANwC,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;;;;;;;wBAzB5F,GAAG;mDACwB,MAAM,WAAW,MAAM,KAAK,QAAQ,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE;sBAC/E,OAAO;yBACJ,OAAO;4BACJ,OAAO;8BACL,MAAM;uBACb,MAAM;yBACJ,OAAO;kBACd,MAAM;2BACG,MAAM;2BACN,MAAM;2BACN;gBACb,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,YAAY,CAAC,EAAE,MAAM,CAAC;aACvB,EAAE;oBACK;gBACN,GAAG,EAAE,MAAM,CAAC;gBACZ,GAAG,EAAE,MAAM,CAAC;gBACZ,KAAK,EAAE,MAAM,CAAC;aACf;uBACU,OAAO;0BACJ,MAAM;;6BASe,IAAI;eACpC,GAAG;;;;;gCANwC,GAAG;sCAAwB,GAAG,EAAE;kCAAoB,MAAM;;;;;AAlgB5G,wBA4gBkE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "main": "./dist/framework.mjs",
   "module": "./dist/framework.mjs",
   "types": "./dist/index.d.ts",
@@ -55,8 +55,8 @@
     "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.95",
-    "@vc-shell/config-generator": "^1.0.95",
+    "@vc-shell/api-client-generator": "^1.0.97",
+    "@vc-shell/config-generator": "^1.0.97",
     "@vitejs/plugin-vue": "^4.2.3",
     "sass": "^1.62.1",
     "typescript": "~5.0.4",

package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts

@@ -9,6 +9,7 @@ import {
   markRaw,
   inject,
   nextTick,
+  warn,
 } from "vue";
 import * as _ from "lodash-es";
 import { useRouter, RouteLocationNormalized } from "vue-router";
@@ -55,6 +56,7 @@ interface IUseBladeNavigation {
   resolveBlades: (to: RouteLocationNormalized) => string;
   resolveLastBlade: (pages: BladePageComponent[]) => void;
   resolveUnknownRoutes: (to: RouteLocationNormalized) => string;
+  resolveBladeByName: (name: string) => BladeConstructor;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -118,6 +120,9 @@ export function useBladeNavigation(): IUseBladeNavigation {
     { blade, param, options, onOpen, onClose }: IBladeEvent<Blade>,
     isWorkspace = false
   ) {
+    if (!blade) {
+      throw new Error("You should pass blade component as openBlade argument");
+    }
     if (isWorkspace) {
       openWorkspace({ blade, param, options });
       return;
@@ -205,6 +210,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
     if (blade && checkPermission(blade.permissions)) {
       navigationInstance.blades.value.push({
         blade: markRaw(blade),
+        ...resolveDynamicProps(blade),
         options,
         param,
         onOpen,
@@ -222,6 +228,21 @@ export function useBladeNavigation(): IUseBladeNavigation {
     }
   }
 
+  function resolveDynamicProps(blade: BladeConstructor) {
+    const routerRoutes = router.getRoutes();
+
+    const selectedRoute = routerRoutes.find((r) => r.path === blade.url);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const selectedRouteProps = selectedRoute?.props as Record<string, () => any>;
+
+    if (selectedRouteProps && "default" in selectedRouteProps && typeof selectedRouteProps.default === "function") {
+      return selectedRouteProps.default();
+    }
+
+    return {};
+  }
+
   async function onParentCall(index: number, args: IParentCallArgs) {
     console.debug(`vc-app#onParentCall(${index}, { method: ${args.method} }) called.`);
 
@@ -296,18 +317,33 @@ export function useBladeNavigation(): IUseBladeNavigation {
     }
   }
 
+  function resolveBladeByName(name: string) {
+    if (!instance) {
+      warn("resolveComponentByName can only be used in setup().");
+      return;
+    }
+    if (!name) {
+      throw new Error("blade name is required");
+    }
+
+    console.log(instance.appContext.components);
+    const components = instance && instance.appContext.components;
+    return components[name] as BladeConstructor;
+  }
+
   return {
-    blades: computed(() => navigationInstance.blades.value),
+    blades: computed(() => navigationInstance?.blades.value),
     workspaceOptions: computed(() => workspaceOptions.value),
     workspaceParam: computed(() => workspaceParam.value),
     lastBladeData: computed(() => lastBladeData.value),
     activeBlade,
-    bladesRefs: navigationInstance.bladesRefs,
+    bladesRefs: navigationInstance?.bladesRefs,
     openBlade,
     closeBlade,
     onParentCall,
     resolveBlades,
     resolveUnknownRoutes,
     resolveLastBlade,
+    resolveBladeByName,
   };
 }

package/shared/components/blade-navigation/types/index.ts

@@ -25,9 +25,6 @@ export type BladePageComponent = BladeConstructor;
 export type CoreBladeAdditionalSettings = {
   url?: `/${string}`;
   permissions?: string | string[];
-  scope?: {
-    notificationClick?: (notification: PushNotification | Record<string, any>) => IBladeEvent;
-  };
 };
 
 export type CoreBladeNavigationData = {
@@ -36,7 +33,6 @@ export type CoreBladeNavigationData = {
 
 export interface CoreBladeExposed {
   title?: string;
-  notificationClick?: (notification: PushNotification) => IBladeEvent;
   onBeforeClose?: () => Promise<boolean>;
   reloadParent?: () => void;
   reload?: () => void;

package/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue

@@ -272,7 +272,7 @@ const props = withDefaults(
   defineProps<{
     property: T;
     modelValue: any;
-    optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<unknown[]> | unknown[];
+    optionsGetter: (property: T, keyword?: string, locale?: string) => Promise<any[]> | any[];
     required: boolean;
     multivalue?: boolean;
     multilanguage?: boolean;