Merge pull request #575 from kbase/develop

Develop -> Master (1.6.0)
kbase · Feb 21, 2018 · 2020f87 · 2020f87
2 parents bf46f7a + 3e1f2aa
commit 2020f87
Show file tree

Hide file tree

Showing 654 changed files with 3,984 additions and 156,700 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -110,7 +110,7 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-open');
     grunt.loadNpmTasks('grunt-filerev');
     grunt.loadNpmTasks('grunt-regex-replace');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
+    // grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-webdriver');
     //grunt.loadNpmTasks('grunt-markdown');
 

diff --git a/Makefile b/Makefile
@@ -184,7 +184,7 @@ run-dev-image:
 	@echo "> libraries $(libraries)"
 	@echo "> To map host directories into the container, you will need to run "
 	@echo ">   deploymnet/dev/tools/run-image.sh with appropriate options."
-	$(eval cmd = $(TOPDIR)/deployment/dev/tools/run-image.sh $(env) $(foreach p,$(plugins),-p $(p)) $(foreach i,$(internal),-i $i) $(foreach l,$(libraries),-l $l))
+	$(eval cmd = $(TOPDIR)/deployment/dev/tools/run-image.sh $(env) $(foreach p,$(plugins),-p $(p)) $(foreach i,$(internal),-i $i) $(foreach l,$(libraries),-l $l) $(foreach s,$(services),-s $s))
 	@echo "> Issuing: $(cmd)"
 	bash $(cmd)
 

diff --git a/bower.json b/bower.json
@@ -18,48 +18,48 @@
     "dependencies": {
         "ajv": "5.1.5",
         "blockui": "2.70",
-        "bluebird": "3.5.0",
+        "bluebird": "3.5.1",
         "bootstrap": "3.3.7",
         "bower-knockout-mapping": "2.6.0",
         "comma-separated-values": "3.6.4",
         "d3-plugins-sankey": "1.1.0",
         "d3": "3.5.17",
         "datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
-        "datatables": "1.10.13",
-        "file-saver": "1.3.3",
+        "datatables": "1.10.16",
+        "file-saver": "1.3.4",
         "font-awesome": "4.7.0",
         "google-code-prettify": "1.0.5",
-        "handlebars": "4.0.5",
+        "handlebars": "4.0.11",
         "highlightjs": "9.10.0",
         "jquery": "2.2.4",
         "jquery-ui": "1.12.1",
-        "kbase-common-ts": "0.16.3",
-        "kbase-common-js": "2.13.3",
+        "js-yaml": "3.10.0",
+        "kbase-common-ts": "0.17.0",
+        "kbase-common-js": "2.15.1",
         "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.6",
-        "moment": "2.18.1",
+        "marked": "0.3.12",
+        "moment": "2.20.1",
         "numeral": "2.0.4",
         "nunjucks": "3.0.0",
-        "plotly.js": "1.26.0",
-        "postal": "1.0.7",
+        "plotly.js": "1.33.1",
         "pure-uuid": "eapearson/pure-uuid#1.1.1",
-        "q": "2.0.2",
         "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-alpha4",
+        "select2": "4.0.5",
+        "select2-bootstrap-theme": "0.1.0-beta.10",
         "spark-md5": "3.0.0",
-        "underscore": "1.8.3",
-        "js-yaml": "3.8.3"
+        "underscore": "1.8.3"
     },
     "resolutions": {
         "font-awesome": "4.7.0",

diff --git a/config/app/ci/menus.yml b/config/app/ci/menus.yml
@@ -1,9 +1,57 @@
 menus:
-    authenticated:
-        main: [narrative, jgi-search]
-        developer: [reske-admin, staging-browser]
-        help: [about, about-services, contact-kbase, help]
-    unauthenticated:
-        main: []
-        developer: []
-        help: [about, contact-kbase, help]
+    hamburger:
+        main:
+            -
+                id: narrative
+                auth: true
+            -
+                id: jgi-search
+                auth: true
+        developer:
+            -
+                id: simple-search
+                auth: true           
+            -
+                id: reske-admin
+                auth: true
+            -
+                id: staging-browser
+                auth: true
+        help:
+            -
+                id: about
+                auth: false
+            -
+                id: about-services
+                auth: true
+            -
+                id: contact-kbase
+                auth: false
+            -
+                id: help
+                auth: false
+    sidebar:
+        main:
+            -
+                id: dashboard
+                auth: true
+            -
+                id: appcatalog
+                auth: false
+            -
+                id: search
+                auth: true
+                allow: [alpha]
+            -
+                id: jobbrowser
+                # The label can ovveride the label from the plugin here
+                label: Jobs
+                auth: true
+                allow: [alpha]
+            -
+                id: account
+                auth: true
+            -
+                id: feeds
+                auth: true
+                allow: [alpha]
diff --git a/config/app/ci/plugins.yml b/config/app/ci/plugins.yml
@@ -33,7 +33,7 @@ plugins:
     -
         name: dataview
         globalName: kbase-ui-plugin-dataview
-        version: 3.4.0
+        version: 3.5.1
         cwd: src/plugin
         source:
             bower: {}
@@ -90,7 +90,7 @@ plugins:
     -
         name: jobbrowser
         globalName: kbase-ui-plugin-jobbrowser
-        version: 0.3.3
+        version: 0.3.4
         cwd: src/plugin
         source:
             bower: {}
@@ -118,7 +118,7 @@ plugins:
     -
         name: auth2-client
         globalName: kbase-ui-plugin-auth2-client
-        version: 1.2.8
+        version: 1.2.9
         cwd: src/plugin
         source:
             bower: {}
@@ -160,7 +160,7 @@ plugins:
     -
         name: jgi-search
         globalName: kbase-ui-plugin-jgi-search
-        version: 0.31.5
+        version: 0.31.6
         cwd: src/plugin
         source:
             bower: {}
@@ -188,7 +188,7 @@ plugins:
     -
         name: reske-simple-search
         globalName: kbase-ui-plugin-reske-simple-search
-        version: 0.7.1
+        version: 0.11.1
         cwd: src/plugin
         source:
             bower: {}            
@@ -202,14 +202,14 @@ plugins:
     -
         name: catalog
         globalName: kbase-ui-plugin-catalog
-        version: 1.2.0
+        version: 1.2.1
         cwd: src/plugin
         source:
             bower: {}
     -
         name: data-search
         globalName: kbase-ui-plugin-data-search
-        version: 0.1.0
+        version: 0.9.11
         cwd: src/plugin
         source:
             bower: {}                           
diff --git a/config/app/dev/menus.yml b/config/app/dev/menus.yml
@@ -1,13 +1,90 @@
 menus:
-    authenticated:
-        main: [narrative, jgi-search]
-        developer: [data-search, simple-sample, narrative-finder, staging-browser,  example-gopherjs, reske-admin, reske-object-search,tester, test_dynamic_table, paveldemo, sdkclientstest, databrowser, typebrowser,  shockbrowser]
-        help: [about, about-services, contact-kbase, help]
-        # TODO: congigurable sidebar menu items
-        #sidebar: [dashboard, catalog, account] 
-    unauthenticated:
-        main: []
-        developer: []
-        help: [about, contact-kbase, help]
-        # TODO: congigurable sidebar menu items
-        #sidebar: [catalog]
+    hamburger:
+        main:
+            -
+                id: narrative
+                auth: true
+            -
+                id: jgi-search
+                auth: true
+        developer:
+            -
+                id: simple-search
+                auth: true
+            -
+                id: simple-sample
+                auth: true
+            -
+                id: narrative-finder
+                auth: true
+            -
+                id: staging-browser
+                auth: true
+            -
+                id: example-gopherjs
+                auth: true
+            -
+                id: reske-admin
+                auth: true
+            -
+                id: reske-object-search
+                auth: true
+            -
+                id: tester
+                auth: true
+            -
+                id: test_dynamic_table
+                auth: true
+            -
+                id: paveldemo
+                auth: true
+            # -
+            #     id: sdkclienttest
+            #     auth: true
+            -
+                id: databrowser
+                auth: true
+            -
+                id: typebrowser
+                auth: true
+            -
+                id: shockbrowser
+                auth: true
+        help:
+            -
+                id: about
+                auth: false
+            -
+                id: about-services
+                auth: true
+            -
+                id: contact-kbase
+                auth: false
+            -
+                id: help
+                auth: false
+    sidebar:
+        main:
+            -
+                id: dashboard
+                auth: true
+            -
+                id: appcatalog
+                auth: false
+            -
+                id: search
+                auth: true
+                allow: [alpha]
+            -
+                id: jobbrowser
+                # The label can ovveride the label from the plugin here
+                label: Jobs
+                auth: true
+                allow: [alpha]
+            -
+                id: account
+                auth: true
+            -
+                id: feeds
+                auth: true
+                allow: [alpha]
diff --git a/config/app/dev/plugins.yml b/config/app/dev/plugins.yml
@@ -33,7 +33,7 @@ plugins:
     -
         name: dataview
         globalName: kbase-ui-plugin-dataview
-        version: 3.4.0
+        version: 3.5.1
         cwd: src/plugin
         source:
             bower: {}
@@ -90,7 +90,7 @@ plugins:
     -
         name: jobbrowser
         globalName: kbase-ui-plugin-jobbrowser
-        version: 0.3.3
+        version: 0.3.4
         cwd: src/plugin
         source:
             bower: {}
@@ -118,7 +118,7 @@ plugins:
     -
         name: auth2-client
         globalName: kbase-ui-plugin-auth2-client
-        version: 1.2.8
+        version: 1.2.9
         cwd: src/plugin
         source:
             bower: {}
@@ -160,7 +160,7 @@ plugins:
     -
         name: jgi-search
         globalName: kbase-ui-plugin-jgi-search
-        version: 0.31.5
+        version: 0.31.6
         cwd: src/plugin
         source:
             bower: {}
@@ -195,7 +195,7 @@ plugins:
     -
         name: reske-simple-search
         globalName: kbase-ui-plugin-reske-simple-search
-        version: 0.7.1
+        version: 0.11.1
         cwd: src/plugin
         source:
             bower: {}
@@ -216,21 +216,21 @@ plugins:
     -
         name: catalog
         globalName: kbase-ui-plugin-catalog
-        version: 1.2.0
+        version: 1.2.1
         cwd: src/plugin
         source:
             bower: {}      
     -
         name: narrative-finder
         globalName: kbase-ui-plugin-narrative-finder
-        version: 0.1.0
+        version: 0.1.1
         cwd: src/plugin
         source:
             bower: {}
     -
         name: data-search
         globalName: kbase-ui-plugin-data-search
-        version: 0.1.0
+        version: 0.9.11
         cwd: src/plugin
         source:
             bower: {}