Merge pull request #42 from eapearson/master

update integration layer to comply with updated kbase-ui preact-based integration; repo cleanup

Author: eapearson

.gitignore

@@ -2,3 +2,4 @@
 node_modules/
 bower_components/
 /dist/
+vendor/

bower.json

@@ -1,11 +1,18 @@
 {
     "name": "kbase-ui-plugin-dashboard",
     "description": "A primary view (panel) for the KBase UI to provide a user with a summary of their Narratives, relationships, and status",
-    "keywords": ["kbase", "widget"],
-    "author": ["[email protected]"],
+    "keywords": [
+        "kbase",
+        "widget"
+    ],
+    "author": [
+        "[email protected]"
+    ],
     "moduleType": "kbase-ui-plugin",
     "main": "src/plugin/config.yml",
-    "ignore": [".gitignore"],
+    "ignore": [
+        ".gitignore"
+    ],
     "repository": {
         "type": "git",
         "url": "git://github.com/kbase/kbase-ui-plugin-dashboard"
@@ -17,8 +24,8 @@
         "jquery": "^2.2.4",
         "kbase-service-clients-js": "^3.3.5",
         "kbase-common-js": "^2.18.1",
-        "kbase-common-es6": "^0.10.14"
+        "kbase-common-es6": "^0.11.11"
     },
     "devDependencies": {},
     "license": "SEE LICENSE IN LICENSE.md"
-}
+}

build/bower.json

@@ -28,6 +28,7 @@
             "kbase-common-es6": "bower_components/kbase-common-es6/src/**",
             "kbase-common-js": "bower_components/kbase-common-js/dist/kb_common/**",
             "kbase-service-clients-js": "bower_components/kbase-service-clients-js/dist/kb_service/**",
+            "kbase-common-ts": "bower_components/kbase-common-ts/dist/*.js",
             "font-awesome": [
                 {
                     "bower_components/font-awesome/css/font-awesome.css": "css/font-awesome.css"
@@ -47,6 +48,7 @@
         "require-css": "0.1.10",
         "kbase-common-js": "2.18.1",
         "kbase-common-es6": "0.11.1",
+        "kbase-common-ts": "0.19.0",
         "js-yaml": "3.13.1",
         "requirejs-text": "2.0.16",
         "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",

build/package.json

@@ -6,6 +6,7 @@
         "install-npm": "grunt copy",
         "remove-source-maps": "node scripts/remove-source-maps.js",
         "install-dist": "node scripts/install-dist.js",
+        "install-dev": "node scripts/install-dev.js",
         "update": "node scripts/install-dev.js"
     },
     "author": "KBase Developers",

dist.tgz

@@ -4,7 +4,8 @@
     "description": "A ui plugin for the UI",
     "main": "index.js",
     "scripts": {
-        "build-plugin": "bash scripts/build-plugin.bash"
+        "build": "bash scripts/build-plugin.bash",
+        "build-dev": "bash scripts/build-plugin-dev.bash"
     },
     "repository": {
         "type": "git",

package.json

@@ -0,0 +1,9 @@
+cd build
+yarn install && \
+yarn clean && \
+yarn install && \
+yarn install-bower && \
+yarn install-npm && \
+yarn remove-source-maps && \
+yarn install-dev
+cd ..

scripts/build-plugin-dev.bash

@@ -1,3 +1,9 @@
 cd build
-yarn install && yarn clean && yarn install && yarn install-bower && yarn install-npm &&yarn remove-source-maps && yarn install-dist
+yarn install && \
+yarn clean && \
+yarn install && \
+yarn install-bower && \
+yarn install-npm && \
+yarn remove-source-maps && \
+yarn install-dist
 cd ..

scripts/build-plugin.bash

@@ -0,0 +1,3 @@
+cd build
+yarn install && yarn clean && yarn install && yarn install-bower && yarn install-npm &&yarn remove-source-maps && yarn install-dist
+cd ..

scripts/install-plugin.bash

@@ -1,26 +1,19 @@
 ## YAML Template.
 ---
 package:
-  author: Erik Pearson
   name: dashboard
   description: The dashboard panel and associated widgets
-  date: August 6, 2015
-  version: 0.0.1
-source:
-  ## sources are relative to build/plugins/PACKAGE/source/javascript
-  ## NB: need to quote file names, otherwise
-  modules:
-  styles:
-    # - file: styles.css
+  type: iframe
 install:
-  widgets:
-    - module: ./panel
-      id: kb_plugin_dashboard
-      type: es6
   routes:
-    - path: ["dashboard"]
-      widget: kb_plugin_dashboard
+    - path: ["dashboard", {type: "rest", name: "path"}]
+      view: main
+      component: /pluginSupport/Plugin
       authorization: true
+      # TODO: get rid of this!!
+      params:
+        view: main
+        plugin: dashboard
   menu:
     - name: dashboard
       definition: