@vc-shell/framework 1.1.27 → 1.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -70,9 +70,9 @@
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^7.0.2",
     "@types/dompurify": "^3.0.5",
-    "@vc-shell/api-client-generator": "^1.1.27",
-    "@vc-shell/config-generator": "^1.1.27",
-    "@vc-shell/ts-config": "^1.1.27",
+    "@vc-shell/api-client-generator": "^1.1.28",
+    "@vc-shell/config-generator": "^1.1.28",
+    "@vc-shell/ts-config": "^1.1.28",
     "@vitejs/plugin-vue": "^5.2.3",
     "@vue/test-utils": "^2.4.5",
     "cypress-signalr-mock": "^1.5.0",

package/shared/components/blade-navigation/composables/useBladeNavigation/internal/bladeRouteResolver.ts

@@ -215,7 +215,7 @@ export function _createBladeRouteResolver(
         effectiveBladeSegment = undefined;
       }
 
-      if (effectiveBladeSegment && bladeComponent && bladeComponent.isBlade) {
+      if (effectiveBladeSegment && bladeComponent && bladeComponent.isBlade && !bladeComponent.isWorkspace) {
         if (!hasAccess(bladeComponent.permissions)) {
           // No access to blade, workspace remains open
         } else {

package/shared/components/blade-navigation/composables/useBladeNavigation/internal/bladeWatchers.ts

@@ -57,30 +57,36 @@ export function _createBladeWatchers(
     bladeState.blades,
     (newBlades) => {
       const workspace = newBlades[0];
-      const lastBladeWithUrl = _.findLast(
-        newBlades,
-        (b: BladeVNode) => b && b.type.url && b.props?.navigation?.isVisible !== false,
+
+      const visibleBladesWithUrls = newBlades.filter(
+        (b): b is BladeVNode => !!(b && b.type && b.type.url && b.props?.navigation?.isVisible !== false),
       );
+      const lastBladeWithUrl: BladeVNode | undefined =
+        visibleBladesWithUrls.length > 0 ? visibleBladesWithUrls[visibleBladesWithUrls.length - 1] : undefined;
 
       if (workspace?.type?.url) {
-        const constructedPath = routerUtils.constructBladePath(workspace, lastBladeWithUrl as BladeVNode | undefined);
+        const constructedPath = routerUtils.constructBladePath(workspace, lastBladeWithUrl);
+
         if (constructedPath) {
           const query = routerUtils.getURLQuery();
-          const fullPath =
-            (routerUtils.mainRouteBaseParamURL.value &&
+          const pathPrefix =
+            routerUtils.mainRouteBaseParamURL.value &&
             !constructedPath.startsWith(routerUtils.mainRouteBaseParamURL.value)
               ? routerUtils.mainRouteBaseParamURL.value
-              : "") +
-            constructedPath +
-            (query.params ? "?" + query.params : "");
+              : "";
+          const querySuffix = query.params ? "?" + query.params : "";
+
+          const finalFullPathToSet = pathPrefix + constructedPath + querySuffix;
+
+          router.options.history.replace(finalFullPathToSet);
 
-          if (route.fullPath !== fullPath) {
-            router.options.history.replace(fullPath);
-            if (lastBladeWithUrl && (lastBladeWithUrl as BladeVNode).type.name) {
-              setupPageTracking.afterEach({ name: (lastBladeWithUrl as BladeVNode).type.name!, fullPath });
-            } else if (workspace.type.name) {
-              setupPageTracking.afterEach({ name: workspace.type.name, fullPath });
-            }
+          if (lastBladeWithUrl && lastBladeWithUrl.type.name) {
+            setupPageTracking.afterEach({
+              name: lastBladeWithUrl.type.name!,
+              fullPath: finalFullPathToSet,
+            });
+          } else if (workspace.type.name) {
+            setupPageTracking.afterEach({ name: workspace.type.name, fullPath: finalFullPathToSet });
           }
         }
       }