Merge pull request #48 from eapearson/master

simply plugin config, remove some deadwood.
kbaseattic · Oct 7, 2020 · b8bb296 · b8bb296
2 parents 8659ccf + 3b776e0
commit b8bb296
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 704 deletions.
diff --git a/dist.tgz b/dist.tgz
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
     "main": "index.js",
     "scripts": {
         "build": "bash scripts/build-plugin.bash",
+        "build-dist": "bash scripts/build-plugin-dist.bash",
         "build-dev": "bash scripts/build-plugin-dev.bash"
     },
     "repository": {

diff --git a/scripts/build-dist.bash b/scripts/build-dist.bash
@@ -0,0 +1,8 @@
+cd build
+yarn install && \
+yarn clean && \
+yarn install && \
+yarn install-bower && \
+yarn install-npm && \
+yarn remove-source-maps
+cd ..
diff --git a/scripts/build-plugin-dev.bash b/scripts/build-plugin-dev.bash
@@ -1,9 +1,4 @@
+yarn build
 cd build
-yarn install && \
-yarn clean && \
-yarn install && \
-yarn install-bower && \
-yarn install-npm && \
-yarn remove-source-maps && \
 yarn install-dev
 cd ..
diff --git a/scripts/build-plugin.bash b/scripts/build-plugin.bash
@@ -1,9 +1,3 @@
 cd build
-yarn install && \
-yarn clean && \
-yarn install && \
-yarn install-bower && \
-yarn install-npm && \
-yarn remove-source-maps && \
 yarn install-dist
 cd ..
diff --git a/scripts/install-plugin.bash b/scripts/install-plugin.bash
diff --git a/src/plugin/config.yml b/src/plugin/config.yml
@@ -6,14 +6,9 @@ package:
   type: iframe
 install:
   routes:
-    - path: ["dashboard", {type: "rest", name: "path"}]
+    - path: dashboard
       view: main
-      component: /pluginSupport/Plugin
       authorization: true
-      # TODO: get rid of this!!
-      params:
-        view: main
-        plugin: dashboard
   menu:
     - name: dashboard
       definition:

diff --git a/src/plugin/iframe_root/modules/dashboardPanel.js b/src/plugin/iframe_root/modules/dashboardPanel.js
@@ -51,11 +51,6 @@ define(['bluebird', 'kb_lib/html', 'kb_lib/observed', 'kbaseUI/widget//widgetSet
                                         viewState: viewState
                                     })
                                 }),
-                                // div({
-                                //     id: widgetSet.addWidget('dashboardMetrics', {
-                                //         viewState: viewState
-                                //     })
-                                // }),
                                 div({
                                     id: widgetSet.addWidget('dashboardCollaborators', {
                                         viewState: viewState

diff --git a/src/plugin/iframe_root/modules/widgets/MetricsWidget.js b/src/plugin/iframe_root/modules/widgets/MetricsWidget.js