Merge branch 'dev' into 'master'

Dev

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

CHANGELOG.md

@@ -8,6 +8,19 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [6.1.1] - 2024-08-30
+
+### Added
+
+-   Added & updated Weblate translations
+
+### Changed
+
+-   Updated icon color classes to use "text-secondary" instead of "text-dark"
+-   Updated Wi-Fi QRCodeModal component to use new styles & added close button
+-   Refactored WiFiGuestForm component to get rid of obsolete div element
+-   NPM audit fix
+
 ## [6.1.0] - 2024-08-23
 
 ### Added
@@ -348,7 +361,8 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02
 
 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.0...master
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.1...master
+[6.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.0...v6.1.1
 [6.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.3...v6.1.0
 [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

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "foris",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "foris",
-            "version": "6.1.0",
+            "version": "6.1.1",
             "license": "GPL-3.0",
             "dependencies": {
                 "@fortawesome/fontawesome-svg-core": "^6.6.0",
@@ -3722,21 +3722,13 @@
             "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
             "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
             }
         },
-        "node_modules/@types/eslint-scope": {
-            "version": "3.7.3",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-            "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-            "dev": true,
-            "dependencies": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
-            }
-        },
         "node_modules/@types/estree": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -6731,10 +6723,11 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.17.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-            "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
+            "version": "5.17.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+            "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.4",
                 "tapable": "^2.2.0"
@@ -6748,6 +6741,7 @@
             "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
             "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
             "dev": true,
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -13785,10 +13779,11 @@
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
@@ -17822,13 +17817,12 @@
             }
         },
         "node_modules/webpack": {
-            "version": "5.92.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
-            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+            "version": "5.94.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/eslint-scope": "^3.7.3",
                 "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -17837,7 +17831,7 @@
                 "acorn-import-attributes": "^1.9.5",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.0",
+                "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
@@ -21181,21 +21175,13 @@
             "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
             "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
             "dev": true,
+            "optional": true,
+            "peer": true,
             "requires": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
             }
         },
-        "@types/eslint-scope": {
-            "version": "3.7.3",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-            "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-            "dev": true,
-            "requires": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
-            }
-        },
         "@types/estree": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -23537,9 +23523,9 @@
             "dev": true
         },
         "enhanced-resolve": {
-            "version": "5.17.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-            "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
+            "version": "5.17.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+            "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.2.4",
@@ -28840,9 +28826,9 @@
             }
         },
         "micromatch": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "dev": true,
             "requires": {
                 "braces": "^3.0.3",
@@ -31815,12 +31801,11 @@
             "dev": true
         },
         "webpack": {
-            "version": "5.92.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
-            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+            "version": "5.94.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
             "dev": true,
             "requires": {
-                "@types/eslint-scope": "^3.7.3",
                 "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -31829,7 +31814,7 @@
                 "acorn-import-attributes": "^1.9.5",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.0",
+                "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {

src/bootstrap/PasswordInput.js

@@ -49,7 +49,7 @@ function PasswordInput({ withEye, newPass, ...props }) {
                     <FontAwesomeIcon
                         icon={isHidden ? faEye : faEyeSlash}
                         style={{ width: "1.25rem" }}
-                        className="text-dark"
+                        className="text-secondary"
                     />
                 </button>
             )}

src/common/WiFiSettings/WiFiGuestForm.js

@@ -68,14 +68,11 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     >
-                        <div className="input-group-append">
                         <WiFiQRCode
                             SSID={formData.SSID}
                             password={formData.password}
                         />
-                        </div>
                     </TextInput>
-
                     <PasswordInput
                         withEye
                         label={_("Password")}

src/common/WiFiSettings/WiFiQRCode.js

@@ -42,7 +42,7 @@ export default function WiFiQRCode({ SSID, password }) {
                     icon="fa-solid fa-qrcode"
                     title={_("Show QR code")}
                     aria-label={_("Show QR code")}
-                    className="text-dark"
+                    className="text-secondary"
                 />
             </button>
             {modal ? (
@@ -70,17 +70,26 @@ function QRCodeModal({ shown, setShown, SSID, password }) {
             <ModalHeader setShown={setShown} title={_("Wi-Fi QR Code")} />
             <ModalBody>
                 <QRCode
+                    className="d-block mx-auto img-logo-black"
                     renderAs="svg"
                     value={toQRCodeContent(SSID, password)}
                     level="M"
                     size={350}
                     includeMargin
-                    style={{ display: "block", margin: "auto" }}
                 />
             </ModalBody>
             <ModalFooter>
                 <Button
-                    className="btn-outline-primary"
+                    className="btn-secondary"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        setShown(false);
+                    }}
+                >
+                    {_("Close")}
+                </Button>
+                <Button
+                    className="btn-primary"
                     onClick={(e) => {
                         e.preventDefault();
                         createAndDownloadPdf(SSID, password);

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

@@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -524,10 +524,91 @@
+@@ -524,10 +524,87 @@
             <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>
@@ -363,9 +363,6 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             type="text"
 +             value="TestGuestSSID"
 +           />
-+           <div
-+             class="input-group-append"
-+           >
 +           <button
 +             class="input-group-text"
 +             type="button"
@@ -375,7 +372,6 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             />
 +           </button>
 +         </div>
-+         </div>
 +         <div
 +           class="form-text"
 +         >
@@ -431,7 +427,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
           class="form-check form-switch mb-3 d-flex align-items-center"
         >
           <input
-@@ -550,10 +631,11 @@
+@@ -550,10 +627,11 @@
         <div
           class="text-end"
         >

translations/es/LC_MESSAGES/forisjs.po

@@ -8,15 +8,16 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-08-23 14:02+0200\n"
-"PO-Revision-Date: 2022-09-11 17:15+0000\n"
-"Last-Translator: Dan Cybersec <dan.cybersec@protonmail.com>\n"
+"PO-Revision-Date: 2024-08-24 13:09+0000\n"
+"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/turris/foris-js/"
+"es/>\n"
 "Language: es\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/turris/foris-"
-"js/es/>\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.7.1-dev\n"
 "Generated-By: Babel 2.16.0\n"
 
 #: src/api/utils.js:61
@@ -39,7 +40,7 @@ msgstr ""
 
 #: src/bootstrap/Alert.js:51 src/bootstrap/Modal.js:98
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #: src/bootstrap/CopyInput.js:57
 msgid "Copied!"
@@ -123,13 +124,15 @@ msgstr "Cifrado"
 
 #: src/common/WiFiSettings/WiFiForm.js:226
 msgid "Disable Management Frame Protection"
-msgstr ""
+msgstr "Desactivar Protected Management Frames"
 
 #: src/common/WiFiSettings/WiFiForm.js:227
 msgid ""
 "In case you have trouble connecting to WiFi Access Point, try disabling "
 "Management Frame Protection."
 msgstr ""
+"Si tienes problemas para conectarte a un punto de acceso Wi-Fi, intenta "
+"desactivar Management Frame Protection."
 
 #: src/common/WiFiSettings/WiFiForm.js:262
 msgid "auto"
@@ -145,9 +148,8 @@ msgstr "Activar el modo Wi-Fi de invitados"
 
 #: src/common/WiFiSettings/WiFiQRCode.js:43
 #: src/common/WiFiSettings/WiFiQRCode.js:44
-#, fuzzy
 msgid "Show QR code"
-msgstr "Código QR Wi-Fi"
+msgstr "Mostrar el código QR"
 
 #: src/common/WiFiSettings/WiFiQRCode.js:70
 msgid "Wi-Fi QR Code"
@@ -444,4 +446,3 @@ msgstr "No contiene una lista de correos electrónicos separados por comas."
 #~ " default option with 20 MHz wide "
 #~ "channel."
 #~ msgstr ""
-