Merge branch 'release_24.1' into dev

dannon · Oct 16, 2024 · b342cf5 · b342cf5
2 parents 3e15aa0 + d772cbc
commit b342cf5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/client/src/components/Workflow/List/WorkflowCard.vue b/client/src/components/Workflow/List/WorkflowCard.vue
@@ -282,6 +282,7 @@ async function onTagClick(tag: string) {
 
         .workflow-card-header {
             display: grid;
+            position: relative;
 
             .workflow-count-actions {
                 display: flex;

diff --git a/client/src/utils/redirect.test.ts b/client/src/utils/redirect.test.ts
@@ -10,6 +10,10 @@ test("route prefix changes", async () => {
     expect(withPrefix("http://")).toEqual("http://");
     expect(withPrefix("/")).toEqual("/prefix/");
     expect(withPrefix("/home")).toEqual("/prefix/home");
+    // keep protocols in query parameters intact
+    expect(withPrefix("/authz/cilogon/login?idphint=https://test.com")).toEqual(
+        "/prefix/authz/cilogon/login?idphint=https://test.com"
+    );
     // ensure that it can only be called once
     expect(withPrefix(withPrefix("/home"))).toEqual("/prefix/prefix/home");
     // This doesn't do what it looks like it should do?

diff --git a/client/src/utils/redirect.ts b/client/src/utils/redirect.ts
@@ -10,7 +10,7 @@ export function reloadPage() {
     window.location.reload();
 }
 
-const slashCleanup = /(\/)+/g;
+const slashCleanup = /(?<!:)(\/)+/g;
 /**
  * Prepends the configured app root to given url
  * @param path

diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
@@ -429,7 +429,7 @@ def replace_dataset_ids(path, key, value):
                 else:
                     return []
 
-            stmt = stmt.where(*data_conditions).group_by(model.Job.id, *used_ids).order_by(model.Job.id.desc())
+        stmt = stmt.where(*data_conditions).group_by(model.Job.id, *used_ids).order_by(model.Job.id.desc())
 
         for job in self.sa_session.execute(stmt):
             # We found a job that is equal in terms of tool_id, user, state and input datasets,