Bump v5.0.3

.eslintrc.js

@@ -1,8 +1,6 @@
 module.exports = {
-    extends: ["eslint-config-reforis", "prettier"],
+    extends: "eslint-config-reforis",
-    plugins: ["prettier"],
     rules: {
-        "prettier/prettier": ["error"],
         "import/prefer-default-export": "off",
     },
 };

.gitignore

@@ -51,4 +51,3 @@ coverage.xml
 dist/
 foris-*.tgz
 styleguide/
-testUtils

.gitlab-ci.yml

@@ -1,44 +1,44 @@
-image: node:16-alpine
+image: node:8-alpine
 
 stages:
-    - test
+  - test
-    - build
+  - build
-    - publish
+  - publish
 
 before_script:
-    - apk add make
+  - apk add make
-    - npm install
+  - npm install
 
 test:
-    stage: test
+  stage: test
-    script:
+  script:
-        - make test
+    - make test
 
 lint:
-    stage: test
+  stage: test
-    script:
+  script:
-        - make lint
+    - make lint
 
 build:
-    stage: build
+  stage: build
-    script:
+  script:
-        - make pack
+    - make pack
-    artifacts:
+  artifacts:
-        paths:
+    paths:
-            - dist/foris-*.tgz
+      - dist/foris-*.tgz
 
 publish_beta:
-    stage: publish
+  stage: publish
-    only:
+  only:
-        refs:
+    refs:
-            - dev
+      - dev
-    script:
+  script:
-        - make publish-beta
+    - make publish-beta
 
 publish_latest:
-    stage: publish
+  stage: publish
-    only:
+  only:
-        refs:
+    refs:
-            - master
+      - master
-    script:
+  script:
-        - make publish-latest
+    - make publish-latest

.prettierrc

@@ -1,11 +0,0 @@
-{
-    "singleQuote": false,
-    "printWidth": 80,
-    "proseWrap": "always",
-    "tabWidth": 4,
-    "useTabs": false,
-    "trailingComma": "es5",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": false,
-    "semi": true
-}

Makefile

@@ -1,30 +1,20 @@
-# Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+.PHONY: all install-js watch-js build-js collect-files pack publish-beta publish-latest lint test test-js-update-snapshots create-messages update-messages docs docs-watch clean
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
 
-PROJECT="Foris JS"
+DEV_PYTHON=python3.7
-# Retrieve Foris JS version from package.json 
-VERSION= $(shell sed -En "s/.*version['\"]: ['\"](.+)['\"].*/\1/p" package.json)
-COPYRIGHT_HOLDER="CZ.NIC, z.s.p.o. (https://www.nic.cz/)"
-MSGID_BUGS_ADDRESS="tech.support@turris.cz"
-
-DEV_PYTHON=python3
 VENV_NAME?=venv
 VENV_BIN=$(shell pwd)/$(VENV_NAME)/bin
 
-.PHONY: all
 all:
 	@echo "make install-js"
-	@echo "    Install npm dependencies."
+	@echo "    Install dependencies"
-	@echo "make lint"
+	@echo "make watch-js"
-	@echo "    Run linter on the project."
+	@echo "    Compile JS in watch mode."
-	@echo "make test"
+	@echo "make build-js"
-	@echo "    Run tests on the project."
+	@echo "    Compile JS."
-	@echo "make test-js-watch"
+	@echo "make lint-js"
-	@echo "    Run tests on the project in watch mode."
+	@echo "    Run linter"
-	@echo "make test-js-update-snapshots"
+	@echo "make test-js"
-	@echo "    Update snapshots."
+	@echo "    Run tests"
 	@echo "make create-messages"
 	@echo "    Create locale messages (.pot)."
 	@echo "make update-messages"
@@ -36,93 +26,43 @@ all:
 	@echo "make clean"
 	@echo "    Remove python artifacts and virtualenv."
 
-
-# Preparation
-
-.PHONY: venv
 venv: $(VENV_NAME)/bin/activate
 $(VENV_NAME)/bin/activate:
 	test -d $(VENV_NAME) || $(DEV_PYTHON) -m virtualenv -p $(DEV_PYTHON) $(VENV_NAME)
 	$(VENV_BIN)/$(DEV_PYTHON) -m pip install -r requirements.txt
 	touch $(VENV_NAME)/bin/activate
 
-
-# Installation
-
-.PHONY: install-js
 install-js: package.json
 	npm install --save-dev
 
-
-# Publishing
-
-.PHONY: collect-files
 collect-files:
 	sh scripts/collect_files.sh
-
-.PHONY: pack
 pack: collect-files
 	cd dist && npm pack
-
-.PHONY: publish-beta
 publish-beta: collect-files
 	sh scripts/publish.sh beta
-
-.PHONY: publish-latest
 publish-latest: collect-files
 	sh scripts/publish.sh latest
 
-
-# Linting
-
-.PHONY: lint
 lint:
 	npm run lint
-
-.PHONY: lint-js-fix
 lint-js-fix:
 	npm run lint:fix
 
-
-# Testing
-
-.PHONY: test
 test:
 	npm test
-
-.PHONY: test-js-watch
-test-js-watch:
-	cd $(JS_DIR); npm test -- --watch
-
-.PHONY: test-js-update-snapshots
 test-js-update-snapshots:
 	npm test -- -u
 
-
-# Translations
-
-.PHONY: create-messages
 create-messages: venv
-	$(VENV_BIN)/pybabel extract -F babel.cfg -o ./translations/forisjs.pot . --project=$(PROJECT) --version=$(VERSION) --copyright-holder=$(COPYRIGHT_HOLDER) --msgid-bugs-address=$(MSGID_BUGS_ADDRESS)
+	$(VENV_BIN)/pybabel extract -F babel.cfg -o ./translations/forisjs.pot .
-
-.PHONY: update-messages
 update-messages: venv
-	$(VENV_BIN)/pybabel update -i ./translations/forisjs.pot -d ./translations -D forisjs --update-header-comment
+	$(VENV_BIN)/pybabel update -i ./translations/forisjs.pot -d ./translations -D forisjs
 
-
-# Documentation
-
-.PHONY: docs
 docs:
 	npm run-script docs
-
-.PHONY: docs-watch
 docs-watch:
 	npm run-script docs:watch
 
-
-# Other
-
-.PHONY: clean
 clean:
 	rm -rf node_modules dist

README.md

@@ -1,5 +1,4 @@
 # foris-js
-
 Set of utils and common React elements for reForis.
 
 ## Publishing package
@@ -14,20 +13,17 @@ tagged `beta`. Versions names are based on commit SHA, e.g.
 
 1. Crete a merge request to `dev` branch with version bumped
 2. When merging add `[skip ci]` to commit message to prevent publishing
-   unnecessary version
+unnecessary version
 3. Create a merge request from `dev` to `master` branch
 4. New version should be published automatically
 
 ## Manually managed dependencies
-
+Because of `<ForisForm />` component it's required to use exposed `ReactRouterDOM`
-Because of `<ForisForm />` component it's required to use exposed
+object from `react-router-dom` library. `ReactRouterDOM` is exposed by
-`ReactRouterDOM` object from `react-router-dom` library. `ReactRouterDOM` is
-exposed by
 [reForis](https://gitlab.labs.nic.cz/turris/reforis/reforis/blob/master/js/webpack.config.js).
 It can be done by following steps:
  
-1. Setting `react-router-dom` as `peerDependencies` and `devDependencies` in
+1. Setting `react-router-dom` as `peerDependencies` and `devDependencies` in `package.json`.
-   `package.json`.
 2. Adding the following rules to `externals` in `webpack.conf.js` of the plugin:
 
 ```js
@@ -38,15 +34,11 @@ externals: {
 ```
 
 ### Docs
-
 Build or watch docs to get more info about library:
-
 ```bash
 make docs
 ```
-
 or
-
 ```bash
 make docs-watch
 ```

babel.config.js

@@ -1,4 +1,9 @@
 module.exports = {
-    presets: ["@babel/preset-env", "@babel/preset-react"],
+    presets: [
-    plugins: ["@babel/plugin-transform-runtime"],
+        "@babel/preset-env",
+        "@babel/preset-react",
+    ],
+    plugins: [
+        "@babel/plugin-transform-runtime",
+    ],
 };

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,12 @@
-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.
-changes in the library. Then the most important tool for you it's the
+Then the most important tool for you it's [`npm link`](https://docs.npmjs.com/cli/link).
-[`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 repo. It happens due to location of 
-of the repo. It happens due to the location of sources `./src`. You need to pack
+sources `./src`. You need to pack library first `make pack` and then link it from `./dist` directory.
-the library first, `make pack` and then link it from the `./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 writing small script similar as `make pack`
-by writing a small script similar to making a pack but by linking every file and
+but with linking every file and directory from `./src` to the some directory and linking then from it. Notice that you
-directory from `./src` to the same directory and linking then from it. Notice
+need to link `package.json` and `package-lock.json` as well.
-that you need to link a `package.json` and a `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,4 @@
+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>

jest.config.js

@@ -27,5 +27,7 @@ module.exports = {
     globals: {
         TZ: "utc",
     },
-    transformIgnorePatterns: ["node_modules/(?!(react-datetime)/)"],
+    transformIgnorePatterns: [
+        "node_modules/(?!(react-datetime)/)",
+    ],
 };

package.json

@@ -1,70 +1,67 @@
 {
-    "name": "foris",
+  "name": "foris",
-    "version": "5.4.1",
+  "version": "5.0.3",
-    "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.",
+  "author": "CZ.NIC, z.s.p.o.",
-    "repository": {
+  "repository": {
-        "type": "git",
+    "type": "git",
-        "url": "https://gitlab.nic.cz/turris/reforis/foris-js.git"
+    "url": "https://gitlab.labs.nic.cz/turris/reforis/foris-js.git"
-    },
+  },
-    "keywords": [
+  "keywords": [
-        "foris",
+    "foris",
-        "reforis"
+    "reforis"
-    ],
+  ],
-    "license": "GPL-3.0",
+  "license": "GPL-3.0",
-    "main": "./src/index.js",
+  "main": "./src/index.js",
-    "dependencies": {
+  "dependencies": {
-        "axios": "^0.21.1",
+    "axios": "^0.19.2",
-        "immutability-helper": "3.0.1",
+    "immutability-helper": "3.0.1",
-        "moment": "^2.24.0",
+    "moment": "^2.24.0",
-        "qrcode.react": "^1.0.1",
+    "qrcode.react": "^0.9.3",
-        "react-datetime": "^3.1.1",
+    "react-datetime": "^2.16.3",
-        "react-uid": "^2.2.0"
+    "react-uid": "^2.2.0"
-    },
+  },
-    "peerDependencies": {
+  "peerDependencies": {
-        "bootstrap": "4.4.1",
+    "bootstrap": "4.4.1",
-        "prop-types": "15.8.1",
+    "prop-types": "15.7.2",
-        "react": "16.9.0",
+    "react": "16.9.0",
-        "react-dom": "16.9.0",
+    "react-dom": "16.9.0",
-        "react-router-dom": "^5.1.2"
+    "react-router-dom": "^5.1.2"
-    },
+  },
-    "devDependencies": {
+  "devDependencies": {
-        "@babel/cli": "^7.12.10",
+    "@babel/cli": "^7.8.4",
-        "@babel/core": "^7.9.0",
+    "@babel/core": "^7.9.0",
-        "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
-        "@babel/preset-env": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
-        "@babel/preset-react": "^7.9.4",
+    "@babel/preset-react": "^7.9.4",
-        "@fortawesome/fontawesome-free": "^5.13.0",
+    "@fortawesome/fontawesome-free": "^5.13.0",
-        "@testing-library/react": "^8.0.9",
+    "@testing-library/react": "^8.0.9",
-        "babel-loader": "^8.1.0",
+    "babel-loader": "^8.1.0",
-        "babel-polyfill": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
-        "bootstrap": "^4.5.0",
+    "bootstrap": "^4.5.0",
-        "css-loader": "^5.2.4",
+    "css-loader": "^3.5.3",
-        "eslint": "^6.8.0",
+    "eslint": "^6.8.0",
-        "eslint-config-prettier": "^6.11.0",
+    "eslint-config-reforis": "^1.0.0",
-        "eslint-config-reforis": "^1.0.0",
+    "file-loader": "^6.0.0",
-        "eslint-plugin-prettier": "^3.1.4",
+    "jest": "^25.2.0",
-        "file-loader": "^6.0.0",
+    "jest-mock-axios": "^3.2.0",
-        "jest": "^25.2.0",
+    "moment-timezone": "^0.5.28",
-        "jest-mock-axios": "^3.2.0",
+    "prop-types": "15.7.2",
-        "moment-timezone": "^0.5.34",
+    "react": "16.9.0",
-        "prettier": "2.0.5",
+    "react-dom": "16.9.0",
-        "prop-types": "15.8.1",
+    "react-router-dom": "^5.1.2",
-        "react": "16.9.0",
+    "react-styleguidist": "^10.6.2",
-        "react-dom": "16.9.0",
+    "snapshot-diff": "^0.7.0",
-        "react-router-dom": "^5.1.2",
+    "style-loader": "^1.2.1",
-        "react-styleguidist": "^11.2.0",
+    "webpack": "^4.43.0"
-        "snapshot-diff": "^0.7.0",
+  },
-        "style-loader": "^1.2.1",
+  "scripts": {
-        "webpack": "^5.68.0"
+    "lint": "eslint src",
-    },
+    "lint:fix": "eslint --fix src",
-    "scripts": {
+    "test": "jest",
-        "lint": "eslint src",
+    "test:watch": "jest --watch",
-        "lint:fix": "eslint --fix src",
+    "test:coverage": "jest --coverage --colors",
-        "test": "jest",
+    "docs": "npx styleguidist build ",
-        "test:watch": "jest --watch",
+    "docs:watch": "styleguidist server"
-        "test:coverage": "jest --coverage --colors",
+  }
-        "docs": "npx styleguidist build ",
-        "docs:watch": "styleguidist server"
-    }
 }

scripts/publish.sh

@@ -6,7 +6,8 @@ then
     exit 1
 else
     cd dist
-    echo "//registry.npmjs.org/:_authToken=$(echo "$NPM_TOKEN")" > .npmrc
+    # Need to replace "_" with "-" as GitLab CI won't accept secret vars with "-"
+    echo "//registry.npmjs.org/:_authToken=$(echo "$NPM_TOKEN" | tr _ -)" > .npmrc
     echo "unsafe-perm = true" >> ~/.npmrc
     if test "$1" = "beta"
     then

src/alertContext/AlertContext.js

@@ -22,12 +22,9 @@ function AlertContextProvider({ children }) {
     const { AlertContext } = window;
     const [alert, setAlert] = useState(null);
 
-    const setAlertWrapper = useCallback(
+    const setAlertWrapper = useCallback((message, type = ALERT_TYPES.DANGER) => {
-        (message, type = ALERT_TYPES.DANGER) => {
+        setAlert({ message, type });
-            setAlert({ message, type });
+    }, [setAlert]);
-        },
-        [setAlert]
-    );
 
     const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
 
@@ -41,7 +38,7 @@ function AlertContextProvider({ children }) {
                 </Portal>
             )}
             <AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
-                {children}
+                { children }
             </AlertContext.Provider>
         </>
     );

src/alertContext/AlertContext.md

@@ -1,5 +1,4 @@
-It provides alert context to children. `AlertContext` allows using `useAlert` in
+It provides alert context to children. `AlertContext` allows using `useAlert` in components.
-components.
 
-Notice that `<div id="alert-container"/>` should be presented in HTML doc to get
+Notice that `<div id="alert-container"/>` should be presented in HTML doc to get it work (In reForis it's already done
-it work (In reForis it's already done with base Jinja2 templates).
+with base Jinja2 templates).

src/alertContext/__tests__/AlertContext.test.js

@@ -6,7 +6,9 @@
  */
 
 import React from "react";
-import { render, getByText, queryByText, fireEvent } from "customTestRender";
+import {
+    render, getByText, queryByText, fireEvent,
+} from "customTestRender";
 
 import { useAlert, AlertContextProvider } from "../AlertContext";
 
@@ -29,7 +31,7 @@ describe("AlertContext", () => {
         const { container } = render(
             <AlertContextProvider>
                 <AlertTest />
-            </AlertContextProvider>
+            </AlertContextProvider>,
         );
         componentContainer = container;
     });

src/api/hooks.js

@@ -1,19 +1,17 @@
 /*
- * 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.
  */
 
-import { useCallback, useEffect, useReducer, useState } from "react";
-
 import {
-    API_ACTIONS,
+    useCallback, useEffect, useReducer, useState,
-    API_METHODS,
+} from "react";
-    API_STATE,
+
-    getErrorPayload,
+import { ForisURLs } from "../utils/forisUrls";
-    HEADERS,
+import {
-    TIMEOUT,
+    API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
 } from "./utils";
 
 const DATA_METHODS = ["POST", "PATCH", "PUT"];
@@ -25,83 +23,76 @@ function createAPIHook(method) {
             data: null,
         });
 
-        const sendRequest = useCallback(
+        const sendRequest = useCallback(async ({ data, suffix } = {}) => {
-            async ({ data, suffix } = {}) => {
+            const headers = { ...HEADERS };
-                const headers = { ...HEADERS };
+            if (contentType) {
-                if (contentType) {
+                headers["Content-Type"] = contentType;
-                    headers["Content-Type"] = contentType;
+            }
+
+            dispatch({ type: API_ACTIONS.INIT });
+            try {
+                // Prepare request
+                const request = API_METHODS[method];
+                const config = {
+                    timeout: TIMEOUT,
+                    headers,
+                };
+                const url = suffix ? `${urlRoot}/${suffix}` : urlRoot;
+
+                // Make request
+                let result;
+                if (DATA_METHODS.includes(method)) {
+                    result = await request(url, data, config);
+                } else {
+                    result = await request(url, config);
                 }
 
-                dispatch({ type: API_ACTIONS.INIT });
+                // Process request result
-                try {
+                dispatch({
-                    // Prepare request
+                    type: API_ACTIONS.SUCCESS,
-                    const request = API_METHODS[method];
+                    payload: result.data,
-                    const config = {
+                });
-                        timeout: TIMEOUT,
+            } catch (error) {
-                        headers,
+                const errorPayload = getErrorPayload(error);
-                    };
+                dispatch({
-                    const url = suffix ? `${urlRoot}/${suffix}` : urlRoot;
+                    type: API_ACTIONS.FAILURE,
-
+                    status: error.response && error.response.status,
-                    // Make request
+                    payload: errorPayload,
-                    let result;
+                });
-                    if (DATA_METHODS.includes(method)) {
+            }
-                        result = await request(url, data, config);
+        }, [urlRoot, contentType]);
-                    } else {
-                        result = await request(url, config);
-                    }
-
-                    // Process request result
-                    dispatch({
-                        type: API_ACTIONS.SUCCESS,
-                        payload: result.data,
-                    });
-                } catch (error) {
-                    const errorPayload = getErrorPayload(error);
-                    dispatch({
-                        type: API_ACTIONS.FAILURE,
-                        status: error.response && error.response.status,
-                        payload: errorPayload,
-                    });
-                }
-            },
-            [urlRoot, contentType]
-        );
         return [state, sendRequest];
     };
 }
 
 function APIReducer(state, action) {
     switch (action.type) {
-        case API_ACTIONS.INIT:
+    case API_ACTIONS.INIT:
-            return {
+        return {
-                ...state,
+            ...state,
-                state: API_STATE.SENDING,
+            state: API_STATE.SENDING,
-            };
+        };
-        case API_ACTIONS.SUCCESS:
+    case API_ACTIONS.SUCCESS:
-            return {
+        return {
-                state: API_STATE.SUCCESS,
+            state: API_STATE.SUCCESS,
-                data: action.payload,
+            data: action.payload,
-            };
+        };
-        case API_ACTIONS.FAILURE:
+    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.
+        // Not an API error - should be rethrown.
-            if (
+        if (action.payload && action.payload.stack && action.payload.message) {
-                action.payload &&
+            throw (action.payload);
-                action.payload.stack &&
+        }
-                action.payload.message
-            ) {
-                throw action.payload;
-            }
 
-            return {
+        return {
-                state: API_STATE.ERROR,
+            state: API_STATE.ERROR,
-                data: action.payload,
+            data: action.payload,
-            };
+        };
-        default:
+    default:
-            throw new Error();
+        throw new Error();
     }
 }
 
@@ -111,10 +102,11 @@ const useAPIPatch = createAPIHook("PATCH");
 const useAPIPut = createAPIHook("PUT");
 const useAPIDelete = createAPIHook("DELETE");
 
-export { useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete };
+export {
+    useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete,
+};
 
-export function useAPIPolling(endpoint, delay = 1000, until) {
+export function useAPIPolling(endpoint, delay = 1000, until) { // delay ms
-    // delay ms
     const [state, setState] = useState({ state: API_STATE.INIT });
     const [getResponse, get] = useAPIGet(endpoint);
 

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;
@@ -44,10 +43,8 @@ function getCookie(name) {
         for (let i = 0; i < cookies.length; i++) {
             const cookie = cookies[i].trim();
             // Does this cookie string begin with the name we want?
-            if (cookie.substring(0, name.length + 1) === `${name}=`) {
+            if (cookie.substring(0, name.length + 1) === (`${name}=`)) {
-                cookieValue = decodeURIComponent(
+                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    cookie.substring(name.length + 1)
-                );
                 break;
             }
         }
@@ -57,7 +54,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/Alert.js

@@ -35,20 +35,12 @@ Alert.defaultProps = {
     type: ALERT_TYPES.DANGER,
 };
 
-export function Alert({ type, onDismiss, children }) {
+export function Alert({
+    type, onDismiss, children,
+}) {
     return (
-        <div
+        <div className={`alert alert-dismissible alert-${type}`}>
-            className={`alert ${
+            {onDismiss ? <button type="button" className="close" onClick={onDismiss}>&times;</button> : false}
-                onDismiss ? "alert-dismissible" : ""
-            } alert-${type}`}
-        >
-            {onDismiss ? (
-                <button type="button" className="close" onClick={onDismiss}>
-                    &times;
-                </button>
-            ) : (
-                false
-            )}
             {children}
         </div>
     );

src/bootstrap/Alert.md

@@ -1,21 +1,21 @@
 Bootstrap alert component.
 
 ```jsx
-import { useState } from "react";
+import {useState} from 'react';
 
-function AlertExample() {
+function AlertExample(){
     const [alert, setAlert] = useState(true);
     if (alert)
-        return (
+        return <Alert 
-            <Alert type="warning" onDismiss={() => setAlert(false)}>
+            type='warning' 
-                Some warning out there!
+            onDismiss={()=>setAlert(false)}
-            </Alert>
+        >
-        );
+            Some warning out there!        
-    return (
+        </Alert>;
-        <button className="btn btn-secondary" onClick={() => setAlert(true)}>
+    return <button 
-            Show alert again
+        className='btn btn-secondary' 
-        </button>
+        onClick={()=>setAlert(true)}
-    );
+    >Show alert again</button>;
-}
+};
-<AlertExample />;
+<AlertExample/>
 ```

src/bootstrap/Button.js

@@ -25,29 +25,22 @@ Button.propTypes = {
 };
 
 export function Button({
-    className,
+    className, loading, forisFormSize, children, ...props
-    loading,
-    forisFormSize,
-    children,
-    ...props
 }) {
     let buttonClass = className ? `btn ${className}` : "btn btn-primary ";
     if (forisFormSize) {
-        buttonClass = `${buttonClass} col-sm-12 col-md-3 col-lg-2`;
+        buttonClass = `${buttonClass} col-sm-12 col-lg-3`;
     }
 
-    const span = loading ? (
+    const span = loading
-        <span
+        ? <span className="spinner-border spinner-border-sm" role="status" aria-hidden="true" /> : null;
-            className="spinner-border spinner-border-sm"
-            role="status"
-            aria-hidden="true"
-        />
-    ) : null;
 
     return (
         <button type="button" className={buttonClass} {...props}>
             {span}
+            {" "}
             {span ? " " : null}
+            {" "}
             {children}
         </button>
     );

src/bootstrap/Button.md

@@ -11,7 +11,5 @@ Can be used without parameters:
 Using loading spinner:
 
 ```jsx
-<Button loading disabled>
+<Button loading disabled>Loading...</Button>
-    Loading...
-</Button>
 ```

src/bootstrap/CheckBox.js

@@ -22,7 +22,9 @@ CheckBox.defaultProps = {
     disabled: false,
 };
 
-export function CheckBox({ label, helpText, disabled, ...props }) {
+export function CheckBox({
+    label, helpText, disabled, ...props
+}) {
     const uid = useUID();
     return (
         <div className="form-group">
@@ -32,15 +34,12 @@ export function CheckBox({ label, helpText, disabled, ...props }) {
                     type="checkbox"
                     id={uid}
                     disabled={disabled}
+
                     {...props}
                 />
                 <label className="custom-control-label" htmlFor={uid}>
                     {label}
-                    {helpText && (
+                    {helpText && <small className="form-text text-muted">{helpText}</small>}
-                        <small className="form-text text-muted">
-                            {helpText}
-                        </small>
-                    )}
                 </label>
             </div>
         </div>

src/bootstrap/Checkbox.md

@@ -1,17 +1,16 @@
-Checkbox with label Bootstrap component with predefined sizes and structure for
+Checkbox with label Bootstrap component with predefined sizes and structure for using in foris forms.
-using in foris forms.
+
+All additional `props` are passed to the `<input type="checkbox">` HTML component.
 
-All additional `props` are passed to the `<input type="checkbox">` HTML
-component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
 const [value, setValue] = useState(false);
 
 <CheckBox
     value={value}
     label="Some label" 
     helpText="Read the small text!"
-    onChange={(event) => setValue(event.target.value)}
+    onChange={event =>setValue(event.target.value)}
-/>;
+/>
 ```

src/bootstrap/CopyInput.js

@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-
-import React, { useState, useRef } from "react";
-import PropTypes from "prop-types";
-import { Input } from "./Input";
-
-CopyInput.propTypes = {
-    /** Field label. */
-    label: PropTypes.string.isRequired,
-    /** Field value. */
-    value: PropTypes.string,
-    /** Help text message. */
-    helpText: PropTypes.string,
-    /** Disable input field */
-    disabled: PropTypes.bool,
-    /** Readonly input field */
-    readOnly: PropTypes.bool,
-};
-
-export function CopyInput({ value, ...props }) {
-    const inputTextRef = useRef();
-    const [isCopied, setIsCopied] = useState(false);
-
-    const handleCopyClick = async () => {
-        // Clipboard API works only in a secure (HTTPS) context.
-        if (navigator.clipboard) {
-            await navigator.clipboard.writeText(value);
-        } else {
-            // Fallback to the "classic" copy to clipboard implementation.
-            inputTextRef.current.focus();
-            inputTextRef.current.select();
-            document.execCommand("copy");
-            inputTextRef.current.blur();
-        }
-
-        setIsCopied(true);
-        setTimeout(() => {
-            setIsCopied(false);
-        }, 1500);
-    };
-
-    return (
-        <Input type="text" value={value} ref={inputTextRef} {...props}>
-            <div className="input-group-append">
-                <button
-                    className="btn btn-outline-secondary"
-                    type="button"
-                    onClick={handleCopyClick}
-                >
-                    <span>{isCopied ? _("Copied!") : _("Copy")}</span>
-                </button>
-            </div>
-        </Input>
-    );
-}

src/bootstrap/CopyInput.md

@@ -1,17 +0,0 @@
-CopyInput Bootstrap component contains input with a label, predefined sizes, and
-structure for use in ForisForm and the "Copy" button (copy to clipboard). It can
-be used with `readOnly` and `disabled` parameters, please see an example.
-
-All additional `props` are passed to the `<input type="text">` HTML component.
-
-```js
-import React, { useState } from "react";
-const [value, setValue] = useState("Text to appear in clipboard.");
-
-<CopyInput
-    label="Copy me"
-    value={value}
-    helpText="Read the small text!"
-    readOnly
-/>;
-```

src/bootstrap/DataTimeInput.js

@@ -7,7 +7,7 @@
 
 import React from "react";
 import PropTypes from "prop-types";
-import Datetime from "react-datetime";
+import Datetime from "react-datetime/DateTime";
 import moment from "moment/moment";
 import "react-datetime/css/react-datetime.css";
 import "./DataTimeInput.css";
@@ -38,17 +38,14 @@ const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
 const DEFAULT_TIME_FORMAT = "HH:mm:ss";
 
 export function DataTimeInput({
-    value,
+    value, onChange, isValidDate, dateFormat, timeFormat, children, ...props
-    onChange,
-    isValidDate,
-    dateFormat,
-    timeFormat,
-    children,
-    ...props
 }) {
     function renderInput(datetimeProps) {
         return (
-            <Input {...props} {...datetimeProps}>
+            <Input
+                {...props}
+                {...datetimeProps}
+            >
                 {children}
             </Input>
         );
@@ -57,12 +54,8 @@ export function DataTimeInput({
     return (
         <Datetime
             locale={ForisTranslations.locale}
-            dateFormat={
+            dateFormat={dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT}
-                dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT
+            timeFormat={timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT}
-            }
-            timeFormat={
-                timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT
-            }
             value={value}
             onChange={onChange}
             isValidDate={isValidDate}

src/bootstrap/DataTimeInput.md

@@ -1,26 +1,25 @@
-Adopted from `react-datetime/DateTime` datatime picker component. It uses
+Adopted from `react-datetime/DateTime` datatime picker component.
-`momentjs` see example.
+It uses `momentjs` see example.
 
-It requires `ForisTranslations.locale` to be defined in order to use right
+It requires `ForisTranslations.locale` to be defined in order to use right locale.
-locale.
 
 ```js
-ForisTranslations = { locale: "en" };
+ForisTranslations={locale:'en'};
 
-import { useState, useEffect } from "react";
+import {useState, useEffect} from 'react';
-import moment from "moment/moment";
+import moment from 'moment/moment';
 
 const [dataTime, setDataTime] = useState(moment());
 const [error, setError] = useState();
-useEffect(() => {
+useEffect(()=>{
-    dataTime.isValid() ? setError(null) : setError("Invalid value!");
+   dataTime.isValid() ? setError(null) : setError('Invalid value!');
-}, [dataTime]);
+},[dataTime]);
  
 <DataTimeInput
-    label="Time to sleep"
+    label='Time to sleep'
     value={dataTime}
     error={error}
-    helpText="Example helptext..."
+    helpText='Example helptext...'
-    onChange={(value) => setDataTime(value)}
+    onChange={value => setDataTime(value)}
-/>;
+/>
 ```

src/bootstrap/DownloadButton.js

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

src/bootstrap/DownloadButton.md

@@ -1,9 +1,6 @@
 Hyperlink with apperance of a button.
 
-It has `download` attribute, which prevents closing WebSocket connection on
+It has `download` attribute, which prevents closing WebSocket connection on Firefox. See [related issue](https://bugzilla.mozilla.org/show_bug.cgi?id=858538) for more details.
-Firefox. See
-[related issue](https://bugzilla.mozilla.org/show_bug.cgi?id=858538) for more
-details.
 
 ```js
 <DownloadButton href="example.zip">Download</DownloadButton>

src/bootstrap/EmailInput.md

@@ -1,19 +1,18 @@
-Bootstrap component of email input with label with predefined sizes and
+Bootstrap component of email input with label with predefined sizes and structure for using in foris forms.
-structure for using in foris forms. It use built-in browser email address
+It use built-in browser email address checking. It's only meaningful using inside `<form>`.
-checking. It's only meaningful using inside `<form>`.
 
 All additional `props` are passed to the `<input type="email">` HTML component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
-const [email, setEmail] = useState("Wrong email");
+const [email, setEmail] = useState('Wrong email');
-<form onSubmit={(e) => e.preventDefault()}>
+<form onSubmit={e=>e.preventDefault()}>
     <EmailInput
         value={email}
         label="Some label" 
         helpText="Read the small text!"
-        onChange={(event) => setEmail(event.target.value)}
+        onChange={event =>setEmail(event.target.value)}
     />
     <button type="submit">Try to submit</button>
-</form>;
+</form>
 ```

src/bootstrap/FileInput.md

@@ -1,10 +1,9 @@
-Bootstrap component for file input. Includes label and has predefined sizes and
+Bootstrap component for file input. Includes label and has predefined sizes and structure for using in foris forms. 
-structure for using in foris forms.
 
 All additional `props` are passed to the `<input type="file">` HTML component.
 
 ```js
-import { useState } from "react";
+import { useState } from 'react';
 
 const [files, setFiles] = useState([]);
 
@@ -16,33 +15,27 @@ const label = files.length === 1 ? files[0].name : "Choose file";
         files={files}
         label={label}
         helpText="Will be uploaded"
-        onChange={(event) => setFiles(event.target.files)}
+        onChange={event=>setFiles(event.target.files)}
     />
-</form>;
+</form>
 ```
 
 ### FileInput with multiple files
-
 ```js
-import { useState } from "react";
+import { useState } from 'react';
 
 const [files, setFiles] = useState([]);
 
 // Note that files is not an array but FileList.
-const label =
+const label = files.length > 0 ? Array.from(files).map(file=>file.name).join(", ") : "Choose files";
-    files.length > 0
-        ? Array.from(files)
-              .map((file) => file.name)
-              .join(", ")
-        : "Choose files";
 
 <form className="col">
     <FileInput
         files={files}
         label={label}
         helpText="Will be uploaded"
-        onChange={(event) => setFiles(event.target.files)}
+        onChange={event=>setFiles(event.target.files)}
         multiple
     />
-</form>;
+</form>
 ```

src/bootstrap/Input.js

@@ -1,60 +1,14 @@
 /*
- * 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 React, { forwardRef } from "react";
+import React from "react";
 import { useUID } from "react-uid";
 import PropTypes from "prop-types";
 
-/** Base bootstrap input component. */
-export const Input = forwardRef(
-    (
-        {
-            type,
-            label,
-            helpText,
-            error,
-            className,
-            children,
-            labelClassName,
-            groupClassName,
-            ...props
-        },
-        ref
-    ) => {
-        const uid = useUID();
-
-        const inputClassName = `form-control ${className || ""} ${
-            error ? "is-invalid" : ""
-        }`.trim();
-
-        return (
-            <div className="form-group">
-                <label className={labelClassName} htmlFor={uid}>
-                    {label}
-                </label>
-                <div className={`input-group ${groupClassName || ""}`.trim()}>
-                    <input
-                        className={inputClassName}
-                        type={type}
-                        id={uid}
-                        ref={ref}
-                        {...props}
-                    />
-                    {children}
-                </div>
-                {error ? <div className="invalid-feedback">{error}</div> : null}
-                {helpText ? (
-                    <small className="form-text text-muted">{helpText}</small>
-                ) : null}
-            </div>
-        );
-    }
-);
-
 Input.propTypes = {
     type: PropTypes.string.isRequired,
     label: PropTypes.string.isRequired,
@@ -68,3 +22,28 @@ Input.propTypes = {
     labelClassName: PropTypes.string,
     groupClassName: PropTypes.string,
 };
+
+/** Base bootstrap input component. */
+export function Input({
+    type, label, helpText, error, className, children, labelClassName, groupClassName, ...props
+}) {
+    const uid = useUID();
+    const inputClassName = `form-control ${className || ""} ${(error ? "is-invalid" : "")}`.trim();
+    return (
+        <div className="form-group">
+            <label className={labelClassName} htmlFor={uid}>{label}</label>
+            <div className={`input-group ${groupClassName || ""}`.trim()}>
+                <input
+                    className={inputClassName}
+                    type={type}
+                    id={uid}
+
+                    {...props}
+                />
+                {children}
+            </div>
+            {error ? <div className="invalid-feedback">{error}</div> : null}
+            {helpText ? <small className="form-text text-muted">{helpText}</small> : null}
+        </div>
+    );
+}

src/bootstrap/Modal.css

@@ -10,6 +10,6 @@
 .modal.show {
     display: block;
     animation-name: modalFade;
-    animation-duration: 0.3s;
+    animation-duration: .3s;
     background: rgba(0, 0, 0, 0.2);
 }

src/bootstrap/Modal.js

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020 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.
  */
 
-import React, { useRef, useEffect } from "react";
+import React, { useRef } from "react";
 import PropTypes from "prop-types";
 
 import { Portal } from "../utils/Portal";
@@ -18,7 +18,6 @@ Modal.propTypes = {
     /** Callback to manage modal visibility */
     setShown: PropTypes.func.isRequired,
     scrollable: PropTypes.bool,
-    size: PropTypes.string,
 
     /** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */
     children: PropTypes.oneOfType([
@@ -27,54 +26,24 @@ Modal.propTypes = {
     ]).isRequired,
 };
 
-export function Modal({ shown, setShown, scrollable, size, children }) {
+export function Modal({
+    shown, setShown, scrollable, children,
+}) {
     const dialogRef = useRef();
-    let modalSize = "modal-";
 
     useClickOutside(dialogRef, () => setShown(false));
 
-    useEffect(() => {
-        const handleEsc = (event) => {
-            if (event.keyCode === 27) {
-                setShown(false);
-            }
-        };
-        window.addEventListener("keydown", handleEsc);
-
-        return () => {
-            window.removeEventListener("keydown", handleEsc);
-        };
-    }, [setShown]);
-
-    switch (size) {
-        case "sm":
-            modalSize += "sm";
-            break;
-        case "lg":
-            modalSize += "lg";
-            break;
-        case "xl":
-            modalSize += "xl";
-            break;
-        default:
-            modalSize = "";
-            break;
-    }
-
     return (
         <Portal containerId="modal-container">
-            <div
+            <div className={`modal fade ${shown ? "show" : ""}`} role="dialog">
-                className={`modal fade ${shown ? "show" : ""}`.trim()}
-                role="dialog"
-            >
                 <div
                     ref={dialogRef}
-                    className={`${modalSize.trim()} modal-dialog modal-dialog-centered ${
+                    className={`modal-dialog modal-dialog-centered${scrollable ? " modal-dialog-scrollable" : ""}`}
-                        scrollable ? "modal-dialog-scrollable" : ""
-                    }`.trim()}
                     role="document"
                 >
-                    <div className="modal-content">{children}</div>
+                    <div className="modal-content">
+                        {children}
+                    </div>
                 </div>
             </div>
         </Portal>
@@ -90,11 +59,7 @@ export function ModalHeader({ setShown, title }) {
     return (
         <div className="modal-header">
             <h5 className="modal-title">{title}</h5>
-            <button
+            <button type="button" className="close" onClick={() => setShown(false)}>
-                type="button"
-                className="close"
-                onClick={() => setShown(false)}
-            >
                 <span aria-hidden="true">&times;</span>
             </button>
         </div>
@@ -120,5 +85,9 @@ ModalFooter.propTypes = {
 };
 
 export function ModalFooter({ children }) {
-    return <div className="modal-footer">{children}</div>;
+    return (
+        <div className="modal-footer">
+            {children}
+        </div>
+    );
 }

src/bootstrap/Modal.md

@@ -1,47 +1,31 @@
 Bootstrap modal component.
 
-It's required to have an element `<div id={"modal-container"}/>` somewhere on
+it's required to have an element `<div id={"modal-container"}/>` somewhere on the page since modals are rendered in portals.
-the page since modals are rendered in portals.
-
-Modals also have three optional sizes, which can be defined through the `size`
-prop:
-
--   small - `sm`
--   large - `lg`
--   extra-large - `xl`
-
-For more details please visit Bootstrap
-<a href="https://getbootstrap.com/docs/4.5/components/modal/#optional-sizes" target="_blank">
-documentation</a>.
 
 ```js
-<div id="modal-container" />
+    <div id="modal-container"/>
 ```
 
 ```js
-import { ModalHeader, ModalBody, ModalFooter } from "./Modal";
+import {ModalHeader, ModalBody, ModalFooter} from './Modal';
 
-import { useState } from "react";
+import {useState} from 'react';
 const [shown, setShown] = useState(false);
 
 <>
-    <Modal setShown={setShown} shown={shown} size="sm">
+    <Modal setShown={setShown} shown={shown}>
-        <ModalHeader setShown={setShown} title="Warning!" />
+        <ModalHeader setShown={setShown} title='Warning!'/>
-        <ModalBody>
+        <ModalBody><p>Bla bla bla...</p></ModalBody>
-            <p>Bla bla bla...</p>
-        </ModalBody>
         <ModalFooter>
             <button 
-                className="btn btn-secondary"
+                className='btn btn-secondary' 
                 onClick={() => setShown(false)}
-            >
+            >Skip it</button>
-                Skip it
-            </button>
         </ModalFooter>
     </Modal>
     
-    <button className="btn btn-secondary" onClick={() => setShown(true)}>
+    <button className='btn btn-secondary' onClick={()=>setShown(true)}>
         Show modal
     </button>
-</>;
+</>
 ```

src/bootstrap/NumberInput.css

@@ -4,7 +4,7 @@ input[type="number"] {
     appearance: textfield;
 }
 
-input[type="number"]::-webkit-inner-spin-button,
+input[type=number]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
+input[type=number]::-webkit-outer-spin-button {
     -webkit-appearance: none;
 }

src/bootstrap/NumberInput.js

@@ -20,7 +20,10 @@ NumberInput.propTypes = {
     /** Help text message. */
     helpText: PropTypes.string,
     /** Number value. */
-    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    value: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+    ]),
     /** Function called when value changes. */
     onChange: PropTypes.func.isRequired,
     /** Additional description dispaled to the right of input value. */
@@ -31,21 +34,15 @@ NumberInput.defaultProps = {
     value: 0,
 };
 
-export function NumberInput({ onChange, inlineText, value, ...props }) {
+export function NumberInput({
+    onChange, inlineText, value, ...props
+}) {
     function updateValue(initialValue, difference) {
         onChange({ target: { value: initialValue + difference } });
     }
 
-    const enableIncrease = useConditionalTimeout(
+    const enableIncrease = useConditionalTimeout({ callback: updateValue }, value, 1);
-        { callback: updateValue },
+    const enableDecrease = useConditionalTimeout({ callback: updateValue }, value, -1);
-        value,
-        1
-    );
-    const enableDecrease = useConditionalTimeout(
-        { callback: updateValue },
-        value,
-        -1
-    );
 
     return (
         <Input type="number" onChange={onChange} value={value} {...props}>

src/bootstrap/NumberInput.md

@@ -1,18 +1,17 @@
-Bootstrap component of number input with label with predefined sizes and
+Bootstrap component of number input with label with predefined sizes and structure for using in foris forms.
-structure for using in foris forms.
 
 All additional `props` are passed to the `<input type="number">` HTML component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
 const [value, setValue] = useState(42);
 
 <NumberInput
     value={value}
     label="Some number" 
     helpText="Read the small text!"
-    min="33"
+    min='33'
-    max="54"
+    max='54'
-    onChange={(event) => setValue(event.target.value)}
+    onChange={event =>setValue(event.target.value)}
-/>;
+/>
 ```

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,37 +21,32 @@ 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 ? (
+            {withEye
-                <div className="input-group-append">
+                ? (
-                    <button
+                    <div className="input-group-append">
-                        type="button"
+                        <button
-                        className="input-group-text"
+                            type="button"
-                        onClick={(e) => {
+                            className="input-group-text"
-                            e.preventDefault();
+                            onClick={(e) => {
-                            setHidden((shouldBeHidden) => !shouldBeHidden);
+                                e.preventDefault();
-                        }}
+                                setHidden((shouldBeHidden) => !shouldBeHidden);
-                    >
+                            }}
-                        <i
+                        >
-                            className={`fa ${
+                            <i className={`fa ${isHidden ? "fa-eye" : "fa-eye-slash"}`} />
-                                isHidden ? "fa-eye" : "fa-eye-slash"
+                        </button>
-                            }`}
+                    </div>
-                        />
+                )
-                    </button>
+                : null}
-                </div>
-            ) : null}
         </Input>
     );
 }

src/bootstrap/PasswordInput.md

@@ -1,18 +1,17 @@
-Password Bootstrap component input with label and predefined sizes and structure
+Password Bootstrap component input with label and predefined sizes and structure for using in foris forms.
-for using in foris forms. Can be used with "eye" button, see example.
+Can be used with "eye" button, see example.
 
-All additional `props` are passed to the `<input type="password">` HTML
+All additional `props` are passed to the `<input type="password">` HTML component.
-component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
-const [value, setValue] = useState("secret");
+const [value, setValue] = useState('secret');
 
 <PasswordInput
     withEye
     value={value}
     label="Some password" 
     helpText="Read the small text!"
-    onChange={(event) => setValue(event.target.value)}
+    onChange={event =>setValue(event.target.value)}
-/>;
+/>
 ```

src/bootstrap/RadioSet.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 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.
@@ -15,35 +15,25 @@ RadioSet.propTypes = {
     /** RadioSet label . */
     label: PropTypes.string,
     /** Choices . */
-    choices: PropTypes.arrayOf(
+    choices: PropTypes.arrayOf(PropTypes.shape({
-        PropTypes.shape({
+        /** Choice lable . */
-            /** Choice lable . */
+        label: PropTypes.oneOfType([
-            label: PropTypes.oneOfType([
+            PropTypes.string,
-                PropTypes.string,
+            PropTypes.element,
-                PropTypes.element,
+            PropTypes.node,
-                PropTypes.node,
+            PropTypes.arrayOf(PropTypes.node),
-                PropTypes.arrayOf(PropTypes.node),
+        ]).isRequired,
-            ]).isRequired,
+        /** Choice value . */
-            /** Choice value . */
+        value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-            value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+    })).isRequired,
-                .isRequired,
-        })
-    ).isRequired,
     /** Initial value . */
     value: PropTypes.string,
     /** Help text message . */
     helpText: PropTypes.string,
-    inline: PropTypes.bool,
 };
 
 export function RadioSet({
-    name,
+    name, label, choices, value, helpText, ...props
-    label,
-    choices,
-    value,
-    helpText,
-    inline,
-    ...props
 }) {
     const uid = useUID();
     const radios = choices.map((choice, key) => {
@@ -57,7 +47,7 @@ export function RadioSet({
                 value={choice.value}
                 helpText={choice.helpText}
                 checked={choice.value === value}
-                inline={inline}
+
                 {...props}
             />
         );
@@ -65,15 +55,9 @@ export function RadioSet({
 
     return (
         <div className="form-group">
-            {label && (
+            {label && <label htmlFor={uid} className="d-block">{label}</label>}
-                <label htmlFor={uid} className="d-block">
-                    {label}
-                </label>
-            )}
             {radios}
-            {helpText && (
+            {helpText && <small className="form-text text-muted">{helpText}</small>}
-                <small className="form-text text-muted">{helpText}</small>
-            )}
         </div>
     );
 }
@@ -86,32 +70,24 @@ Radio.propTypes = {
         PropTypes.arrayOf(PropTypes.node),
     ]).isRequired,
     id: PropTypes.string.isRequired,
-    inline: PropTypes.bool,
     helpText: PropTypes.string,
 };
 
-export function Radio({ label, id, helpText, inline, ...props }) {
+export function Radio({
+    label, id, helpText, ...props
+}) {
     return (
         <>
-            <div
+            <div className={`custom-control custom-radio ${!helpText ? "custom-control-inline" : ""}`.trim()}>
-                className={`custom-control custom-radio ${
-                    inline ? "custom-control-inline" : ""
-                }`.trim()}
-            >
                 <input
                     id={id}
                     className="custom-control-input"
                     type="radio"
+
                     {...props}
                 />
-                <label className="custom-control-label" htmlFor={id}>
+                <label className="custom-control-label" htmlFor={id}>{label}</label>
-                    {label}
+                {helpText && <small className="form-text text-muted mt-0 mb-3">{helpText}</small>}
-                </label>
-                {helpText && (
-                    <small className="form-text text-muted mt-0 mb-3">
-                        {helpText}
-                    </small>
-                )}
             </div>
         </>
     );

src/bootstrap/RadioSet.md

@@ -1,16 +1,15 @@
-Set of radio Bootstrap component input with label and predefined sizes and
+Set of radio Bootstrap component input with label and predefined sizes and structure for using in foris forms.
-structure for using in foris forms.
 
 All additional `props` are passed to the `<input type="number">` HTML component.
 
 Unless `helpText` is set for one of the options they are displayed inline.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
-const CHOICES = [
+const CHOICES=[
-    { value: "one", label: "1" },
+    {value:'one',label:'1'},
-    { value: "two", label: "2" },
+    {value:'two',label:'2'},
-    { value: "three", label: "3" },
+    {value:'three',label:'3'},
 ];
 const [value, setValue] = useState(CHOICES[0].value);
 
@@ -18,10 +17,10 @@ const [value, setValue] = useState(CHOICES[0].value);
     {/*Yeah, it gets event, not value!*/}
     <RadioSet
         value={value}
-        name="some-radio"
+        name='some-radio'
         choices={CHOICES}
-        onChange={(event) => setValue(event.target.value)}
+        onChange={event =>setValue(event.target.value)}
     />
     <p>Selected value: {value}</p>
-</>;
+</>
 ```

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 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.
@@ -15,29 +15,35 @@ Select.propTypes = {
     /** Choices if form of {value : "Label",...}. */
     choices: PropTypes.object.isRequired,
     /** Current value. */
-    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+    value: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+    ]).isRequired,
     /** Help text message. */
     helpText: PropTypes.string,
 };
 
-export function Select({ label, choices, helpText, ...props }) {
+export function Select({
+    label, choices, helpText, ...props
+}) {
     const uid = useUID();
 
-    const options = Object.keys(choices).map((choice) => (
+    const options = Object.keys(choices).sort(
-        <option key={choice} value={choice}>
+        (a, b) => a - b || a.toString().localeCompare(b.toString()),
-            {choices[choice]}
+    ).map(
-        </option>
+        (key) => <option key={key} value={key}>{choices[key]}</option>,
-    ));
+    );
-
     return (
         <div className="form-group">
             <label htmlFor={uid}>{label}</label>
-            <select className="custom-select" id={uid} {...props}>
+            <select
+                className="custom-select"
+                id={uid}
+                {...props}
+            >
                 {options}
             </select>
-            {helpText ? (
+            {helpText ? <small className="form-text text-muted">{helpText}</small> : null}
-                <small className="form-text text-muted">{helpText}</small>
-            ) : null}
         </div>
     );
 }

src/bootstrap/Select.md

@@ -1,14 +1,13 @@
-Select with options Bootstrap component input with label and predefined sizes
+Select with options Bootstrap component input with label and predefined sizes and structure for using in foris forms.
-and structure for using in foris forms.
 
 All additional `props` are passed to the `<select>` HTML component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
-const CHOICES = {
+const CHOICES={
-    apple: "Apple",
+    apple:'Apple',
-    banana: "Banana",
+    banana:'Banana',
-    peach: "Peach",
+    peach:'Peach',
 };
 const [value, setValue] = useState(Object.keys(CHOICES)[0]);
 
@@ -18,9 +17,9 @@ const [value, setValue] = useState(Object.keys(CHOICES)[0]);
         label="Fruit"
         value={value}
         choices={CHOICES}
-        onChange={(event) => setValue(event.target.value)}
+        onChange={event=>setValue(event.target.value)}
     />
     <p>Selected choice label: {CHOICES[value]}</p>
     <p>Selected choice value: {value}</p>
-</>;
+</>
 ```

src/bootstrap/Spinner.css

@@ -5,7 +5,7 @@
 }
 
 .spinner-fs-background {
-    background-color: rgba(2, 2, 2, 0.5);
+    background-color: rgba(2, 2, 2, .5);
     color: rgb(230, 230, 230);
     position: fixed;
     width: 100%;

src/bootstrap/Spinner.js

@@ -25,12 +25,12 @@ Spinner.defaultProps = {
     fullScreen: false,
 };
 
-export function Spinner({ fullScreen, children, className }) {
+export function Spinner({
+    fullScreen, children, className,
+}) {
     if (!fullScreen) {
         return (
-            <div
+            <div className={`spinner-wrapper ${className || "my-3 text-center"}`}>
-                className={`spinner-wrapper ${className || "my-3 text-center"}`}
-            >
                 <SpinnerElement>{children}</SpinnerElement>
             </div>
         );
@@ -61,9 +61,7 @@ export function SpinnerElement({ small, className, children }) {
     return (
         <>
             <div
-                className={`spinner-border ${
+                className={`spinner-border ${small ? "spinner-border-sm" : ""} ${className || ""}`.trim()}
-                    small ? "spinner-border-sm" : ""
-                } ${className || ""}`.trim()}
                 role="status"
             >
                 <span className="sr-only" />

src/bootstrap/Switch.js

@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-
-import React from "react";
-import PropTypes from "prop-types";
-import { useUID } from "react-uid";
-
-Switch.propTypes = {
-    label: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.element,
-        PropTypes.node,
-        PropTypes.arrayOf(PropTypes.node),
-    ]).isRequired,
-    helpText: PropTypes.string,
-    switchHeading: PropTypes.bool,
-};
-
-export function Switch({ label, helpText, switchHeading, ...props }) {
-    const uid = useUID();
-    return (
-        <div className={`form-group ${switchHeading ? "switch" : ""}`.trim()}>
-            <div
-                className={`custom-control custom-switch ${
-                    !helpText ? "custom-control-inline" : ""
-                } ${switchHeading ? "switch-heading" : ""}`.trim()}
-            >
-                <input
-                    type="checkbox"
-                    className="custom-control-input"
-                    id={uid}
-                    {...props}
-                />
-                <label className="custom-control-label" htmlFor={uid}>
-                    {label}
-                </label>
-                {helpText && (
-                    <small className="form-text text-muted mt-0 mb-3">
-                        {helpText}
-                    </small>
-                )}
-            </div>
-        </div>
-    );
-}

src/bootstrap/Switch.md

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

src/bootstrap/TextInput.md

@@ -1,16 +1,15 @@
-Text Bootstrap component input with label and predefined sizes and structure for
+Text Bootstrap component input with label and predefined sizes and structure for using in foris forms.
-using in foris forms.
 
 All additional `props` are passed to the `<input type="text">` HTML component.
 
 ```js
-import { useState } from "react";
+import {useState} from 'react';
-const [value, setValue] = useState("Bla bla");
+const [value, setValue] = useState('Bla bla');
 
 <TextInput
     value={value}
     label="Some text" 
     helpText="Read the small text!"
-    onChange={(event) => setValue(event.target.value)}
+    onChange={event =>setValue(event.target.value)}
-/>;
+/>
 ```

src/bootstrap/__tests__/Button.test.js

@@ -14,18 +14,19 @@ import { Button } from "../Button";
 describe("<Button />", () => {
     it("Render button correctly", () => {
         const { container } = render(<Button>Test Button</Button>);
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 
     it("Render button with custom classes", () => {
-        const { container } = render(
+        const { container } = render(<Button className="one two three">Test Button</Button>);
-            <Button className="one two three">Test Button</Button>
+        expect(container.firstChild)
-        );
+            .toMatchSnapshot();
-        expect(container.firstChild).toMatchSnapshot();
     });
 
     it("Render button with spinner", () => {
         const { container } = render(<Button loading>Test Button</Button>);
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 });

src/bootstrap/__tests__/CheckBox.test.js

@@ -18,16 +18,22 @@ describe("<Checkbox/>", () => {
                 label="Test label"
                 checked
                 helpText="Some help text"
-                onChange={() => {}}
+                onChange={() => {
-            />
+                }}
+            />,
         );
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 
     it("Render uncheked checkbox", () => {
         const { container } = render(
-            <CheckBox label="Test label" helpText="Some help text" />
+            <CheckBox
+                label="Test label"
+                helpText="Some help text"
+            />,
         );
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 });

src/bootstrap/__tests__/DownloadButton.test.js

@@ -13,11 +13,7 @@ import { DownloadButton } from "../DownloadButton";
 
 describe("<DownloadButton />", () => {
     it("should have download attribute", () => {
-        const { container } = render(
+        const { container } = render(<DownloadButton href="http://example.com">Test Button</DownloadButton>);
-            <DownloadButton href="http://example.com">
-                Test Button
-            </DownloadButton>
-        );
         expect(container.firstChild.getAttribute("download")).not.toBeNull();
     });
 });

src/bootstrap/__tests__/NumberInput.test.js

@@ -7,7 +7,9 @@
 
 import React from "react";
 
-import { render, fireEvent, getByLabelText, wait } from "customTestRender";
+import {
+    render, fireEvent, getByLabelText, wait,
+} from "customTestRender";
 
 import { NumberInput } from "../NumberInput";
 
@@ -22,7 +24,7 @@ describe("<NumberInput/>", () => {
                 helpText="Some help text"
                 value={1}
                 onChange={onChangeMock}
-            />
+            />,
         );
         componentContainer = container;
     });
@@ -34,16 +36,12 @@ describe("<NumberInput/>", () => {
     it("Increase number with button", async () => {
         const increaseButton = getByLabelText(componentContainer, "Increase");
         fireEvent.mouseDown(increaseButton);
-        await wait(() =>
+        await wait(() => expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } }));
-            expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } })
-        );
     });
 
     it("Decrease number with button", async () => {
         const decreaseButton = getByLabelText(componentContainer, "Decrease");
         fireEvent.mouseDown(decreaseButton);
-        await wait(() =>
+        await wait(() => expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } }));
-            expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } })
-        );
     });
 });

src/bootstrap/__tests__/PasswordInput.test.js

@@ -18,9 +18,11 @@ describe("<PasswordInput/>", () => {
                 label="Test label"
                 helpText="Some help text"
                 value="Some password"
-                onChange={() => {}}
+                onChange={() => {
-            />
+                }}
+            />,
         );
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 });

src/bootstrap/__tests__/RadioSet.test.js

@@ -35,9 +35,11 @@ describe("<RadioSet/>", () => {
                 value="value"
                 choices={TEST_CHOICES}
                 helpText="Some help text"
-                onChange={() => {}}
+                onChange={() => {
-            />
+                }}
+            />,
         );
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 });

src/bootstrap/__tests__/Select.test.js

@@ -8,10 +8,7 @@
 import React from "react";
 
 import {
-    fireEvent,
+    fireEvent, getByDisplayValue, getByText, render,
-    getByDisplayValue,
-    getByText,
-    render,
 } from "customTestRender";
 
 import { Select } from "../Select";
@@ -32,24 +29,29 @@ describe("<Select/>", () => {
                 value="1"
                 choices={TEST_CHOICES}
                 helpText="Help text"
+
                 onChange={onChangeHandler}
-            />
+            />,
         );
         selectContainer = container;
     });
 
     it("Test with snapshot.", () => {
-        expect(selectContainer).toMatchSnapshot();
+        expect(selectContainer)
+            .toMatchSnapshot();
     });
 
     it("Test onChange handling.", () => {
         const select = getByDisplayValue(selectContainer, "one");
-        expect(select.value).toBe("1");
+        expect(select.value)
+            .toBe("1");
         fireEvent.change(select, { target: { value: "2" } });
 
         const option = getByText(selectContainer, "two");
-        expect(onChangeHandler).toBeCalled();
+        expect(onChangeHandler)
+            .toBeCalled();
 
-        expect(option.value).toBe("2");
+        expect(option.value)
+            .toBe("2");
     });
 });

src/bootstrap/__tests__/Switch.test.js

@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-import React from "react";
-
-import { render } from "customTestRender";
-
-import { Switch } from "../Switch";
-
-describe("<Switch/>", () => {
-    it("Render switch", () => {
-        const { container } = render(
-            <Switch
-                label="Test label"
-                checked
-                helpText="Some help text"
-                onChange={() => {}}
-            />
-        );
-        expect(container.firstChild).toMatchSnapshot();
-    });
-
-    it("Render uncheked switch", () => {
-        const { container } = render(
-            <Switch label="Test label" helpText="Some help text" />
-        );
-        expect(container.firstChild).toMatchSnapshot();
-    });
-});

src/bootstrap/__tests__/TextInput.test.js

@@ -18,9 +18,11 @@ describe("<TextInput/>", () => {
                 label="Test label"
                 helpText="Some help text"
                 value="Some text"
-                onChange={() => {}}
+                onChange={() => {
-            />
+                }}
+            />,
         );
-        expect(container.firstChild).toMatchSnapshot();
+        expect(container.firstChild)
+            .toMatchSnapshot();
     });
 });

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

@@ -5,6 +5,8 @@ exports[`<Button /> Render button correctly 1`] = `
   class="btn btn-primary "
   type="button"
 >
+   
+   
   Test Button
 </button>
 `;
@@ -14,6 +16,8 @@ exports[`<Button /> Render button with custom classes 1`] = `
   class="btn one two three"
   type="button"
 >
+   
+   
   Test Button
 </button>
 `;
@@ -29,6 +33,8 @@ exports[`<Button /> Render button with spinner 1`] = `
     role="status"
   />
    
+   
+   
   Test Button
 </button>
 `;

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/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap

@@ -11,7 +11,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     Radios set label
   </label>
   <div
-    class="custom-control custom-radio"
+    class="custom-control custom-radio custom-control-inline"
   >
     <input
       checked=""
@@ -29,7 +29,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="custom-control custom-radio"
+    class="custom-control custom-radio custom-control-inline"
   >
     <input
       class="custom-control-input"
@@ -46,7 +46,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="custom-control custom-radio"
+    class="custom-control custom-radio custom-control-inline"
   >
     <input
       class="custom-control-input"

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

@@ -1,56 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Switch/> Render switch 1`] = `
-<div
-  class="form-group"
->
-  <div
-    class="custom-control custom-switch"
-  >
-    <input
-      checked=""
-      class="custom-control-input"
-      id="1"
-      type="checkbox"
-    />
-    <label
-      class="custom-control-label"
-      for="1"
-    >
-      Test label
-    </label>
-    <small
-      class="form-text text-muted mt-0 mb-3"
-    >
-      Some help text
-    </small>
-  </div>
-</div>
-`;
-
-exports[`<Switch/> Render uncheked switch 1`] = `
-<div
-  class="form-group"
->
-  <div
-    class="custom-control custom-switch"
-  >
-    <input
-      class="custom-control-input"
-      id="1"
-      type="checkbox"
-    />
-    <label
-      class="custom-control-label"
-      for="1"
-    >
-      Test label
-    </label>
-    <small
-      class="form-text text-muted mt-0 mb-3"
-    >
-      Some help text
-    </small>
-  </div>
-</div>
-`;

src/bootstrap/constants.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,5 +7,4 @@
 
 /** Bootstrap column size for form fields */
 // eslint-disable-next-line import/prefer-default-export
-export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
+export const formFieldsSize = "col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3";
-export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";

src/common/RebootButton.js

@@ -13,9 +13,15 @@ import { API_STATE } from "../api/utils";
 import { ForisURLs } from "../utils/forisUrls";
 
 import { Button } from "../bootstrap/Button";
-import { Modal, ModalHeader, ModalBody, ModalFooter } from "../bootstrap/Modal";
+import {
+    Modal, ModalHeader, ModalBody, ModalFooter,
+} from "../bootstrap/Modal";
 import { useAlert } from "../alertContext/AlertContext";
 
+RebootButton.propTypes = {
+    forisFormSize: PropTypes.bool,
+};
+
 export function RebootButton(props) {
     const [triggered, setTriggered] = useState(false);
     const [modalShown, setModalShown] = useState(false);
@@ -36,16 +42,13 @@ export function RebootButton(props) {
 
     return (
         <>
-            <RebootModal
+            <RebootModal shown={modalShown} setShown={setModalShown} onReboot={rebootHandler} />
-                shown={modalShown}
-                setShown={setModalShown}
-                onReboot={rebootHandler}
-            />
             <Button
                 className="btn-danger"
                 loading={triggered}
                 disabled={triggered}
                 onClick={() => setModalShown(true)}
+
                 {...props}
             >
                 {_("Reboot")}
@@ -63,15 +66,11 @@ RebootModal.propTypes = {
 function RebootModal({ shown, setShown, onReboot }) {
     return (
         <Modal shown={shown} setShown={setShown}>
-            <ModalHeader setShown={setShown} title={_("Warning!")} />
+            <ModalHeader setShown={setShown} title={_("Reboot confirmation")} />
-            <ModalBody>
+            <ModalBody><p>{_("Are you sure you want to restart the router?")}</p></ModalBody>
-                <p>{_("Are you sure you want to restart the router?")}</p>
-            </ModalBody>
             <ModalFooter>
                 <Button onClick={() => setShown(false)}>{_("Cancel")}</Button>
-                <Button className="btn-danger" onClick={onReboot}>
+                <Button className="btn-danger" onClick={onReboot}>{_("Confirm reboot")}</Button>
-                    {_("Confirm reboot")}
-                </Button>
             </ModalFooter>
         </Modal>
     );

src/common/WiFiSettings/ResetWiFiSettings.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.
@@ -20,15 +20,16 @@ ResetWiFiSettings.propTypes = {
     endpoint: PropTypes.string.isRequired,
 };
 
-export function ResetWiFiSettings({ ws, endpoint }) {
+export default function ResetWiFiSettings({ ws, endpoint }) {
     const [isLoading, setIsLoading] = useState(false);
 
     useEffect(() => {
         const module = "wifi";
-        ws.subscribe(module).bind(module, "reset", () => {
+        ws.subscribe(module)
-            // eslint-disable-next-line no-restricted-globals
+            .bind(module, "reset", () => {
-            setTimeout(() => location.reload(), 1000);
+                // eslint-disable-next-line no-restricted-globals
-        });
+                setTimeout(() => location.reload(), 1000);
+            });
     }, [ws]);
 
     const [postResetResponse, postReset] = useAPIPost(endpoint);
@@ -37,10 +38,7 @@ export function ResetWiFiSettings({ ws, endpoint }) {
         if (postResetResponse.state === API_STATE.ERROR) {
             setAlert(_("An error occurred during resetting Wi-Fi settings."));
         } else if (postResetResponse.state === API_STATE.SUCCESS) {
-            setAlert(
+            setAlert(_("Wi-Fi settings are set to defaults."), ALERT_TYPES.SUCCESS);
-                _("Wi-Fi settings are set to defaults."),
-                ALERT_TYPES.SUCCESS
-            );
         }
     }, [postResetResponse, setAlert]);
 
@@ -51,24 +49,26 @@ export function ResetWiFiSettings({ ws, endpoint }) {
     }
 
     return (
-        <div className={formFieldsSize}>
+        <>
-            <h2>{_("Reset Wi-Fi Settings")}</h2>
+            <h4>{_("Reset Wi-Fi Settings")}</h4>
             <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">
+            <div className={`${formFieldsSize} text-right`}>
                 <Button
-                    className="btn-primary"
+                    className="btn-warning"
                     forisFormSize
                     loading={isLoading}
                     disabled={isLoading}
+
                     onClick={onReset}
                 >
                     {_("Reset Wi-Fi Settings")}
                 </Button>
             </div>
-        </div>
+        </>
     );
 }

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 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,7 +7,7 @@
 
 import React from "react";
 import PropTypes from "prop-types";
-import { Switch } from "../../bootstrap/Switch";
+
 import { CheckBox } from "../../bootstrap/CheckBox";
 import { PasswordInput } from "../../bootstrap/PasswordInput";
 import { RadioSet } from "../../bootstrap/RadioSet";
@@ -15,28 +15,28 @@ import { Select } from "../../bootstrap/Select";
 import { TextInput } from "../../bootstrap/TextInput";
 import WiFiQRCode from "./WiFiQRCode";
 import WifiGuestForm from "./WiFiGuestForm";
-import { HELP_TEXTS, HTMODES, HWMODES, ENCRYPTIONMODES } from "./constants";
+import { HELP_TEXTS, HTMODES, HWMODES } from "./constants";
 
 WiFiForm.propTypes = {
-    formData: PropTypes.shape({ devices: PropTypes.arrayOf(PropTypes.object) })
+    formData: PropTypes.shape(
-        .isRequired,
+        { devices: PropTypes.arrayOf(PropTypes.object) },
-    formErrors: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+    ).isRequired,
+    formErrors: PropTypes.oneOfType([
+        PropTypes.object,
+        PropTypes.array,
+    ]),
     setFormValue: PropTypes.func.isRequired,
     hasGuestNetwork: PropTypes.bool,
 };
 
 WiFiForm.defaultProps = {
     formData: { devices: [] },
-    setFormValue: () => {},
+    setFormValue: () => { },
     hasGuestNetwork: true,
 };
 
 export default function WiFiForm({
-    formData,
+    formData, formErrors, setFormValue, hasGuestNetwork, disabled,
-    formErrors,
-    setFormValue,
-    hasGuestNetwork,
-    disabled,
 }) {
     return formData.devices.map((device, index) => (
         <DeviceForm
@@ -47,7 +47,6 @@ export default function WiFiForm({
             setFormValue={setFormValue}
             hasGuestNetwork={hasGuestNetwork}
             disabled={disabled}
-            divider={index + 1 !== formData.devices.length}
         />
     ));
 }
@@ -63,15 +62,11 @@ DeviceForm.propTypes = {
         htmode: PropTypes.string.isRequired,
         channel: PropTypes.string.isRequired,
         guest_wifi: PropTypes.object.isRequired,
-        encryption: PropTypes.string.isRequired,
-        available_bands: PropTypes.array.isRequired,
-        "80211w": PropTypes.bool.isRequired,
     }),
     formErrors: PropTypes.object.isRequired,
     setFormValue: PropTypes.func.isRequired,
     hasGuestNetwork: PropTypes.bool,
     deviceIndex: PropTypes.number,
-    divider: PropTypes.bool,
 };
 
 DeviceForm.defaultProps = {
@@ -80,180 +75,144 @@ DeviceForm.defaultProps = {
 };
 
 function DeviceForm({
-    formData,
+    formData, formErrors, setFormValue, hasGuestNetwork, deviceIndex, ...props
-    formErrors,
-    setFormValue,
-    hasGuestNetwork,
-    deviceIndex,
-    divider,
-    ...props
 }) {
     const deviceID = formData.id;
-    const bnds = formData.available_bands;
     return (
         <>
-            <Switch
+            <h3>{_(`Wi-Fi ${deviceID + 1}`)}</h3>
-                label={<h2>{_(`Wi-Fi ${deviceID + 1}`)}</h2>}
+            <CheckBox
+                label={_("Enable")}
                 checked={formData.enabled}
-                onChange={setFormValue((value) => ({
+
-                    devices: {
+                onChange={setFormValue(
-                        [deviceIndex]: { enabled: { $set: value } },
+                    (value) => ({ devices: { [deviceIndex]: { enabled: { $set: value } } } }),
-                    },
+                )}
-                }))}
+
-                switchHeading
                 {...props}
             />
-            {formData.enabled && (
+            {formData.enabled
-                <>
+                ? (
-                    <TextInput
+                    <>
-                        label="SSID"
+                        <TextInput
-                        value={formData.SSID}
+                            label="SSID"
-                        error={formErrors.SSID || null}
+                            value={formData.SSID}
-                        helpText={HELP_TEXTS.ssid}
+                            error={formErrors.SSID || null}
-                        required
+                            required
-                        onChange={setFormValue((value) => ({
+                            onChange={setFormValue(
-                            devices: {
+                                (value) => ({
-                                [deviceIndex]: {
+                                    devices: {
-                                    SSID: { $set: value },
+                                        [deviceIndex]: {
-                                },
+                                            SSID: { $set: value },
-                            },
-                        }))}
-                        {...props}
-                    >
-                        <div className="input-group-append">
-                            <WiFiQRCode
-                                SSID={formData.SSID}
-                                password={formData.password}
-                            />
-                        </div>
-                    </TextInput>
-
-                    <PasswordInput
-                        withEye
-                        label={_("Password")}
-                        value={formData.password}
-                        error={formErrors.password}
-                        helpText={HELP_TEXTS.password}
-                        required
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [deviceIndex]: { password: { $set: value } },
-                            },
-                        }))}
-                        {...props}
-                    />
-
-                    <Switch
-                        label={_("Hide SSID")}
-                        helpText={HELP_TEXTS.hidden}
-                        checked={formData.hidden}
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [deviceIndex]: { hidden: { $set: value } },
-                            },
-                        }))}
-                        {...props}
-                    />
-
-                    <RadioSet
-                        name={`hwmode-${deviceID}`}
-                        label="GHz"
-                        choices={getHwmodeChoices(formData)}
-                        value={formData.hwmode}
-                        helpText={HELP_TEXTS.hwmode}
-                        inline
-                        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}
+                            {...props}
-                    />
+                        >
-
+                            <div className="input-group-append">
-                    <Select
+                                <WiFiQRCode
-                        label={_("802.11n/ac/ax mode")}
+                                    SSID={formData.SSID}
-                        choices={getHtmodeChoices(formData)}
+                                    password={formData.password}
-                        value={formData.htmode}
+                                />
-                        helpText={HELP_TEXTS.htmode}
+                            </div>
-                        onChange={setFormValue((value) => ({
+                        </TextInput>
-                            devices: {
+
-                                [deviceIndex]: { htmode: { $set: value } },
+                        <PasswordInput
-                            },
+                            withEye
-                        }))}
+                            label="Password"
-                        {...props}
+                            value={formData.password}
-                    />
+                            error={formErrors.password}
-
+                            helpText={HELP_TEXTS.password}
-                    <Select
+                            required
-                        label={_("Channel")}
+
-                        choices={getChannelChoices(formData)}
+                            onChange={setFormValue(
-                        value={formData.channel}
+                                (value) => (
-                        onChange={setFormValue((value) => ({
+                                    { devices: { [deviceIndex]: { password: { $set: value } } } }
-                            devices: {
+                                ),
-                                [deviceIndex]: { channel: { $set: value } },
-                            },
-                        }))}
-                        {...props}
-                    />
-
-                    <Select
-                        label={_("Encryption")}
-                        choices={getEncryptionChoices(formData)}
-                        helpText={HELP_TEXTS.wpa3}
-                        value={formData.encryption}
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [deviceIndex]: { encryption: { $set: value } },
-                            },
-                        }))}
-                        {...props}
-                    />
-
-                    {(formData.encryption === "WPA3" ||
-                        formData.encryption === "WPA2/3") && (
-                        <Switch
-                            label={_("Disable Management Frame Protection")}
-                            helpText={_(
-                                "In case you have trouble connecting to WiFi Access Point, try disabling Management Frame Protection."
                             )}
-                            checked={formData["80211w"]}
-                            onChange={setFormValue((value) => ({
-                                devices: {
-                                    [deviceIndex]: {
-                                        "80211w": { $set: value },
-                                    },
-                                },
-                            }))}
-                            {...props}
-                        />
-                    )}
 
-                    {hasGuestNetwork && (
-                        <WifiGuestForm
-                            formData={{
-                                id: deviceIndex,
-                                ...formData.guest_wifi,
-                            }}
-                            formErrors={formErrors.guest_wifi || {}}
-                            setFormValue={setFormValue}
                             {...props}
                         />
-                    )}
+
-                </>
+                        <CheckBox
-            )}
+                            label="Hide SSID"
-            {divider && <hr />}
+                            helpText={HELP_TEXTS.hidden}
+                            checked={formData.hidden}
+
+                            onChange={setFormValue(
+                                (value) => (
+                                    { devices: { [deviceIndex]: { hidden: { $set: value } } } }
+                                ),
+                            )}
+
+                            {...props}
+                        />
+
+                        <RadioSet
+                            name={`hwmode-${deviceID}`}
+                            label="GHz"
+                            choices={getHwmodeChoices(formData)}
+                            value={formData.hwmode}
+                            helpText={HELP_TEXTS.hwmode}
+
+                            onChange={setFormValue(
+                                (value) => ({
+                                    devices: {
+                                        [deviceIndex]: {
+                                            hwmode: { $set: value },
+                                            channel: { $set: "0" },
+                                        },
+                                    },
+                                }),
+                            )}
+
+                            {...props}
+                        />
+
+                        <Select
+                            label="802.11n/ac mode"
+                            choices={getHtmodeChoices(formData)}
+                            value={formData.htmode}
+                            helpText={HELP_TEXTS.htmode}
+
+                            onChange={setFormValue(
+                                (value) => (
+                                    { devices: { [deviceIndex]: { htmode: { $set: value } } } }
+                                ),
+                            )}
+
+                            {...props}
+                        />
+
+                        <Select
+                            label="Channel"
+                            choices={getChannelChoices(formData)}
+                            value={formData.channel}
+
+                            onChange={setFormValue(
+                                (value) => (
+                                    { devices: { [deviceIndex]: { channel: { $set: value } } } }
+                                ),
+                            )}
+
+                            {...props}
+                        />
+
+                        {hasGuestNetwork && (
+                            <WifiGuestForm
+                                formData={{ id: deviceIndex, ...formData.guest_wifi }}
+                                formErrors={formErrors.guest_wifi || {}}
+
+                                setFormValue={setFormValue}
+
+                                {...props}
+                            />
+                        )}
+                    </>
+                )
+                : null}
         </>
     );
 }
@@ -269,9 +228,7 @@ function getChannelChoices(device) {
         availableBand.available_channels.forEach((availableChannel) => {
             channelChoices[availableChannel.number.toString()] = `
                         ${availableChannel.number}
-                        (${availableChannel.frequency} MHz ${
+                        (${availableChannel.frequency} MHz ${availableChannel.radar ? " ,DFS" : ""})
-                availableChannel.radar ? " ,DFS" : ""
-            })
                     `;
         });
     });
@@ -298,10 +255,3 @@ function getHwmodeChoices(device) {
         value: availableBand.hwmode,
     }));
 }
-
-function getEncryptionChoices(device) {
-    if (device.encryption === "custom") {
-        ENCRYPTIONMODES.custom = _("Custom");
-    }
-    return ENCRYPTIONMODES;
-}

src/common/WiFiSettings/WiFiGuestForm.js

@@ -8,8 +8,8 @@
 import React from "react";
 import PropTypes from "prop-types";
 
+import { CheckBox } from "../../bootstrap/CheckBox";
 import { TextInput } from "../../bootstrap/TextInput";
-import { Switch } from "../../bootstrap/Switch";
 import { PasswordInput } from "../../bootstrap/PasswordInput";
 import WiFiQRCode from "./WiFiQRCode";
 import { HELP_TEXTS } from "./constants";
@@ -26,73 +26,75 @@ WifiGuestForm.propTypes = {
         password: PropTypes.string,
     }),
     setFormValue: PropTypes.func.isRequired,
-    deviceIndex: PropTypes.string,
 };
 
 export default function WifiGuestForm({
-    formData,
+    formData, formErrors, setFormValue, ...props
-    formErrors,
-    setFormValue,
-    deviceIndex,
-    ...props
 }) {
     return (
         <>
-            <Switch
+            <CheckBox
-                label={_("Enable Guest Wi-Fi")}
+                label={_("Enable Guest Wifi")}
                 checked={formData.enabled}
                 helpText={HELP_TEXTS.guest_wifi_enabled}
-                onChange={setFormValue((value) => ({
+
-                    devices: {
+                onChange={setFormValue(
-                        [formData.id]: {
+                    (value) => (
-                            guest_wifi: { enabled: { $set: value } },
+                        { devices: { [formData.id]: { guest_wifi: { enabled: { $set: value } } } } }
-                        },
+                    ),
-                    },
+                )}
-                }))}
+
                 {...props}
             />
-            {formData.enabled ? (
+            {formData.enabled
-                <>
+                ? (
-                    <TextInput
+                    <>
-                        label="SSID"
+                        <TextInput
-                        value={formData.SSID}
+                            label="SSID"
-                        error={formErrors.SSID}
+                            value={formData.SSID}
-                        helpText={HELP_TEXTS.ssid}
+                            error={formErrors.SSID}
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [formData.id]: {
-                                    guest_wifi: { SSID: { $set: value } },
-                                },
-                            },
-                        }))}
-                        {...props}
-                    >
-                        <div className="input-group-append">
-                            <WiFiQRCode
-                                SSID={formData.SSID}
-                                password={formData.password}
-                            />
-                        </div>
-                    </TextInput>
 
-                    <PasswordInput
+                            onChange={setFormValue(
-                        withEye
+                                (value) => ({
-                        label={_("Password")}
+                                    devices: {
-                        value={formData.password}
+                                        [formData.id]: { guest_wifi: { SSID: { $set: value } } },
-                        helpText={HELP_TEXTS.password}
+                                    },
-                        error={formErrors.password}
+                                }),
-                        required
+                            )}
-                        onChange={setFormValue((value) => ({
+
-                            devices: {
+                            {...props}
-                                [formData.id]: {
+                        >
-                                    guest_wifi: { password: { $set: value } },
+                            <div className="input-group-append">
-                                },
+                                <WiFiQRCode
-                            },
+                                    SSID={formData.SSID}
-                        }))}
+                                    password={formData.password}
-                        {...props}
+                                />
-                    />
+                            </div>
-                </>
+                        </TextInput>
-            ) : null}
+
+                        <PasswordInput
+                            withEye
+                            label={_("Password")}
+                            value={formData.password}
+                            helpText={HELP_TEXTS.password}
+                            error={formErrors.password}
+                            required
+
+                            onChange={setFormValue(
+                                (value) => ({
+                                    devices: {
+                                        [formData.id]: {
+                                            guest_wifi: { password: { $set: value } },
+                                        },
+                                    },
+                                }),
+                            )}
+
+                            {...props}
+                        />
+                    </>
+                )
+                : null}
         </>
     );
 }

src/common/WiFiSettings/WiFiQRCode.js

@@ -12,10 +12,7 @@ import PropTypes from "prop-types";
 import { ForisURLs } from "../../utils/forisUrls";
 import { Button } from "../../bootstrap/Button";
 import {
-    Modal,
+    Modal, ModalBody, ModalFooter, ModalHeader,
-    ModalBody,
-    ModalFooter,
-    ModalHeader,
 } from "../../bootstrap/Modal";
 import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers";
 
@@ -39,21 +36,11 @@ export default function WiFiQRCode({ SSID, password }) {
                     setModal(true);
                 }}
             >
-                <img
+                <img width="20" src={QR_ICON_PATH} alt="QR" style={{ opacity: 0.67 }} />
-                    width="20"
-                    src={QR_ICON_PATH}
-                    alt="QR"
-                    style={{ opacity: 0.67 }}
-                />
             </button>
-            {modal ? (
+            {modal
-                <QRCodeModal
+                ? <QRCodeModal setShown={setModal} shown={modal} SSID={SSID} password={password} />
-                    setShown={setModal}
+                : null}
-                    shown={modal}
-                    SSID={SSID}
-                    password={password}
-                />
-            ) : null}
         </>
     );
 }
@@ -65,7 +52,9 @@ QRCodeModal.propTypes = {
     setShown: PropTypes.func.isRequired,
 };
 
-function QRCodeModal({ shown, setShown, SSID, password }) {
+function QRCodeModal({
+    shown, setShown, SSID, password,
+}) {
     return (
         <Modal setShown={setShown} shown={shown}>
             <ModalHeader setShown={setShown} title={_("Wi-Fi QR Code")} />

src/common/WiFiSettings/WiFiSettings.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.
@@ -10,7 +10,7 @@ import PropTypes from "prop-types";
 
 import { ForisForm } from "../../form/components/ForisForm";
 import WiFiForm from "./WiFiForm";
-import { ResetWiFiSettings } from "./ResetWiFiSettings";
+import ResetWiFiSettings from "./ResetWiFiSettings";
 
 WiFiSettings.propTypes = {
     ws: PropTypes.object.isRequired,
@@ -19,7 +19,9 @@ WiFiSettings.propTypes = {
     hasGuestNetwork: PropTypes.bool,
 };
 
-export function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
+export function WiFiSettings({
+    ws, endpoint, resetEndpoint, hasGuestNetwork,
+}) {
     return (
         <>
             <ForisForm
@@ -57,59 +59,35 @@ function prepDataToSubmit(formData) {
             return;
         }
 
-        if (!device.guest_wifi.enabled)
+        if (!device.guest_wifi.enabled) formData.devices[idx].guest_wifi = { enabled: false };
-            formData.devices[idx].guest_wifi = { enabled: false };
     });
     return formData;
 }
 
-export function byteCount(string) {
-    const buffer = Buffer.from(string, "utf-8");
-    const count = buffer.byteLength;
-    return count;
-}
-
 export function validator(formData) {
-    const formErrors = formData.devices.map((device) => {
+    const formErrors = formData.devices.map(
-        if (!device.enabled) return {};
+        (device) => {
+            if (!device.enabled) return {};
 
-        const errors = {};
+            const errors = {};
-        if (device.SSID.length > 32)
+            if (device.SSID.length > 32) errors.SSID = _("SSID can't be longer than 32 symbols");
-            errors.SSID = _("SSID can't be longer than 32 symbols");
+            if (device.SSID.length === 0) errors.SSID = _("SSID can't be empty");
-        if (device.SSID.length === 0) errors.SSID = _("SSID can't be empty");
-        if (byteCount(device.SSID) > 32)
-            errors.SSID = _("SSID can't be longer than 32 bytes");
 
-        if (device.password.length < 8)
+            if (device.password.length < 8) errors.password = _("Password must contain at least 8 symbols");
-            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;
+            if (!device.guest_wifi.enabled) return errors;
 
-        const guest_wifi_errors = {};
+            const guest_wifi_errors = {};
-        if (device.guest_wifi.SSID.length > 32)
+            if (device.guest_wifi.SSID.length > 32) guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
-            guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
+            if (device.guest_wifi.SSID.length === 0) guest_wifi_errors.SSID = _("SSID can't be empty");
-        if (device.guest_wifi.SSID.length === 0)
-            guest_wifi_errors.SSID = _("SSID can't be empty");
-        if (byteCount(device.guest_wifi.SSID) > 32)
-            guest_wifi_errors.SSID = _("SSID can't be longer than 32 bytes");
 
-        if (device.guest_wifi.password.length < 8)
+            if (device.guest_wifi.password.length < 8) guest_wifi_errors.password = _("Password must contain at least 8 symbols");
-            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) {
+            if (guest_wifi_errors.SSID || guest_wifi_errors.password) {
-            errors.guest_wifi = guest_wifi_errors;
+                errors.guest_wifi = guest_wifi_errors;
-        }
+            }
-        return errors;
+            return errors;
-    });
+        },
+    );
     return JSON.stringify(formErrors).match(/\[[{},?]+\]/) ? null : formErrors;
 }

src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.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.
@@ -14,7 +14,7 @@ import { mockJSONError } from "testUtils/network";
 import { mockSetAlert } from "testUtils/alertContextMock";
 import { ALERT_TYPES } from "../../../bootstrap/Alert";
 
-import { ResetWiFiSettings } from "../ResetWiFiSettings";
+import ResetWiFiSettings from "../ResetWiFiSettings";
 
 describe("<ResetWiFiSettings/>", () => {
     const webSockets = new WebSockets();
@@ -22,34 +22,19 @@ describe("<ResetWiFiSettings/>", () => {
     let getAllByText;
 
     beforeEach(() => {
-        ({ getAllByText } = render(
+        ({ getAllByText } = render(<ResetWiFiSettings ws={webSockets} endpoint={endpoint} />));
-            <ResetWiFiSettings ws={webSockets} endpoint={endpoint} />
-        ));
     });
 
     it("should display alert on open ports - success", async () => {
         fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
-        expect(mockAxios.post).toBeCalledWith(
+        expect(mockAxios.post).toBeCalledWith(endpoint, undefined, expect.anything());
-            endpoint,
-            undefined,
-            expect.anything()
-        );
         mockAxios.mockResponse({ data: { foo: "bar" } });
-        await wait(() =>
+        await wait(() => expect(mockSetAlert).toBeCalledWith("Wi-Fi settings are set to defaults.", ALERT_TYPES.SUCCESS));
-            expect(mockSetAlert).toBeCalledWith(
-                "Wi-Fi settings are set to defaults.",
-                ALERT_TYPES.SUCCESS
-            )
-        );
     });
 
     it("should display alert on open ports - failure", async () => {
         fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
         mockJSONError();
-        await wait(() =>
+        await wait(() => expect(mockSetAlert).toBeCalledWith("An error occurred during resetting Wi-Fi settings."));
-            expect(mockSetAlert).toBeCalledWith(
-                "An error occurred during resetting Wi-Fi settings."
-            )
-        );
     });
 });

src/common/WiFiSettings/__tests__/WiFiSettings.test.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.
@@ -13,36 +13,23 @@ import { fireEvent, render, wait } from "customTestRender";
 import { WebSockets } from "webSockets/WebSockets";
 import { mockJSONError } from "testUtils/network";
 
-import {
+import { wifiSettingsFixture, oneDevice, twoDevices, threeDevices } from "./__fixtures__/wifiSettings";
-    wifiSettingsFixture,
+import { WiFiSettings, validator } from "../WiFiSettings";
-    oneDevice,
-    twoDevices,
-    threeDevices,
-} from "./__fixtures__/wifiSettings";
-import { WiFiSettings, validator, byteCount } from "../WiFiSettings";
 
 describe("<WiFiSettings/>", () => {
     let firstRender;
     let getAllByText;
     let getAllByLabelText;
     let getByText;
-    let getByLabelText;
     let asFragment;
     const endpoint = "/reforis/api/wifi";
 
     beforeEach(async () => {
         const webSockets = new WebSockets();
-        const renderRes = render(
+        const renderRes = render(<WiFiSettings ws={webSockets} endpoint={endpoint} resetEndpoint="foo" />);
-            <WiFiSettings
-                ws={webSockets}
-                endpoint={endpoint}
-                resetEndpoint="foo"
-            />
-        );
         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"));
@@ -51,13 +38,7 @@ describe("<WiFiSettings/>", () => {
 
     it("should handle error", async () => {
         const webSockets = new WebSockets();
-        const { getByText } = render(
+        const { getByText } = render(<WiFiSettings ws={webSockets} ws={webSockets} endpoint={endpoint} resetEndpoint="foo" />);
-            <WiFiSettings
-                ws={webSockets}
-                endpoint={endpoint}
-                resetEndpoint="foo"
-            />
-        );
         const errorMessage = "An API error occurred.";
         mockJSONError(errorMessage);
         await wait(() => {
@@ -70,21 +51,21 @@ describe("<WiFiSettings/>", () => {
     });
 
     it("Snapshot one module enabled.", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
         expect(diffSnapshot(firstRender, asFragment())).toMatchSnapshot();
     });
 
     it("Snapshot 2.4 GHz", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
         const enabledRender = asFragment();
         fireEvent.click(getAllByText("2.4")[0]);
         expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
     });
 
     it("Snapshot guest network.", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
         const enabledRender = asFragment();
-        fireEvent.click(getAllByText("Enable Guest Wi-Fi")[0]);
+        fireEvent.click(getAllByText("Enable Guest Wifi")[0]);
         expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
     });
 
@@ -97,15 +78,11 @@ describe("<WiFiSettings/>", () => {
                 { enabled: false, id: 1 },
             ],
         };
-        expect(mockAxios.post).toHaveBeenCalledWith(
+        expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
-            endpoint,
-            data,
-            expect.anything()
-        );
     });
 
     it("Post form: one module enabled.", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
 
         fireEvent.click(getByText("Save"));
         expect(mockAxios.post).toBeCalled();
@@ -117,24 +94,19 @@ describe("<WiFiSettings/>", () => {
                     enabled: true,
                     guest_wifi: { enabled: false },
                     hidden: false,
-                    htmode: "HT80",
+                    htmode: "HT40",
                     hwmode: "11a",
                     id: 0,
                     password: "TestPass",
-                    encryption: "WPA3",
                 },
                 { enabled: false, id: 1 },
             ],
         };
-        expect(mockAxios.post).toHaveBeenCalledWith(
+        expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
-            endpoint,
-            data,
-            expect.anything()
-        );
     });
 
     it("Post form: 2.4 GHz", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
         fireEvent.click(getAllByText("2.4")[0]);
 
         fireEvent.click(getByText("Save"));
@@ -147,28 +119,21 @@ describe("<WiFiSettings/>", () => {
                     enabled: true,
                     guest_wifi: { enabled: false },
                     hidden: false,
-                    htmode: "VHT80",
+                    htmode: "HT40",
                     hwmode: "11g",
                     id: 0,
                     password: "TestPass",
-                    encryption: "WPA3",
                 },
                 { enabled: false, id: 1 },
             ],
         };
-        expect(mockAxios.post).toHaveBeenCalledWith(
+        expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
-            endpoint,
-            data,
-            expect.anything()
-        );
     });
 
     it("Post form: guest network.", () => {
-        fireEvent.click(getByText("Wi-Fi 1"));
+        fireEvent.click(getAllByText("Enable")[0]);
-        fireEvent.click(getAllByText("Enable Guest Wi-Fi")[0]);
+        fireEvent.click(getAllByText("Enable Guest Wifi")[0]);
-        fireEvent.change(getAllByLabelText("Password")[1], {
+        fireEvent.change(getAllByLabelText("Password")[1], { target: { value: "test_password" } });
-            target: { value: "test_password" },
-        });
 
         fireEvent.click(getByText("Save"));
         expect(mockAxios.post).toBeCalled();
@@ -184,20 +149,15 @@ describe("<WiFiSettings/>", () => {
                         password: "test_password",
                     },
                     hidden: false,
-                    htmode: "HT80",
+                    htmode: "HT40",
                     hwmode: "11a",
                     id: 0,
                     password: "TestPass",
-                    encryption: "WPA3",
                 },
                 { enabled: false, id: 1 },
             ],
         };
-        expect(mockAxios.post).toHaveBeenCalledWith(
+        expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
-            endpoint,
-            data,
-            expect.anything()
-        );
     });
 
     it("Validator function using regex for one device", () => {    
@@ -205,40 +165,12 @@ describe("<WiFiSettings/>", () => {
     });
 
     it("Validator function using regex for two devices", () => {
-        const twoDevicesFormErrors = [{ SSID: "SSID can't be empty" }, {}];
+        const twoDevicesFormErrors = [{SSID: "SSID can't be empty"}, {}];    
         expect(validator(twoDevices)).toEqual(twoDevicesFormErrors);
     });
 
     it("Validator function using regex for three devices", () => {
-        const threeDevicesFormErrors = [
+        const threeDevicesFormErrors = [{}, {}, {password: "Password must contain at least 8 symbols"}];    
-            {},
-            {},
-            { password: "Password must contain at least 8 symbols" },
-        ];
         expect(validator(threeDevices)).toEqual(threeDevicesFormErrors);
     });
-
-    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__/__fixtures__/wifiSettings.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.
@@ -226,11 +226,10 @@ export function wifiSettingsFixture() {
                     password: "",
                 },
                 hidden: false,
-                htmode: "HT80",
+                htmode: "HT40",
                 hwmode: "11a",
                 id: 0,
                 password: "TestPass",
-                encryption: "WPA3",
             },
             {
                 SSID: "Turris",
@@ -293,7 +292,11 @@ export function wifiSettingsFixture() {
                                 radar: false,
                             },
                         ],
-                        available_htmodes: ["NOHT", "HT20", "HT40"],
+                        available_htmodes: [
+                            "NOHT",
+                            "HT20",
+                            "HT40",
+                        ],
                         hwmode: "11g",
                     },
                 ],
@@ -309,7 +312,6 @@ export function wifiSettingsFixture() {
                 hwmode: "11g",
                 id: 1,
                 password: "TestPass",
-                encryption: "WPA3",
             },
         ],
     };
@@ -325,10 +327,9 @@ const oneDevice = {
             htmode: "HT40",
             hwmode: "11a",
             id: 0,
-            password: "TestPass",
+            password: "TestPass"
-            encryption: "WPA3",
+        }
-        },
+    ]
-    ],
 };
 
 const twoDevices = {
@@ -342,8 +343,7 @@ const twoDevices = {
             htmode: "HT40",
             hwmode: "11a",
             id: 0,
-            password: "TestPass",
+            password: "TestPass"
-            encryption: "WPA3",
         },
         {
             SSID: "Turris2",
@@ -353,11 +353,10 @@ const twoDevices = {
             hidden: false,
             htmode: "HT40",
             hwmode: "11a",
-            id: 1,
+            id: 0,
-            password: "TestPass",
+            password: "TestPass"
-            encryption: "WPA3",
+        }
-        },
+    ]
-    ],
 };
 
 const threeDevices = {
@@ -371,8 +370,7 @@ const threeDevices = {
             htmode: "HT40",
             hwmode: "11a",
             id: 0,
-            password: "TestPass",
+            password: "TestPass"
-            encryption: "WPA3",
         },
         {
             SSID: "Turris2",
@@ -382,9 +380,8 @@ const threeDevices = {
             hidden: false,
             htmode: "HT40",
             hwmode: "11a",
-            id: 1,
+            id: 0,
-            password: "TestPass",
+            password: "TestPass"
-            encryption: "WPA3",
         },
         {
             SSID: "Turris3",
@@ -394,11 +391,10 @@ const threeDevices = {
             hidden: false,
             htmode: "HT40",
             hwmode: "11a",
-            id: 2,
+            id: 0,
-            password: "",
+            password: ""
-            encryption: "WPA3",
+        }
-        },
+    ]
-    ],
 };
 
-export { oneDevice, twoDevices, threeDevices };
+export {oneDevice, twoDevices, threeDevices};

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

@@ -5,7 +5,7 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
 - First value
 + Second value
 
-@@ -241,207 +241,95 @@
+@@ -246,207 +246,95 @@
               value=\\"0\\"
             >
               auto
@@ -251,14 +251,17 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
 exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
 <DocumentFragment>
   <div
-    class="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
+    class="col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3"
   >
     <form>
+      <h3>
+        Wi-Fi 1
+      </h3>
       <div
-        class="form-group switch"
+        class="form-group"
       >
         <div
-          class="custom-control custom-switch custom-control-inline switch-heading"
+          class="custom-control custom-checkbox "
         >
           <input
             class="custom-control-input"
@@ -269,18 +272,18 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
             class="custom-control-label"
             for="1"
           >
-            <h2>
+            Enable
-              Wi-Fi 1
-            </h2>
           </label>
         </div>
       </div>
-      <hr />
+      <h3>
+        Wi-Fi 2
+      </h3>
       <div
-        class="form-group switch"
+        class="form-group"
       >
         <div
-          class="custom-control custom-switch custom-control-inline switch-heading"
+          class="custom-control custom-checkbox "
         >
           <input
             class="custom-control-input"
@@ -291,9 +294,7 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
             class="custom-control-label"
             for="2"
           >
-            <h2>
+            Enable
-              Wi-Fi 2
-            </h2>
           </label>
         </div>
       </div>
@@ -301,33 +302,32 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
         class="text-right"
       >
         <button
-          class="btn btn-primary  col-sm-12 col-md-3 col-lg-2"
+          class="btn btn-primary  col-sm-12 col-lg-3"
           type="submit"
         >
-          Save
+            Save
         </button>
       </div>
     </form>
   </div>
+  <h4>
+    Reset Wi-Fi Settings
+  </h4>
+  <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.
+        
+  </p>
   <div
-    class="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
+    class="col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3 text-right"
   >
-    <h2>
+    <button
-      Reset Wi-Fi Settings
+      class="btn btn-warning col-sm-12 col-lg-3"
-    </h2>
+      type="button"
-    <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.
-    </p>
-    <div
-      class="text-right"
     >
-      <button
-        class="btn btn-primary col-sm-12 col-md-3 col-lg-2"
-        type="button"
-      >
         Reset Wi-Fi Settings
-      </button>
+    </button>
-    </div>
   </div>
 </DocumentFragment>
 `;
@@ -337,17 +337,17 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -500,10 +500,92 @@
+@@ -475,10 +475,89 @@
-            >
+          
-              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>
-            </small>
+            </label>
           </div>
         </div>
 +       <div
 +         class=\\"form-group\\"
 +       >
 +         <label
-+           for=\\"22\\"
++           for=\\"20\\"
 +         >
 +           SSID
 +         </label>
@@ -356,7 +356,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +         >
 +           <input
 +             class=\\"form-control\\"
-+             id=\\"22\\"
++             id=\\"20\\"
 +             type=\\"text\\"
 +             value=\\"TestGuestSSID\\"
 +           />
@@ -376,17 +376,12 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             </button>
 +           </div>
 +         </div>
-+         <small
-+           class=\\"form-text text-muted\\"
-+         >
-+           SSID which contains non-standard characters could cause problems on some devices.
-+         </small>
 +       </div>
 +       <div
 +         class=\\"form-group\\"
 +       >
 +         <label
-+           for=\\"23\\"
++           for=\\"21\\"
 +         >
 +           Password
 +         </label>
@@ -394,9 +389,9 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"current-password\\"
++             autocomplete=\\"new-password\\"
 +             class=\\"form-control  is-invalid\\"
-+             id=\\"23\\"
++             id=\\"21\\"
 +             required=\\"\\"
 +             type=\\"password\\"
 +             value=\\"\\"
@@ -422,24 +417,26 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           WPA2/3 pre-shared key, that is required to connect to the network.
++           
++         WPA2 pre-shared key, that is required to connect to the network.
++     
 +         </small>
 +       </div>
-        <hr />
+        <h3>
+          Wi-Fi 2
+        </h3>
         <div
-          class=\\"form-group switch\\"
+          class=\\"form-group\\"
-        >
+@@ -502,10 +581,11 @@
-          <div
-@@ -527,10 +609,11 @@
         <div
           class=\\"text-right\\"
         >
           <button
-            class=\\"btn btn-primary  col-sm-12 col-md-3 col-lg-2\\"
+            class=\\"btn btn-primary  col-sm-12 col-lg-3\\"
 +           disabled=\\"\\"
             type=\\"submit\\"
           >
-            Save
+              Save
           </button>
         </div>"
 `;
@@ -449,9 +446,9 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 - First value
 + Second value
 
-@@ -22,10 +22,488 @@
+@@ -23,10 +23,462 @@
-                Wi-Fi 1
+            >
-              </h2>
+              Enable
             </label>
           </div>
         </div>
@@ -489,11 +486,6 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             </button>
 +           </div>
 +         </div>
-+         <small
-+           class=\\"form-text text-muted\\"
-+         >
-+           SSID which contains non-standard characters could cause problems on some devices.
-+         </small>
 +       </div>
 +       <div
 +         class=\\"form-group\\"
@@ -507,7 +499,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"current-password\\"
++             autocomplete=\\"new-password\\"
 +             class=\\"form-control\\"
 +             id=\\"5\\"
 +             required=\\"\\"
@@ -530,7 +522,9 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           WPA2/3 pre-shared key, that is required to connect to the network.
++           
++         WPA2 pre-shared key, that is required to connect to the network.
++     
 +         </small>
 +       </div>
 +       <div
@@ -604,7 +598,10 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           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.
++           
++         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.
 +         </small>
 +       </div>
 +       <div
@@ -613,18 +610,13 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <label
 +           for=\\"8\\"
 +         >
-+           802.11n/ac/ax mode
++           802.11n/ac mode
 +         </label>
 +         <select
 +           class=\\"custom-select\\"
 +           id=\\"8\\"
 +         >
 +           <option
-+             value=\\"NOHT\\"
-+           >
-+             Disabled
-+           </option>
-+           <option
 +             value=\\"HT20\\"
 +           >
 +             802.11n - 20 MHz wide channel
@@ -635,6 +627,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
@@ -653,7 +650,11 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         <small
 +           class=\\"form-text text-muted\\"
 +         >
-+           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.
++           
++         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.
++     
 +         </small>
 +       </div>
 +       <div
@@ -878,64 +879,34 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +       <div
 +         class=\\"form-group\\"
 +       >
-+         <label
-+           for=\\"10\\"
-+         >
-+           Encryption
-+         </label>
-+         <select
-+           class=\\"custom-select\\"
-+           id=\\"10\\"
-+         >
-+           <option
-+             value=\\"WPA3\\"
-+           >
-+             WPA3 only
-+           </option>
-+           <option
-+             value=\\"WPA2/3\\"
-+           >
-+             WPA3 with WPA2 as fallback (default)
-+           </option>
-+           <option
-+             value=\\"WPA2\\"
-+           >
-+             WPA2 only
-+           </option>
-+         </select>
-+         <small
-+           class=\\"form-text text-muted\\"
-+         >
-+           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.
-+         </small>
-+       </div>
-+       <div
-+         class=\\"form-group\\"
-+       >
 +         <div
-+           class=\\"custom-control custom-switch\\"
++           class=\\"custom-control custom-checkbox \\"
 +         >
 +           <input
 +             class=\\"custom-control-input\\"
-+             id=\\"11\\"
++             id=\\"10\\"
 +             type=\\"checkbox\\"
 +           />
 +           <label
 +             class=\\"custom-control-label\\"
-+             for=\\"11\\"
++             for=\\"10\\"
 +           >
-+             Enable Guest Wi-Fi
++             Enable Guest Wifi
++             <small
++               class=\\"form-text text-muted\\"
++             >
++               
++         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>
 +           </label>
-+           <small
-+             class=\\"form-text text-muted mt-0 mb-3\\"
-+           >
-+             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>
 +         </div>
 +       </div>
-        <hr />
+        <h3>
+          Wi-Fi 2
+        </h3>
         <div
-          class=\\"form-group switch\\"
+          class=\\"form-group\\""
-        >
-          <div"
 `;

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 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,40 +13,28 @@ 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",
     "11a": "5",
 };
-export const ENCRYPTIONMODES = {
-    WPA3: _("WPA3 only"),
-    "WPA2/3": _("WPA3 with WPA2 as fallback (default)"),
-    WPA2: _("WPA2 only"),
-};
 export const HELP_TEXTS = {
-    ssid: _(
+    password: _(`
-        "SSID which contains non-standard characters could cause problems on some devices."
+        WPA2 pre-shared key, that is required to connect to the network.
-    ),
+    `),
-    password: _(
+    hidden: _("If set, network is not visible when scanning for available networks."),
-        "WPA2/3 pre-shared key, that is required to connect to the network."
+    hwmode: _(`
-    ),
+        The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
-    hidden: _(
+        newer standard and may not be supported by all your devices. It usually has less interference, but the signal
-        "If set, network is not visible when scanning for available networks."
+        does not carry so well indoors.`),
-    ),
+    htmode: _(`
-    hwmode: _(
+        Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
-        "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."
+        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.
-    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
-    guest_wifi_enabled: _(
+        access the internet, but aren't allowed to access other devices and the configuration interface of the router.
-        "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."
+        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."
-    ),
 };

src/common/__tests__/RebootButton.test.js

@@ -8,11 +8,7 @@
 import React from "react";
 
 import {
-    fireEvent,
+    fireEvent, getByText, queryByText, render, wait,
-    getByText,
-    queryByText,
-    render,
-    wait,
 } from "customTestRender";
 import mockAxios from "jest-mock-axios";
 import { mockJSONError } from "testUtils/network";
@@ -23,41 +19,38 @@ import { RebootButton } from "../RebootButton";
 describe("<RebootButton/>", () => {
     let componentContainer;
     beforeEach(() => {
-        const { container } = render(
+        const { container } = render(<>
-            <>
+            <div id="modal-container" />
-                <div id="modal-container" />
+            <RebootButton />
-                <RebootButton />
+        </>);
-            </>
-        );
         componentContainer = container;
     });
 
     it("Render.", () => {
-        expect(componentContainer).toMatchSnapshot();
+        expect(componentContainer)
+            .toMatchSnapshot();
     });
 
     it("Render modal.", () => {
-        expect(queryByText(componentContainer, "Confirm reboot")).toBeNull();
+        expect(queryByText(componentContainer, "Confirm reboot"))
+            .toBeNull();
         fireEvent.click(getByText(componentContainer, "Reboot"));
-        expect(componentContainer).toMatchSnapshot();
+        expect(componentContainer)
+            .toMatchSnapshot();
     });
 
     it("Confirm reboot.", () => {
         fireEvent.click(getByText(componentContainer, "Reboot"));
         fireEvent.click(getByText(componentContainer, "Confirm reboot"));
-        expect(mockAxios.post).toHaveBeenCalledWith(
+        expect(mockAxios.post)
-            "/reforis/api/reboot",
+            .toHaveBeenCalledWith("/reforis/api/reboot", undefined, expect.anything());
-            undefined,
-            expect.anything()
-        );
     });
 
     it("Hold error.", async () => {
         fireEvent.click(getByText(componentContainer, "Reboot"));
         fireEvent.click(getByText(componentContainer, "Confirm reboot"));
         mockJSONError();
-        await wait(() =>
+        await wait(() => expect(mockSetAlert)
-            expect(mockSetAlert).toBeCalledWith("Reboot request failed.")
+            .toBeCalledWith("Reboot request failed."));
-        );
     });
 });

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

@@ -22,7 +22,7 @@ exports[`<RebootButton/> Render modal. 1`] = `
             <h5
               class="modal-title"
             >
-              Warning!
+              Reboot confirmation
             </h5>
             <button
               class="close"
@@ -49,12 +49,16 @@ exports[`<RebootButton/> Render modal. 1`] = `
               class="btn btn-primary "
               type="button"
             >
+               
+               
               Cancel
             </button>
             <button
               class="btn btn-danger"
               type="button"
             >
+               
+               
               Confirm reboot
             </button>
           </div>
@@ -66,6 +70,8 @@ exports[`<RebootButton/> Render modal. 1`] = `
     class="btn btn-danger"
     type="button"
   >
+     
+     
     Reboot
   </button>
 </div>
@@ -80,6 +86,8 @@ exports[`<RebootButton/> Render. 1`] = `
     class="btn btn-danger"
     type="button"
   >
+     
+     
     Reboot
   </button>
 </div>

src/form/__tests__/SubmitButton.test.js

@@ -13,14 +13,17 @@ import { STATES, SubmitButton } from "../components/SubmitButton";
 describe("<SubmitButton/>", () => {
     it("Render ready", () => {
         const { container } = render(<SubmitButton state={STATES.READY} />);
-        expect(container).toMatchSnapshot();
+        expect(container)
+            .toMatchSnapshot();
     });
     it("Render saving", () => {
         const { container } = render(<SubmitButton state={STATES.SAVING} />);
-        expect(container).toMatchSnapshot();
+        expect(container)
+            .toMatchSnapshot();
     });
     it("Render load", () => {
         const { container } = render(<SubmitButton state={STATES.LOAD} />);
-        expect(container).toMatchSnapshot();
+        expect(container)
+            .toMatchSnapshot();
     });
 });

src/form/__tests__/__snapshots__/SubmitButton.test.js.snap

@@ -3,7 +3,7 @@
 exports[`<SubmitButton/> Render load 1`] = `
 <div>
   <button
-    class="btn btn-primary  col-sm-12 col-md-3 col-lg-2"
+    class="btn btn-primary  col-sm-12 col-lg-3"
     disabled=""
     type="submit"
   >
@@ -13,6 +13,8 @@ exports[`<SubmitButton/> Render load 1`] = `
       role="status"
     />
      
+     
+     
     Load settings
   </button>
 </div>
@@ -21,9 +23,11 @@ exports[`<SubmitButton/> Render load 1`] = `
 exports[`<SubmitButton/> Render ready 1`] = `
 <div>
   <button
-    class="btn btn-primary  col-sm-12 col-md-3 col-lg-2"
+    class="btn btn-primary  col-sm-12 col-lg-3"
     type="submit"
   >
+     
+     
     Save
   </button>
 </div>
@@ -32,7 +36,7 @@ exports[`<SubmitButton/> Render ready 1`] = `
 exports[`<SubmitButton/> Render saving 1`] = `
 <div>
   <button
-    class="btn btn-primary  col-sm-12 col-md-3 col-lg-2"
+    class="btn btn-primary  col-sm-12 col-lg-3"
     disabled=""
     type="submit"
   >
@@ -42,6 +46,8 @@ exports[`<SubmitButton/> Render saving 1`] = `
       role="status"
     />
      
+     
+     
     Updating
   </button>
 </div>

src/form/__tests__/hooks.test.js

@@ -7,7 +7,9 @@
 
 import React from "react";
 
-import { act, fireEvent, render, waitForElement } from "customTestRender";
+import {
+    act, fireEvent, render, waitForElement,
+} from "customTestRender";
 import mockAxios from "jest-mock-axios";
 import { WebSockets } from "webSockets/WebSockets";
 import { ForisForm } from "../components/ForisForm";
@@ -36,12 +38,8 @@ describe("useForm hook.", () => {
 
     beforeEach(async () => {
         mockPrepData = jest.fn(() => ({ field: "preparedData" }));
-        mockPrepDataToSubmit = jest.fn(() => ({
+        mockPrepDataToSubmit = jest.fn(() => ({ field: "preparedDataToSubmit" }));
-            field: "preparedDataToSubmit",
+        mockValidator = jest.fn((data) => (data.field === "invalidValue" ? { field: "Error" } : {}));
-        }));
-        mockValidator = jest.fn((data) =>
-            data.field === "invalidValue" ? { field: "Error" } : {}
-        );
         const { getByTestId, container } = render(
             <ForisForm
                 ws={new WebSockets()}
@@ -55,7 +53,7 @@ describe("useForm hook.", () => {
                 validator={mockValidator}
             >
                 <Child />
-            </ForisForm>
+            </ForisForm>,
         );
         mockAxios.mockResponse({ field: "fetchedData" });
 
@@ -69,22 +67,16 @@ describe("useForm hook.", () => {
         expect(Child.mock.calls[0][0].formErrors).toMatchObject({});
 
         act(() => {
-            fireEvent.change(input, {
+            fireEvent.change(input, { target: { value: "invalidValue", type: "text" } });
-                target: { value: "invalidValue", type: "text" },
-            });
         });
 
         expect(Child).toHaveBeenCalledTimes(2);
         expect(mockValidator).toHaveBeenCalledTimes(2);
-        expect(Child.mock.calls[1][0].formErrors).toMatchObject({
+        expect(Child.mock.calls[1][0].formErrors).toMatchObject({ field: "Error" });
-            field: "Error",
-        });
     });
 
     it("Update text value.", () => {
-        fireEvent.change(input, {
+        fireEvent.change(input, { target: { value: "newValue", type: "text" } });
-            target: { value: "newValue", type: "text" },
-        });
         expect(input.value).toBe("newValue");
     });
 
@@ -94,21 +86,14 @@ describe("useForm hook.", () => {
     });
 
     it("Update checkbox value.", () => {
-        fireEvent.change(input, {
+        fireEvent.change(input, { target: { checked: true, type: "checkbox" } });
-            target: { checked: true, type: "checkbox" },
-        });
         expect(input.checked).toBe(true);
     });
 
     it("Fetch data.", () => {
-        expect(mockAxios.get).toHaveBeenCalledWith(
+        expect(mockAxios.get).toHaveBeenCalledWith("testEndpoint", expect.anything());
-            "testEndpoint",
-            expect.anything()
-        );
         expect(mockPrepData).toHaveBeenCalledTimes(1);
-        expect(Child.mock.calls[0][0].formData).toMatchObject({
+        expect(Child.mock.calls[0][0].formData).toMatchObject({ field: "preparedData" });
-            field: "preparedData",
-        });
     });
 
     it("Submit.", () => {
@@ -122,7 +107,7 @@ describe("useForm hook.", () => {
         expect(mockAxios.post).toHaveBeenCalledWith(
             "testEndpoint",
             { field: "preparedDataToSubmit" },
-            expect.anything()
+            expect.anything(),
         );
     });
 });

src/form/__tests__/validation.test.js

@@ -1,100 +1,135 @@
 /*
- * 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";
 
 describe("Validation functions", () => {
     it("validateIPv4Address valid", () => {
-        expect(validateIPv4Address("192.168.1.1")).toBe(undefined);
+        expect(validateIPv4Address("192.168.1.1"))
-        expect(validateIPv4Address("1.1.1.1")).toBe(undefined);
+            .toBe(undefined);
-        expect(validateIPv4Address("0.0.0.0")).toBe(undefined);
+        expect(validateIPv4Address("1.1.1.1"))
+            .toBe(undefined);
+        expect(validateIPv4Address("0.0.0.0"))
+            .toBe(undefined);
     });
     it("validateIPv4Address invalid", () => {
-        expect(validateIPv4Address("invalid")).not.toBe(undefined);
+        expect(validateIPv4Address("invalid"))
-        expect(validateIPv4Address("192.256.1.1")).not.toBe(undefined);
+            .not
-        expect(validateIPv4Address("192.168.256.1")).not.toBe(undefined);
+            .toBe(undefined);
-        expect(validateIPv4Address("192.168.1.256")).not.toBe(undefined);
+        expect(validateIPv4Address("192.256.1.1"))
-        expect(validateIPv4Address("192.168.1.256")).not.toBe(undefined);
+            .not
+            .toBe(undefined);
+        expect(validateIPv4Address("192.168.256.1"))
+            .not
+            .toBe(undefined);
+        expect(validateIPv4Address("192.168.1.256"))
+            .not
+            .toBe(undefined);
+        expect(validateIPv4Address("192.168.1.256"))
+            .not
+            .toBe(undefined);
     });
 
     it("validateIPv6Address valid", () => {
-        expect(
+        expect(validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
-            validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
+            .toBe(undefined);
-        ).toBe(undefined);
+        expect(validateIPv6Address("0:0:0:0:0:0:0:1"))
-        expect(validateIPv6Address("0:0:0:0:0:0:0:1")).toBe(undefined);
+            .toBe(undefined);
-        expect(validateIPv6Address("::1")).toBe(undefined);
+        expect(validateIPv6Address("::1"))
-        expect(validateIPv6Address("::")).toBe(undefined);
+            .toBe(undefined);
+        expect(validateIPv6Address("::"))
+            .toBe(undefined);
     });
     it("validateIPv6Address invalid", () => {
-        expect(validateIPv6Address("invalid")).not.toBe(undefined);
+        expect(validateIPv6Address("invalid"))
-        expect(validateIPv6Address("1.1.1.1")).not.toBe(undefined);
+            .not
-        expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313")).not.toBe(
+            .toBe(undefined);
-            undefined
+        expect(validateIPv6Address("1.1.1.1"))
-        );
+            .not
-        expect(
+            .toBe(undefined);
-            validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313")
+        expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313"))
-        ).not.toBe(undefined);
+            .not
+            .toBe(undefined);
+        expect(validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313"))
+            .not
+            .toBe(undefined);
     });
 
     it("validateIPv6Prefix valid", () => {
-        expect(validateIPv6Prefix("2002:0000::/16")).toBe(undefined);
+        expect(validateIPv6Prefix("2002:0000::/16"))
-        expect(validateIPv6Prefix("0::/0")).toBe(undefined);
+            .toBe(undefined);
+        expect(validateIPv6Prefix("0::/0"))
+            .toBe(undefined);
     });
     it("validateIPv6Prefix invalid", () => {
-        expect(
+        expect(validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
-            validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
+            .not
-        ).not.toBe(undefined);
+            .toBe(undefined);
-        expect(validateIPv6Prefix("::1")).not.toBe(undefined);
+        expect(validateIPv6Prefix("::1"))
-        expect(validateIPv6Prefix("2002:0000::/999")).not.toBe(undefined);
+            .not
+            .toBe(undefined);
+        expect(validateIPv6Prefix("2002:0000::/999"))
+            .not
+            .toBe(undefined);
     });
 
     it("validateDomain valid", () => {
-        expect(validateDomain("example.com")).toBe(undefined);
+        expect(validateDomain("example.com"))
-        expect(validateDomain("one.two.three")).toBe(undefined);
+            .toBe(undefined);
+        expect(validateDomain("one.two.three"))
+            .toBe(undefined);
     });
     it("validateDomain invalid", () => {
-        expect(validateDomain("test/")).not.toBe(undefined);
+        expect(validateDomain("test/"))
-        expect(validateDomain(".")).not.toBe(undefined);
+            .not
-    });
+            .toBe(undefined);
-
+        expect(validateDomain("."))
-    it("validateHostname valid", () => {
+            .not
-        expect(validateHostname("new-android")).toBe(undefined);
+            .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("abcdefAB"))
-        expect(validateDUID("ABCDEF12")).toBe(undefined);
+            .toBe(undefined);
-        expect(validateDUID("ABCDEF12AB")).toBe(undefined);
+        expect(validateDUID("ABCDEF12"))
+            .toBe(undefined);
+        expect(validateDUID("ABCDEF12AB"))
+            .toBe(undefined);
     });
     it("validateDUID invalid", () => {
-        expect(validateDUID("gggggggg")).not.toBe(undefined);
+        expect(validateDUID("gggggggg"))
-        expect(validateDUID("abcdefABa")).not.toBe(undefined);
+            .not
+            .toBe(undefined);
+        expect(validateDUID("abcdefABa"))
+            .not
+            .toBe(undefined);
     });
 
     it("validateMAC valid", () => {
-        expect(validateMAC("00:D0:56:F2:B5:12")).toBe(undefined);
+        expect(validateMAC("00:D0:56:F2:B5:12"))
-        expect(validateMAC("00:26:DD:14:C4:EE")).toBe(undefined);
+            .toBe(undefined);
-        expect(validateMAC("06:00:00:00:00:00")).toBe(undefined);
+        expect(validateMAC("00:26:DD:14:C4:EE"))
+            .toBe(undefined);
+        expect(validateMAC("06:00:00:00:00:00"))
+            .toBe(undefined);
     });
     it("validateMAC invalid", () => {
-        expect(validateMAC("00:00:00:00:00:0G")).not.toBe(undefined);
+        expect(validateMAC("00:00:00:00:00:0G"))
-        expect(validateMAC("06:00:00:00:00:00:00")).not.toBe(undefined);
+            .not
+            .toBe(undefined);
+        expect(validateMAC("06:00:00:00:00:00:00"))
+            .not
+            .toBe(undefined);
     });
 });

src/form/components/ForisForm.js

@@ -52,25 +52,19 @@ ForisForm.propTypes = {
     onSubmitOverridden: PropTypes.func,
     /** Reference to actual form element (useful for programmatically submitting it).
      * Pass the output of useRef hook to this prop.
-     */
+    */
     formReference: PropTypes.object,
     /** reForis form components. */
     children: PropTypes.node.isRequired,
 
     // eslint-disable-next-line react/no-unused-prop-types
     customWSProp(props) {
-        const wsModuleIsSpecified = !!(
+        const wsModuleIsSpecified = !!(props.forisConfig && props.forisConfig.wsModule);
-            props.forisConfig && props.forisConfig.wsModule
-        );
         if (props.ws && !wsModuleIsSpecified) {
-            return new Error(
+            return new Error("forisConfig.wsModule should be specified when ws object is passed.");
-                "forisConfig.wsModule should be specified when ws object is passed."
-            );
         }
         if (!props.ws && wsModuleIsSpecified) {
-            return new Error(
+            return new Error("forisConfig.wsModule is specified without passing ws object.");
-                "forisConfig.wsModule is specified without passing ws object."
-            );
         }
     },
 };
@@ -101,10 +95,7 @@ export function ForisForm({
     formReference,
     children,
 }) {
-    const [formState, onFormChangeHandler, resetFormData] = useForm(
+    const [formState, onFormChangeHandler, resetFormData] = useForm(validator, prepData);
-        validator,
-        prepData
-    );
     const [setAlert, dismissAlert] = useAlert();
 
     const [forisModuleState] = useForisModule(ws, forisConfig);
@@ -150,39 +141,29 @@ export function ForisForm({
         return SUBMIT_BUTTON_STATES.READY;
     }
 
-    const formIsDisabled =
+    const formIsDisabled = (disabled
-        disabled ||
+        || forisModuleState.state === API_STATE.SENDING
-        forisModuleState.state === API_STATE.SENDING ||
+        || postState.state === API_STATE.SENDING);
-        postState.state === API_STATE.SENDING;
     const submitButtonIsDisabled = disabled || !!formState.errors;
 
-    const childrenWithFormProps = React.Children.map(children, (child) =>
+    const childrenWithFormProps = React.Children.map(
-        React.cloneElement(child, {
+        children,
+        (child) => React.cloneElement(child, {
             initialData: formState.initialData,
             formData: formState.data,
             formErrors: formState.errors,
             setFormValue: onFormChangeHandler,
             disabled: formIsDisabled,
-        })
+        }),
     );
 
     const onSubmit = onSubmitOverridden
-        ? onSubmitOverridden(
+        ? onSubmitOverridden(formState.data, onFormChangeHandler, onSubmitHandler)
-              formState.data,
-              onFormChangeHandler,
-              onSubmitHandler
-          )
         : onSubmitHandler;
 
     function getMessageOnLeavingPage() {
-        if (
+        if (JSON.stringify(formState.data) === JSON.stringify(formState.initialData)) return true;
-            JSON.stringify(formState.data) ===
+        return _("Changes you made may not be saved. Are you sure you want to leave?");
-            JSON.stringify(formState.initialData)
-        )
-            return true;
-        return _(
-            "Changes you made may not be saved. Are you sure you want to leave?"
-        );
     }
 
     return (

src/form/components/ForisForm.md

@@ -1,11 +1,8 @@
-`<ForisForm/>` is Higher-Order Component which encapsulates entire form logic
+`<ForisForm/>` is Higher-Order Component which encapsulates entire form logic and provides with children required props.
-and provides with children required props. This component structure provides
+This component structure provides comfort API and allows to create typical Foris module forms easily.
-comfort API and allows to create typical Foris module forms easily.
 
 ## Example of usage of `<ForisForm/>`
-
 You can pass more forms as children.
-
 ```js
 <ForisForm
     ws={ws}
@@ -27,10 +24,7 @@ You can pass more forms as children.
 
 ```js
 export default function MACForm({
-    formData,
+    formData, formErrors, setFormValue, ...props
-    formErrors,
-    setFormValue,
-    ...props
 }) {
     const macSettings = formData.mac_settings;
     const errors = (formErrors || {}).mac_settings || {};
@@ -41,33 +35,38 @@ export default function MACForm({
                 label={_("Custom MAC address")}
                 checked={macSettings.custom_mac_enabled}
                 helpText={HELP_TEXTS.custom_mac_enabled}
-                onChange={setFormValue((value) => ({
+
-                    mac_settings: { custom_mac_enabled: { $set: value } },
+                onChange={setFormValue(
-                }))}
+                    (value) => ({ mac_settings: { custom_mac_enabled: { $set: value } } }),
+                )}
+
                 {...props}
             />
-            {macSettings.custom_mac_enabled ? (
+            {macSettings.custom_mac_enabled
-                <TextInput
+                ? (
-                    label={_("MAC address")}
+                    <TextInput
-                    value={macSettings.custom_mac || ""}
+                        label={_("MAC address")}
-                    helpText={HELP_TEXTS.custom_mac}
+                        value={macSettings.custom_mac || ""}
-                    error={errors.custom_mac}
+                        helpText={HELP_TEXTS.custom_mac}
-                    required
+                        error={errors.custom_mac}
-                    onChange={setFormValue((value) => ({
+                        required
-                        mac_settings: { custom_mac: { $set: value } },
+
-                    }))}
+                        onChange={setFormValue(
-                    {...props}
+                            (value) => ({ mac_settings: { custom_mac: { $set: value } } }),
-                />
+                        )}
-            ) : null}
+
+                        {...props}
+                    />
+                )
+                : null}
         </>
     );
 }
 ```
-
 The <ForisForm/> passes subsequent `props` to the child components.
 
 | Prop           | Type   | Description                                                                |
-| -------------- | ------ | -------------------------------------------------------------------------- |
+|----------------|--------|----------------------------------------------------------------------------|
 | `formData`     | object | Data returned from API.                                                    |
 | `formErrors`   | object | Errors returned after validation via validator.                            |
 | `setFormValue` | func   | Function for data update. It takes update rule as arg (see example above). |

src/form/components/SubmitButton.js

@@ -18,7 +18,8 @@ export const STATES = {
 
 SubmitButton.propTypes = {
     disabled: PropTypes.bool,
-    state: PropTypes.oneOf(Object.keys(STATES).map((key) => STATES[key])),
+    state: PropTypes.oneOf(Object.keys(STATES)
+        .map((key) => STATES[key])),
 };
 
 export function SubmitButton({ disabled, state, ...props }) {
@@ -27,14 +28,14 @@ export function SubmitButton({ disabled, state, ...props }) {
 
     let labelSubmitButton;
     switch (state) {
-        case STATES.SAVING:
+    case STATES.SAVING:
-            labelSubmitButton = _("Updating");
+        labelSubmitButton = _("Updating");
-            break;
+        break;
-        case STATES.LOAD:
+    case STATES.LOAD:
-            labelSubmitButton = _("Load settings");
+        labelSubmitButton = _("Load settings");
-            break;
+        break;
-        default:
+    default:
-            labelSubmitButton = _("Save");
+        labelSubmitButton = _("Save");
     }
 
     return (
@@ -43,6 +44,7 @@ export function SubmitButton({ disabled, state, ...props }) {
             loading={loadingSubmitButton}
             disabled={disableSubmitButton}
             forisFormSize
+
             {...props}
         >
             {labelSubmitButton}

src/form/hooks.js

@@ -23,61 +23,57 @@ export function useForm(validator, dataPreprocessor) {
         errors: {},
     });
 
-    const onFormReload = useCallback(
+    const onFormReload = useCallback((data) => {
-        (data) => {
+        dispatch({
-            dispatch({
+            type: FORM_ACTIONS.resetData,
-                type: FORM_ACTIONS.resetData,
+            data,
-                data,
+            dataPreprocessor,
-                dataPreprocessor,
+            validator,
-                validator,
+        });
-            });
+    }, [dataPreprocessor, validator]);
-        },
-        [dataPreprocessor, validator]
-    );
 
-    const onFormChangeHandler = useCallback(
+    const onFormChangeHandler = useCallback((updateRule) => (event) => {
-        (updateRule) => (event) => {
+        dispatch({
-            dispatch({
+            type: FORM_ACTIONS.updateValue,
-                type: FORM_ACTIONS.updateValue,
+            value: getChangedValue(event.target),
-                value: getChangedValue(event.target),
+            updateRule,
-                updateRule,
+            validator,
-                validator,
+        });
-            });
+    }, [validator]);
-        },
-        [validator]
-    );
 
-    return [state, onFormChangeHandler, onFormReload];
+    return [
+        state,
+        onFormChangeHandler,
+        onFormReload,
+    ];
 }
 
 function formReducer(state, action) {
     switch (action.type) {
-        case FORM_ACTIONS.updateValue: {
+    case FORM_ACTIONS.updateValue: {
-            const newData = update(state.data, action.updateRule(action.value));
+        const newData = update(state.data, action.updateRule(action.value));
-            const errors = action.validator(newData);
+        const errors = action.validator(newData);
-            return {
+        return {
-                ...state,
+            ...state,
-                data: newData,
+            data: newData,
-                errors,
+            errors,
-            };
+        };
+    }
+    case FORM_ACTIONS.resetData: {
+        if (!action.data) {
+            return { ...state, initialData: state.data };
         }
-        case FORM_ACTIONS.resetData: {
-            if (!action.data) {
-                return { ...state, initialData: state.data };
-            }
 
-            const data = action.dataPreprocessor
+        const data = action.dataPreprocessor ? action.dataPreprocessor(action.data) : action.data;
-                ? action.dataPreprocessor(action.data)
+        return {
-                : action.data;
+            data,
-            return {
+            initialData: data,
-                data,
+            errors: action.data ? action.validator(data) : undefined,
-                initialData: data,
+        };
-                errors: action.data ? action.validator(data) : undefined,
+    }
-            };
+    default: {
-        }
+        throw new Error();
-        default: {
+    }
-            throw new Error();
-        }
     }
 }
 

src/index.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.
@@ -20,7 +20,6 @@ export { API_STATE } from "./api/utils";
 export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
 export { Button } from "./bootstrap/Button";
 export { CheckBox } from "./bootstrap/CheckBox";
-export { CopyInput } from "./bootstrap/CopyInput";
 export { DownloadButton } from "./bootstrap/DownloadButton";
 export { DataTimeInput } from "./bootstrap/DataTimeInput";
 export { EmailInput } from "./bootstrap/EmailInput";
@@ -31,22 +30,26 @@ export { PasswordInput } from "./bootstrap/PasswordInput";
 export { Radio, RadioSet } from "./bootstrap/RadioSet";
 export { Select } from "./bootstrap/Select";
 export { TextInput } from "./bootstrap/TextInput";
-export { formFieldsSize, buttonFormFieldsSize } from "./bootstrap/constants";
+export { formFieldsSize } from "./bootstrap/constants";
-export { Switch } from "./bootstrap/Switch";
 
-export { Spinner, SpinnerElement } from "./bootstrap/Spinner";
+export {
-export { Modal, ModalBody, ModalFooter, ModalHeader } from "./bootstrap/Modal";
+    Spinner,
+    SpinnerElement,
+} from "./bootstrap/Spinner";
+export {
+    Modal,
+    ModalBody,
+    ModalFooter,
+    ModalHeader,
+} from "./bootstrap/Modal";
 
 // Common
 export { RebootButton } from "./common/RebootButton";
 export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
-export { ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
+
 // Form
 export { ForisForm } from "./form/components/ForisForm";
-export {
+export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "./form/components/SubmitButton";
-    SubmitButton,
-    STATES as SUBMIT_BUTTON_STATES,
-} from "./form/components/SubmitButton";
 export { useForisModule, useForm } from "./form/hooks";
 
 // WebSockets
@@ -55,24 +58,13 @@ export { WebSockets } from "./webSockets/WebSockets";
 
 // Utils
 export { Portal } from "./utils/Portal";
+export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "./utils/objectHelpers";
 export {
-    undefinedIfEmpty,
+    withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
-    withoutUndefinedKeys,
-    onlySpecifiedKeys,
-} from "./utils/objectHelpers";
-export {
-    withEither,
-    withSpinner,
-    withSending,
-    withSpinnerOnSending,
-    withError,
-    withErrorMessage,
 } from "./utils/conditionalHOCs";
 export { ErrorMessage } from "./utils/ErrorMessage";
 export { useClickOutside } from "./utils/hooks";
 export { toLocaleDateString } from "./utils/datetime";
-export { displayCard } from "./utils/displayCard";
-export { isPluginInstalled } from "./utils/isPluginInstalled";
 
 // Foris URL
 export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
@@ -83,7 +75,6 @@ export {
     validateIPv6Address,
     validateIPv6Prefix,
     validateDomain,
-    validateHostname,
     validateDUID,
     validateMAC,
     validateMultipleEmails,

src/testUtils/alertContextMock.js

@@ -15,7 +15,7 @@ window.AlertContext = React.createContext();
 function AlertContextMock({ children }) {
     return (
         <AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}>
-            {children}
+            { children }
         </AlertContext.Provider>
     );
 }

src/testUtils/customTestRender.js

@@ -26,14 +26,15 @@ function Wrapper({ children }) {
     return (
         <AlertContextMock>
             <StaticRouter>
-                <UIDReset>{children}</UIDReset>
+                <UIDReset>
+                    {children}
+                </UIDReset>
             </StaticRouter>
         </AlertContextMock>
     );
 }
 
-const customTestRender = (ui, options) =>
+const customTestRender = (ui, options) => render(ui, { wrapper: Wrapper, ...options });
-    render(ui, { wrapper: Wrapper, ...options });
 
 // re-export everything
 export * from "@testing-library/react";

src/testUtils/network.js

@@ -8,7 +8,5 @@
 import mockAxios from "jest-mock-axios";
 
 export function mockJSONError(data) {
-    mockAxios.mockError({
+    mockAxios.mockError({ response: { data, headers: { "content-type": "application/json" } } });
-        response: { data, headers: { "content-type": "application/json" } },
-    });
 }

src/utils/ErrorMessage.js

@@ -17,5 +17,7 @@ ErrorMessage.defaultProps = {
 };
 
 export function ErrorMessage({ message }) {
-    return <p className="text-center text-danger">{message}</p>;
+    return (
+        <p className="text-center text-danger">{message}</p>
+    );
 }

src/utils/__tests__/conditionalHOCs.test.js

@@ -9,12 +9,7 @@ import React from "react";
 import { render } from "customTestRender";
 import { API_STATE } from "api/utils";
 import {
-    withEither,
+    withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
-    withSpinner,
-    withSending,
-    withSpinnerOnSending,
-    withError,
-    withErrorMessage,
 } from "../conditionalHOCs";
 
 describe("conditional HOCs", () => {
@@ -57,18 +52,14 @@ describe("conditional HOCs", () => {
         it("should render First component", () => {
             const withAlternative = withSending(Alternative);
             const FirstWithConditional = withAlternative(First);
-            const { getByText } = render(
+            const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />);
-                <FirstWithConditional apiState={API_STATE.SUCCESS} />
-            );
             expect(getByText("First")).toBeDefined();
         });
 
         it("should render Alternative component", () => {
             const withAlternative = withSending(Alternative);
             const FirstWithConditional = withAlternative(First);
-            const { getByText } = render(
+            const { getByText } = render(<FirstWithConditional apiState={API_STATE.SENDING} />);
-                <FirstWithConditional apiState={API_STATE.SENDING} />
-            );
             expect(getByText("Alternative")).toBeDefined();
         });
     });
@@ -76,17 +67,13 @@ describe("conditional HOCs", () => {
     describe("withSpinnerOnSending", () => {
         it("should render First component", () => {
             const FirstWithConditional = withSpinnerOnSending(First);
-            const { getByText } = render(
+            const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />);
-                <FirstWithConditional apiState={API_STATE.SUCCESS} />
-            );
             expect(getByText("First")).toBeDefined();
         });
 
         it("should render spinner", () => {
             const FirstWithConditional = withSpinnerOnSending(First);
-            const { container } = render(
+            const { container } = render(<FirstWithConditional apiState={API_STATE.SENDING} />);
-                <FirstWithConditional apiState={API_STATE.SENDING} />
-            );
             expect(container).toMatchSnapshot();
         });
     });
@@ -110,17 +97,13 @@ describe("conditional HOCs", () => {
     describe("withErrorMessage", () => {
         it("should render First component", () => {
             const FirstWithConditional = withErrorMessage(First);
-            const { getByText } = render(
+            const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />);
-                <FirstWithConditional apiState={API_STATE.SUCCESS} />
-            );
             expect(getByText("First")).toBeDefined();
         });
 
         it("should render error message", () => {
             const FirstWithConditional = withErrorMessage(First);
-            const { container } = render(
+            const { container } = render(<FirstWithConditional apiState={API_STATE.ERROR} />);
-                <FirstWithConditional apiState={API_STATE.ERROR} />
-            );
             expect(container).toMatchSnapshot();
         });
     });

src/utils/__tests__/datetime.test.js

@@ -10,40 +10,42 @@ import { toLocaleDateString } from "../datetime";
 describe("toLocaleDateString", () => {
     it("should work with different locale", () => {
         global.ForisTranslations = { locale: "fr" };
-        expect(toLocaleDateString("2020-02-20T12:51:36+00:00")).toBe(
+        expect(
-            "20 février 2020 12:51"
+            toLocaleDateString("2020-02-20T12:51:36+00:00")
-        );
+        ).toBe("20 février 2020 12:51");
         global.ForisTranslations = { locale: "en" };
-    });
+    })
 
     it("should convert with default format", () => {
-        expect(toLocaleDateString("2020-02-20T12:51:36+00:00")).toBe(
+        expect(
-            "February 20, 2020 12:51 PM"
+            toLocaleDateString("2020-02-20T12:51:36+00:00")
-        );
+        ).toBe("February 20, 2020 12:51 PM");
     });
 
     it("should convert with custom input format", () => {
         expect(
-            toLocaleDateString("2020-02-20 12:51:36 +0000", {
+            toLocaleDateString(
-                inputFormat: "YYYY-MM-DD HH:mm:ss Z",
+                "2020-02-20 12:51:36 +0000",
-            })
+                { inputFormat: "YYYY-MM-DD HH:mm:ss Z" },
+            )
         ).toBe("February 20, 2020 12:51 PM");
     });
 
     it("should convert with custom output format", () => {
         expect(
-            toLocaleDateString("2020-02-20T12:51:36+00:00", {
+            toLocaleDateString(
-                outputFormat: "LL",
+                "2020-02-20T12:51:36+00:00",
-            })
+                { outputFormat: "LL" },
+            )
         ).toBe("February 20, 2020");
     });
 
     it("should convert with custom input and output format", () => {
         expect(
-            toLocaleDateString("2020-02-20 12:51:36 +0000", {
+            toLocaleDateString(
-                inputFormat: "YYYY-MM-DD HH:mm:ss Z",
+                "2020-02-20 12:51:36 +0000",
-                outputFormat: "LL",
+                { inputFormat: "YYYY-MM-DD HH:mm:ss Z", outputFormat: "LL" },
-            })
+            )
         ).toBe("February 20, 2020");
     });
 });

src/utils/conditionalHOCs.js

@@ -24,8 +24,8 @@ function withEither(conditionalFn, Either) {
 
 function isSending(props) {
     if (Array.isArray(props.apiState)) {
-        return props.apiState.some((state) =>
+        return props.apiState.some(
-            [API_STATE.INIT, API_STATE.SENDING].includes(state)
+            (state) => [API_STATE.INIT, API_STATE.SENDING].includes(state),
         );
     }
     return [API_STATE.INIT, API_STATE.SENDING].includes(props.apiState);
@@ -38,18 +38,15 @@ const withSpinnerOnSending = withSpinner(isSending);
 // Error handling
 
 const withError = (conditionalFn) => withEither(conditionalFn, ErrorMessage);
-const withErrorMessage = withError((props) => {
+const withErrorMessage = withError(
-    if (Array.isArray(props.apiState)) {
+    (props) => {
-        return props.apiState.includes(API_STATE.ERROR);
+        if (Array.isArray(props.apiState)) {
-    }
+            return props.apiState.includes(API_STATE.ERROR);
-    return props.apiState === API_STATE.ERROR;
+        }
-});
+        return props.apiState === API_STATE.ERROR;
+    },
+);
 
 export {
-    withEither,
+    withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
-    withSpinner,
-    withSending,
-    withSpinnerOnSending,
-    withError,
-    withErrorMessage,
 };

src/utils/datetime.js

@@ -1,9 +1,8 @@
 import moment from "moment";
 
-export function toLocaleDateString(
+export function toLocaleDateString(date, { inputFormat, outputFormat = "LLL" } = {}) {
-    date,
-    { inputFormat, outputFormat = "LLL" } = {}
-) {
     const parsedDate = inputFormat ? moment(date, inputFormat) : moment(date);
-    return parsedDate.locale(ForisTranslations.locale).format(outputFormat);
+    return parsedDate
+        .locale(ForisTranslations.locale)
+        .format(outputFormat);
 }

src/utils/displayCard.js

@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-
-export function displayCard({ package_lists: packages }, cardName) {
-    const enabledPackagesNames = [];
-    packages
-        .filter((item) => item.enabled)
-        .map((item) => {
-            enabledPackagesNames.push(item.name);
-            item.options
-                .filter((option) => option.enabled)
-                .map((option) => {
-                    enabledPackagesNames.push(option.name);
-                    return null;
-                });
-            return null;
-        });
-    return enabledPackagesNames.includes(cardName);
-}

src/utils/forisUrls.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.
@@ -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`,
@@ -18,21 +18,12 @@ export const ForisURLs = {
     packageManagement: {
         updateSettings: `${REFORIS_URL_PREFIX}/package-management/update-settings`,
         updates: `${REFORIS_URL_PREFIX}/package-management/updates`,
-        packages: `${REFORIS_URL_PREFIX}/package-management/packages`,
     },
 
-    // Plugins
-    storage: `${REFORIS_URL_PREFIX}/storage`,
-    sentinelAgreement: `${REFORIS_URL_PREFIX}/sentinel/agreement`,
-
     // Notifications links are used with <Link/> inside Router, thus url subdir is not required.
-    overview: "/overview",
+    notifications: "/notifications",
-    notifications: "/overview#notifications",
     notificationsSettings: "/administration/notifications-settings",
 
-    approveUpdates: "/package-management/updates",
-    languages: "/package-management/languages",
-    maintenance: "/administration/maintenance",
     luci: "/cgi-bin/luci",
 
     // API