Fix scratchbook->window-manager selector rename in Python/tour, use addSearchParams, guard focus()

Author: dannon

client/src/stores/windowManagerStore.ts

@@ -4,6 +4,7 @@ import { ref } from "vue";
 
 import _l from "@/utils/localization";
 import { withPrefix } from "@/utils/redirect";
+import { addSearchParams } from "@/utils/url";
 
 const STORAGE_KEY = "galaxy-window-manager-windows";
 
@@ -42,10 +43,7 @@ export const useWindowManagerStore = defineStore("windowManager", () => {
     }
 
     function buildUrl(url: string): string {
-        let fullUrl = withPrefix(url);
-        fullUrl += fullUrl.includes("?") ? "&" : "?";
-        fullUrl += "hide_panels=true&hide_masthead=true";
-        return fullUrl;
+        return addSearchParams(withPrefix(url), { hide_panels: "true", hide_masthead: "true" });
     }
 
     function add(options: { title?: string; url: string; x?: number; y?: number; width?: number; height?: number }) {
@@ -82,6 +80,9 @@ export const useWindowManagerStore = defineStore("windowManager", () => {
     }
 
     function focus(id: string) {
+        if (focusedId.value === id) {
+            return;
+        }
         focusedId.value = id;
         const win = windows.value.find((w) => w.id === id);
         if (win) {

config/plugins/tours/core.windows.yaml

@@ -80,7 +80,7 @@ steps:
       intro: "Clicking the eye-icon usually displays a dataset in the center panel."
       postclick: true
 
-    - element: ".scratchbook-window"
+    - element: ".window-manager-window"
       intro: "However while using the Window Manager, the dataset will be shown as resizable window."
 
     - title: "Done."

lib/galaxy/selenium/navigates_galaxy.py

@@ -2228,13 +2228,13 @@ def window_manager_is_active(self) -> bool:
 
     def window_manager_window_count(self) -> int:
         """Return number of open scratchbook windows."""
-        return len(self.find_elements_by_selector(".scratchbook-window"))
+        return len(self.find_elements_by_selector(".window-manager-window"))
 
     def window_manager_wait_for_window_count(self, expected_count: int):
         """Wait until the expected number of scratchbook windows exist."""
 
         def check_count(driver=None):
-            count = len(self.find_elements_by_selector(".scratchbook-window"))
+            count = len(self.find_elements_by_selector(".window-manager-window"))
             return count == expected_count
 
         self._wait_on(check_count, f"window count to be {expected_count}")
@@ -2247,7 +2247,7 @@ def scratchbook_frame(self, index=0):
             with self.scratchbook_frame(0):
                 self.wait_for_selector_visible(".dataset-view")
         """
-        iframes = self.find_elements_by_selector(".scratchbook-window iframe")
+        iframes = self.find_elements_by_selector(".window-manager-window iframe")
         assert len(iframes) > index, f"Expected at least {index + 1} scratchbook iframes, found {len(iframes)}"
         try:
             self.switch_to_frame(iframes[index])

lib/galaxy_test/selenium/test_window_manager_persistence.py

@@ -13,7 +13,7 @@ class TestWindowManagerPersistence(SeleniumTestCase):
 
     def setUp(self):
         super().setUp()
-        self.execute_script("localStorage.removeItem('galaxy-scratchbook-windows');")
+        self.execute_script("localStorage.removeItem('galaxy-window-manager-windows');")
 
     @selenium_test
     @managed_history