@iobroker/adapter-react-v5 4.3.0 → 4.3.2

package/Components/Utils.js

@@ -210,10 +210,8 @@ var Utils = /*#__PURE__*/function () {
             if (settings[user].subOrder && settings[user].subOrder[forEnumId]) {
               return JSON.parse(JSON.stringify(settings[user].subOrder[forEnumId]));
             }
-          } else {
-            if (settings[user].order) {
-              return JSON.parse(JSON.stringify(settings[user].order));
-            }
+          } else if (settings[user].order) {
+            return JSON.parse(JSON.stringify(settings[user].order));
           }
         }
       }
@@ -240,10 +238,8 @@ var Utils = /*#__PURE__*/function () {
             if (settings[user].subURLs && settings[user].subURLs[forEnumId]) {
               return JSON.parse(JSON.stringify(settings[user].subURLs[forEnumId]));
             }
-          } else {
-            if (settings[user].URLs) {
-              return JSON.parse(JSON.stringify(settings[user].URLs));
-            }
+          } else if (settings[user].URLs) {
+            return JSON.parse(JSON.stringify(settings[user].URLs));
           }
         }
       }
@@ -266,15 +262,15 @@ var Utils = /*#__PURE__*/function () {
       result.splice(dest, 0, removed);
       return result;
     }
-  }, {
-    key: "getSettings",
-    value:
+
     /**
      * @param {any} obj
      * @param {{ id: any; user: any; name: any; icon: any; color: any; language: ioBroker.Languages; }} options
      * @param {boolean} [defaultEnabling]
      */
-    function getSettings(obj, options, defaultEnabling) {
+  }, {
+    key: "getSettings",
+    value: function getSettings(obj, options, defaultEnabling) {
       var settings;
       var id = obj && obj._id || options && options.id;
       if (obj && obj.hasOwnProperty('common')) {
@@ -295,9 +291,15 @@ var Utils = /*#__PURE__*/function () {
         settings.enabled = defaultEnabling === undefined ? true : defaultEnabling;
       }
       if (false && settings.useCommon) {
-        if (obj.color) settings.color = obj.color;
-        if (obj.icon) settings.icon = obj.icon;
-        if (obj.name) settings.name = obj.name;
+        if (obj.color) {
+          settings.color = obj.color;
+        }
+        if (obj.icon) {
+          settings.icon = obj.icon;
+        }
+        if (obj.name) {
+          settings.name = obj.name;
+        }
       } else {
         if (options) {
           if (!settings.name && options.name) settings.name = options.name;
@@ -360,9 +362,8 @@ var Utils = /*#__PURE__*/function () {
           }
         }
         return true;
-      } else {
-        return false;
       }
+      return false;
     }
 
     /**
@@ -380,20 +381,20 @@ var Utils = /*#__PURE__*/function () {
           return /*#__PURE__*/_react["default"].createElement("span", {
             style: style || {}
           }, settings.icon);
-        } else if (settings.icon.startsWith('data:image')) {
+        }
+        if (settings.icon.startsWith('data:image')) {
           return /*#__PURE__*/_react["default"].createElement("img", {
             alt: settings.name,
             src: settings.icon,
             style: style || {}
           });
-        } else {
-          // maybe later some changes for a second type
-          return /*#__PURE__*/_react["default"].createElement("img", {
-            alt: settings.name,
-            src: (settings.prefix || '') + settings.icon,
-            style: style || {}
-          });
         }
+        // maybe later some changes for a second type
+        return /*#__PURE__*/_react["default"].createElement("img", {
+          alt: settings.name,
+          src: (settings.prefix || '') + settings.icon,
+          style: style || {}
+        });
       }
       return null;
     }
@@ -417,27 +418,26 @@ var Utils = /*#__PURE__*/function () {
         // If UTF-8 icon
         if (typeof icon === 'string' && icon.length <= 2) {
           return icon;
-        } else if (icon.startsWith('data:image')) {
+        }
+        if (icon.startsWith('data:image')) {
           return icon;
+        }
+        var parts = id.split('.');
+        if (parts[0] === 'system') {
+          icon = "adapter/".concat(parts[2]).concat(icon.startsWith('/') ? '' : '/').concat(icon);
         } else {
-          var parts = id.split('.');
-          if (parts[0] === 'system') {
-            icon = "adapter/".concat(parts[2]).concat(icon.startsWith('/') ? '' : '/').concat(icon);
-          } else {
-            icon = "adapter/".concat(parts[0]).concat(icon.startsWith('/') ? '' : '/').concat(icon);
-          }
-          if (window.location.pathname.match(/adapter\/[^/]+\/[^/]+\.html/)) {
-            icon = "../../".concat(icon);
-          } else if (window.location.pathname.match(/material\/[.\d]+/)) {
-            icon = "../../".concat(icon);
-          } else if (window.location.pathname.match(/material\//)) {
-            icon = "../".concat(icon);
-          }
-          return icon;
+          icon = "adapter/".concat(parts[0]).concat(icon.startsWith('/') ? '' : '/').concat(icon);
         }
-      } else {
-        return null;
+        if (window.location.pathname.match(/adapter\/[^/]+\/[^/]+\.html/)) {
+          icon = "../../".concat(icon);
+        } else if (window.location.pathname.match(/material\/[.\d]+/)) {
+          icon = "../../".concat(icon);
+        } else if (window.location.pathname.match(/material\//)) {
+          icon = "../".concat(icon);
+        }
+        return icon;
       }
+      return null;
     }
 
     /**
@@ -479,9 +479,8 @@ var Utils = /*#__PURE__*/function () {
           }
           return '';
         }).join(' ');
-      } else {
-        return Utils.CapitalWords(text);
       }
+      return Utils.CapitalWords(text);
     }
 
     /**
@@ -528,16 +527,16 @@ var Utils = /*#__PURE__*/function () {
       // http://stackoverflow.com/a/3943023/112731
       return r * 0.299 + g * 0.587 + b * 0.114 <= 186;
     }
-  }, {
-    key: "getTimeString",
-    value:
+
     /**
      * Get the time string in the format 00:00.
      * @param {string | number} seconds
      */
-    function getTimeString(seconds) {
+  }, {
+    key: "getTimeString",
+    value: function getTimeString(seconds) {
       seconds = parseFloat(seconds);
-      if (isNaN(seconds)) {
+      if (Number.isNaN(seconds)) {
         return '--:--';
       }
       var hours = Math.floor(seconds / 3600);
@@ -551,12 +550,11 @@ var Utils = /*#__PURE__*/function () {
           secs = "0".concat(secs);
         }
         return "".concat(hours, ":").concat(minutes, ":").concat(secs);
-      } else {
-        if (secs < 10) {
-          secs = "0".concat(secs);
-        }
-        return "".concat(minutes, ":").concat(secs);
       }
+      if (secs < 10) {
+        secs = "0".concat(secs);
+      }
+      return "".concat(minutes, ":").concat(secs);
     }
 
     /**
@@ -569,43 +567,58 @@ var Utils = /*#__PURE__*/function () {
     value: function getWindDirection(angle) {
       if (angle >= 0 && angle < 11.25) {
         return 'N';
-      } else if (angle >= 11.25 && angle < 33.75) {
+      }
+      if (angle >= 11.25 && angle < 33.75) {
         return 'NNE';
-      } else if (angle >= 33.75 && angle < 56.25) {
+      }
+      if (angle >= 33.75 && angle < 56.25) {
         return 'NE';
-      } else if (angle >= 56.25 && angle < 78.75) {
+      }
+      if (angle >= 56.25 && angle < 78.75) {
         return 'ENE';
-      } else if (angle >= 78.75 && angle < 101.25) {
+      }
+      if (angle >= 78.75 && angle < 101.25) {
         return 'E';
-      } else if (angle >= 101.25 && angle < 123.75) {
+      }
+      if (angle >= 101.25 && angle < 123.75) {
         return 'ESE';
-      } else if (angle >= 123.75 && angle < 146.25) {
+      }
+      if (angle >= 123.75 && angle < 146.25) {
         return 'SE';
-      } else if (angle >= 146.25 && angle < 168.75) {
+      }
+      if (angle >= 146.25 && angle < 168.75) {
         return 'SSE';
-      } else if (angle >= 168.75 && angle < 191.25) {
+      }
+      if (angle >= 168.75 && angle < 191.25) {
         return 'S';
-      } else if (angle >= 191.25 && angle < 213.75) {
+      }
+      if (angle >= 191.25 && angle < 213.75) {
         return 'SSW';
-      } else if (angle >= 213.75 && angle < 236.25) {
+      }
+      if (angle >= 213.75 && angle < 236.25) {
         return 'SW';
-      } else if (angle >= 236.25 && angle < 258.75) {
+      }
+      if (angle >= 236.25 && angle < 258.75) {
         return 'WSW';
-      } else if (angle >= 258.75 && angle < 281.25) {
+      }
+      if (angle >= 258.75 && angle < 281.25) {
         return 'W';
-      } else if (angle >= 281.25 && angle < 303.75) {
+      }
+      if (angle >= 281.25 && angle < 303.75) {
         return 'WNW';
-      } else if (angle >= 303.75 && angle < 326.25) {
+      }
+      if (angle >= 303.75 && angle < 326.25) {
         return 'NW';
-      } else if (angle >= 326.25 && angle < 348.75) {
+      }
+      if (angle >= 326.25 && angle < 348.75) {
         return 'NNW';
-      } else if (angle >= 348.75) {
-        return 'N';
       }
+      // if (angle >= 348.75) {
+      return 'N';
     }
 
     /**
-     * Pad the given number with a zero if its not 2 digits long.
+     * Pad the given number with a zero if it's not 2 digits long.
      * @param {string | number} num
      */
   }, {
@@ -614,14 +627,13 @@ var Utils = /*#__PURE__*/function () {
       if (typeof num === 'string') {
         if (num.length < 2) {
           return "0".concat(num);
-        } else {
-          return num;
         }
-      } else if (num < 10) {
-        return "0".concat(num);
-      } else {
         return num;
       }
+      if (num < 10) {
+        return "0".concat(num);
+      }
+      return num;
     }
 
     /**
@@ -673,16 +685,15 @@ var Utils = /*#__PURE__*/function () {
               if (Math.abs(now.getTime - Date.now()) > 3600000 * 24 * 10) {
                 now = new Date(year, a[1] - 1, a[0]);
               }
-            } else
+            } else if (Utils.dateFormat[0][0] === 'D' && Utils.dateFormat[1][0] === 'M') {
               // DD MM
-              if (Utils.dateFormat[0][0] === 'D' && Utils.dateFormat[1][0] === 'M') {
-                now = new Date(year, a[1] - 1, a[0]);
-                if (Math.abs(now.getTime - Date.now()) > 3600000 * 24 * 10) {
-                  now = new Date(year, a[0] - 1, a[1]);
-                }
-              } else {
-                now = new Date(now);
+              now = new Date(year, a[1] - 1, a[0]);
+              if (Math.abs(now.getTime - Date.now()) > 3600000 * 24 * 10) {
+                now = new Date(year, a[0] - 1, a[1]);
               }
+            } else {
+              now = new Date(now);
+            }
           }
         } else {
           now = new Date(now);
@@ -750,9 +761,8 @@ var Utils = /*#__PURE__*/function () {
           }
         } while (m);
         return result;
-      } else {
-        return text;
       }
+      return text;
     }
 
     /**
@@ -769,25 +779,21 @@ var Utils = /*#__PURE__*/function () {
         if (!noCommon) {
           if (!states.common) {
             return states.smartName;
-          } else {
-            if (states && !states.common) {
-              return states.smartName;
-            } else {
-              return states.common.smartName;
-            }
           }
-        } else {
           if (states && !states.common) {
             return states.smartName;
-          } else {
-            return states && states.common && states.common.custom && states.common.custom[instanceId] ? states.common.custom[instanceId].smartName : undefined;
           }
+          return states.common.smartName;
+        }
+        if (states && !states.common) {
+          return states.smartName;
         }
-      } else if (!noCommon) {
+        return states && states.common && states.common.custom && states.common.custom[instanceId] ? states.common.custom[instanceId].smartName : undefined;
+      }
+      if (!noCommon) {
         return states[id].common.smartName;
-      } else {
-        return states[id] && states[id].common && states[id].common.custom && states[id].common.custom[instanceId] ? states[id].common.custom[instanceId].smartName || null : null;
       }
+      return states[id] && states[id].common && states[id].common.custom && states[id].common.custom[instanceId] ? states[id].common.custom[instanceId].smartName || null : null;
     }
 
     /**
@@ -802,20 +808,16 @@ var Utils = /*#__PURE__*/function () {
       if (!noCommon) {
         if (!obj.common) {
           return obj.smartName;
-        } else {
-          if (obj && !obj.common) {
-            return obj.smartName;
-          } else {
-            return obj.common.smartName;
-          }
         }
-      } else {
         if (obj && !obj.common) {
           return obj.smartName;
-        } else {
-          return obj && obj.common && obj.common.custom && obj.common.custom[instanceId] ? obj.common.custom[instanceId].smartName : undefined;
         }
+        return obj.common.smartName;
       }
+      if (obj && !obj.common) {
+        return obj.smartName;
+      }
+      return obj && obj.common && obj.common.custom && obj.common.custom[instanceId] ? obj.common.custom[instanceId].smartName : undefined;
     }
 
     /**
@@ -959,22 +961,20 @@ var Utils = /*#__PURE__*/function () {
                 delete obj.common.custom[instanceId].uk;
                 delete obj.common.custom[instanceId]['zh-cn'];
               }
+            } else if (obj.common.smartName.byON !== undefined) {
+              delete obj.common.smartName.en;
+              delete obj.common.smartName.de;
+              delete obj.common.smartName.ru;
+              delete obj.common.smartName.nl;
+              delete obj.common.smartName.pl;
+              delete obj.common.smartName.it;
+              delete obj.common.smartName.fr;
+              delete obj.common.smartName.pt;
+              delete obj.common.smartName.es;
+              delete obj.common.smartName.uk;
+              delete obj.common.smartName['zh-cn'];
             } else {
-              if (obj.common.smartName.byON !== undefined) {
-                delete obj.common.smartName.en;
-                delete obj.common.smartName.de;
-                delete obj.common.smartName.ru;
-                delete obj.common.smartName.nl;
-                delete obj.common.smartName.pl;
-                delete obj.common.smartName.it;
-                delete obj.common.smartName.fr;
-                delete obj.common.smartName.pt;
-                delete obj.common.smartName.es;
-                delete obj.common.smartName.uk;
-                delete obj.common.smartName['zh-cn'];
-              } else {
-                obj.common.smartName = null;
-              }
+              obj.common.smartName = null;
             }
           }
         }
@@ -1023,9 +1023,8 @@ var Utils = /*#__PURE__*/function () {
       var pos = (fileName || '').lastIndexOf('.');
       if (pos !== -1) {
         return fileName.substring(pos + 1).toLowerCase();
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -1041,7 +1040,7 @@ var Utils = /*#__PURE__*/function () {
         return "".concat(bytes, " B");
       }
       var units = ['KB', 'MB', 'GB'];
-      //const units = ['KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB'];
+      // const units = ['KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB'];
       var u = -1;
       do {
         bytes /= 1024;
@@ -1062,16 +1061,15 @@ var Utils = /*#__PURE__*/function () {
     value: function getInvertedColor(color, themeType, invert) {
       if (!color) {
         return undefined;
-      } else {
-        var invertedColor = Utils.invertColor(color, true);
-        if (invertedColor === '#FFFFFF' && (themeType === 'dark' || invert && themeType === 'light')) {
-          return '#DDD';
-        } else if (invertedColor === '#000000' && (themeType === 'light' || invert && themeType === 'dark')) {
-          return '#222';
-        } else {
-          return undefined;
-        }
       }
+      var invertedColor = Utils.invertColor(color, true);
+      if (invertedColor === '#FFFFFF' && (themeType === 'dark' || invert && themeType === 'light')) {
+        return '#DDD';
+      }
+      if (invertedColor === '#000000' && (themeType === 'light' || invert && themeType === 'dark')) {
+        return '#222';
+      }
+      return undefined;
     }
 
     // Big thanks to: https://stackoverflow.com/questions/35969656/how-can-i-generate-the-opposite-color-according-to-current-color
@@ -1269,8 +1267,10 @@ var Utils = /*#__PURE__*/function () {
       var x;
       var str = '';
       while (i < arguments.length) {
-        if (tmp = arguments[i++]) {
-          if (x = Utils._toVal(tmp)) {
+        tmp = arguments[i++];
+        if (tmp) {
+          x = Utils._toVal(tmp);
+          if (x) {
             str && (str += ' ');
             str += x;
           }
@@ -1412,9 +1412,8 @@ var Utils = /*#__PURE__*/function () {
       if (p.length > 1) {
         p.pop();
         return p.join('.');
-      } else {
-        return null;
       }
+      return null;
     }
   }, {
     key: "formatDate",
@@ -1479,11 +1478,11 @@ var Utils = /*#__PURE__*/function () {
         var s = seconds % 60;
         if (d) {
           return "".concat(d, ".").concat(h.toString().padStart(2, '0'), ":").concat(m.toString().padStart(2, '0'), ":").concat(s.toString().padStart(2, '0'));
-        } else if (h) {
+        }
+        if (h) {
           return "".concat(h, ":").concat(m.toString().padStart(2, '0'), ":").concat(s.toString().padStart(2, '0'));
-        } else {
-          return "0:".concat(m.toString().padStart(2, '0'), ":").concat(s.toString().padStart(2, '0'));
         }
+        return "0:".concat(m.toString().padStart(2, '0'), ":").concat(s.toString().padStart(2, '0'));
       } else {
         return '0:00:00';
       }
@@ -1525,9 +1524,8 @@ var Utils = /*#__PURE__*/function () {
           }
         }
         return '';
-      } else {
-        return header.title;
       }
+      return header.title;
     }
   }, {
     key: "MDextractHeader",
@@ -1650,31 +1648,30 @@ var Utils = /*#__PURE__*/function () {
             console.error("Cannot parse states: ".concat(states));
             states = null;
           }
-        } else
+        } else if (typeof states === 'string') {
           // if old format val1:text1;val2:text2
-          if (typeof states === 'string') {
-            var parts = states.split(';');
-            states = {};
-            for (var p = 0; p < parts.length; p++) {
-              var s = parts[p].split(':');
-              states[s[0]] = s[1];
-            }
-          } else if (Array.isArray(states)) {
-            var result = {};
-            if (obj.common.type === 'number') {
-              states.forEach(function (value, key) {
-                return result[key] = value;
-              });
-            } else if (obj.common.type === 'string') {
-              states.forEach(function (value) {
-                return result[value] = value;
-              });
-            } else if (obj.common.type === 'boolean') {
-              result['false'] = states[0];
-              result['true'] = states[1];
-            }
-            return result;
+          var parts = states.split(';');
+          states = {};
+          for (var p = 0; p < parts.length; p++) {
+            var s = parts[p].split(':');
+            states[s[0]] = s[1];
+          }
+        } else if (Array.isArray(states)) {
+          var result = {};
+          if (obj.common.type === 'number') {
+            states.forEach(function (value, key) {
+              return result[key] = value;
+            });
+          } else if (obj.common.type === 'string') {
+            states.forEach(function (value) {
+              return result[value] = value;
+            });
+          } else if (obj.common.type === 'boolean') {
+            result["false"] = states[0];
+            result["true"] = states[1];
           }
+          return result;
+        }
       }
       return states;
     }