Merge pull request #20684 from dannon/fix-scratchbook-display

[25.0] Fix scratchbook display

Author: ahmedhamidawan

client/src/components/Dataset/DatasetView.vue

@@ -29,10 +29,12 @@ const { toggled: headerCollapsed, toggle: toggleHeaderCollapse } = usePersistent
 interface Props {
     datasetId: string;
     tab?: "details" | "edit" | "error" | "preview" | "raw" | "visualize";
+    displayOnly?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
     tab: "preview",
+    displayOnly: false,
 });
 
 const iframeLoading = ref(true);
@@ -90,7 +92,7 @@ watch(
 <template>
     <LoadingSpan v-if="isLoading || !dataset" message="Loading dataset details" />
     <div v-else class="dataset-view d-flex flex-column h-100">
-        <header :key="`dataset-header-${dataset.id}`" class="dataset-header flex-shrink-0">
+        <header v-if="!displayOnly" :key="`dataset-header-${dataset.id}`" class="dataset-header flex-shrink-0">
             <div class="d-flex">
                 <Heading
                     h1
@@ -132,7 +134,7 @@ watch(
                 </div>
             </transition>
         </header>
-        <BNav pills class="my-2 p-2 bg-light border-bottom">
+        <BNav v-if="!displayOnly" pills class="my-2 p-2 bg-light border-bottom">
             <BNavItem
                 title="View a preview of the dataset contents"
                 :active="tab === 'preview'"

client/src/components/History/Content/ContentItem.vue

@@ -13,6 +13,7 @@ import { BBadge, BButton, BCollapse } from "bootstrap-vue";
 import { computed, ref } from "vue";
 import { useRoute, useRouter } from "vue-router/composables";
 
+import { getGalaxyInstance } from "@/app";
 import type { ItemUrls } from "@/components/History/Content/Dataset/index";
 import { updateContentFields } from "@/components/History/model/queries";
 import { useEntryPointStore } from "@/stores/entryPointStore";
@@ -21,6 +22,7 @@ import { clearDrag } from "@/utils/setDrag";
 
 import { JobStateSummary } from "./Collection/JobStateSummary";
 import { getContentItemState, type StateMap, STATES } from "./model/states";
+import type { RouterPushOptions } from "./router-push-options";
 
 import CollectionDescription from "./Collection/CollectionDescription.vue";
 import ContentOptions from "./ContentOptions.vue";
@@ -263,15 +265,33 @@ function onDisplay() {
         const url = entryPointsForHda[0]?.target;
         window.open(url, "_blank");
     } else {
+        const Galaxy = getGalaxyInstance();
+        const isWindowManagerActive = Galaxy.frame && Galaxy.frame.active;
+
+        // Build the display URL with displayOnly query param if needed
+        let displayUrl = itemUrls.value.display;
+        if (isWindowManagerActive && displayUrl) {
+            displayUrl += displayUrl.includes("?") ? "&displayOnly=true" : "?displayOnly=true";
+        }
+
         // vue-router 4 supports a native force push with clean URLs,
         // but we're using a __vkey__ bit as a workaround
         // Only conditionally force to keep urls clean most of the time.
         if (route.path === itemUrls.value.display) {
+            const options: RouterPushOptions = {
+                force: true,
+                preventWindowManager: !isWindowManagerActive,
+                title: isWindowManagerActive ? `${props.item.hid}: ${props.name}` : undefined,
+            };
             // @ts-ignore - monkeypatched router, drop with migration.
-            router.push(itemUrls.value.display, { force: true, preventWindowManager: true });
-        } else if (itemUrls.value.display) {
+            router.push(displayUrl, options);
+        } else if (displayUrl) {
+            const options: RouterPushOptions = {
+                preventWindowManager: !isWindowManagerActive,
+                title: isWindowManagerActive ? `${props.item.hid}: ${props.name}` : undefined,
+            };
             // @ts-ignore - monkeypatched router, drop with migration.
-            router.push(itemUrls.value.display, { preventWindowManager: true });
+            router.push(displayUrl, options);
         }
     }
 }

client/src/components/History/Content/router-push-options.ts

@@ -0,0 +1,12 @@
+/**
+ * Custom options for the monkeypatched router.push() method
+ * Used to control window manager behavior and force navigation
+ */
+export interface RouterPushOptions {
+    // Title for window manager frame
+    title?: string;
+    // Force reload (currently by adding timestamp to URL)
+    force?: boolean;
+    // Explicit WM bypass -- prevent opening in window manager even if active
+    preventWindowManager?: boolean;
+}

client/src/entry/analysis/router.js

@@ -266,6 +266,7 @@ export function getRouter(Galaxy) {
                         props: (route) => ({
                             datasetId: route.params.datasetId,
                             tab: route.params.tab,
+                            displayOnly: route.query.displayOnly === "true",
                         }),
                     },
                     {