Merge pull request #2887 from kbase/DATAUP-737_misc_fixes

DATAUP-737: more Deepscan fixes for global variables and function params
kbase · Apr 14, 2022 · 97f8fa6 · 97f8fa6
2 parents b393ee6 + a28d67a
commit 97f8fa6
Show file tree

Hide file tree

Showing 62 changed files with 368 additions and 919 deletions.
diff --git a/kbase-extension/static/kbase/js/common/iframe/messages.js b/kbase-extension/static/kbase/js/common/iframe/messages.js
@@ -7,8 +7,8 @@ define(['bluebird', 'uuid'], (Promise, Uuid) => {
 
         let lastId = 0; //: number;
         const partners = {}; // Object<String, any>;
-        const listeners = {}; //Object<String, Array<any>>;
-        const awaitingResponse = {}; //: Object<String, any>;
+        const listeners = {}; // Object<String, Array<any>>;
+        const awaitingResponse = {}; // Object<String, any>;
 
         function genId() {
             lastId += 1;
@@ -30,7 +30,7 @@ define(['bluebird', 'uuid'], (Promise, Uuid) => {
             const message = event.data;
             let response;
 
-            if (!message.address && !message.address.to) {
+            if (!message.address || !message.address.to) {
                 console.warn('Message without address.to - ignored (iframe)', message);
                 return;
             }

diff --git a/kbase-extension/static/kbase/js/common/parameterSpec.js b/kbase-extension/static/kbase/js/common/parameterSpec.js
@@ -43,10 +43,7 @@ define([], () => {
         }
 
         function isAdvanced() {
-            if (spec.advanced === 1) {
-                return true;
-            }
-            return false;
+            return spec.advanced === 1;
         }
 
         function dataType() {
@@ -150,7 +147,7 @@ define([], () => {
                 case 'float':
                     return parseFloat(_defaultValue);
                 case 'boolean':
-                    return coerceToBoolean(_defaultValue);
+                    return !!_defaultValue;
                 case 'string':
                 case 'workspaceObjectName':
                 default:
@@ -177,7 +174,7 @@ define([], () => {
             if (typeof value !== 'string') {
                 return 0;
             }
-            switch (value.toLowerCase(value)) {
+            switch (value.toLowerCase()) {
                 case 'true':
                 case 't':
                 case 'yes':
@@ -237,13 +234,10 @@ define([], () => {
             if (value === undefined || value === null) {
                 return true;
             }
-            if (
+            return !!(
                 (dataType() === 'string' || dataType() === 'workspaceObjectName') &&
                 value.length === 0
-            ) {
-                return true;
-            }
-            return false;
+            );
         }
 
         function uiClass() {

diff --git a/kbase-extension/static/kbase/js/common/sdk.js b/kbase-extension/static/kbase/js/common/sdk.js
@@ -15,7 +15,7 @@ define(['common/props'], (Props) => {
         if (typeof value !== 'string') {
             return false;
         }
-        switch (value.toLowerCase(value)) {
+        switch (value.toLowerCase()) {
             case 'true':
             case 't':
             case 'yes':
@@ -39,7 +39,7 @@ define(['common/props'], (Props) => {
         if (converted.multipleItems) {
             return [];
         }
-        const nullValue = (function () {
+        return (function () {
             switch (converted.data.type) {
                 case 'string':
                     return '';
@@ -59,7 +59,6 @@ define(['common/props'], (Props) => {
                     return null;
             }
         })();
-        return nullValue;
     }
 
     function updateNullValue(converted) {
@@ -578,7 +577,7 @@ define(['common/props'], (Props) => {
         if (spec.allow_multiple) {
             // except, ahem, for the custom_subdata, at least for now...
             if (spec.field_type === 'custom_textsubdata') {
-                spec.allow_multiple === 0;
+                spec.allow_multiple = 0;
                 spec.textsubdata_options = {
                     multiselection: 1,
                 };
@@ -633,17 +632,14 @@ define(['common/props'], (Props) => {
         });
         const required = group.optional ? false : true;
 
-        let defaultValue;
-        let nullValue;
-
-        nullValue = null;
-        defaultValue = {};
+        const nullValue = null;
+        const defaultValue = {};
         Object.keys(groupParams).forEach((id) => {
             defaultValue[id] = groupParams[id].data.defaultValue;
         });
         const zeroValue = defaultValue;
 
-        const structSpec = {
+        return {
             id: group.id,
             multipleItems: false,
             ui: {
@@ -669,7 +665,6 @@ define(['common/props'], (Props) => {
                 specs: groupParams,
             },
         };
-        return structSpec;
     }
 
     // just differs from the makeParameterSequence in that the
@@ -770,10 +765,7 @@ define(['common/props'], (Props) => {
         // and then add the groups in.
         const parameterLayout = sdkAppSpec.parameters
             .filter((parameter) => {
-                if (parameterSpecs[parameter.id]) {
-                    return true;
-                }
-                return false;
+                return !!parameterSpecs[parameter.id];
             })
             .map((parameter) => {
                 return {
@@ -786,10 +778,7 @@ define(['common/props'], (Props) => {
                     // first filter out any groups which were not added to the parameters.
                     // This includes ones with no parameters specified
                     .filter((group) => {
-                        if (parameterSpecs[group.id]) {
-                            return true;
-                        }
-                        return false;
+                        return !!parameterSpecs[group.id];
                     })
                     .map((group) => {
                         return {

diff --git a/kbase-extension/static/kbase/js/common/ui.js b/kbase-extension/static/kbase/js/common/ui.js
@@ -1193,7 +1193,7 @@ define([
                     fontSize = jsonBlockWidgetConfig.fontSize || 0.8;
 
                 function render(obj) {
-                    const specText = JSON.stringify(obj, false, indent),
+                    const specText = JSON.stringify(obj, null, indent),
                         fixedText = specText.replace(/</g, '&lt;').replace(/>/g, '&gt;');
                     return pre(
                         {