Merge branch 'dev' into 'master'

Dev

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "5.5.0",
+    "version": "5.6.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": {

src/common/WiFiSettings/WiFiForm.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.
@@ -64,7 +64,7 @@ DeviceForm.propTypes = {
         guest_wifi: PropTypes.object.isRequired,
         encryption: PropTypes.string.isRequired,
         available_bands: PropTypes.array.isRequired,
-        ieee80211w_disabled: PropTypes.bool.isRequired,
+        ieee80211w_disabled: PropTypes.bool,
     }),
     formErrors: PropTypes.object.isRequired,
     setFormValue: PropTypes.func.isRequired,

src/testUtils/customTestRender.js

@@ -25,13 +25,13 @@ Wrapper.propTypes = {
 
 function Wrapper({ children }) {
     return (
-        <AlertContextMock>
+        <CustomizationContextMock>
-            <CustomizationContextMock>
+            <AlertContextMock>
                 <StaticRouter>
                     <UIDReset>{children}</UIDReset>
                 </StaticRouter>
-            </CustomizationContextMock>
+            </AlertContextMock>
-        </AlertContextMock>
+        </CustomizationContextMock>
     );
 }
 

src/testUtils/cutomizationContextMock.js

@@ -9,12 +9,23 @@ import React from "react";
 
 window.CustomizationContext = React.createContext();
 
-const deviceDetails = {};
+const deviceDetails = {
-const isCustomized = jest.fn();
+    kernel: "5.x.x",
+    model: "Turris Omnia",
+    os_branch: {
+        mode: "branch",
+        value: "hbs",
+    },
+    os_version: "6.x.x",
+    reforis_version: "1.x.x",
+    serial: 123456789,
+};
+
+const isCustomized = false;
 
 function CustomizationContextMock({ children }) {
     return (
-        <CustomizationContext.Provider value={(deviceDetails, isCustomized)}>
+        <CustomizationContext.Provider value={{ deviceDetails, isCustomized }}>
             {children}
         </CustomizationContext.Provider>
     );

translations/ru/LC_MESSAGES/forisjs.po

@@ -8,16 +8,17 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-12-02 15:54+0100\n"
-"PO-Revision-Date: 2022-05-28 09:19+0000\n"
+"PO-Revision-Date: 2022-12-07 12:47+0000\n"
 "Last-Translator: Алексей Леньшин <alenshin@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/turris/foris-js/"
+"ru/>\n"
 "Language: ru\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/turris/foris-"
-"js/ru/>\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15-dev\n"
 "Generated-By: Babel 2.11.0\n"
 
 #: src/api/utils.js:61
@@ -118,13 +119,15 @@ msgstr "Шифрование"
 
 #: src/common/WiFiSettings/WiFiForm.js:226
 msgid "Disable Management Frame Protection"
-msgstr ""
+msgstr "Отключить защиту кадров управления"
 
 #: src/common/WiFiSettings/WiFiForm.js:227
 msgid ""
 "In case you have trouble connecting to WiFi Access Point, try disabling "
 "Management Frame Protection."
 msgstr ""
+"Если у вас возникли проблемы с подключением к точке доступа Wi-Fi, "
+"попробуйте отключить защиту кадров управления."
 
 #: src/common/WiFiSettings/WiFiForm.js:262
 msgid "auto"
@@ -381,4 +384,3 @@ msgstr "Не содержит списка электронных адресов
 #~ "конфигурации Wi-Fi и восстановлению "
 #~ "значений по умолчанию.\n"
 #~ "        "
-

translations/sk/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: 2022-12-02 15:54+0100\n"
-"PO-Revision-Date: 2022-05-30 06:14+0000\n"
+"PO-Revision-Date: 2022-12-05 16:48+0000\n"
 "Last-Translator: Atec <dr.atec@gmail.com>\n"
+"Language-Team: Slovak <https://hosted.weblate.org/projects/turris/foris-js/"
+"sk/>\n"
 "Language: sk\n"
-"Language-Team: Slovak <https://hosted.weblate.org/projects/turris/foris-"
-"js/sk/>\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 4.15-dev\n"
 "Generated-By: Babel 2.11.0\n"
 
 #: src/api/utils.js:61
@@ -117,13 +118,15 @@ msgstr "Šifrovanie"
 
 #: src/common/WiFiSettings/WiFiForm.js:226
 msgid "Disable Management Frame Protection"
-msgstr ""
+msgstr "Zakázať Management Frame Protection"
 
 #: src/common/WiFiSettings/WiFiForm.js:227
 msgid ""
 "In case you have trouble connecting to WiFi Access Point, try disabling "
 "Management Frame Protection."
 msgstr ""
+"Ak máte problémy s pripojením k prístupovému bodu WiFi, skúste zakázať "
+"Management Frame Protection."
 
 #: src/common/WiFiSettings/WiFiForm.js:262
 msgid "auto"
@@ -377,4 +380,3 @@ msgstr "Neobsahuje zoznam e-mailov oddelených čiarkami."
 #~ "že sa tým odstráni aktuálna konfigurácia"
 #~ " a obnovia sa východiskové hodnoty.\n"
 #~ "        "
-