@vc-shell/framework 1.0.96 → 1.0.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.96",
+  "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.96",
-    "@vc-shell/config-generator": "^1.0.96",
+    "@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;