Merge branch 'dev' into 'master'

Dev

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

docs/components/Logo.js

@@ -1,36 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import Styled from "rsg-components/Styled";
-import logo from "./logo.svg";
-
-const styles = ({ fontFamily }) => ({
-    logo: {
-        display: "flex",
-        alignItems: "center",
-        margin: 0,
-        fontFamily: fontFamily.base,
-        fontSize: 18,
-        fontWeight: "normal",
-    },
-    image: {
-        height: "1.3em",
-        marginLeft: "-0.2em",
-        marginRight: "0.2em",
-    },
-});
-
-export function LogoRenderer({ classes, children }) {
-    return (
-        <h1 className={classes.logo}>
-            <img className={classes.image} src={logo} alt="React logo" />
-            {children}
-        </h1>
-    );
-}
-
-LogoRenderer.propTypes = {
-    classes: PropTypes.object.isRequired,
-    children: PropTypes.node,
-};
-
-export default Styled(styles)(LogoRenderer);

docs/components/logo.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000">
-    <path d="M288.258 240.0394L717.5586-.44c.803 62.277-1.8207 124.502-1.4996 186.7266 1.8208 7.6343-7.2288 10.1966-12.102 13.4908L286.4375 432.1518l1.8206-192.1124zm2.284 277.645L711 278.3176l-.8416 192.7742L457.357 614.514l-1.842 289.03-167.7097 95.8926 2.7365-481.753z"/>
-</svg>

docs/development.md

@@ -1,15 +1,15 @@
-Sooner or later, you will face with situation when you want/need to make some
+Sooner or later you will face with situation when you want/need to make some
-changes in the library. Then the most important tool for you it's the
+changes in the library. Then the most important tool for you it's
 [`npm link`](https://docs.npmjs.com/cli/link).
 
-Please, notice that it will not work if you link the library just from the root
+Please, notice that it will not work if you link library just from root of the
-of the repo. It happens due to the location of sources `./src`. You need to pack
+repo. It happens due to location of sources `./src`. You need to pack library
-the library first, `make pack` and then link it from the `./dist` directory.
+first `make pack` and then link it from `./dist` directory.
 
-Yeah, it's not such a comfortable solution for development. But it can be fixed
+Yeah it's not such comfortable solution for development. But it can fixed by
-by writing a small script similar to making a pack but by linking every file and
+writing small script similar as `make pack` but with linking every file and
-directory from `./src` to the same directory and linking then from it. Notice
+directory from `./src` to the some directory and linking then from it. Notice
-that you need to link a `package.json` and a `package-lock.json` as well.
+that you need to link `package.json` and `package-lock.json` as well.
 
 So step by step:
 

docs/forisjs-npm.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" fill="white">
-    <path d="M49.5 171.722222222222h400v133.333333333333h-200v22.222222222223h-88.888888888889v-22.222222222223H49.5V171.722222222222zm22.222222222222 111.111111111111h44.444444444445v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-88.888888888889H71.722222222222v88.888888888889zm111.111111111111-88.888888888889v111.111111111111h44.444444444445v-22.222222222222h44.444444444444v-88.888888888889h-88.888888888889zm44.444444444445 22.222222222222H249.5v44.444444444445h-22.222222222222v-44.444444444445zm66.666666666666-22.222222222222v88.888888888889h44.444444444445v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-66.666666666667h22.222222222222v66.666666666667h22.222222222223v-88.888888888889H293.944444444444z" fill="#cb3837" />
-    <path d="M71.722222222222 282.833333333333h44.444444444444v-66.666666666667h22.222222222223v66.666666666667h22.222222222222v-88.888888888889H71.722222222222zm111.111111111111-88.888888888889v111.111111111111h44.444444444444v-22.222222222222h44.444444444445v-88.888888888889h-88.888888888889zM249.5 260.611111111111h-22.222222222223v-44.444444444445H249.5v44.444444444445zm44.444444444444-66.666666666667v88.888888888889h44.444444444444v-66.666666666667h22.222222222223v66.666666666667h22.222222222222v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-88.888888888889z" />
-</svg>

docs/intro.md

@@ -0,0 +1,6 @@
+Foris JS library is set of components and utils for Foris JS application and
+plugins.
+
+Please notice that all of these components or utils are used in reForis and
+plugins. If you like to study by example I would recommend to full-text search
+these repos.

docs/introduction.md

@@ -1,37 +0,0 @@
-Welcome! This is the official documentation for Foris JS.
-
-## What Foris JS is
-
-Foris JS library is a set of components and utils for reForis application and
-plugins.
-
-Please notice that all of these components or utils are used in reForis and
-plugins. If you want to study them by example, I recommend you to full-text
-search those repositories.
-
-# Installation
-
-## Prerequisites
-
-Please make sure that [Node.js](https://nodejs.org/en/) is installed on your
-system.
-
-The current Long Term Support (LTS) release is an ideal starting point, see
-[here](https://github.com/nodejs/Release#release-schedule).
-
-## Installation
-
-To install the latest release:
-
-```plain
-npm install foris
-```
-
-To install a specific version:
-
-```plain
-npm install foris@version
-```
-
-<a target="_blank" href="https://www.npmjs.com/package/foris">Check
-on<img width="100px" src="./docs/forisjs-npm.svg"></a>

package.json

@@ -1,7 +1,7 @@
 {
     "name": "foris",
-    "version": "5.2.0",
+    "version": "5.1.16",
-    "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
+    "description": "Set of components and utils for Foris and its plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
         "type": "git",
@@ -53,10 +53,10 @@
         "react": "16.9.0",
         "react-dom": "16.9.0",
         "react-router-dom": "^5.1.2",
-        "react-styleguidist": "^11.2.0",
+        "react-styleguidist": "^7.3.11",
         "snapshot-diff": "^0.7.0",
         "style-loader": "^1.2.1",
-        "webpack": "^5.68.0"
+        "webpack": "^5.15.0"
     },
     "scripts": {
         "lint": "eslint src",

src/api/hooks.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://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.
@@ -7,6 +7,7 @@
 
 import { useCallback, useEffect, useReducer, useState } from "react";
 
+import { ForisURLs } from "../utils/forisUrls";
 import {
     API_ACTIONS,
     API_METHODS,
@@ -83,8 +84,8 @@ function APIReducer(state, action) {
                 data: action.payload,
             };
         case API_ACTIONS.FAILURE:
-            if (action.status === 401) {
+            if (action.status === 403) {
-                window.location.reload();
+                window.location.assign(ForisURLs.login);
             }
 
             // Not an API error - should be rethrown.

src/api/utils.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://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.
@@ -11,7 +11,6 @@ export const HEADERS = {
     Accept: "application/json",
     "Content-Type": "application/json",
     "X-CSRFToken": getCookie("_csrf_token"),
-    "X-Requested-With": "json",
 };
 
 export const TIMEOUT = 30500;
@@ -57,7 +56,7 @@ function getCookie(name) {
 
 export function getErrorPayload(error) {
     if (error.response) {
-        if (error.response.status === 401) {
+        if (error.response.status === 403) {
             return _("The session is expired. Please log in again.");
         }
         return getJSONErrorMessage(error);

src/bootstrap/DownloadButton.js

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

src/bootstrap/PasswordInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 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.
@@ -21,17 +21,14 @@ 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, newPass, ...props }) {
+export function PasswordInput({ withEye, ...props }) {
     const [isHidden, setHidden] = useState(true);
-
     return (
         <Input
             type={withEye && !isHidden ? "text" : "password"}
-            autoComplete={newPass ? "new-password" : "current-password"}
+            autoComplete={isHidden ? "new-password" : null}
             {...props}
         >
             {withEye ? (

src/bootstrap/Select.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2021 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,14 +18,20 @@ 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, ...props }) {
+export function Select({ label, choices, helpText, customOrder, ...props }) {
     const uid = useUID();
 
-    const options = Object.keys(choices).map((choice) => (
+    const keys = Object.keys(choices);
-        <option key={choice} value={choice}>
+    if (!customOrder) {
-            {choices[choice]}
+        keys.sort((a, b) => a - b || a.toString().localeCompare(b.toString()));
+    }
+    const options = keys.map((key) => (
+        <option key={key} value={key}>
+            {choices[key]}
         </option>
     ));
 

src/bootstrap/Switch.md

@@ -1,5 +0,0 @@
-Switch example:
-
-```js
-<Switch label="Enable Switch" helpText="Toggle that switch!" />
-```

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

@@ -13,7 +13,7 @@ exports[`<PasswordInput/> Render password input 1`] = `
     class="input-group"
   >
     <input
-      autocomplete="current-password"
+      autocomplete="new-password"
       class="form-control"
       id="1"
       type="password"

src/common/WiFiSettings/WiFiForm.js

@@ -64,7 +64,6 @@ 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,
@@ -88,7 +87,6 @@ function DeviceForm({
     ...props
 }) {
     const deviceID = formData.id;
-    const bnds = formData.available_bands;
     return (
         <>
             <Switch
@@ -161,24 +159,18 @@ function DeviceForm({
                         value={formData.hwmode}
                         helpText={HELP_TEXTS.hwmode}
                         inline
-                        onChange={setFormValue((value) => {
+                        onChange={setFormValue((value) => ({
-                            // Get the last item in an array of available HT modes
+                            devices: {
-                            const [best2] = bnds[0].available_htmodes.slice(-1);
+                                [deviceIndex]: {
-                            const [best5] = bnds[1].available_htmodes.slice(-1);
+                                    hwmode: { $set: value },
-                            return {
+                                    channel: { $set: "0" },
-                                devices: {
+                                    htmode: {
-                                    [deviceIndex]: {
+                                        $set:
-                                        hwmode: { $set: value },
+                                            value === "11a" ? "VHT80" : "HT20",
-                                        channel: { $set: "0" },
-                                        htmode: {
-                                            $set:
-                                                // Set HT mode depending on checked frequency
-                                                value === "11a" ? best5 : best2,
-                                        },
                                     },
                                 },
-                            };
+                            },
-                        })}
+                        }))}
                         {...props}
                     />
 
@@ -217,6 +209,7 @@ function DeviceForm({
                                 [deviceIndex]: { encryption: { $set: value } },
                             },
                         }))}
+                        customOrder
                         {...props}
                     />
 

src/common/WiFiSettings/WiFiSettings.js

@@ -82,10 +82,6 @@ export function validator(formData) {
 
         if (device.password.length < 8)
             errors.password = _("Password must contain at least 8 symbols");
-        if (device.password.length >= 64)
-            errors.password = _(
-                "Password must not contain more than 63 symbols"
-            );
 
         if (!device.guest_wifi.enabled) return errors;
 
@@ -101,10 +97,6 @@ export function validator(formData) {
             guest_wifi_errors.password = _(
                 "Password must contain at least 8 symbols"
             );
-        if (device.guest_wifi.password.length >= 64)
-            guest_wifi_errors.password = _(
-                "Password must not contain more than 63 symbols"
-            );
 
         if (guest_wifi_errors.SSID || guest_wifi_errors.password) {
             errors.guest_wifi = guest_wifi_errors;

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

@@ -26,7 +26,6 @@ describe("<WiFiSettings/>", () => {
     let getAllByText;
     let getAllByLabelText;
     let getByText;
-    let getByLabelText;
     let asFragment;
     const endpoint = "/reforis/api/wifi";
 
@@ -42,7 +41,6 @@ describe("<WiFiSettings/>", () => {
         asFragment = renderRes.asFragment;
         getAllByText = renderRes.getAllByText;
         getAllByLabelText = renderRes.getAllByLabelText;
-        getByLabelText = renderRes.getByLabelText;
         getByText = renderRes.getByText;
         mockAxios.mockResponse({ data: wifiSettingsFixture() });
         await wait(() => renderRes.getByText("Wi-Fi 1"));
@@ -53,6 +51,7 @@ describe("<WiFiSettings/>", () => {
         const webSockets = new WebSockets();
         const { getByText } = render(
             <WiFiSettings
+                ws={webSockets}
                 ws={webSockets}
                 endpoint={endpoint}
                 resetEndpoint="foo"
@@ -147,7 +146,7 @@ describe("<WiFiSettings/>", () => {
                     enabled: true,
                     guest_wifi: { enabled: false },
                     hidden: false,
-                    htmode: "VHT80",
+                    htmode: "HT20",
                     hwmode: "11g",
                     id: 0,
                     password: "TestPass",
@@ -221,24 +220,4 @@ describe("<WiFiSettings/>", () => {
     it("ByteCount function", () => {
         expect(byteCount("abc")).toEqual(3);
     });
-
-    it("Should validate password length", () => {
-        const shortErrorFeedback = /Password must contain/i;
-        const longErrorFeedback = /Password must not contain/i;
-
-        fireEvent.click(getByText("Wi-Fi 1"));
-
-        const passwordInput = getByLabelText("Password");
-
-        const changePassword = (value) =>
-            fireEvent.change(passwordInput, { target: { value } });
-
-        changePassword("12");
-        expect(getByText(shortErrorFeedback)).toBeDefined();
-
-        changePassword(
-            "longpasswordlongpasswordlongpasswordlongpasswordlongpasswordlong"
-        );
-        expect(getByText(longErrorFeedback)).toBeDefined();
-    });
 });

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

@@ -394,7 +394,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"current-password\\"
++             autocomplete=\\"new-password\\"
 +             class=\\"form-control  is-invalid\\"
 +             id=\\"23\\"
 +             required=\\"\\"
@@ -509,7 +509,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"current-password\\"
++             autocomplete=\\"new-password\\"
 +             class=\\"form-control\\"
 +             id=\\"5\\"
 +             required=\\"\\"
@@ -627,11 +627,6 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           id=\\"8\\"
 +         >
 +           <option
-+             value=\\"NOHT\\"
-+           >
-+             Disabled
-+           </option>
-+           <option
 +             value=\\"HT20\\"
 +           >
 +             802.11n - 20 MHz wide channel
@@ -642,6 +637,11 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             802.11n - 40 MHz wide channel
 +           </option>
 +           <option
++             value=\\"NOHT\\"
++           >
++             Disabled
++           </option>
++           <option
 +             value=\\"VHT20\\"
 +           >
 +             802.11ac - 20 MHz wide channel

src/common/WiFiSettings/constants.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2021 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.
@@ -13,10 +13,6 @@ 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",

src/form/__tests__/validation.test.js

@@ -1,17 +1,16 @@
 /*
- * Copyright (C) 2019-2022 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.
  */
 
 import {
+    validateDomain,
+    validateDUID,
     validateIPv4Address,
     validateIPv6Address,
     validateIPv6Prefix,
-    validateDomain,
-    validateHostname,
-    validateDUID,
     validateMAC,
 } from "utils/validations";
 
@@ -69,15 +68,6 @@ describe("Validation functions", () => {
         expect(validateDomain(".")).not.toBe(undefined);
     });
 
-    it("validateHostname valid", () => {
-        expect(validateHostname("new-android")).toBe(undefined);
-        expect(validateHostname("local")).toBe(undefined);
-    });
-    it("validateHostname invalid", () => {
-        expect(validateHostname("-android")).not.toBe(undefined);
-        expect(validateHostname("local.")).not.toBe(undefined);
-    });
-
     it("validateDUID valid", () => {
         expect(validateDUID("abcdefAB")).toBe(undefined);
         expect(validateDUID("ABCDEF12")).toBe(undefined);

src/index.js

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

src/utils/forisUrls.js

@@ -9,8 +9,8 @@ export const REFORIS_URL_PREFIX = "/reforis";
 export const REFORIS_API_URL_PREFIX = `${REFORIS_URL_PREFIX}/api`;
 
 export const ForisURLs = {
-    login: `/login?${REFORIS_URL_PREFIX}/`,
+    login: `${REFORIS_URL_PREFIX}/login`,
-    logout: `/logout`,
+    logout: `${REFORIS_URL_PREFIX}/logout`,
 
     static: `${REFORIS_URL_PREFIX}/static/reforis`,
     wifi: `${REFORIS_URL_PREFIX}/network-settings/wifi`,

src/utils/validations.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 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.
@@ -14,7 +14,6 @@ export const ERROR_MESSAGES = {
     IPv6: _("This is not a valid IPv6 address."),
     IPv6Prefix: _("This is not a valid IPv6 prefix."),
     domain: _("This is not a valid domain name."),
-    hostname: _("This is not a valid hostname."),
     DUID: _("This is not a valid DUID."),
     MAC: _("This is not a valid MAC address."),
     MultipleEmails: _("Doesn't contain a list of emails separated by commas."),
@@ -24,8 +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-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/,
+    domain: /^[A-Za-z0-9][A-Za-z0-9.-]{1,255}$/,
-    hostname: /^[a-z\d]([a-z\d-]{0,61}[a-z\d])?(\.[a-z\d]([a-z\d-]{0,61}[a-z\d])?)*$/i,
     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-.]+ *)*$/,
@@ -42,7 +40,6 @@ const validateIPv4Address = createValidator("IPv4");
 const validateIPv6Address = createValidator("IPv6");
 const validateIPv6Prefix = createValidator("IPv6Prefix");
 const validateDomain = createValidator("domain");
-const validateHostname = createValidator("hostname");
 const validateDUID = createValidator("DUID");
 const validateMAC = createValidator("MAC");
 const validateMultipleEmails = createValidator("MultipleEmails");
@@ -52,7 +49,6 @@ export {
     validateIPv6Address,
     validateIPv6Prefix,
     validateDomain,
-    validateHostname,
     validateDUID,
     validateMAC,
     validateMultipleEmails,

src/webSockets/WebSockets.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2020 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.
@@ -7,6 +7,8 @@
 
 /* eslint no-console: "off" */
 
+import { ForisURLs } from "../utils/forisUrls";
+
 const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
 
 const URL = process.env.LIGHTTPD
@@ -19,6 +21,12 @@ export class WebSockets {
     constructor() {
         this.ws = new WebSocket(URL);
         this.ws.onerror = (e) => {
+            if (!window.initialData.logged) {
+                console.error(
+                    "WS: Error observed, you aren't logged probably."
+                );
+                window.location.replace(ForisURLs.login);
+            }
             console.error("WS: Error:", e);
         };
         this.ws.onmessage = (e) => {

styleguide.config.js

@@ -1,56 +1,39 @@
 /*
- * Copyright (C) 2019-2022 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.
  */
+
 const path = require("path");
-const pjson = require("./package.json");
 
 module.exports = {
-    title: "Foris JS Docs",
+    title: "Foris JS docs",
-    version: `v${pjson.version}`,
-    theme: {
-        color: {
-            link: "#0075a3",
-            linkHover: "#00a2e2",
-        },
-    },
-    tocMode: "collapse",
-    pagePerSection: true,
     sections: [
         {
-            name: "Introduction",
+            name: "Foris JS",
-            content: "docs/introduction.md",
+            content: "docs/intro.md",
         },
         {
-            name: "Development",
+            name: "Development (Linking)",
             content: "docs/development.md",
         },
         {
-            name: "Components",
+            name: "Foris forms",
-            description: "Set of main components.",
+            components: [
-            sections: [
+                "src/form/components/ForisForm.js",
-                {
+                "src/form/components/alerts.js",
-                    name: "Foris forms",
+                "src/form/components/SubmitButton.js",
-                    components: [
-                        "src/form/components/ForisForm.js",
-                        "src/form/components/alerts.js",
-                        "src/form/components/SubmitButton.js",
-                    ],
-                    exampleMode: "expand",
-                    usageMode: "expand",
-                },
-                {
-                    name: "Alert Context",
-                    components: ["src/alertContext/AlertContext.js"],
-                    exampleMode: "expand",
-                    usageMode: "expand",
-                },
             ],
-            sectionDepth: 1,
+            exampleMode: "expand",
+            usageMode: "expand",
+        },
+        {
+            name: "Alert Context",
+            components: ["src/alertContext/AlertContext.js"],
+            exampleMode: "expand",
+            usageMode: "expand",
         },
-
         {
             name: "Bootstrap components",
             description: "Set of bootstrap components.",
@@ -58,12 +41,8 @@ module.exports = {
             exampleMode: "expand",
             usageMode: "expand",
             ignore: ["src/bootstrap/constants.js"],
-            sectionDepth: 0,
         },
     ],
-    template: {
-        favicon: "/docs/components/logo.svg",
-    },
     require: [
         "babel-polyfill",
         path.join(__dirname, "src/testUtils/mockGlobals"),
@@ -76,9 +55,6 @@ module.exports = {
             "node_modules/@fortawesome/fontawesome-free/css/all.min.css"
         ),
     ],
-    styleguideComponents: {
-        LogoRenderer: path.join(__dirname, "docs/components/Logo"),
-    },
     webpackConfig: {
         module: {
             rules: [
@@ -97,8 +73,5 @@ module.exports = {
                 },
             ],
         },
-        devServer: {
-            publicPath: "/",
-        },
     },
 };