Merge branch 'dev' into 'master'

Bump v6.0.0

See merge request turris/reforis/foris-js!220

CHANGELOG.md

@@ -8,29 +8,6 @@ and this project adheres to
 
 ## [Unreleased]
 
-## [6.0.3] - 2024-07-26
-
-### Changed
-
--   Updated WiFiQRCode component
-
-## [6.0.2] - 2024-06-28
-
-### Added
-
--   Added className prop to CheckBox and Radio components
-
-## [6.0.1] - 2024-06-26
-
-### Added
-
--   Added className prop to Switch component
-
-### Changed
-
--   Updated dependencies in package.json
--   NPM audit fix
-
 ## [6.0.0] - 2024-06-11
 
 ### Added
@@ -337,10 +314,7 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02
 
 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.3...master
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.0...master
-[6.0.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.2...v6.0.3
-[6.0.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.1...v6.0.2
-[6.0.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.0...v6.0.1
 [6.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.1...v6.0.0
 [5.6.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.0...v5.6.1
 [5.6.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.5.0...v5.6.0

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "foris",
-    "version": "6.0.3",
+    "version": "6.0.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "foris",
-            "version": "6.0.3",
+            "version": "6.0.0",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.7.2",
@@ -35,7 +35,7 @@
                 "jest-environment-jsdom": "^29.7.0",
                 "jest-mock-axios": "^4.7.3",
                 "moment-timezone": "^0.5.45",
-                "prettier": "^3.3.2",
+                "prettier": "^3.3.1",
                 "prop-types": "15.8.1",
                 "react": "16.9.0",
                 "react-dom": "16.9.0",
@@ -43,7 +43,7 @@
                 "react-styleguidist": "^12.0.1",
                 "snapshot-diff": "^0.10.0",
                 "style-loader": "^1.2.1",
-                "webpack": "^5.92.1"
+                "webpack": "^5.91.0"
             },
             "peerDependencies": {
                 "bootstrap": "^5.3.3",
@@ -4314,16 +4314,6 @@
                 "acorn-walk": "^8.0.2"
             }
         },
-        "node_modules/acorn-import-attributes": {
-            "version": "1.9.5",
-            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "acorn": "^8"
-            }
-        },
         "node_modules/acorn-jsx": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -15081,11 +15071,10 @@
             }
         },
         "node_modules/prettier": {
-            "version": "3.3.2",
+            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
-            "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+            "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
             "dev": true,
-            "license": "MIT",
             "bin": {
                 "prettier": "bin/prettier.cjs"
             },
@@ -18156,11 +18145,10 @@
             }
         },
         "node_modules/webpack": {
-            "version": "5.92.1",
+            "version": "5.91.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+            "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "@types/eslint-scope": "^3.7.3",
                 "@types/estree": "^1.0.5",
@@ -18168,10 +18156,10 @@
                 "@webassemblyjs/wasm-edit": "^1.12.1",
                 "@webassemblyjs/wasm-parser": "^1.12.1",
                 "acorn": "^8.7.1",
-                "acorn-import-attributes": "^1.9.5",
+                "acorn-import-assertions": "^1.9.0",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.0",
+                "enhanced-resolve": "^5.16.0",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
@@ -18416,6 +18404,15 @@
                 "lodash": "^4.17.15"
             }
         },
+        "node_modules/webpack/node_modules/acorn-import-assertions": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+            "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+            "dev": true,
+            "peerDependencies": {
+                "acorn": "^8"
+            }
+        },
         "node_modules/webpack/node_modules/schema-utils": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -18697,11 +18694,10 @@
             }
         },
         "node_modules/ws": {
-            "version": "8.17.1",
+            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
             "dev": true,
-            "license": "MIT",
             "engines": {
                 "node": ">=10.0.0"
             },
@@ -22087,13 +22083,6 @@
                 "acorn-walk": "^8.0.2"
             }
         },
-        "acorn-import-attributes": {
-            "version": "1.9.5",
-            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-            "dev": true,
-            "requires": {}
-        },
         "acorn-jsx": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -30161,9 +30150,9 @@
             "dev": true
         },
         "prettier": {
-            "version": "3.3.2",
+            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
-            "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+            "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
             "dev": true
         },
         "prettier-linter-helpers": {
@@ -32462,9 +32451,9 @@
             "dev": true
         },
         "webpack": {
-            "version": "5.92.1",
+            "version": "5.91.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+            "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
             "dev": true,
             "requires": {
                 "@types/eslint-scope": "^3.7.3",
@@ -32473,10 +32462,10 @@
                 "@webassemblyjs/wasm-edit": "^1.12.1",
                 "@webassemblyjs/wasm-parser": "^1.12.1",
                 "acorn": "^8.7.1",
-                "acorn-import-attributes": "^1.9.5",
+                "acorn-import-assertions": "^1.9.0",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.0",
+                "enhanced-resolve": "^5.16.0",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
@@ -32493,6 +32482,13 @@
                 "webpack-sources": "^3.2.3"
             },
             "dependencies": {
+                "acorn-import-assertions": {
+                    "version": "1.9.0",
+                    "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+                    "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+                    "dev": true,
+                    "requires": {}
+                },
                 "schema-utils": {
                     "version": "3.3.0",
                     "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -32857,9 +32853,9 @@
             }
         },
         "ws": {
-            "version": "8.17.1",
+            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
             "dev": true,
             "requires": {}
         },

package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.0.3",
+    "version": "6.0.0",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
@@ -47,7 +47,7 @@
         "jest-environment-jsdom": "^29.7.0",
         "jest-mock-axios": "^4.7.3",
         "moment-timezone": "^0.5.45",
-        "prettier": "^3.3.2",
+        "prettier": "^3.3.1",
         "prop-types": "15.8.1",
         "react": "16.9.0",
         "react-dom": "16.9.0",
@@ -55,7 +55,7 @@
         "react-styleguidist": "^12.0.1",
         "snapshot-diff": "^0.10.0",
         "style-loader": "^1.2.1",
-        "webpack": "^5.92.1"
+        "webpack": "^5.91.0"
     },
     "scripts": {
         "lint": "eslint src",

src/bootstrap/CheckBox.js

@@ -17,19 +17,17 @@ CheckBox.propTypes = {
     helpText: PropTypes.string,
     /** Control if checkbox is clickable */
     disabled: PropTypes.bool,
-    /** Additional class name */
-    className: PropTypes.string,
 };
 
 CheckBox.defaultProps = {
     disabled: false,
 };
 
-function CheckBox({ label, helpText, disabled, className, ...props }) {
+function CheckBox({ label, helpText, disabled, ...props }) {
     const uid = useUID();
 
     return (
-        <div className={`${className || "mb-3"} form-check`.trim()}>
+        <div className="mb-3 form-check">
             <input
                 className="form-check-input"
                 type="checkbox"

src/bootstrap/RadioSet.js

@@ -83,13 +83,12 @@ Radio.propTypes = {
     id: PropTypes.string.isRequired,
     inline: PropTypes.bool,
     helpText: PropTypes.string,
-    className: PropTypes.string,
 };
 
-export function Radio({ label, id, helpText, inline, className, ...props }) {
+export function Radio({ label, id, helpText, inline, ...props }) {
     return (
         <div
-            className={`${className || "mb-3"} ${inline ? "form-check form-check-inline" : ""}`.trim()}
+            className={`mb-2 ${inline ? "form-check form-check-inline" : ""}`.trim()}
         >
             <input
                 id={id}

src/bootstrap/Switch.js

@@ -19,16 +19,15 @@ Switch.propTypes = {
     ]).isRequired,
     helpText: PropTypes.string,
     switchHeading: PropTypes.bool,
-    className: PropTypes.string,
 };
 
-function Switch({ label, helpText, switchHeading, className, ...props }) {
+function Switch({ label, helpText, switchHeading, ...props }) {
     const uid = useUID();
 
     return (
         <div
-            className={`form-check form-switch ${className || "mb-3"} ${
+            className={`form-check form-switch mb-3 ${
-                switchHeading ? "d-flex align-items-center" : ""
+                switchHeading ? "d-flex align-items-center" : null
             }`.trim()}
         >
             <input

src/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap

@@ -11,7 +11,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     Radios set label
   </label>
   <div
-    class="mb-3"
+    class="mb-2"
   >
     <input
       checked=""
@@ -29,7 +29,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="mb-3"
+    class="mb-2"
   >
     <input
       class="form-check-input me-2"
@@ -46,7 +46,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="mb-3"
+    class="mb-2"
   >
     <input
       class="form-check-input me-2"

src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap

@@ -2,7 +2,7 @@
 
 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-check form-switch mb-3"
+  class="form-check form-switch mb-3 null"
 >
   <input
     checked=""
@@ -29,7 +29,7 @@ exports[`<Switch/> Render switch 1`] = `
 
 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-check form-switch mb-3"
+  class="form-check form-switch mb-3 null"
 >
   <input
     class="form-check-input"

src/common/WiFiSettings/WiFiQRCode.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -18,12 +18,15 @@ import {
     ModalFooter,
     ModalHeader,
 } from "../../bootstrap/Modal";
+import { ForisURLs } from "../../utils/forisUrls";
 
 WiFiQRCode.propTypes = {
     SSID: PropTypes.string.isRequired,
     password: PropTypes.string.isRequired,
 };
 
+const QR_ICON_PATH = `${ForisURLs.static}/imgs/QR_icon.svg`;
+
 export default function WiFiQRCode({ SSID, password }) {
     const [modal, setModal] = useState(false);
 
@@ -37,10 +40,11 @@ export default function WiFiQRCode({ SSID, password }) {
                     setModal(true);
                 }}
             >
-                <i
+                <img
-                    className="fa-solid fa-qrcode"
+                    width="20"
-                    title={_("Show QR code")}
+                    src={QR_ICON_PATH}
-                    aria-label={_("Show QR code")}
+                    alt="QR"
+                    style={{ opacity: 0.67 }}
                 />
             </button>
             {modal ? (

src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap

@@ -5,7 +5,7 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
 - First value
 + Second value
 
-@@ -242,207 +242,95 @@
+@@ -243,207 +243,95 @@
               value="0"
             >
               auto
@@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -526,10 +526,93 @@
+@@ -527,10 +527,94 @@
             <small>
               Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
             </small>
@@ -370,10 +370,11 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +               class="input-group-text"
 +               type="button"
 +             >
-+               <i
++               <img
-+                 aria-label="Show QR code"
++                 alt="QR"
-+                 class="fa-solid fa-qrcode"
++                 src="/reforis/static/reforis/imgs/QR_icon.svg"
-+                 title="Show QR code"
++                 style="opacity: 0.67;"
++                 width="20"
 +               />
 +             </button>
 +           </div>
@@ -433,7 +434,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
           class="form-check form-switch mb-3 d-flex align-items-center"
         >
           <input
-@@ -552,10 +635,11 @@
+@@ -553,10 +637,11 @@
         <div
           class="text-end"
         >
@@ -452,7 +453,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 - First value
 + Second value
 
-@@ -21,10 +21,515 @@
+@@ -21,10 +21,516 @@
             >
               Wi-Fi 1
             </h2>
@@ -481,10 +482,11 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             class="input-group-text"
 +             type="button"
 +           >
-+             <i
++             <img
-+               aria-label="Show QR code"
++               alt="QR"
-+               class="fa-solid fa-qrcode"
++               src="/reforis/static/reforis/imgs/QR_icon.svg"
-+               title="Show QR code"
++               style="opacity: 0.67;"
++               width="20"
 +             />
 +           </button>
 +         </div>
@@ -534,7 +536,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3"
++         class="form-check form-switch mb-3 null"
 +       >
 +         <input
 +           class="form-check-input"
@@ -566,7 +568,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           GHz
 +         </label>
 +         <div
-+           class="mb-3 form-check form-check-inline"
++           class="mb-2 form-check form-check-inline"
 +         >
 +           <input
 +             class="form-check-input me-2"
@@ -583,7 +585,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           </label>
 +         </div>
 +         <div
-+           class="mb-3 form-check form-check-inline"
++           class="mb-2 form-check form-check-inline"
 +         >
 +           <input
 +             checked=""
@@ -918,7 +920,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3"
++         class="form-check form-switch mb-3 null"
 +       >
 +         <input
 +           class="form-check-input"
@@ -941,7 +943,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3"
++         class="form-check form-switch mb-3 null"
 +       >
 +         <input
 +           class="form-check-input"