From 8ba16c84c02871b8a15fd1ff0512228b8a7ea17b Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Mon, 31 May 2021 18:22:50 +0200
Subject: [PATCH 1/5] fix https://github.com/galaxyproject/galaxy/issues/12005

---
 .../components/Libraries/LibrariesList.vue    | 24 +++++++++----------
 .../components/Libraries/LibraryEditField.vue |  5 +++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/client/src/components/Libraries/LibrariesList.vue b/client/src/components/Libraries/LibrariesList.vue
index 8d3dd475a4f..1f989ad482b 100644
--- a/client/src/components/Libraries/LibrariesList.vue
+++ b/client/src/components/Libraries/LibrariesList.vue
@@ -59,22 +59,22 @@
                 <div class="deleted-item" v-else-if="row.item.deleted && include_deleted">{{ row.item.name }}</div>
                 <b-link v-else :to="{ path: `folders/${row.item.root_folder_id}` }">{{ row.item.name }}</b-link>
             </template>
-            <template v-slot:cell(description)="row">
+            <template v-slot:cell(description)="{ item }">
                 <LibraryEditField
-                    @toggleDescriptionExpand="toggleDescriptionExpand(row.item)"
-                    :ref="`description-${row.item.id}`"
-                    :is-expanded="row.item.isExpanded"
-                    :is-edit-mode="row.item.editMode"
-                    :text="row.item.description"
+                    @toggleDescriptionExpand="toggleDescriptionExpand(item)"
+                    :ref="`description-${item.id}`"
+                    :is-expanded="item.isExpanded"
+                    :is-edit-mode="item.editMode"
+                    :text="item.description"
                 />
             </template>
-            <template v-slot:cell(synopsis)="row">
+            <template v-slot:cell(synopsis)="{ item }">
                 <LibraryEditField
-                    @toggleDescriptionExpand="toggleDescriptionExpand(row.item)"
-                    :ref="`synopsis-${row.item.id}`"
-                    :is-expanded="row.item.isExpanded"
-                    :is-edit-mode="row.item.editMode"
-                    :text="row.item.synopsis"
+                    @toggleDescriptionExpand="toggleDescriptionExpand(item)"
+                    :ref="`synopsis-${item.id}`"
+                    :is-expanded="item.isExpanded"
+                    :is-edit-mode="item.editMode"
+                    :text="item.synopsis"
                 />
             </template>
             <template v-slot:cell(is_unrestricted)="row">
diff --git a/client/src/components/Libraries/LibraryEditField.vue b/client/src/components/Libraries/LibraryEditField.vue
index 7d20e88427c..ffb039b1c45 100644
--- a/client/src/components/Libraries/LibraryEditField.vue
+++ b/client/src/components/Libraries/LibraryEditField.vue
@@ -3,7 +3,7 @@
         <div class="text-field">
             <!-- edit mode -->
             <div v-if="isEditMode">
-                <textarea class="form-control" v-model="textField" rows="3" />
+                <b-form-textarea class="form-control" :value="text" @change="updateValue" rows="3" no-resize />
             </div>
             <!-- shrink long text -->
             <div v-else-if="text.length > maxDescriptionLength && !isExpanded">
@@ -59,6 +59,9 @@ export default {
         };
     },
     methods: {
+        updateValue(value) {
+            this.textField = value;
+        },
         toggleDescriptionExpand() {
             this.$emit("toggleDescriptionExpand");
         },

From a664b9d8f102bdbc53c01b9bccfad079d587877f Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Wed, 2 Jun 2021 17:02:35 +0200
Subject: [PATCH 2/5] change value to v-model typo in name

---
 client/src/components/Libraries/LibrariesList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/components/Libraries/LibrariesList.vue b/client/src/components/Libraries/LibrariesList.vue
index 1f989ad482b..e6c2589af6e 100644
--- a/client/src/components/Libraries/LibrariesList.vue
+++ b/client/src/components/Libraries/LibrariesList.vue
@@ -51,8 +51,7 @@
                 <textarea
                     v-if="row.item.editMode"
                     class="form-control input_library_name"
-                    :ref="`name-${row.item.id}`"
-                    :value="row.item.name"
+                    v-model="row.item.name"
                     rows="3"
                 />
 

From 275cc67562287d416379f8e4e474b224cc900df2 Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Wed, 2 Jun 2021 20:24:10 +0200
Subject: [PATCH 3/5] remove refs

---
 client/src/components/Libraries/LibrariesList.vue  | 14 ++++++++++++--
 .../src/components/Libraries/LibraryEditField.vue  |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Libraries/LibrariesList.vue b/client/src/components/Libraries/LibrariesList.vue
index e6c2589af6e..673885dcff8 100644
--- a/client/src/components/Libraries/LibrariesList.vue
+++ b/client/src/components/Libraries/LibrariesList.vue
@@ -65,6 +65,7 @@
                     :is-expanded="item.isExpanded"
                     :is-edit-mode="item.editMode"
                     :text="item.description"
+                    :changed-value.sync="item[newDescriptionProperty]"
                 />
             </template>
             <template v-slot:cell(synopsis)="{ item }">
@@ -74,6 +75,7 @@
                     :is-expanded="item.isExpanded"
                     :is-edit-mode="item.editMode"
                     :text="item.synopsis"
+                    :changed-value.sync="item[newSynopsisProperty]"
                 />
             </template>
             <template v-slot:cell(is_unrestricted)="row">
@@ -207,6 +209,8 @@ export default {
     data() {
         const galaxy = getGalaxyInstance();
         return {
+            newDescriptionProperty: "newDescription",
+            newSynopsisProperty: "newSynopsis",
             isNewLibFormVisible: false,
             currentPage: 1,
             fields: fields,
@@ -244,8 +248,14 @@ export default {
             this.$refs.libraries_list.refresh();
         },
         saveChanges(item) {
-            item.description = this.$refs[`description-${item.id}`].textField;
-            item.synopsis = this.$refs[`synopsis-${item.id}`].textField;
+            const description = item[this.newDescriptionProperty];
+            const synopsis = item[this.newSynopsisProperty];
+            if (description) {
+                item.description = description;
+            }
+            if (synopsis) {
+                item.synopsis = synopsis;
+            }
             this.services.saveChanges(
                 item,
                 () => {
diff --git a/client/src/components/Libraries/LibraryEditField.vue b/client/src/components/Libraries/LibraryEditField.vue
index ffb039b1c45..de6a7497e7d 100644
--- a/client/src/components/Libraries/LibraryEditField.vue
+++ b/client/src/components/Libraries/LibraryEditField.vue
@@ -45,6 +45,9 @@ export default {
         text: {
             type: String,
         },
+        changedValue: {
+            type: String,
+        },
         isEditMode: {
             type: Boolean,
         },
@@ -55,12 +58,11 @@ export default {
     data() {
         return {
             maxDescriptionLength: MAX_DESCRIPTION_LENGTH,
-            textField: this.text,
         };
     },
     methods: {
         updateValue(value) {
-            this.textField = value;
+            this.$emit('update:changedValue', value)
         },
         toggleDescriptionExpand() {
             this.$emit("toggleDescriptionExpand");

From a79207245b3e677b8772d37df2b2c0213815822c Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Wed, 2 Jun 2021 20:38:23 +0200
Subject: [PATCH 4/5] lint

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

diff --git a/client/src/components/Libraries/LibraryEditField.vue b/client/src/components/Libraries/LibraryEditField.vue
index de6a7497e7d..41259336464 100644
--- a/client/src/components/Libraries/LibraryEditField.vue
+++ b/client/src/components/Libraries/LibraryEditField.vue
@@ -62,7 +62,7 @@ export default {
     },
     methods: {
         updateValue(value) {
-            this.$emit('update:changedValue', value)
+            this.$emit("update:changedValue", value);
         },
         toggleDescriptionExpand() {
             this.$emit("toggleDescriptionExpand");

From 58c6be847564afa73145c91c7a9aa1e809a3c801 Mon Sep 17 00:00:00 2001
From: Mason Houtz <nerdinacan@gmail.com>
Date: Tue, 13 Apr 2021 10:01:16 -0700
Subject: [PATCH 5/5] Fixed uploader link on tool list and legacy empty history
 message

---
 client/src/components/Panels/ToolBox.vue            | 4 ++--
 client/src/mvc/history/history-view-edit-current.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/components/Panels/ToolBox.vue b/client/src/components/Panels/ToolBox.vue
index 98f205b39b1..73167474b32 100644
--- a/client/src/components/Panels/ToolBox.vue
+++ b/client/src/components/Panels/ToolBox.vue
@@ -50,7 +50,7 @@
 <script>
 import ToolSection from "./Common/ToolSection";
 import ToolSearch from "./Common/ToolSearch";
-import { UploadButton } from "components/Upload";
+import { UploadButton, openGlobalUploadModal } from "components/Upload";
 import FavoritesButton from "./Buttons/FavoritesButton";
 import { filterToolSections, filterTools } from "./utilities";
 import { getGalaxyInstance } from "app";
@@ -145,7 +145,7 @@ export default {
         onOpen(tool, evt) {
             if (tool.id === "upload1") {
                 evt.preventDefault();
-                this.eventHub.$emit("upload:open");
+                openGlobalUploadModal();
             } else if (tool.form_style === "regular") {
                 evt.preventDefault();
                 const Galaxy = getGalaxyInstance();
diff --git a/client/src/mvc/history/history-view-edit-current.js b/client/src/mvc/history/history-view-edit-current.js
index 54c74228af1..52897551cb7 100644
--- a/client/src/mvc/history/history-view-edit-current.js
+++ b/client/src/mvc/history/history-view-edit-current.js
@@ -5,7 +5,7 @@ import { getGalaxyInstance } from "app";
 import HISTORY_VIEW_EDIT from "mvc/history/history-view-edit";
 import BASE_MVC from "mvc/base-mvc";
 import _l from "utils/localization";
-import { eventHub } from "components/plugins/eventHub";
+import { openGlobalUploadModal } from "components/Upload";
 
 // ============================================================================
 /** session storage for history panel preferences (and to maintain state)
@@ -338,7 +338,7 @@ var CurrentHistoryView = _super.extend(
         events: _.extend(_.clone(_super.prototype.events), {
             // the two links in the empty message
             "click .uploader-link": function (ev) {
-                eventHub.$emit("upload:open");
+                openGlobalUploadModal();
             },
             "click .get-data-link": function (ev) {
                 var $toolMenu = $(".toolMenuContainer");