From c5825e07dbc1e54ef9b6db5f6c6979cfb97402dd Mon Sep 17 00:00:00 2001
From: Alexander OSTROVSKY <a.ostrovsky@mac.com>
Date: Mon, 30 Aug 2021 14:06:35 -0700
Subject: [PATCH] remove webpack for initial version, fix default location

---
 client/src/components/NewUserWelcome/components/Slides.vue | 7 +------
 .../src/components/NewUserWelcome/components/Subtopics.vue | 2 +-
 client/src/components/NewUserWelcome/components/Topics.vue | 3 +--
 client/src/components/NewUserWelcome/newUserWelcome.vue    | 4 ++--
 client/src/entry/analysis/AnalysisRouter.js                | 3 ---
 doc/source/admin/galaxy_options.rst                        | 2 +-
 lib/galaxy/config/sample/galaxy.yml.sample                 | 2 +-
 lib/galaxy/webapps/galaxy/config_schema.yml                | 2 +-
 8 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/client/src/components/NewUserWelcome/components/Slides.vue b/client/src/components/NewUserWelcome/components/Slides.vue
index 5d47780780d..a23162dcae3 100644
--- a/client/src/components/NewUserWelcome/components/Slides.vue
+++ b/client/src/components/NewUserWelcome/components/Slides.vue
@@ -31,11 +31,6 @@
 <script>
     import { getAppRoot } from "onload/loadConfig";
     export default {
-        // data() {
-        //     return {
-        //         imageLoc: "static/plugins/welcome_page/new_user/static/topics/",
-        //     }
-        // },
         props: {
             header: {type: String, required: true},
             slides: {type: Array, required: true},
@@ -44,7 +39,7 @@
         methods: {
             imgUrl(src) {
                 const root = getAppRoot();
-                const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
+                const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
                 return url;
             }
         }
diff --git a/client/src/components/NewUserWelcome/components/Subtopics.vue b/client/src/components/NewUserWelcome/components/Subtopics.vue
index bd1767d377c..1ff535ce52f 100644
--- a/client/src/components/NewUserWelcome/components/Subtopics.vue
+++ b/client/src/components/NewUserWelcome/components/Subtopics.vue
@@ -42,7 +42,7 @@
         methods:    {    
             imgUrl(src) {
                 const root = getAppRoot();
-                const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
+                const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
                 return url;
             }
         }
diff --git a/client/src/components/NewUserWelcome/components/Topics.vue b/client/src/components/NewUserWelcome/components/Topics.vue
index 42d663c15b8..830df9e69a7 100644
--- a/client/src/components/NewUserWelcome/components/Topics.vue
+++ b/client/src/components/NewUserWelcome/components/Topics.vue
@@ -32,7 +32,6 @@
 <script>
 import { getAppRoot } from "onload/loadConfig";
 export default {
-
     props: {
         topics: {type: Array, required: true},
         imageLoc: {type: String, required: false, default: "static/plugins/welcome_page/new_user/static/topics/"},
@@ -40,7 +39,7 @@ export default {
     methods:    {    
         imgUrl(src) {
             const root = getAppRoot();
-            const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
+            const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
             return url;
         }
     }
diff --git a/client/src/components/NewUserWelcome/newUserWelcome.vue b/client/src/components/NewUserWelcome/newUserWelcome.vue
index 6c155ad32eb..5b2d1b83a14 100644
--- a/client/src/components/NewUserWelcome/newUserWelcome.vue
+++ b/client/src/components/NewUserWelcome/newUserWelcome.vue
@@ -6,7 +6,7 @@
                 v-bind="currentNode"
                 @select="down"
                 @back="up"
-                :image-loc="config.welcome_directory || defaultLocation"
+                :image-loc="config.welcome_directory"
                 >
             </component>
         </ConfigProvider>
@@ -60,7 +60,7 @@ export default {
     methods: {
         imgUrl(src) {
             const root = getAppRoot();
-            const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
+            const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
             return url;
         },
         up(){
diff --git a/client/src/entry/analysis/AnalysisRouter.js b/client/src/entry/analysis/AnalysisRouter.js
index 2d58c6a1160..df2f596dd7d 100644
--- a/client/src/entry/analysis/AnalysisRouter.js
+++ b/client/src/entry/analysis/AnalysisRouter.js
@@ -433,13 +433,10 @@ export const getAnalysisRouter = (Galaxy) => {
         },
 
         mountWelcome: async function() {
-            import(/* webpackIgnore: true */ getAppRoot() + "static/plugins" + Galaxy.config.welcome_directory + "topics.js").then(module=> {
                 const propsData = {
                     newUserDict,
                 };
                 this._display_vue_helper(NewUserWelcome, propsData);
-                }
-            )
         },
 
         /** load the center panel with a tool form described by the given params obj */
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index e4905050993..8c021c3c3ca 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -4796,7 +4796,7 @@
     Location of New User Welcome data, a single directory containing
     the images and JSON of Topics/Subtopics/Slides as export. This
     location is relative to galaxy/static
-:Default: ``/welcome_page/new_user/static/``
+:Default: ``plugins/welcome_page/new_user/static/topics/``
 :Type: str
 
 
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 617034329b5..75ea984d432 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -2349,5 +2349,5 @@ galaxy:
   # Location of New User Welcome data, a single directory containing the
   # images and JSON of Topics/Subtopics/Slides as export. This location
   # is relative to galaxy/static
-  #welcome_directory: /welcome_page/new_user/static/
+  #welcome_directory: plugins/welcome_page/new_user/static/topics/
 
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index 550a97497d3..4131099732a 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -3497,7 +3497,7 @@ mapping:
 
       welcome_directory:
         type: str
-        default: /welcome_page/new_user/static/
+        default: plugins/welcome_page/new_user/static/topics/
         required: false
         desc: |
           Location of New User Welcome data, a single directory containing the