diff --git a/bower.json b/bower.json index 0e9cff0ed..1d6ed52a5 100644 --- a/bower.json +++ b/bower.json @@ -37,7 +37,7 @@ "kbase-knockout-extensions-es6": "0.1.4", "kbase-common-ts": "0.18.0", "kbase-common-js": "2.16.1", - "kbase-common-es6": "0.5.1", + "kbase-common-es6": "0.5.2", "kbase-sdk-clients-js": "0.5.1", "kbase-service-clients-js": "3.3.5", "kbase-ui-widget": "1.3.0", diff --git a/config/app/dev/plugins.yml b/config/app/dev/plugins.yml index 7a33f43f2..84e6f2cb4 100644 --- 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.8.0 + version: 3.8.2 cwd: src/plugin source: bower: {} diff --git a/config/app/prod/plugins.yml b/config/app/prod/plugins.yml index f3db09442..a3535b528 100644 --- a/config/app/prod/plugins.yml +++ b/config/app/prod/plugins.yml @@ -33,7 +33,7 @@ plugins: - name: dataview globalName: kbase-ui-plugin-dataview - version: 3.8.0 + version: 3.8.2 cwd: src/plugin source: bower: {} diff --git a/src/client/modules/lib/kbaseServiceManager.js b/src/client/modules/lib/kbaseServiceManager.js index 75464bef5..447e2b672 100644 --- a/src/client/modules/lib/kbaseServiceManager.js +++ b/src/client/modules/lib/kbaseServiceManager.js @@ -49,8 +49,8 @@ define([ throw new Error(errorMessage); } else { console.error(errorMessage); + return null; } - }); } @@ -70,6 +70,7 @@ define([ throw new Error(errorMessage); } else { console.error(errorMessage); + return null; } }); } @@ -89,11 +90,18 @@ define([ throw new Error(errorMessage); } else { console.error(errorMessage); + return null; } } }).then((result) => { let version; - if (serviceConfig.version.propertyPath) { + if (result === null) { + if (!this.throwErrors) { + return null; + } else { + throw new Error('Invalid semver check result: ' + result); + } + } else if (serviceConfig.version.propertyPath) { version = props.getProp(result, serviceConfig.version.propertyPath); } else { version = result; diff --git a/src/plugins/mainwindow/modules/mainWindow.css b/src/plugins/mainwindow/modules/mainWindow.css index ef4717d73..974052674 100644 --- a/src/plugins/mainwindow/modules/mainWindow.css +++ b/src/plugins/mainwindow/modules/mainWindow.css @@ -111,6 +111,10 @@ align-items: center; justify-content: left; display: flex; + width: 0px; + overflow-x: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .plugin-mainwindow.widget-mainwindow .-navbar .-cell.-menu {}