Bundle admin toolshed beta interface.

galaxyproject · Nov 21, 2017 · 76f0eb4 · 76f0eb4
1 parent c92d958
commit 76f0eb4
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 38 deletions.
diff --git a/client/galaxy/scripts/apps/admin-toolshed.js b/client/galaxy/scripts/apps/admin-toolshed.js
@@ -0,0 +1,7 @@
+import AdminToolshed from "admin.toolshed";
+
+export function App(options) {
+    new AdminToolshed.GalaxyApp(options);
+}
+
+window.adminToolshedApp = App;
diff --git a/client/galaxy/scripts/apps/library.js b/client/galaxy/scripts/apps/library.js
@@ -1,7 +1,7 @@
 import GalaxyLibrary from "galaxy.library";
 
-export function tracksterApp(options) {
+export function App(options) {
     new GalaxyLibrary.GalaxyApp(options);
 }
 
-window.libraryApp = tracksterApp;
+window.libraryApp = App;
diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -47,7 +47,8 @@ module.exports = {
         workflow: "./galaxy/scripts/apps/workflow.js",
         masthead: "./galaxy/scripts/apps/masthead.js",
         viz: "./galaxy/scripts/apps/viz.js",
-        library: "./galaxy/scripts/apps/library.js"
+        library: "./galaxy/scripts/apps/library.js",
+        adminToolshed: "./galaxy/scripts/apps/admin-toolshed.js"
     },
     output: {
         path: path.join(__dirname, "../", "static/scripts/bundled"),

diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py
@@ -173,12 +173,13 @@ def browse_tool_shed(self, trans, **kwd):
     @web.require_admin
     def browse_toolsheds(self, trans, **kwd):
         app = {
-            'jscript': "admin.toolshed"
+            'jscript': "adminToolshedApp"
         }
         return trans.fill_template('galaxy.panels.mako',
                                    config={
                                        'title': 'Galaxy Tool Sheds',
-                                       'app': app})
+                                       'app': app,
+                                       'bundle': 'adminToolshed'})
 
     @web.expose
     @web.require_admin

diff --git a/static/scripts/bundled/admin.bundled.js b/static/scripts/bundled/admin.bundled.js
diff --git a/static/scripts/bundled/admin.bundled.js.map b/static/scripts/bundled/admin.bundled.js.map
diff --git a/static/scripts/bundled/adminToolshed.bundled.js b/static/scripts/bundled/adminToolshed.bundled.js
diff --git a/static/scripts/bundled/adminToolshed.bundled.js.map b/static/scripts/bundled/adminToolshed.bundled.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/library.bundled.js b/static/scripts/bundled/library.bundled.js
diff --git a/static/scripts/bundled/library.bundled.js.map b/static/scripts/bundled/library.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/bundled/login.bundled.js b/static/scripts/bundled/login.bundled.js
diff --git a/static/scripts/bundled/login.bundled.js.map b/static/scripts/bundled/login.bundled.js.map
diff --git a/static/scripts/bundled/masthead.bundled.js b/static/scripts/bundled/masthead.bundled.js
diff --git a/static/scripts/bundled/masthead.bundled.js.map b/static/scripts/bundled/masthead.bundled.js.map
diff --git a/static/scripts/bundled/viz.bundled.js b/static/scripts/bundled/viz.bundled.js
diff --git a/static/scripts/bundled/viz.bundled.js.map b/static/scripts/bundled/viz.bundled.js.map
diff --git a/static/scripts/bundled/workflow.bundled.js b/static/scripts/bundled/workflow.bundled.js
diff --git a/static/scripts/bundled/workflow.bundled.js.map b/static/scripts/bundled/workflow.bundled.js.map