Merge pull request #703 from eapearson/develop

tighten eslint rules, and resulting codebase changes

.eslintignore

@@ -0,0 +1,6 @@
+/node_modules/
+/bower_components/
+/build/
+/deployment/
+**/*.js
+!/src/**/*.js

.eslintrc.yml

@@ -24,3 +24,29 @@ rules:
     - allow:
       - warn
       - error
+  # stylistic
+  no-trailing-spaces:
+    - error
+  space-before-function-paren:
+    - error
+    -
+      anonymous: always
+      named: never
+      asyncArrow: always
+  space-in-parens:
+    - error
+    - never
+  func-call-spacing:
+    - error
+    - never
+  keyword-spacing:
+    - error
+    - 
+      before: true
+      after: true
+  no-fallthrough:
+    - error
+    - 
+      commentPattern: fallthrough
+  prefer-const:
+    - error

config/app/dev/plugins.yml

@@ -260,7 +260,7 @@ plugins:
     -
         name: narrative-info
         globalName: kbase-ui-plugin-narrative-info
-        version: 1.1.3
+        version: 1.1.4
         cwd: src/plugin
         source:
             bower: {}

config/app/prod/plugins.yml

@@ -223,7 +223,7 @@ plugins:
     -
         name: narrative-info
         globalName: kbase-ui-plugin-narrative-info
-        version: 1.1.3
+        version: 1.1.4
         cwd: src/plugin
         source:
             bower: {}

src/client/modules/app/App.js

@@ -138,7 +138,7 @@ define([
         }
 
         function checkCoreServices() {
-            let manager = new kbaseServiceManager.KBaseServiceManager({
+            const manager = new kbaseServiceManager.KBaseServiceManager({
                 runtime: api
             });
             return manager.check();

src/client/modules/app/runtime.js

@@ -8,7 +8,7 @@ define([
         var messenger = config.messenger;
         var serviceManager = config.serviceManager;
 
-        // Access to ui config. 
+        // Access to ui config.
         // This is simply a wrapping around the venerable Props module.
         function getConfig(prop, defaultValue) {
             return configProps.getItem(prop, defaultValue);
@@ -23,8 +23,8 @@ define([
         }
 
         // allow tag
-        // Returns true if the provided string 'tag' is found in 
-        // the array of allowed tags, as defined in the config 
+        // Returns true if the provided string 'tag' is found in
+        // the array of allowed tags, as defined in the config
         // property 'ui.allow'.
         function allow(tag) {
             var allowed = configProps.getItem('ui.allow', []);
@@ -35,18 +35,18 @@ define([
         }
 
         var featureSwitches = {};
-        configProps.getItem('ui.featureSwitches.available').reduce((features, featureSwitch) => {
+        configProps.getItem('ui.featureSwitches.available', []).reduce((features, featureSwitch) => {
             featureSwitches[featureSwitch.id] = featureSwitch;
-        });
+        }, {});
 
         function featureEnabled(id) {
-            let featureSwitch = featureSwitches[id];
+            const featureSwitch = featureSwitches[id];
             if (!featureSwitch) {
                 throw new Error('Feature switch "' + id + '" not defined');
             }
 
             // look for the feature switch in the.
-            let enabledFeatureSwitches = configProps.getItem('ui.featureSwitches.enabled');
+            const enabledFeatureSwitches = configProps.getItem('ui.featureSwitches.enabled');
             // let disabledFeatureSwitches = configProps.getItem('ui.featureSwitches.disabled');
 
             if (enabledFeatureSwitches.includes(id)) {
@@ -56,13 +56,13 @@ define([
         }
 
         function featureDisabled(id) {
-            let featureSwitch = featureSwitches[id];
+            const featureSwitch = featureSwitches[id];
             if (!featureSwitch) {
                 throw new Error('Feature switch "' + id + '" not defined');
             }
 
             // look for the feature switch in the.
-            let disabledFeatureSwitches = configProps.getItem('ui.featureSwitches.disabled');
+            const disabledFeatureSwitches = configProps.getItem('ui.featureSwitches.disabled');
 
             if (disabledFeatureSwitches.includes(id)) {
                 return true;

src/client/modules/app/services/connection.js

@@ -154,7 +154,7 @@ define([
 
             //     // show the disconnected dialog
             //     // which starts listening back to home base to see if we are
-            //     // connected yet. Allow the user to bail to a default "closer" 
+            //     // connected yet. Allow the user to bail to a default "closer"
             //     // page which is just a simple view which destroys the current view
             //     // and allows the user to just kill the tab.
             // });
@@ -164,7 +164,7 @@ define([
                 if (checking) {
                     return;
                 }
-                var now = new Date().getTime();
+                const now = new Date().getTime();
                 if (now - lastCheckAt > interval) {
                     checking = true;
                     var httpClient = new HttpClient.HttpClient();

src/client/modules/app/services/coreService.js

@@ -5,15 +5,15 @@ define([
 ) {
     'use strict';
 
-    class CoreService {
-        constructor({moduleName, minimumVersion, url, versionMethod, versionPath}) {
-            this.moduleName = moduleName;
-            this.minimumVersion = minimumVersion;
-            this.url = url;
-            this.versionMethod = versionMethod;
-            this.versionPath = versionPath;
-        }
-    }
+    // class CoreService {
+    //     constructor({moduleName, minimumVersion, url, versionMethod, versionPath}) {
+    //         this.moduleName = moduleName;
+    //         this.minimumVersion = minimumVersion;
+    //         this.url = url;
+    //         this.versionMethod = versionMethod;
+    //         this.versionPath = versionPath;
+    //     }
+    // }
 
     class CoreServicesMonitor {
         constructor({runtime}) {
@@ -22,22 +22,22 @@ define([
             this.services = {};
         }
 
-        start () {
+        start() {
 
         }
 
-        stop () {
+        stop() {
 
         }
 
-        pluginHandler(config) {
+        pluginHandler() {
             // console.log('plugin handler', config);
         }
 
-        addCoreServiceDepenency(dep) {
-            
+        addCoreServiceDepenency() {
+
         }
-    }    
+    }
 
 
     return {ServiceClass: CoreServicesMonitor};

src/client/modules/app/services/data.js

@@ -25,8 +25,8 @@ define([
         }
 
         function getJson(arg) {
-            let url = '/data/' + arg.path + '/' + arg.file + '.json';
-            let http = new HttpClient.HttpClient();
+            const url = '/data/' + arg.path + '/' + arg.file + '.json';
+            const http = new HttpClient.HttpClient();
             return http.request({
                 method: 'GET',
                 url: url
@@ -42,7 +42,6 @@ define([
                         throw new Error('Error fetching file: ' + result.status);
                     }
                 });
-
         }
         return {
             start: start,

src/client/modules/app/services/dynamic-service.js

@@ -1,15 +1,15 @@
 define([
-    'kb_common/hotCache',
-    'kb_common/jsonRpc/genericClient',
-    'kb_common/jsonRpc/dynamicServiceClient'
+    'kb_common/hotCache'
+    // 'kb_common/jsonRpc/genericClient',
+    // 'kb_common/jsonRpc/dynamicServiceClient'
 ], function (
-    HotCache,
-    GenericClient,
-    DynamicServiceClient
+    HotCache
+    // GenericClient,
+    // DynamicServiceClient
 ) {
     'use strict';
 
-    function factory(config) {
+    function factory() {
         var cache = HotCache.make({
             hardTtl: 3600000, // 1 min
             hotTtl:  18000000, // 5 min

src/client/modules/app/services/heartbeat.js

@@ -1,6 +1,6 @@
 /*global define */
 /*jslint white: true, browser: true */
-define([], function() {
+define([], function () {
     'use strict';
 
     function factory(config) {
@@ -12,7 +12,7 @@ define([], function() {
 
         function start() {
             heartbeat = 0;
-            heartbeatTimer = window.setInterval(function() {
+            heartbeatTimer = window.setInterval(function () {
                 heartbeat += 1;
                 runtime.send('app', 'heartbeat', { heartbeat: heartbeat });
             }, interval);
@@ -30,7 +30,7 @@ define([], function() {
     }
 
     return {
-        make: function(config) {
+        make: function (config) {
             return factory(config);
         }
     };

src/client/modules/app/services/menu.js

@@ -2,7 +2,7 @@ define([
     'bluebird',
     'kb_common/observed'
 ], function (
-    Promise, 
+    Promise,
     observed
 ) {
     'use strict';
@@ -43,7 +43,7 @@ define([
          * Add a defined menu item to a menu, according to a menu entry definition.
          */
         function addToMenu(menuEntry, menuItemSpec) {
-            var menu, section, position, 
+            var menu, section, position,
                 menuItems = state.getItem('menuItems'),
                 menuItemDef = menuItems[menuItemSpec.id];
 
@@ -78,7 +78,7 @@ define([
                 allowRoles: menuItemSpec.allowRoles || null,
                 authRequired: menuItemSpec.auth ? true : false
             };
-            
+
             menu = menuEntry.menu;
             section = menuEntry.section;
             position = menuEntry.position || 'bottom';
@@ -97,7 +97,6 @@ define([
             });
         }
 
-        // Get the 
         function getCurrentMenu(menu) {
             menu = menu || 'hamburger';
             var menus = state.getItem('menu.' + menu);

src/client/modules/app/services/route.js

@@ -63,7 +63,7 @@ define([
                     handler = {
                         params: {
                             title: 'Access Error',
-                            error: 'One or more required roles not available in your account: ' + handler.route.rolesRequired.join(', ')                           
+                            error: 'One or more required roles not available in your account: ' + handler.route.rolesRequired.join(', ')
                         },
                         route: {
                             authorization: false,

src/client/modules/app/services/rpc.js

@@ -2,7 +2,7 @@ define([
     'bluebird',
     'lib/rpc'
 ], function (
-    Promise, 
+    Promise,
     rpc
 ) {
     'use strict';
@@ -27,31 +27,20 @@ define([
         function stop() {
             return true;
         }
-        function pluginHandler(widgetsConfig, pluginConfig) {
+        function pluginHandler() {
             return Promise.try(function () {
-                // widgetsConfig.forEach(function (widgetDef) {
-                //     // If source modules are not specified, we are using module
-                //     // paths. A full path will start with "plugins/" and a relative
-                //     // path won't. Prefix a relative path with the plugin's module path.
-                //     if (!pluginConfig.usingSourceModules) {
-                //         if (!widgetDef.module.match(/^plugins\//)) {
-                //             widgetDef.module = [pluginConfig.moduleRoot, widgetDef.module].join('/');
-                //         }
-                //     }
-                //     widgetManager.addWidget(widgetDef);
-                // });
             });
         }
 
         function makeClient(arg) {
-            let client = new rpc.RPCClient({
+            const client = new rpc.RPCClient({
                 runtime: runtime,
                 module: arg.module
             });
             return client;
         }
 
-        return {start, stop, pluginHandler, makeClient};        
+        return {start, stop, pluginHandler, makeClient};
     }
     return {
         make: function (config) {

src/client/modules/app/services/widget.js

@@ -47,7 +47,7 @@ define([
             stop: stop,
             // plugin interface
             pluginHandler: pluginHandler,
-            makeWidget: function () {                
+            makeWidget: function () {
                 return proxyMethod(widgetManager, 'makeWidget', arguments);
             },
             getWidget: function () {