Merge pull request #660 from kbase/develop

develop -> master (1.6.9)
kbase · May 2, 2018 · 0898956 · 0898956
2 parents 0e2d47e + dfe7b8b
commit 0898956
Show file tree

Hide file tree

Showing 22 changed files with 328 additions and 119 deletions.
diff --git a/bower.json b/bower.json
@@ -2,75 +2,77 @@
     "name": "kbase-ui",
     "description": "The KBase User Interface",
     "keywords": [
-        "kbase",
-        "ui"
+      "kbase",
+      "ui"
     ],
     "author": [
-        "kbase"
+      "kbase"
     ],
     "moduleType": "amd-application",
     "main": "src/client/index.html",
     "ignore": [],
     "repository": {
-        "type": "git",
-        "url": "git://github.com/kbase/kbase-ui"
+      "type": "git",
+      "url": "git://github.com/kbase/kbase-ui"
     },
     "dependencies": {
-        "ajv": "6.2.0",
-        "blockui": "2.70",
-        "bluebird": "3.5.1",
-        "bootstrap": "3.3.7",
-        "bower-knockout-mapping": "2.6.0",
-        "comma-separated-values": "3.6.4",
-        "d3": "3.5.17",
-        "d3-plugins-sankey": "1.1.0",
-        "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
-        "datatables": "1.10.16",
-        "file-saver": "1.3.4",
-        "font-awesome": "4.7.0",
-        "google-code-prettify": "1.0.5", 
-        "handlebars": "4.0.11",
-        "highlightjs": "9.10.0",
-        "jquery": "2.2.4",
-        "jquery-ui": "1.12.1",
-        "js-yaml": "3.10.0",
-        "kbase-ko-components-js": "0.4.0",
-        "kbase-common-ts": "0.18.0",
-        "kbase-common-js": "2.15.2",
-        "kbase-sdk-clients-js": "0.5.1",
-        "kbase-service-clients-js": "3.3.5",
-        "kbase-ui-widget": "1.2.1",
-        "knockout-arraytransforms": "2.1.1",
-        "knockout-switch-case": "2.1.0",
-        "knockout-validation": "2.0.3",
-        "knockout": "3.5.0-beta",
-        "marked": "0.3.12",
-        "moment": "2.20.1",
-        "numeral": "2.0.4",
-        "nunjucks": "3.0.0",
-        "plotly.js": "1.33.1",
-        "pure-uuid": "eapearson/pure-uuid#1.1.1",
-        "regression-js": "1.4.0",
-        "require-css": "0.1.10",
-        "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
-        "requirejs-domready": "2.0.1",
-        "requirejs-json": "0.0.3",
-        "requirejs-text": "2.0.15",
-        "requirejs": "eapearson/requirejs#3.0.0-alpha5",
-        "select2": "4.0.5",
-        "select2-bootstrap-theme": "0.1.0-beta.10",
-        "spark-md5": "3.0.0",
-        "underscore": "1.8.3"
+      "blockui": "2.70",
+      "bluebird": "3.5.1",
+      "bootstrap": "3.3.7",
+      "bower-knockout-mapping": "2.6.0",
+      "comma-separated-values": "3.6.4",
+      "d3": "3.5.17",
+      "d3-plugins-sankey": "1.1.0",
+      "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
+      "datatables": "1.10.16",
+      "file-saver": "1.3.4",
+      "font-awesome": "4.7.0",
+      "google-code-prettify": "1.0.5",
+      "handlebars": "4.0.11",
+      "highlightjs": "9.12.0",
+      "jquery": "2.2.4",
+      "jquery-ui": "1.12.1",
+      "js-yaml": "3.11.0",
+      "kbase-ko-components-js": "0.5.3",
+      "kbase-knockout-extensions-es6": "0.1.1",
+      "kbase-common-ts": "0.18.0",
+      "kbase-common-js": "2.16.0",
+      "kbase-common-es6": "0.1.0",
+      "kbase-sdk-clients-js": "0.5.1",
+      "kbase-service-clients-js": "3.3.5",
+      "kbase-ui-widget": "1.3.0",
+      "knockout-arraytransforms": "2.1.1",
+      "knockout-switch-case": "2.1.0",
+      "knockout-validation": "2.0.3",
+      "knockout": "3.5.0-rc",
+      "marked": "0.3.19",
+      "moment": "2.22.1",
+      "numeral": "2.0.6",
+      "nunjucks": "3.0.0",
+      "plotly.js": "1.33.1",
+      "pure-uuid": "eapearson/pure-uuid#1.1.1",
+      "regression-js": "1.4.0",
+      "require-css": "0.1.10",
+      "requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
+      "requirejs-domready": "2.0.1",
+      "requirejs-json": "0.0.3",
+      "requirejs-text": "2.0.15",
+      "requirejs": "eapearson/requirejs#3.0.0-alpha5",
+      "select2": "4.0.5",
+      "select2-bootstrap-theme": "0.1.0-beta.10",
+      "spark-md5": "3.0.0",
+      "underscore": "1.8.3"
     },
     "resolutions": {
-        "font-awesome": "4.7.0",
-        "datatables-bootstrap3-plugin": "1.0.1",
-        "numeral": "2.0.4",
-        "nunjucks": "3.0.0",
-        "kbase-common-js": "^2.5.0",
-        "kbase-service-clients-js": "^3.0.0",
-        "requirejs": "3.0.0-alpha5"
+      "font-awesome": "4.7.0",
+      "datatables-bootstrap3-plugin": "1.0.1",
+      "numeral": "2.0.6",
+      "nunjucks": "3.0.0",
+      "kbase-common-js": "^2.5.0",
+      "kbase-service-clients-js": "^3.0.0",
+      "requirejs": "3.0.0-alpha5"
     },
     "devDependencies": {},
     "license": "SEE LICENSE IN LICENSE"
-}
+  }
+
diff --git a/config/app/dev/plugins.yml b/config/app/dev/plugins.yml
@@ -27,13 +27,13 @@ plugins:
         name: typeview
         globalName: kbase-ui-plugin-typeview
         cwd: src/plugin
-        version: 1.1.1
+        version: 1.2.2
         source:
             bower: {}
     -
         name: dataview
         globalName: kbase-ui-plugin-dataview
-        version: 3.7.2
+        version: 3.7.3
         cwd: src/plugin
         source:
             bower: {}
@@ -44,6 +44,13 @@ plugins:
         cwd: src/plugin
         source:
             bower: {}
+    # -
+    #     name: dashboard2
+    #     globalName: kbase-ui-plugin-dashboard2
+    #     version: 0.1.0
+    #     cwd: src/plugin
+    #     source:
+    #         bower: {}            
 
     # These are just developer
     # -
@@ -119,7 +126,7 @@ plugins:
     -
         name: auth2-client
         globalName: kbase-ui-plugin-auth2-client
-        version: 1.2.19
+        version: 1.2.22
         cwd: src/plugin
         source:
             bower: {}
@@ -161,7 +168,7 @@ plugins:
     -
         name: jgi-search
         globalName: kbase-ui-plugin-jgi-search
-        version: 0.33.1
+        version: 0.33.3
         cwd: src/plugin
         source:
             bower: {}
@@ -217,7 +224,7 @@ plugins:
     -
         name: catalog
         globalName: kbase-ui-plugin-catalog
-        version: 1.2.3
+        version: 1.2.7
         cwd: src/plugin
         source:
             bower: {}      
@@ -231,7 +238,7 @@ plugins:
     -
         name: data-search
         globalName: kbase-ui-plugin-data-search
-        version: 0.13.3
+        version: 0.15.2
         cwd: src/plugin
         source:
             bower: {}
@@ -249,6 +256,21 @@ plugins:
         cwd: src/plugin
         source:
             bower: {}    
+
+    -
+        name: narrative-info
+        globalName: kbase-ui-plugin-narrative-info
+        version: 0.1.5
+        cwd: src/plugin
+        source:
+            bower: {}
+    -
+        name: test-lookup
+        globalName: kbase-ui-plugin-test-lookup
+        version: 0.1.1
+        cwd: src/plugin
+        source: 
+            bower: {}
     # -
     #     name: example-clojurescript
     #     globalName: kbase-ui-plugin-example-clojurescript

diff --git a/config/app/dev/services.yml b/config/app/dev/services.yml
@@ -28,6 +28,12 @@ ui:
                   auth: true
             developer:
               items: 
+                -
+                  id: test-lookup
+                  auth: true
+                -
+                  id: narrative-info
+                  auth: true  
                 -
                   id: dagre-example
                   auth: true
@@ -46,6 +52,9 @@ ui:
                 -
                   id: example-gopherjs
                   auth: true
+                # -
+                #   id: example-clojurescript
+                # auth: true
                 -
                   id: reske-admin
                   auth: true
@@ -61,7 +70,7 @@ ui:
                 -
                   id: paveldemo
                   auth: true
-                -
+                -             
                   id: databrowser
                   auth: true
                 -
@@ -70,14 +79,14 @@ ui:
                 -
                   id: shockbrowser
                   auth: true
+                -
+                  id: about-services
+                  auth: true
             help:
               items:
                 -
                   id: about
                   auth: false
-                -
-                  id: about-services
-                  auth: true
                 -
                   id: contact-kbase
                   auth: false

diff --git a/config/app/prod/plugins.yml b/config/app/prod/plugins.yml
@@ -27,13 +27,13 @@ plugins:
         name: typeview
         globalName: kbase-ui-plugin-typeview
         cwd: src/plugin
-        version: 1.1.1
+        version: 1.2.2
         source:
             bower: {}
     -
         name: dataview
         globalName: kbase-ui-plugin-dataview
-        version: 3.7.2
+        version: 3.7.3
         cwd: src/plugin
         source:
             bower: {}
@@ -118,7 +118,7 @@ plugins:
     -
         name: auth2-client
         globalName: kbase-ui-plugin-auth2-client
-        version: 1.2.19
+        version: 1.2.22
         cwd: src/plugin
         source:
             bower: {}
@@ -160,7 +160,7 @@ plugins:
     -
         name: jgi-search
         globalName: kbase-ui-plugin-jgi-search
-        version: 0.33.1
+        version: 0.33.3
         cwd: src/plugin
         source:
             bower: {}
@@ -202,14 +202,14 @@ plugins:
     -
         name: catalog
         globalName: kbase-ui-plugin-catalog
-        version: 1.2.3
+        version: 1.2.7
         cwd: src/plugin
         source:
             bower: {}
     -
         name: data-search
         globalName: kbase-ui-plugin-data-search
-        version: 0.13.3
+        version: 0.15.2
         cwd: src/plugin
         source:
             bower: {}     
@@ -220,3 +220,10 @@ plugins:
         cwd: src/plugin
         source:
             bower: {}
+    -
+        name: narrative-info
+        globalName: kbase-ui-plugin-narrative-info
+        version: 0.1.5
+        cwd: src/plugin
+        source:
+            bower: {}
diff --git a/config/app/prod/services.yml b/config/app/prod/services.yml
@@ -28,23 +28,27 @@ ui:
                   auth: true
             developer:
               items:
+                -
+                  id: about-services
+                  auth: true
+                  allowRoles: [DevToken]
                 -
                   id: simple-search
                   auth: true           
+                  allowRoles: [DevToken]
                 -
-                  id: reske-admin
+                  id: narrative-info
                   auth: true
+                  allow: [alpha]
                 -
-                  id: staging-browser
+                  id: reske-admin
                   auth: true
+                  allow: [alpha]
             help:
               items:
                 -
                   id: about
                   auth: false
-                -
-                  id: about-services
-                  auth: true
                 -
                   id: contact-kbase
                   auth: false

diff --git a/config/bowerInstall.yml b/config/bowerInstall.yml
@@ -203,12 +203,24 @@ bowerFiles:
         cwd: dist/kb_common
         src: "**/*"
         bowerComponent: false
+    -
+        name: kb_lib
+        dir: kbase-common-es6
+        cwd: src
+        src: '**/*'
+        bowerComponent: false
     -
         name: kb_ko
         dir: kbase-ko-components-js
         cwd: src
         src: "**/*"
         bowerComponent: false
+    -
+        name: kb_knockout
+        dir: kbase-knockout-extensions-es6
+        cwd: src
+        src: "**/*"
+        bowerComponent: false
     -
         name: kb_service
         dir: kbase-service-clients-js