From 43edbdaa86d1a2c3e1377fd53b569417643fbcfe Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 2 Jun 2022 10:51:37 -0400
Subject: [PATCH] Remove editor mako use router instead

---
 .../src/components/Workflow/Editor/Index.vue  |  2 +-
 .../Workflow/Editor/modules/utilities.js      |  2 +-
 .../components/Workflow/WorkflowDropdown.vue  |  2 +-
 client/src/entry/analysis/router.js           |  2 +-
 .../webapps/galaxy/controllers/workflow.py    |  5 +--
 templates/webapps/galaxy/workflow/editor.mako | 45 -------------------
 6 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 templates/webapps/galaxy/workflow/editor.mako

diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 4ea246580cb..9ccf36f24d1 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -427,7 +427,7 @@ export default {
             this.showInPanel = "attributes";
         },
         onEditSubworkflow(contentId) {
-            const editUrl = `${getAppRoot()}workflow/editor?workflow_id=${contentId}`;
+            const editUrl = `${getAppRoot()}workflows/edit?id=${contentId}`;
             this.onNavigate(editUrl);
         },
         async onClone(node) {
diff --git a/client/src/components/Workflow/Editor/modules/utilities.js b/client/src/components/Workflow/Editor/modules/utilities.js
index 23971d4de9a..0c3018604c7 100644
--- a/client/src/components/Workflow/Editor/modules/utilities.js
+++ b/client/src/components/Workflow/Editor/modules/utilities.js
@@ -79,7 +79,7 @@ export function saveAs(workflow) {
                 },
             })
                 .done((id) => {
-                    workflow.onNavigate(`${getAppRoot()}workflow/editor?id=${id}`, true);
+                    workflow.onNavigate(`${getAppRoot()}workflows/edit?id=${id}`, true);
                 })
                 .fail((err) => {
                     console.debug(err);
diff --git a/client/src/components/Workflow/WorkflowDropdown.vue b/client/src/components/Workflow/WorkflowDropdown.vue
index 013723146f6..0a3172d73ed 100644
--- a/client/src/components/Workflow/WorkflowDropdown.vue
+++ b/client/src/components/Workflow/WorkflowDropdown.vue
@@ -83,7 +83,7 @@ export default {
     props: ["workflow"],
     computed: {
         urlEdit() {
-            return `${getAppRoot()}workflow/editor?id=${this.workflow.id}`;
+            return `${getAppRoot()}workflows/edit?id=${this.workflow.id}`;
         },
         urlDownload() {
             return `${getAppRoot()}api/workflows/${this.workflow.id}/download?format=json-download`;
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index c2d2b59b0d9..20bf4ceff12 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -328,7 +328,7 @@ export function getRouter(Galaxy) {
                         component: FormGeneric,
                         props: {
                             url: "workflow/create",
-                            redirect: "workflow/editor",
+                            redirect: "workflows/edit",
                             active_tab: "workflow",
                             submitTitle: "Create",
                             submitIcon: "fa-check",
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index 7147061842e..efe903eb8ca 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -649,7 +649,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
         return trans.response.send_redirect(f"{url_for('/')}workflow?status=done&message={escape(message)}")
 
     @web.expose
-    # @web.json
+    @web.json
     @web.require_login("edit workflows")
     def editor(self, trans, id=None, workflow_id=None, version=None):
         """
@@ -741,8 +741,7 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
         }
 
         # parse to mako
-        # return editor_config
-        return trans.fill_template("workflow/editor.mako", editor_config=editor_config)
+        return editor_config
 
     @web.json
     def load_workflow(self, trans, id, version=None):
diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako
deleted file mode 100644
index abc6b186902..00000000000
--- a/templates/webapps/galaxy/workflow/editor.mako
+++ /dev/null
@@ -1,45 +0,0 @@
-<%inherit file="/webapps/galaxy/base_panels.mako"/>
-
-<%def name="title()">
-    Workflow Editor
-</%def>
-
-<%def name="init()">
-<%
-    self.active_view="workflow"
-    self.overlay_visible=True
-%>
-</%def>
-
-<%def name="javascript_app()">
-    ${parent.javascript_app()}
-    <script type="text/javascript">
-        var editorConfig = ${ h.dumps( editor_config ) };
-        config.addInitialization(function(galaxy, config) {
-            console.log("workflow/editor.mako, editorConfig", editorConfig);
-            window.bundleEntries.mountWorkflowEditor(editorConfig);
-        });
-    </script>
-</%def>
-
-<%def name="stylesheets()">
-    ## Include "base.css" for styling tool menu and forms (details)
-    ${h.css("jquery-ui/smoothness/jquery-ui" )}
-
-    ## But make sure styles for the layout take precedence
-    ${parent.stylesheets()}
-</%def>
-
-<%def name="overlay(visible=False)">
-    ${parent.overlay( "Loading workflow...",
-                      "<div class='progress progress-striped progress-info active'><div class='progress-bar' style='width: 100%;'></div></div>", self.overlay_visible )}
-</%def>
-
-<%def name="left_panel()">
-</%def>
-
-<%def name="center_panel()">
-</%def>
-
-<%def name="right_panel()">
-</%def>