From c64d1bc20046c6484443fff8e02dd7c1d8833458 Mon Sep 17 00:00:00 2001
From: oleg <oleg.zharkov22@gmail.com>
Date: Thu, 25 Nov 2021 20:18:34 +0100
Subject: [PATCH 1/6] fix history error

---
 client/src/components/HistoryView.vue         | 97 ++++++++++---------
 .../webapps/galaxy/controllers/history.py     |  2 +-
 2 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/client/src/components/HistoryView.vue b/client/src/components/HistoryView.vue
index 2097ff141fd..50b91acc1e3 100644
--- a/client/src/components/HistoryView.vue
+++ b/client/src/components/HistoryView.vue
@@ -1,38 +1,43 @@
 <template>
     <div id="structured-history-view">
-        <div id="history-view-controls" class="clear">
-            <div class="float-left">
-                <span v-if="historyHistory['purged'] == false">
-                    <span v-if="historyData.user_is_owner == false">
-                        <button id="import" class="btn btn-secondary">Import and start using history</button>
-                    </span>
-                    <span v-if="historyData.user_is_owner && historyData.history_is_current == false">
-                        <button id="switch-history" class="btn btn-secondary" @click="switchHistory">
-                            Switch to this history
+        <div v-if="errorMessages.length > 0">
+            <div :key="index" v-for="(error, index) in errorMessages">
+                <div class="alert alert-danger" role="alert">{{ error }}</div>
+            </div>
+        </div>
+        <div v-else>
+            <div id="history-view-controls" class="clear">
+                <div class="float-left">
+                    <span v-if="historyHistory && historyHistory['purged'] == false">
+                        <span v-if="historyData.user_is_owner == false">
+                            <button id="import" class="btn btn-secondary">Import and start using history</button>
+                        </span>
+                        <span v-if="historyData.user_is_owner && historyData.history_is_current == false">
+                            <button id="switch-history" class="btn btn-secondary" @click="switchHistory">
+                                Switch to this history
+                            </button>
+                        </span>
+                        <button id="show-structure" class="btn btn-secondary" @click="showStructure">
+                            Show structure
                         </button>
                     </span>
-                    <button id="show-structure" class="btn btn-secondary" @click="showStructure">Show structure</button>
-                </span>
-            </div>
-            <div class="float-right">
-                <button id="toggle-deleted" class="btn btn-secondary">Include deleted</button>
-                <button id="toggle-hidden" class="btn btn-secondary">Include hidden</button>
+                </div>
+                <div class="float-right">
+                    <button id="toggle-deleted" class="btn btn-secondary">Include deleted</button>
+                    <button id="toggle-hidden" class="btn btn-secondary">Include hidden</button>
+                </div>
             </div>
+            <div
+                v-if="historyHistory"
+                :id="'history-' + historyHistory['id']"
+                class="history-panel unified-panel-body"
+                style="overflow: auto"
+            ></div>
         </div>
-        <!-- eslint-disable-next-line vue/require-v-for-key -->
-        <div v-for="error in errorMessages">
-            <div class="alert alert-danger" role="alert">{{ error }}</div>
-        </div>
-        <div
-            :id="'history-' + historyHistory['id']"
-            class="history-panel unified-panel-body"
-            style="overflow: auto"
-        ></div>
     </div>
 </template>
 
 <script>
-import $ from "jquery";
 import { getAppRoot } from "onload/loadConfig";
 import axios from "axios";
 import Vue from "vue";
@@ -58,14 +63,18 @@ export default {
     },
     created: function () {
         const url = getAppRoot() + "history/view/" + this.id;
-        this.ajaxCall(url, this.updateHistoryView);
+        this.ajaxCall(url);
     },
     methods: {
-        ajaxCall: function (url, callBack) {
+        ajaxCall: function (url) {
             axios
                 .get(url)
                 .then((response) => {
-                    callBack(response);
+                    if (response.data.error_msg) {
+                        this.errorMessages.push(response.data.error_msg);
+                    } else {
+                        this.updateHistoryView(response);
+                    }
                 })
                 .catch((e) => {
                     this.showError(
@@ -83,23 +92,21 @@ export default {
             this.errorMessages.push(errorMsg);
         },
         makeHistoryView: function (history) {
-            $(function () {
-                const options = {
-                    hasMasthead: history.use_panels ? "true" : "false",
-                    userIsOwner: history.user_is_owner ? "true" : "false",
-                    isCurrent: history.history_is_current ? "true" : "false",
-                    historyJSON: history.history,
-                    showDeletedJson: history.show_deleted,
-                    showHiddenJson: history.show_hidden,
-                    initialModeDeleted: history.show_deleted ? "showing_deleted" : "not_showing_deleted",
-                    initialModeHidden: history.show_hidden ? "showing_hidden" : "not_showing_hidden",
-                    allowUserDatasetPurge: history.allow_user_dataset_purge ? "true" : "false",
-                };
-                options.viewToUse = options.userIsOwner
-                    ? { location: "mvc/history/history-view-edit", className: "HistoryViewEdit" }
-                    : { location: "mvc/history/history-view", className: "HistoryView" };
-                HistoryView.historyEntry(options);
-            });
+            const options = {
+                hasMasthead: history.use_panels ? "true" : "false",
+                userIsOwner: history.user_is_owner ? "true" : "false",
+                isCurrent: history.history_is_current ? "true" : "false",
+                historyJSON: history.history,
+                showDeletedJson: history.show_deleted,
+                showHiddenJson: history.show_hidden,
+                initialModeDeleted: history.show_deleted ? "showing_deleted" : "not_showing_deleted",
+                initialModeHidden: history.show_hidden ? "showing_hidden" : "not_showing_hidden",
+                allowUserDatasetPurge: history.allow_user_dataset_purge ? "true" : "false",
+            };
+            options.viewToUse = options.userIsOwner
+                ? { location: "mvc/history/history-view-edit", className: "HistoryViewEdit" }
+                : { location: "mvc/history/history-view", className: "HistoryView" };
+            return HistoryView.historyEntry(options);
         },
         showStructure: function () {
             const Galaxy = getGalaxyInstance();
diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 1e67db56ade..8e1b379e81e 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -578,7 +578,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
             else:
                 error_msg = ('An error occurred getting the history data from the server. '
                              + 'Please contact a Galaxy administrator if the problem persists.')
-            return trans.show_error_message(error_msg, use_panels=use_panels)
+            return {"error_msg": error_msg}
 
         return {
             "history": history_dictionary,

From d1cfec038e77fb6538491371647d0f3713854d18 Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Fri, 26 Nov 2021 14:01:11 +0100
Subject: [PATCH 2/6] drop local error handling and use @expose_api
 functionality

---
 client/src/components/HistoryView.vue         | 19 +--------
 .../webapps/galaxy/controllers/history.py     | 42 ++++++++-----------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/client/src/components/HistoryView.vue b/client/src/components/HistoryView.vue
index 50b91acc1e3..6977d0f7b1a 100644
--- a/client/src/components/HistoryView.vue
+++ b/client/src/components/HistoryView.vue
@@ -69,28 +69,13 @@ export default {
         ajaxCall: function (url) {
             axios
                 .get(url)
-                .then((response) => {
-                    if (response.data.error_msg) {
-                        this.errorMessages.push(response.data.error_msg);
-                    } else {
-                        this.updateHistoryView(response);
-                    }
-                })
-                .catch((e) => {
-                    this.showError(
-                        "Error fetching histories -- reload the page to retry this request.  Please contact an administrator if the problem persists.",
-                        e
-                    );
-                });
+                .then((response) => this.updateHistoryView(response))
+                .catch((error) => this.errorMessages.push(error));
         },
         updateHistoryView: function (response) {
             this.historyData = response.data;
             this.historyHistory = response.data.history;
         },
-        showError: function (errorMsg, verbose) {
-            console.error(verbose);
-            this.errorMessages.push(errorMsg);
-        },
         makeHistoryView: function (history) {
             const options = {
                 hasMasthead: history.use_panels ? "true" : "false",
diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 8e1b379e81e..4f71e692040 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -29,7 +29,10 @@ from galaxy.util import (
     string_as_bool,
     unicodify
 )
-from galaxy.web import url_for
+from galaxy.web import (
+    expose_api,
+    url_for
+)
 from galaxy.web.framework.helpers import (
     grids,
     iff,
@@ -543,7 +546,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
             'template': html_template
         }
 
-    @web.expose
+    @expose_api
     @web.json
     def view(self, trans, id=None, show_deleted=False, show_hidden=False, use_panels=True):
         """
@@ -555,30 +558,19 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
 
         history_dictionary = {}
         user_is_owner = False
-        try:
-            if id:
-                history_to_view = self.history_manager.get_accessible(self.decode_id(id), trans.user,
-                    current_history=trans.history)
-                user_is_owner = history_to_view.user == trans.user
-                history_is_current = history_to_view == trans.history
-            else:
-                history_to_view = trans.history
-                user_is_owner = True
-                history_is_current = True
+        if id:
+            history_to_view = self.history_manager.get_accessible(self.decode_id(id), trans.user,
+                current_history=trans.history)
+            user_is_owner = history_to_view.user == trans.user
+            history_is_current = history_to_view == trans.history
+        else:
+            history_to_view = trans.history
+            user_is_owner = True
+            history_is_current = True
 
-            # include all datasets: hidden, deleted, and purged
-            history_dictionary = self.history_serializer.serialize_to_view(history_to_view,
-                view='dev-detailed', user=trans.user, trans=trans)
-
-        except Exception as exc:
-            user_id = str(trans.user.id) if trans.user else '(anonymous)'
-            log.exception('Error bootstrapping history for user %s', user_id)
-            if isinstance(exc, exceptions.ItemAccessibilityException):
-                error_msg = 'You do not have permission to view this history.'
-            else:
-                error_msg = ('An error occurred getting the history data from the server. '
-                             + 'Please contact a Galaxy administrator if the problem persists.')
-            return {"error_msg": error_msg}
+        # include all datasets: hidden, deleted, and purged
+        history_dictionary = self.history_serializer.serialize_to_view(history_to_view,
+            view='dev-detailed', user=trans.user, trans=trans)
 
         return {
             "history": history_dictionary,

From 1caa2b9c081e48c95f16b69d02df1c5269910298 Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Fri, 26 Nov 2021 14:16:46 +0100
Subject: [PATCH 3/6] fix error message

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

diff --git a/client/src/components/HistoryView.vue b/client/src/components/HistoryView.vue
index 6977d0f7b1a..82f5fb1ef34 100644
--- a/client/src/components/HistoryView.vue
+++ b/client/src/components/HistoryView.vue
@@ -70,7 +70,7 @@ export default {
             axios
                 .get(url)
                 .then((response) => this.updateHistoryView(response))
-                .catch((error) => this.errorMessages.push(error));
+                .catch((error) => this.errorMessages.push(error.response.data.err_msg));
         },
         updateHistoryView: function (response) {
             this.historyData = response.data;

From 499362f6a6f8246381f10704abe1954848ee2ef2 Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Fri, 26 Nov 2021 15:29:18 +0100
Subject: [PATCH 4/6] fix response formatting

---
 lib/galaxy/webapps/galaxy/controllers/history.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 4f71e692040..e6c8e95cef8 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -547,7 +547,6 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
         }
 
     @expose_api
-    @web.json
     def view(self, trans, id=None, show_deleted=False, show_hidden=False, use_panels=True):
         """
         View a history. If a history is importable, then it is viewable by any user.

From dbcf1e8e983ba4bda63ed8058573e1e0fff09cdb Mon Sep 17 00:00:00 2001
From: Oleg Zharkov <oleg.zharkov22@gmail.com>
Date: Mon, 6 Dec 2021 19:28:34 +0100
Subject: [PATCH 5/6] expose api to expose api anonymous

---
 lib/galaxy/webapps/galaxy/controllers/history.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index e6c8e95cef8..a3b046f12d2 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -30,7 +30,7 @@ from galaxy.util import (
     unicodify
 )
 from galaxy.web import (
-    expose_api,
+    expose_api_anonymous,
     url_for
 )
 from galaxy.web.framework.helpers import (
@@ -546,7 +546,7 @@ class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesIt
             'template': html_template
         }
 
-    @expose_api
+    @expose_api_anonymous
     def view(self, trans, id=None, show_deleted=False, show_hidden=False, use_panels=True):
         """
         View a history. If a history is importable, then it is viewable by any user.

From 4a40df178ad72e672553eb1c9f9a1a0f894464a4 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Tue, 7 Dec 2021 21:30:11 -0500
Subject: [PATCH 6/6] Post-merge format

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

diff --git a/client/src/components/HistoryView.vue b/client/src/components/HistoryView.vue
index 82f5fb1ef34..27cafd3d89d 100644
--- a/client/src/components/HistoryView.vue
+++ b/client/src/components/HistoryView.vue
@@ -31,8 +31,7 @@
                 v-if="historyHistory"
                 :id="'history-' + historyHistory['id']"
                 class="history-panel unified-panel-body"
-                style="overflow: auto"
-            ></div>
+                style="overflow: auto"></div>
         </div>
     </div>
 </template>