Skip to content

[25.0] Avoid displaying dataset tab view in window manager #20317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2025
Merged

[25.0] Avoid displaying dataset tab view in window manager #20317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c8c998
Prevent opening dataset tab view in window manager
guerler May 20, 2025
1b1d959
Add explicit preventWindowManager parameter to router.push
dannon Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/components/History/Content/ContentItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,10 @@ function onDisplay() {
// Only conditionally force to keep urls clean most of the time.
if (route.path === itemUrls.value.display) {
// @ts-ignore - monkeypatched router, drop with migration.
router.push(itemUrls.value.display, { title: props.name, force: true });
router.push(itemUrls.value.display, { force: true, preventWindowManager: true });
} else if (itemUrls.value.display) {
// @ts-ignore - monkeypatched router, drop with migration.
router.push(itemUrls.value.display, { title: props.name });
router.push(itemUrls.value.display, { preventWindowManager: true });
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions client/src/entry/analysis/router-push.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import { addSearchParams } from "utils/url";
* refresh if needed.
*
* @param {String} Location as parsed to original router.push()
* @param {Object} Custom options, to provide a title and/or force reload
* @param {Object} Custom options, to provide a title, force reload, and/or prevent window manager
*/
export function patchRouterPush(VueRouter) {
const originalPush = VueRouter.prototype.push;
VueRouter.prototype.push = function push(location, options = {}) {
// add key to location to force component refresh
const { title, force } = options;
const { title, force, preventWindowManager } = options;
if (force) {
location = addSearchParams(location, { __vkey__: Date.now() });
}
Expand All @@ -27,7 +27,7 @@ export function patchRouterPush(VueRouter) {
}
// show location in window manager
const Galaxy = getGalaxyInstance();
if (title && Galaxy.frame && Galaxy.frame.active) {
if (title && !preventWindowManager && Galaxy.frame && Galaxy.frame.active) {
Galaxy.frame.add({ title: title, url: location });
return;
}
Expand Down
Loading