Bump v4.5.1.

* Add initial data to ForisForm children.
 * Update .pot file.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foris",
-  "version": "4.3.1",
+  "version": "4.5.1",
   "description": "Set of components and utils for Foris and its plugins.",
   "author": "CZ.NIC, z.s.p.o.",
   "repository": {
@@ -14,10 +14,9 @@
   "license": "GPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "axios": "^0.19.1",
+    "axios": "^0.19.2",
     "immutability-helper": "3.0.1",
     "moment": "^2.24.0",
-    "pdfmake": "^0.1.63",
     "qrcode.react": "^0.9.3",
     "react-datetime": "^2.16.3",
     "react-uid": "^2.2.0"
@@ -30,26 +29,26 @@
     "react-router-dom": "^5.1.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.7",
+    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.7.7",
+    "@babel/core": "^7.9.0",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.7.7",
+    "@babel/preset-env": "^7.9.0",
-    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-react": "^7.9.4",
-    "@fortawesome/fontawesome-free": "^5.12.0",
+    "@fortawesome/fontawesome-free": "^5.13.0",
     "@testing-library/react": "^8.0.9",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.1.0",
     "babel-polyfill": "^6.26.0",
     "eslint": "^6.8.0",
     "eslint-config-reforis": "^1.0.0",
-    "jest": "^24.9.0",
+    "jest": "^25.2.0",
     "jest-mock-axios": "^3.2.0",
-    "moment-timezone": "^0.5.27",
+    "moment-timezone": "^0.5.28",
     "prop-types": "15.7.2",
     "react": "16.9.0",
     "react-dom": "16.9.0",
     "react-router-dom": "^5.1.2",
-    "react-styleguidist": "^10.4.2",
+    "react-styleguidist": "^10.6.2",
-    "snapshot-diff": "^0.5.1"
+    "snapshot-diff": "^0.7.0"
   },
   "scripts": {
     "lint": "eslint src",

src/api/hooks.js

@@ -9,7 +9,7 @@ import {
     useCallback, useEffect, useReducer, useState,
 } from "react";
 
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 import {
     API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
 } from "./utils";

src/common/RebootButton.js

@@ -10,7 +10,7 @@ import PropTypes from "prop-types";
 
 import { useAPIPost } from "../api/hooks";
 import { API_STATE } from "../api/utils";
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 
 import { Button } from "../bootstrap/Button";
 import {

src/common/WiFiSettings/WiFiForm.js

@@ -36,7 +36,7 @@ WiFiForm.defaultProps = {
 };
 
 export default function WiFiForm({
-    formData, formErrors, setFormValue, hasGuestNetwork, ...props
+    formData, formErrors, setFormValue, hasGuestNetwork, disabled,
 }) {
     return formData.devices.map((device) => (
         <DeviceForm
@@ -45,8 +45,7 @@ export default function WiFiForm({
             formErrors={(formErrors || [])[device.id]}
             setFormValue={setFormValue}
             hasGuestNetwork={hasGuestNetwork}
-
+            disabled={disabled}
-            {...props}
         />
     ));
 }

src/common/WiFiSettings/WiFiQRCode.js

@@ -9,7 +9,7 @@ import React, { useState } from "react";
 import QRCode from "qrcode.react";
 import PropTypes from "prop-types";
 
-import { ForisURLs } from "../../forisUrls";
+import { ForisURLs } from "../../utils/forisUrls";
 import { Button } from "../../bootstrap/Button";
 import {
     Modal, ModalBody, ModalFooter, ModalHeader,

src/common/WiFiSettings/qrCodeHelpers.js

@@ -5,22 +5,36 @@
  * See /LICENSE for more information.
  */
 
-import pdfMake from "pdfmake";
-
 export function createAndDownloadPdf(SSID, password) {
     const docDefinition = {
         content: [
             {
-                text: "Wi-Fi", style: "header", fontSize: 55, alignment: "center",
+                text: "Wi-Fi",
+                style: "header",
+                fontSize: 55,
+                alignment: "center",
             },
             {
-                qr: toQRCodeContent(SSID, password), fit: "350", margin: [0, 80], alignment: "center",
+                qr: toQRCodeContent(SSID, password),
+                fit: "350",
+                margin: [0, 80],
+                alignment: "center",
+            },
+            {
+                text: `SSID: ${SSID}`,
+                fontSize: 25,
+                alignment: "center",
+            },
+            {
+                text: `Password: ${password}`,
+                fontSize: 25,
+                alignment: "center",
             },
-            { text: `SSID: ${SSID}`, fontSize: 25, alignment: "center" },
-            { text: `Password: ${password}`, fontSize: 25, alignment: "center" },
         ],
     };
-    pdfMake.createPdf(docDefinition).download("wifi.pdf");
+
+    // pdfmake is exposed by reForis main application. Thus we can use it from globals.
+    window.pdfMake.createPdf(docDefinition).download("wifi.pdf");
 }
 
 export function toQRCodeContent(SSID, password) {

src/form/__tests__/validation.test.js

@@ -12,7 +12,7 @@ import {
     validateIPv6Address,
     validateIPv6Prefix,
     validateMAC,
-} from "validations";
+} from "utils/validations";
 
 describe("Validation functions", () => {
     it("validateIPv4Address valid", () => {

src/form/components/ForisForm.js

@@ -149,6 +149,7 @@ export function ForisForm({
     const childrenWithFormProps = React.Children.map(
         children,
         (child) => React.cloneElement(child, {
+            initialData: formState.initialData,
             formData: formState.data,
             formErrors: formState.errors,
             setFormValue: onFormChangeHandler,

src/index.js

@@ -67,7 +67,7 @@ export { useClickOutside } from "./utils/hooks";
 export { toLocaleDateString } from "./utils/datetime";
 
 // Foris URL
-export { ForisURLs, REFORIS_URL_PREFIX } from "./forisUrls";
+export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
 
 // Validation
 export {
@@ -78,7 +78,7 @@ export {
     validateDUID,
     validateMAC,
     validateMultipleEmails,
-} from "./validations";
+} from "./utils/validations";
 
 // Alert context
 export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";

src/utils/validations.js

@@ -23,7 +23,7 @@ const REs = {
     IPv4: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
     IPv6: /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/,
     IPv6Prefix: /^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$/,
-    domain: /^([a-zA-Z0-9-]{1,63}\.?)*$/,
+    domain: /^[A-Za-z0-9][A-Za-z0-9.-]{1,255}$/,
     DUID: /^([0-9a-fA-F]{2}){4}([0-9a-fA-F]{2})*$/,
     MAC: /^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/,
     MultipleEmails: /^([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+ *)( *, *[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+ *)*$/,

src/webSockets/WebSockets.js

@@ -7,7 +7,7 @@
 
 /* eslint no-console: "off" */
 
-import { ForisURLs } from "../forisUrls";
+import { ForisURLs } from "../utils/forisUrls";
 
 const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
 

translations/forisjs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-02-20 17:28+0100\n"
+"POT-Creation-Date: 2020-05-07 16:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,34 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 
-#: src/validations.js:13
-msgid "This is not a valid IPv4 address."
-msgstr ""
-
-#: src/validations.js:14
-msgid "This is not a valid IPv6 address."
-msgstr ""
-
-#: src/validations.js:15
-msgid "This is not a valid IPv6 prefix."
-msgstr ""
-
-#: src/validations.js:16
-msgid "This is not a valid domain name."
-msgstr ""
-
-#: src/validations.js:17
-msgid "This is not a valid DUID."
-msgstr ""
-
-#: src/validations.js:18
-msgid "This is not a valid MAC address."
-msgstr ""
-
-#: src/validations.js:19
-msgid "Doesn't contain a list of emails separated by commas."
-msgstr ""
-
 #: src/api/utils.js:58
 msgid "The session is expired. Please log in again."
 msgstr ""
@@ -107,15 +79,15 @@ msgid ""
 "        "
 msgstr ""
 
-#: src/common/WiFiSettings/WiFiForm.js:82
+#: src/common/WiFiSettings/WiFiForm.js:81
 msgid "Wi-Fi ${deviceID + 1}"
 msgstr ""
 
-#: src/common/WiFiSettings/WiFiForm.js:84
+#: src/common/WiFiSettings/WiFiForm.js:83
 msgid "Enable"
 msgstr ""
 
-#: src/common/WiFiSettings/WiFiForm.js:215
+#: src/common/WiFiSettings/WiFiForm.js:214
 msgid "auto"
 msgstr ""
 
@@ -222,7 +194,7 @@ msgstr ""
 msgid "Settings saved successfully"
 msgstr ""
 
-#: src/form/components/ForisForm.js:165
+#: src/form/components/ForisForm.js:166
 msgid "Changes you made may not be saved. Are you sure you want to leave?"
 msgstr ""
 
@@ -242,3 +214,31 @@ msgstr ""
 msgid "An error occurred while fetching data."
 msgstr ""
 
+#: src/utils/validations.js:13
+msgid "This is not a valid IPv4 address."
+msgstr ""
+
+#: src/utils/validations.js:14
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: src/utils/validations.js:15
+msgid "This is not a valid IPv6 prefix."
+msgstr ""
+
+#: src/utils/validations.js:16
+msgid "This is not a valid domain name."
+msgstr ""
+
+#: src/utils/validations.js:17
+msgid "This is not a valid DUID."
+msgstr ""
+
+#: src/utils/validations.js:18
+msgid "This is not a valid MAC address."
+msgstr ""
+
+#: src/utils/validations.js:19
+msgid "Doesn't contain a list of emails separated by commas."
+msgstr ""
+