Merge branch 'dev' into 'master'

Dev See merge request turris/reforis/foris-js!137
2025-11-03 23:00:31 +01:00 · 2020-09-29 11:01:27 +02:00
parent 187ecc54e5 0892a1534a
commit 96150fe230
6 changed files with 39 additions and 100 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
    "name": "foris",
-    "version": "5.1.4",
+    "version": "5.1.5",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
@@ -4500,11 +4500,6 @@
            "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
            "dev": true
        },
-        "asap": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-            "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-        },
        "asn1": {
            "version": "0.2.4",
            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -5979,11 +5974,6 @@
                }
            }
        },
-        "core-js": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-            "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-        },
        "core-js-compat": {
            "version": "3.6.4",
            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
@@ -6053,16 +6043,6 @@
                "sha.js": "^2.4.8"
            }
        },
-        "create-react-class": {
-            "version": "15.6.3",
-            "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
-            "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
-            "requires": {
-                "fbjs": "^0.8.9",
-                "loose-envify": "^1.3.1",
-                "object-assign": "^4.1.1"
-            }
-        },
        "cross-spawn": {
            "version": "6.0.5",
            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -6597,11 +6577,21 @@
            "dev": true
        },
        "encoding": {
-            "version": "0.1.12",
-            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-            "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+            "version": "0.1.13",
+            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+            "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
            "requires": {
-                "iconv-lite": "~0.4.13"
+                "iconv-lite": "^0.6.2"
+            },
+            "dependencies": {
+                "iconv-lite": {
+                    "version": "0.6.2",
+                    "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+                    "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+                    "requires": {
+                        "safer-buffer": ">= 2.1.2 < 3.0.0"
+                    }
+                }
            }
        },
        "end-of-stream": {
@@ -7681,20 +7671,6 @@
                "bser": "2.1.1"
            }
        },
-        "fbjs": {
-            "version": "0.8.17",
-            "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
-            "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
-            "requires": {
-                "core-js": "^1.0.0",
-                "isomorphic-fetch": "^2.1.1",
-                "loose-envify": "^1.0.0",
-                "object-assign": "^4.1.0",
-                "promise": "^7.1.1",
-                "setimmediate": "^1.0.5",
-                "ua-parser-js": "^0.7.18"
-            }
-        },
        "figgy-pudding": {
            "version": "3.5.2",
            "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -9066,6 +9042,7 @@
            "version": "0.4.24",
            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
            "requires": {
                "safer-buffer": ">= 2.1.2 < 3"
            }
@@ -9663,7 +9640,8 @@
        "is-stream": {
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+            "dev": true
        },
        "is-symbol": {
            "version": "1.0.2",
@@ -9723,15 +9701,6 @@
            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
            "dev": true
        },
-        "isomorphic-fetch": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-            "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-            "requires": {
-                "node-fetch": "^1.0.1",
-                "whatwg-fetch": ">=0.10.0"
-            }
-        },
        "isstream": {
            "version": "0.1.2",
            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -13267,15 +13236,6 @@
                "minimatch": "^3.0.2"
            }
        },
-        "node-fetch": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-            "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-            "requires": {
-                "encoding": "^0.1.11",
-                "is-stream": "^1.0.1"
-            }
-        },
        "node-forge": {
            "version": "0.9.0",
            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -14253,14 +14213,6 @@
            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
            "dev": true
        },
-        "promise": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-            "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-            "requires": {
-                "asap": "~2.0.3"
-            }
-        },
        "promise-inflight": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -14482,21 +14434,11 @@
            }
        },
        "react-datetime": {
-            "version": "2.16.3",
-            "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-2.16.3.tgz",
-            "integrity": "sha512-amWfb5iGEiyqjLmqCLlPpu2oN415jK8wX1qoTq7qn6EYiU7qQgbNHglww014PT4O/3G5eo/3kbJu/M/IxxTyGw==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-3.0.4.tgz",
+            "integrity": "sha512-v6MVwCve+DRaLN2f22LTO5TlrPpkUXumPkp1zfrbhaFtSYGl2grZ2JtwJfLxRj/T4ACyePAV4srCR6cMSiQ/Iw==",
            "requires": {
-                "create-react-class": "^15.5.2",
-                "object-assign": "^3.0.0",
-                "prop-types": "^15.5.7",
-                "react-onclickoutside": "^6.5.0"
-            },
-            "dependencies": {
-                "object-assign": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-                    "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-                }
+                "prop-types": "^15.5.7"
            }
        },
        "react-dev-utils": {
@@ -14891,11 +14833,6 @@
            "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
            "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
        },
-        "react-onclickoutside": {
-            "version": "6.9.0",
-            "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz",
-            "integrity": "sha512-8ltIY3bC7oGhj2nPAvWOGi+xGFybPNhJM0V1H8hY/whNcXgmDeaeoCMPPd8VatrpTsUWjb/vGzrmu6SrXVty3A=="
-        },
        "react-router": {
            "version": "5.1.2",
            "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz",
@@ -15576,7 +15513,8 @@
        "safer-buffer": {
            "version": "2.1.2",
            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
        },
        "sane": {
            "version": "4.1.0",
@@ -15820,7 +15758,8 @@
        "setimmediate": {
            "version": "1.0.5",
            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+            "dev": true
        },
        "setprototypeof": {
            "version": "1.1.1",
@@ -17409,9 +17348,9 @@
            }
        },
        "ua-parser-js": {
-            "version": "0.7.20",
-            "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
-            "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+            "version": "0.7.22",
+            "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
+            "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="
        },
        "unherit": {
            "version": "1.1.3",
@@ -18456,9 +18395,9 @@
            }
        },
        "whatwg-fetch": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-            "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+            "version": "3.4.1",
+            "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz",
+            "integrity": "sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="
        },
        "whatwg-mimetype": {
            "version": "2.3.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "foris",
-    "version": "5.1.4",
+    "version": "5.1.5",
    "description": "Set of components and utils for Foris and its plugins.",
    "author": "CZ.NIC, z.s.p.o.",
    "repository": {
@@ -18,7 +18,7 @@
        "immutability-helper": "3.0.1",
        "moment": "^2.24.0",
        "qrcode.react": "^0.9.3",
-        "react-datetime": "^2.16.3",
+        "react-datetime": "^3.0.4",
        "react-uid": "^2.2.0"
    },
    "peerDependencies": {
--- a/src/bootstrap/DataTimeInput.js
+++ b/src/bootstrap/DataTimeInput.js
@@ -7,7 +7,7 @@

 import React from "react";
 import PropTypes from "prop-types";
-import Datetime from "react-datetime/DateTime";
+import Datetime from "react-datetime";
 import moment from "moment/moment";
 import "react-datetime/css/react-datetime.css";
 import "./DataTimeInput.css";
--- a/src/bootstrap/Switch.js
+++ b/src/bootstrap/Switch.js
@@ -23,7 +23,7 @@ Switch.propTypes = {
 export function Switch({ label, helpText, switchHeading, ...props }) {
    const uid = useUID();
    return (
-        <div className={`form-group ${switchHeading ? "switch" : ""}`}>
+        <div className={`form-group ${switchHeading ? "switch" : ""}`.trim()}>
            <div
                className={`custom-control custom-switch ${
                    !helpText ? "custom-control-inline" : ""
--- a/src/bootstrap/tests/snapshots/Switch.test.js.snap
+++ b/src/bootstrap/tests/snapshots/Switch.test.js.snap
@@ -2,7 +2,7 @@

 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-group "
+  class="form-group"
 >
  <div
    class="custom-control custom-switch"
@@ -30,7 +30,7 @@ exports[`<Switch/> Render switch 1`] = `

 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-group "
+  class="form-group"
 >
  <div
    class="custom-control custom-switch"
--- a/src/common/WiFiSettings/tests/snapshots/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/tests/snapshots/WiFiSettings.test.js.snap
@@ -886,7 +886,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </select>
 +       </div>
 +       <div
-+         class=\\"form-group \\"
+         class=\\"form-group\\"
 +       >
 +         <div
 +           class=\\"custom-control custom-switch\\"