From 60cd5fc27970b712b3d9731bce9ce4c124d135f3 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 19 Jan 2022 11:26:35 +0100
Subject: [PATCH 01/11] Fix workflow invocation name overflow

This will force wrapping the name of the workflow when it overflows
---
 client/src/components/Workflow/Invocations.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 9e655d3da27..f357b1929ef 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -150,3 +150,8 @@ export default {
     },
 };
 </script>
+<style scoped>
+.toggle-invocation-details {
+    word-break: break-all;
+}
+</style>

From 9ba9783bd0306d97f94a0aada4df1d71c53aae39 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 19 Jan 2022 18:35:26 +0100
Subject: [PATCH 02/11] Use break-word on overflow-wrap

---
 client/src/components/Workflow/Invocations.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index f357b1929ef..d895db53716 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -152,6 +152,6 @@ export default {
 </script>
 <style scoped>
 .toggle-invocation-details {
-    word-break: break-all;
+    overflow-wrap: break-word;
 }
 </style>

From b920bfb7a953520afc30227487b1f3fb8ca89711 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Wed, 19 Jan 2022 18:36:50 +0100
Subject: [PATCH 03/11] Set table columns widths as suggested in comments

---
 .../src/components/Workflow/Invocations.vue   | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index d895db53716..b74b45bc2fd 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -99,12 +99,12 @@ export default {
     },
     data() {
         const fields = [
-            { key: "workflow_id", label: "Workflow" },
-            { key: "history_id", label: "History" },
-            { key: "create_time", label: "Invoked" },
-            { key: "update_time", label: "Updated" },
-            { key: "state" },
-            { key: "execute", label: "" },
+            { key: "workflow_id", label: "Workflow", class: "col-name" },
+            { key: "history_id", label: "History", class: "col-history" },
+            { key: "create_time", label: "Invoked", class: "col-small" },
+            { key: "update_time", label: "Updated", class: "col-small" },
+            { key: "state", class: "col-small" },
+            { key: "execute", label: "", class: "col-execute" },
         ];
         return {
             invocationItemsModel: [],
@@ -154,4 +154,17 @@ export default {
 .toggle-invocation-details {
     overflow-wrap: break-word;
 }
+.table::v-deep .col-name {
+    width: 40%;
+    min-width: 20ch;
+}
+.table::v-deep .col-history {
+    width: 20%;
+}
+.table::v-deep .col-small {
+    width: 100px;
+}
+.table::v-deep .col-execute {
+    width: 50px;
+}
 </style>

From 71e3fd4a6812e10c84028e4f8c449cf9fd57e773 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:26:40 +0100
Subject: [PATCH 04/11] Add min-width to table

This will prevent the workflow name column to completely dissapear in small resolutions
---
 client/src/components/Workflow/Invocations.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index b74b45bc2fd..5afa90b0fea 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -21,6 +21,7 @@
                 caption-top
                 :busy="loading"
                 fixed
+                class="invocations-table"
             >
                 <template v-slot:row-details="row">
                     <b-card>
@@ -151,12 +152,13 @@ export default {
 };
 </script>
 <style scoped>
-.toggle-invocation-details {
-    overflow-wrap: break-word;
+.invocations-table {
+    min-width: 40rem;
 }
 .table::v-deep .col-name {
-    width: 40%;
-    min-width: 20ch;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 .table::v-deep .col-history {
     width: 20%;

From 5e603a9856cf1d49b765020b7f48f1f03be539ec Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:28:34 +0100
Subject: [PATCH 05/11] Add explicit row expand button

- Makes more obvious that the row can be expanded.
- Allows to display the full name in the tooltip when truncated.
---
 .../src/components/Workflow/Invocations.vue   | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 5afa90b0fea..5608fae4f8c 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -34,11 +34,27 @@
                         />
                     </b-card>
                 </template>
+                <template v-slot:cell(expand)="data">
+                    <b-link
+                        v-b-tooltip.hover.bottom
+                        title="Show Invocation Details"
+                        class="btn-sm fa fa-chevron-down"
+                        v-if="!data.detailsShowing"
+                        @click.stop="swapRowDetails(data)"
+                    />
+                    <b-link
+                        v-b-tooltip.hover.bottom
+                        title="Hide Invocation Details"
+                        class="btn-sm fa fa-chevron-up"
+                        v-if="data.detailsShowing"
+                        @click.stop="swapRowDetails(data)"
+                    />
+                </template>
                 <template v-slot:cell(workflow_id)="data">
                     <b-link
                         class="toggle-invocation-details"
                         v-b-tooltip
-                        title="Show Invocation details"
+                        :title="getWorkflowNameByInstanceId(data.item.workflow_id)"
                         href="#"
                         @click.stop="swapRowDetails(data)"
                     >
@@ -100,12 +116,13 @@ export default {
     },
     data() {
         const fields = [
+            { key: "expand", label: "", class: "col-button" },
             { key: "workflow_id", label: "Workflow", class: "col-name" },
             { key: "history_id", label: "History", class: "col-history" },
             { key: "create_time", label: "Invoked", class: "col-small" },
             { key: "update_time", label: "Updated", class: "col-small" },
             { key: "state", class: "col-small" },
-            { key: "execute", label: "", class: "col-execute" },
+            { key: "execute", label: "", class: "col-button" },
         ];
         return {
             invocationItemsModel: [],
@@ -166,7 +183,7 @@ export default {
 .table::v-deep .col-small {
     width: 100px;
 }
-.table::v-deep .col-execute {
+.table::v-deep .col-button {
     width: 50px;
 }
 </style>

From de633e9b52bbdf18d69edbee21d2eba4df794ec3 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:43:14 +0100
Subject: [PATCH 06/11] Fix column index in unit tests

After adding a new "first" column for expanding
---
 client/src/components/Workflow/Invocations.test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.test.js b/client/src/components/Workflow/Invocations.test.js
index aae62d91f19..cf4285d4071 100644
--- a/client/src/components/Workflow/Invocations.test.js
+++ b/client/src/components/Workflow/Invocations.test.js
@@ -75,12 +75,12 @@ describe("Invocations.vue with invocation", () => {
         expect(rows.length).toBe(1);
         const row = rows[0];
         const columns = row.findAll("td");
-        expect(columns.at(0).text()).toBe("workflow name");
-        expect(columns.at(1).text()).toBe("history name");
-        expect(columns.at(2).text()).toBe(moment.utc(invocationData.create_time).fromNow());
-        expect(columns.at(3).text()).toBe(moment.utc(invocationData.update_time).fromNow());
-        expect(columns.at(4).text()).toBe("scheduled");
-        expect(columns.at(5).text()).toBe("");
+        expect(columns.at(1).text()).toBe("workflow name");
+        expect(columns.at(2).text()).toBe("history name");
+        expect(columns.at(3).text()).toBe(moment.utc(invocationData.create_time).fromNow());
+        expect(columns.at(4).text()).toBe(moment.utc(invocationData.update_time).fromNow());
+        expect(columns.at(5).text()).toBe("scheduled");
+        expect(columns.at(6).text()).toBe("");
     });
 
     it("toggles detail rendering", async () => {

From 36a0f5618403e6279f268e37f989fcfa134138c4 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 13:42:08 +0100
Subject: [PATCH 07/11] Truncate history name too

---
 client/src/components/Workflow/Invocations.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 5608fae4f8c..37f4d061855 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -117,8 +117,8 @@ export default {
     data() {
         const fields = [
             { key: "expand", label: "", class: "col-button" },
-            { key: "workflow_id", label: "Workflow", class: "col-name" },
-            { key: "history_id", label: "History", class: "col-history" },
+            { key: "workflow_id", label: "Workflow", class: "col-name truncate" },
+            { key: "history_id", label: "History", class: "col-history truncate" },
             { key: "create_time", label: "Invoked", class: "col-small" },
             { key: "update_time", label: "Updated", class: "col-small" },
             { key: "state", class: "col-small" },
@@ -173,9 +173,7 @@ export default {
     min-width: 40rem;
 }
 .table::v-deep .col-name {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
+    width: 40%;
 }
 .table::v-deep .col-history {
     width: 20%;
@@ -186,4 +184,9 @@ export default {
 .table::v-deep .col-button {
     width: 50px;
 }
+.table::v-deep .truncate {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
 </style>

From 407c04d711e5609d350a073554e7e9d9f40fff06 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 13:44:28 +0100
Subject: [PATCH 08/11] Fix tooltip position

The tooltip was ignoring the text-overflow when the full name was truncated and was positioned in the center of where the full text would be.
Putting the tooltip into a wrapping div seems to solve the issue.
---
 .../src/components/Workflow/Invocations.vue   | 59 +++++++++----------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 37f4d061855..6285eb90a4c 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -35,42 +35,39 @@
                     </b-card>
                 </template>
                 <template v-slot:cell(expand)="data">
-                    <b-link
-                        v-b-tooltip.hover.bottom
-                        title="Show Invocation Details"
-                        class="btn-sm fa fa-chevron-down"
-                        v-if="!data.detailsShowing"
-                        @click.stop="swapRowDetails(data)"
-                    />
-                    <b-link
-                        v-b-tooltip.hover.bottom
-                        title="Hide Invocation Details"
-                        class="btn-sm fa fa-chevron-up"
-                        v-if="data.detailsShowing"
-                        @click.stop="swapRowDetails(data)"
-                    />
+                    <div class="toggle-invocation-details">
+                        <b-link
+                            v-b-tooltip.hover.top
+                            title="Show Invocation Details"
+                            class="btn-sm fa fa-chevron-down"
+                            v-if="!data.detailsShowing"
+                            @click.stop="swapRowDetails(data)"
+                        />
+                        <b-link
+                            v-b-tooltip.hover.top
+                            title="Hide Invocation Details"
+                            class="btn-sm fa fa-chevron-up"
+                            v-if="data.detailsShowing"
+                            @click.stop="swapRowDetails(data)"
+                        />
+                    </div>
                 </template>
                 <template v-slot:cell(workflow_id)="data">
-                    <b-link
-                        class="toggle-invocation-details"
-                        v-b-tooltip
-                        :title="getWorkflowNameByInstanceId(data.item.workflow_id)"
-                        href="#"
-                        @click.stop="swapRowDetails(data)"
-                    >
-                        <b>{{ getWorkflowNameByInstanceId(data.item.workflow_id) }}</b>
-                    </b-link>
+                    <div v-b-tooltip.hover.top :title="getWorkflowNameByInstanceId(data.item.workflow_id)">
+                        <b-link href="#" @click.stop="swapRowDetails(data)">
+                            <b>{{ getWorkflowNameByInstanceId(data.item.workflow_id) }}</b>
+                        </b-link>
+                    </div>
                 </template>
                 <template v-slot:cell(history_id)="data">
-                    <b-link
-                        id="switch-to-history"
-                        v-b-tooltip
-                        title="Switch to History"
-                        href="#"
-                        @click.stop="switchHistory(data.item.history_id)"
+                    <div
+                        v-b-tooltip.hover.top
+                        :title="`Switch to History: ${getHistoryNameById(data.item.history_id)}`"
                     >
-                        <b>{{ getHistoryNameById(data.item.history_id) }}</b>
-                    </b-link>
+                        <b-link id="switch-to-history" href="#" @click.stop="switchHistory(data.item.history_id)">
+                            <b>{{ getHistoryNameById(data.item.history_id) }}</b>
+                        </b-link>
+                    </div>
                 </template>
                 <template v-slot:cell(create_time)="data">
                     <UtcDate :date="data.value" mode="elapsed" />

From bac2cc24c40b7ec6254659f58c15dd7ed0630f51 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:26:24 +0100
Subject: [PATCH 09/11] Move `toggle-invocation-details` class to expand column

---
 .../src/components/Workflow/Invocations.vue   | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 6285eb90a4c..0ba5d9faa74 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -35,22 +35,20 @@
                     </b-card>
                 </template>
                 <template v-slot:cell(expand)="data">
-                    <div class="toggle-invocation-details">
-                        <b-link
-                            v-b-tooltip.hover.top
-                            title="Show Invocation Details"
-                            class="btn-sm fa fa-chevron-down"
-                            v-if="!data.detailsShowing"
-                            @click.stop="swapRowDetails(data)"
-                        />
-                        <b-link
-                            v-b-tooltip.hover.top
-                            title="Hide Invocation Details"
-                            class="btn-sm fa fa-chevron-up"
-                            v-if="data.detailsShowing"
-                            @click.stop="swapRowDetails(data)"
-                        />
-                    </div>
+                    <b-link
+                        v-b-tooltip.hover.top
+                        title="Show Invocation Details"
+                        class="btn-sm fa fa-chevron-down toggle-invocation-details"
+                        v-if="!data.detailsShowing"
+                        @click.stop="swapRowDetails(data)"
+                    />
+                    <b-link
+                        v-b-tooltip.hover.top
+                        title="Hide Invocation Details"
+                        class="btn-sm fa fa-chevron-up toggle-invocation-details"
+                        v-if="data.detailsShowing"
+                        @click.stop="swapRowDetails(data)"
+                    />
                 </template>
                 <template v-slot:cell(workflow_id)="data">
                     <div v-b-tooltip.hover.top :title="getWorkflowNameByInstanceId(data.item.workflow_id)">

From ad9b422f9231013db98c7fc622bb36ef0725f7ee Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Fri, 21 Jan 2022 14:45:56 +0100
Subject: [PATCH 10/11] Fix column text overflow after wrapping in div

And slightly enhance switch to history tooltip
---
 client/src/components/Workflow/Invocations.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Workflow/Invocations.vue b/client/src/components/Workflow/Invocations.vue
index 0ba5d9faa74..b80969e4a53 100644
--- a/client/src/components/Workflow/Invocations.vue
+++ b/client/src/components/Workflow/Invocations.vue
@@ -51,7 +51,11 @@
                     />
                 </template>
                 <template v-slot:cell(workflow_id)="data">
-                    <div v-b-tooltip.hover.top :title="getWorkflowNameByInstanceId(data.item.workflow_id)">
+                    <div
+                        v-b-tooltip.hover.top
+                        :title="getWorkflowNameByInstanceId(data.item.workflow_id)"
+                        class="truncate"
+                    >
                         <b-link href="#" @click.stop="swapRowDetails(data)">
                             <b>{{ getWorkflowNameByInstanceId(data.item.workflow_id) }}</b>
                         </b-link>
@@ -59,8 +63,9 @@
                 </template>
                 <template v-slot:cell(history_id)="data">
                     <div
-                        v-b-tooltip.hover.top
-                        :title="`Switch to History: ${getHistoryNameById(data.item.history_id)}`"
+                        v-b-tooltip.hover.top.html
+                        :title="`<b>Switch to History:</b><br>${getHistoryNameById(data.item.history_id)}`"
+                        class="truncate"
                     >
                         <b-link id="switch-to-history" href="#" @click.stop="switchHistory(data.item.history_id)">
                             <b>{{ getHistoryNameById(data.item.history_id) }}</b>
@@ -112,8 +117,8 @@ export default {
     data() {
         const fields = [
             { key: "expand", label: "", class: "col-button" },
-            { key: "workflow_id", label: "Workflow", class: "col-name truncate" },
-            { key: "history_id", label: "History", class: "col-history truncate" },
+            { key: "workflow_id", label: "Workflow", class: "col-name" },
+            { key: "history_id", label: "History", class: "col-history" },
             { key: "create_time", label: "Invoked", class: "col-small" },
             { key: "update_time", label: "Updated", class: "col-small" },
             { key: "state", class: "col-small" },

From 29f8b1807f550119c787b86c46a168dd0fd3b9e5 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 20 Jan 2022 19:02:15 +0100
Subject: [PATCH 11/11] Handle unique tag name constraints

The idea is to create the tag one by one in a separate session, and
catch any violations.
---
 lib/galaxy/model/tags.py              | 15 ++++++++++++++-
 test/unit/managers/test_TagHandler.py |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/galaxy/model/tags.py b/lib/galaxy/model/tags.py
index fd96b8b6634..17260ddfbfa 100644
--- a/lib/galaxy/model/tags.py
+++ b/lib/galaxy/model/tags.py
@@ -2,6 +2,8 @@ import logging
 import re
 from typing import Dict
 
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.scoping import scoped_session
 from sqlalchemy.sql import select
 from sqlalchemy.sql.expression import func
@@ -245,7 +247,18 @@ class TagHandler:
         return self.sa_session.query(galaxy.model.Tag).filter_by(name=tag_name).first()
 
     def _create_tag_instance(self, tag_name):
-        return galaxy.model.Tag(type=0, name=tag_name)
+        # For good performance caller should first check if there's already an appropriate tag
+        Session = sessionmaker(self.sa_session.bind)
+        tag = galaxy.model.Tag(type=0, name=tag_name)
+        with Session() as separate_session:
+            separate_session.add(tag)
+            try:
+                separate_session.commit()
+                separate_session.flush()
+            except IntegrityError:
+                # tag already exists, get from database
+                separate_session.rollback()
+        return self._get_tag(tag_name)
 
     def _get_or_create_tag(self, tag_str):
         """Get or create a Tag object from a tag string."""
diff --git a/test/unit/managers/test_TagHandler.py b/test/unit/managers/test_TagHandler.py
index 7839be7d019..118edddfaa6 100644
--- a/test/unit/managers/test_TagHandler.py
+++ b/test/unit/managers/test_TagHandler.py
@@ -100,6 +100,12 @@ class TagHandlerTestCase(BaseTestCase):
         self.tag_handler.delete_item_tags(user=self.user, item=hda)
         self.assertEqual(hda.tags, [])
 
+    def test_unique_constraint_applied(self):
+        tag_name = 'abc'
+        tag = self.tag_handler._create_tag_instance(tag_name)
+        same_tag = self.tag_handler._create_tag_instance(tag_name)
+        assert tag.id == same_tag.id
+
     def test_item_has_tag(self):
         hda = self._create_vanilla_hda()
         tags = ['tag1']