foris 5.2.0-beta.dd383ef1 → 5.3.0-beta.e24cd760

package/bootstrap/DownloadButton.js

@@ -21,9 +21,14 @@ DownloadButton.defaultProps = {
     className: "btn-primary",
 };
 
-export function DownloadButton({ href, className, children }) {
+export function DownloadButton({ href, className, children, ...props }) {
     return (
-        <a href={href} className={`btn ${className}`.trim()} download>
+        <a
+            href={href}
+            className={`btn ${className}`.trim()}
+            {...props}
+            download
+        >
             {children}
         </a>
     );

package/bootstrap/PasswordInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -21,14 +21,17 @@ PasswordInput.propTypes = {
     helpText: PropTypes.string,
     /** Use show/hide password button. */
     withEye: PropTypes.bool,
+    /** Use new-password in autocomplete attribute. */
+    newPass: PropTypes.bool,
 };
 
-export function PasswordInput({ withEye, ...props }) {
+export function PasswordInput({ withEye, newPass, ...props }) {
     const [isHidden, setHidden] = useState(true);
+
     return (
         <Input
             type={withEye && !isHidden ? "text" : "password"}
-            autoComplete={isHidden ? "new-password" : null}
+            autoComplete={newPass ? "new-password" : "current-password"}
             {...props}
         >
             {withEye ? (

package/bootstrap/Select.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -18,20 +18,14 @@ Select.propTypes = {
     value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
     /** Help text message. */
     helpText: PropTypes.string,
-    /** Turns on/off alphabetical ordering of the Select options. */
-    customOrder: PropTypes.bool,
 };
 
-export function Select({ label, choices, helpText, customOrder, ...props }) {
+export function Select({ label, choices, helpText, ...props }) {
     const uid = useUID();
 
-    const keys = Object.keys(choices);
-    if (!customOrder) {
-        keys.sort((a, b) => a - b || a.toString().localeCompare(b.toString()));
-    }
-    const options = keys.map((key) => (
-        <option key={key} value={key}>
-            {choices[key]}
+    const options = Object.keys(choices).map((choice) => (
+        <option key={choice} value={choice}>
+            {choices[choice]}
         </option>
     ));
 

package/common/WiFiSettings/ResetWiFiSettings.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -54,9 +54,9 @@ export function ResetWiFiSettings({ ws, endpoint }) {
         <div className={formFieldsSize}>
             <h2>{_("Reset Wi-Fi Settings")}</h2>
             <p>
-                {_(`If a number of wireless cards doesn't match, you may try \
-to reset the Wi-Fi settings. Note that this will remove the current Wi-Fi \
-configuration and restore the default values.`)}
+                {_(
+                    "If a number of wireless cards doesn't match, you may try to reset the Wi-Fi settings. Note that this will remove the current Wi-Fi configuration and restore the default values."
+                )}
             </p>
             <div className="text-right">
                 <Button

package/common/WiFiSettings/WiFiForm.js

@@ -64,6 +64,7 @@ DeviceForm.propTypes = {
         channel: PropTypes.string.isRequired,
         guest_wifi: PropTypes.object.isRequired,
         encryption: PropTypes.string.isRequired,
+        available_bands: PropTypes.array.isRequired,
     }),
     formErrors: PropTypes.object.isRequired,
     setFormValue: PropTypes.func.isRequired,
@@ -87,6 +88,7 @@ function DeviceForm({
     ...props
 }) {
     const deviceID = formData.id;
+    const bnds = formData.available_bands;
     return (
         <>
             <Switch
@@ -159,23 +161,29 @@ function DeviceForm({
                         value={formData.hwmode}
                         helpText={HELP_TEXTS.hwmode}
                         inline
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [deviceIndex]: {
-                                    hwmode: { $set: value },
-                                    channel: { $set: "0" },
-                                    htmode: {
-                                        $set:
-                                            value === "11a" ? "VHT80" : "HT20",
+                        onChange={setFormValue((value) => {
+                            // Get the last item in an array of available HT modes
+                            const [best2] = bnds[0].available_htmodes.slice(-1);
+                            const [best5] = bnds[1].available_htmodes.slice(-1);
+                            return {
+                                devices: {
+                                    [deviceIndex]: {
+                                        hwmode: { $set: value },
+                                        channel: { $set: "0" },
+                                        htmode: {
+                                            $set:
+                                                // Set HT mode depending on checked frequency
+                                                value === "11a" ? best5 : best2,
+                                        },
                                     },
                                 },
-                            },
-                        }))}
+                            };
+                        })}
                         {...props}
                     />
 
                     <Select
-                        label={_("802.11n/ac mode")}
+                        label={_("802.11n/ac/ax mode")}
                         choices={getHtmodeChoices(formData)}
                         value={formData.htmode}
                         helpText={HELP_TEXTS.htmode}
@@ -209,7 +217,6 @@ function DeviceForm({
                                 [deviceIndex]: { encryption: { $set: value } },
                             },
                         }))}
-                        customOrder
                         {...props}
                     />
 

package/common/WiFiSettings/constants.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -13,6 +13,10 @@ export const HTMODES = {
     VHT40: _("802.11ac - 40 MHz wide channel"),
     VHT80: _("802.11ac - 80 MHz wide channel"),
     VHT160: _("802.11ac - 160 MHz wide channel"),
+    HE20: _("802.11ax - 20 MHz wide channel"),
+    HE40: _("802.11ax - 40 MHz wide channel"),
+    HE80: _("802.11ax - 80 MHz wide channel"),
+    HE160: _("802.11ax - 160 MHz wide channel"),
 };
 export const HWMODES = {
     "11g": "2.4",
@@ -25,28 +29,23 @@ export const ENCRYPTIONMODES = {
 };
 export const HELP_TEXTS = {
     ssid: _(
-        `SSID which contains non-standard characters could cause problems on some devices.`
+        "SSID which contains non-standard characters could cause problems on some devices."
+    ),
+    password: _(
+        "WPA2 pre-shared key, that is required to connect to the network."
     ),
-    password: _(`
-        WPA2 pre-shared key, that is required to connect to the network.
-    `),
     hidden: _(
         "If set, network is not visible when scanning for available networks."
     ),
-    hwmode: _(`
-        The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
-        newer standard and may not be supported by all your devices. It usually has less interference, but the signal
-        does not carry so well indoors.`),
-    htmode: _(`
-        Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
-        throughput but can cause more interference in the network. If you don't know what to choose, use the default
-        option with 20 MHz wide channel.
-    `),
-    guest_wifi_enabled: _(`
-        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.
-        `),
+    hwmode: _(
+        "The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a newer standard and may not be supported by all your devices. It usually has less interference, but the signal does not carry so well indoors."
+    ),
+    htmode: _(
+        "Change this to adjust 802.11n/ac/ax mode of operation. 802.11n with 40 MHz wide channels can yield higher throughput but can cause more interference in the network. If you don't know what to choose, use the default option with 20 MHz wide channel."
+    ),
+    guest_wifi_enabled: _(
+        "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."
+    ),
     wpa3: _(
         "The WPA3 standard is the new most secure encryption method that is suggested to be used with any device that supports it. The older devices without WPA3 support require older WPA2. If you experience issues with connecting older devices, try to enable WPA2."
     ),

package/index.js

@@ -82,6 +82,7 @@ export {
     validateIPv6Address,
     validateIPv6Prefix,
     validateDomain,
+    validateHostname,
     validateDUID,
     validateMAC,
     validateMultipleEmails,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "5.2.0-beta.dd383ef1",
+    "version": "5.3.0-beta.e24cd760",
     "description": "Set of components and utils for Foris and its plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
@@ -17,8 +17,8 @@
         "axios": "^0.21.1",
         "immutability-helper": "3.0.1",
         "moment": "^2.24.0",
-        "qrcode.react": "^0.9.3",
-        "react-datetime": "^3.0.4",
+        "qrcode.react": "^1.0.1",
+        "react-datetime": "^3.1.1",
         "react-uid": "^2.2.0"
     },
     "peerDependencies": {
@@ -47,16 +47,16 @@
         "file-loader": "^6.0.0",
         "jest": "^25.2.0",
         "jest-mock-axios": "^3.2.0",
-        "moment-timezone": "^0.5.28",
+        "moment-timezone": "^0.5.34",
         "prettier": "2.0.5",
         "prop-types": "15.7.2",
         "react": "16.9.0",
         "react-dom": "16.9.0",
         "react-router-dom": "^5.1.2",
-        "react-styleguidist": "^7.3.11",
+        "react-styleguidist": "^11.2.0",
         "snapshot-diff": "^0.7.0",
         "style-loader": "^1.2.1",
-        "webpack": "^5.15.0"
+        "webpack": "^5.68.0"
     },
     "scripts": {
         "lint": "eslint src",

package/translations/cs/LC_MESSAGES/forisjs.po

@@ -1,14 +1,14 @@
-# Czech translations for PROJECT.
-# Copyright (C) 2019 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# Czech translations for Foris JS.
+# Copyright (C) 2022 CZ.NIC, z.s.p.o. (https://www.nic.cz/)
+# This file is distributed under the same license as the Foris JS project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-07-30 16:58+0300\n"
-"PO-Revision-Date: 2021-02-17 14:50+0000\n"
+"POT-Creation-Date: 2022-02-22 16:41+0100\n"
+"PO-Revision-Date: 2021-08-18 15:36+0000\n"
 "Last-Translator: Lukas Jelinek <lukas.jelinek@nic.cz>\n"
 "Language: cs\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/turris/foris-"
@@ -19,19 +19,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.9.0\n"
 
-#: src/api/utils.js:60
+#: src/api/utils.js:61
 msgid "The session is expired. Please log in again."
 msgstr "Platnost relace skončila. Přihlaste se znovu."
 
-#: src/api/utils.js:65
+#: src/api/utils.js:66
 msgid "Timeout error occurred."
 msgstr "Došlo k chybě kvůli překročení časového limitu."
 
-#: src/api/utils.js:68
+#: src/api/utils.js:69
 msgid "No response received."
 msgstr "Neobdržena žádná odezva."
 
-#: src/api/utils.js:78
+#: src/api/utils.js:79
 msgid "An unknown API error occurred."
 msgstr "Došlo k neznámé chybě v aplikačním programovém rozhraní."
 
@@ -72,32 +72,47 @@ msgstr "Nastavení Wi-Fi jsou uvedena do výchozího stavu."
 msgid "Reset Wi-Fi Settings"
 msgstr "Resetovat nastavení Wi-Fi"
 
-#: src/common/WiFiSettings/WiFiForm.js:92
+#: src/common/WiFiSettings/ResetWiFiSettings.js:57
+msgid ""
+"If a number of wireless cards doesn't match, you may try to reset the Wi-"
+"Fi settings. Note that this will remove the current Wi-Fi configuration "
+"and restore the default values."
+msgstr ""
+
+#: src/common/WiFiSettings/WiFiForm.js:95
 msgid "Wi-Fi ${deviceID + 1}"
 msgstr "Wi-Fi ${deviceID + 1}"
 
-#: src/common/WiFiSettings/WiFiForm.js:129
+#: src/common/WiFiSettings/WiFiForm.js:132
 #: src/common/WiFiSettings/WiFiGuestForm.js:80
 msgid "Password"
 msgstr "Heslo"
 
-#: src/common/WiFiSettings/WiFiForm.js:143
+#: src/common/WiFiSettings/WiFiForm.js:146
 msgid "Hide SSID"
-msgstr ""
+msgstr "Skrýt SSID"
 
-#: src/common/WiFiSettings/WiFiForm.js:177
+#: src/common/WiFiSettings/WiFiForm.js:186
 msgid "802.11n/ac mode"
-msgstr ""
+msgstr "Režim 802.11n/ac"
 
-#: src/common/WiFiSettings/WiFiForm.js:190
-#, fuzzy
+#: src/common/WiFiSettings/WiFiForm.js:199
 msgid "Channel"
-msgstr "Storno"
+msgstr "Kanál"
+
+#: src/common/WiFiSettings/WiFiForm.js:211
+msgid "Encryption"
+msgstr ""
 
-#: src/common/WiFiSettings/WiFiForm.js:221
+#: src/common/WiFiSettings/WiFiForm.js:243
 msgid "auto"
 msgstr "automaticky"
 
+#: src/common/WiFiSettings/WiFiForm.js:284
+#, fuzzy
+msgid "Custom"
+msgstr "automaticky"
+
 #: src/common/WiFiSettings/WiFiGuestForm.js:42
 msgid "Enable Guest Wi-Fi"
 msgstr "Zapnout Wi-Fi pro hosty"
@@ -111,25 +126,31 @@ msgid "Download PDF"
 msgstr "Stáhnout PDF"
 
 #: src/common/WiFiSettings/WiFiSettings.js:78
-#: src/common/WiFiSettings/WiFiSettings.js:90
+#: src/common/WiFiSettings/WiFiSettings.js:94
 msgid "SSID can't be longer than 32 symbols"
 msgstr "SSID nemůže být delší než 32 znaků"
 
 #: src/common/WiFiSettings/WiFiSettings.js:79
-#: src/common/WiFiSettings/WiFiSettings.js:92
+#: src/common/WiFiSettings/WiFiSettings.js:96
 msgid "SSID can't be empty"
 msgstr "SSID je třeba vyplnit"
 
 #: src/common/WiFiSettings/WiFiSettings.js:81
-#: src/common/WiFiSettings/WiFiSettings.js:94
+#: src/common/WiFiSettings/WiFiSettings.js:98
 msgid "SSID can't be longer than 32 bytes"
 msgstr "SSID nemůže být delší než 32 bajtů"
 
 #: src/common/WiFiSettings/WiFiSettings.js:84
-#: src/common/WiFiSettings/WiFiSettings.js:97
+#: src/common/WiFiSettings/WiFiSettings.js:101
 msgid "Password must contain at least 8 symbols"
 msgstr "Je třeba, aby heslo obsahovalo alespoň 8 znaků"
 
+#: src/common/WiFiSettings/WiFiSettings.js:86
+#: src/common/WiFiSettings/WiFiSettings.js:105
+#, fuzzy
+msgid "Password must not contain more than 63 symbols"
+msgstr "Je třeba, aby heslo obsahovalo alespoň 8 znaků"
+
 #: src/common/WiFiSettings/constants.js:9
 msgid "Disabled"
 msgstr "Vypnuto"
@@ -158,7 +179,39 @@ msgstr "802.11ac – kanál šíře 80 MHz"
 msgid "802.11ac - 160 MHz wide channel"
 msgstr "802.11ac – kanál šíře 160 MHz"
 
-#: src/common/WiFiSettings/constants.js:22
+#: src/common/WiFiSettings/constants.js:16
+#, fuzzy
+msgid "802.11ax - 20 MHz wide channel"
+msgstr "802.11ac – kanál šíře 20 MHz"
+
+#: src/common/WiFiSettings/constants.js:17
+#, fuzzy
+msgid "802.11ax - 40 MHz wide channel"
+msgstr "802.11ac – kanál šíře 40 MHz"
+
+#: src/common/WiFiSettings/constants.js:18
+#, fuzzy
+msgid "802.11ax - 80 MHz wide channel"
+msgstr "802.11ac – kanál šíře 80 MHz"
+
+#: src/common/WiFiSettings/constants.js:19
+#, fuzzy
+msgid "802.11ax - 160 MHz wide channel"
+msgstr "802.11ac – kanál šíře 160 MHz"
+
+#: src/common/WiFiSettings/constants.js:26
+msgid "WPA3 only"
+msgstr ""
+
+#: src/common/WiFiSettings/constants.js:27
+msgid "WPA3 with WPA2 as fallback (default)"
+msgstr ""
+
+#: src/common/WiFiSettings/constants.js:28
+msgid "WPA2 only"
+msgstr ""
+
+#: src/common/WiFiSettings/constants.js:31
 msgid ""
 "SSID which contains non-standard characters could cause problems on some "
 "devices."
@@ -166,31 +219,28 @@ msgstr ""
 "SSID obsahující nestandardní znaky může na některých zařízení způsobovat "
 "problémy."
 
-#: src/common/WiFiSettings/constants.js:25
-msgid ""
-"\n"
-"        WPA2 pre-shared key, that is required to connect to the network.\n"
-"    "
+#: src/common/WiFiSettings/constants.js:34
+#, fuzzy
+msgid "WPA2 pre-shared key, that is required to connect to the network."
 msgstr ""
 "\n"
 "        WPA2 předsdílený klíč, který je vyžadován pro připojení se k "
 "síti.\n"
 "    "
 
-#: src/common/WiFiSettings/constants.js:28
+#: src/common/WiFiSettings/constants.js:37
 msgid "If set, network is not visible when scanning for available networks."
 msgstr ""
 "Při zapnutí této volby se síť nebude zobrazovat zařízením když budou "
 "vyhledávat dostupné sítě."
 
-#: src/common/WiFiSettings/constants.js:31
+#: src/common/WiFiSettings/constants.js:40
+#, fuzzy
 msgid ""
-"\n"
-"        The 2.4 GHz band is more widely supported by clients, but tends "
-"to have more interference. The 5 GHz band is a\n"
-"        newer standard and may not be supported by all your devices. It "
-"usually has less interference, but the signal\n"
-"        does not carry so well indoors."
+"The 2.4 GHz band is more widely supported by clients, but tends to have "
+"more interference. The 5 GHz band is a newer standard and may not be "
+"supported by all your devices. It usually has less interference, but the "
+"signal does not carry so well indoors."
 msgstr ""
 "\n"
 "        Pásmo 2,4 GHz je v klientských zařízeních podporováno nejčastěji,"
@@ -199,15 +249,13 @@ msgstr ""
 "zařízeními. Obvykle bývá méně zarušené,\n"
 "        ale signál se hůře šíři uvnitř budov."
 
-#: src/common/WiFiSettings/constants.js:35
+#: src/common/WiFiSettings/constants.js:43
+#, fuzzy
 msgid ""
-"\n"
-"        Change this to adjust 802.11n/ac mode of operation. 802.11n with "
-"40 MHz wide channels can yield higher\n"
-"        throughput but can cause more interference in the network. If you"
-" don't know what to choose, use the default\n"
-"        option with 20 MHz wide channel.\n"
-"    "
+"Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz "
+"wide channels can yield higher throughput but can cause more interference"
+" in the network. If you don't know what to choose, use the default option"
+" with 20 MHz wide channel."
 msgstr ""
 "\n"
 "        Změna tohoto upraví režim fungování 802.11n/ac. 802.11n s kanály "
@@ -217,16 +265,14 @@ msgstr ""
 "        20 MHz.\n"
 "    "
 
-#: src/common/WiFiSettings/constants.js:40
+#: src/common/WiFiSettings/constants.js:46
+#, fuzzy
 msgid ""
-"\n"
-"        Enables Wi-Fi for guests, which is separated from LAN network. "
-"Devices connected to this network are allowed to\n"
-"        access the internet, but aren't allowed to access other devices "
-"and the configuration interface of the router.\n"
-"        Parameters of the guest network can be set in the Guest network "
-"tab.\n"
-"        "
+"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."
 msgstr ""
 "\n"
 "        Zapíná Wi-Fi pro hosty, která je oddělená od místní sítě (LAN). "
@@ -237,6 +283,14 @@ msgstr ""
 "hosty“.\n"
 "        "
 
+#: src/common/WiFiSettings/constants.js:49
+msgid ""
+"The WPA3 standard is the new most secure encryption method that is "
+"suggested to be used with any device that supports it. The older devices "
+"without WPA3 support require older WPA2. If you experience issues with "
+"connecting older devices, try to enable WPA2."
+msgstr ""
+
 #: src/form/components/ForisForm.js:121
 msgid "Settings saved successfully"
 msgstr "Nastavení úspěšně uložena"
@@ -280,14 +334,19 @@ msgid "This is not a valid domain name."
 msgstr "Toto není platné doménové jméno."
 
 #: src/utils/validations.js:17
+#, fuzzy
+msgid "This is not a valid hostname."
+msgstr "Toto není platné doménové jméno."
+
+#: src/utils/validations.js:18
 msgid "This is not a valid DUID."
 msgstr "Tohle není platné DUID."
 
-#: src/utils/validations.js:18
+#: src/utils/validations.js:19
 msgid "This is not a valid MAC address."
 msgstr "Toto není platná MAC adresa."
 
-#: src/utils/validations.js:19
+#: src/utils/validations.js:20
 msgid "Doesn't contain a list of emails separated by commas."
 msgstr "Neobsahuje seznam e-mailů oddělených čárkou."