Merge branch 'feature/wifi-API-update' into 'master'

WiFi API update

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

.eslintrc.js

@@ -1,8 +1,3 @@
 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,4 +1,4 @@
-image: node:16-alpine
+image: registry.nic.cz/turris/reforis/reforis/reforis-image
 
 stages:
     - test
@@ -6,7 +6,7 @@ stages:
     - publish
 
 before_script:
-    - apk add make
+    - apt-get update && apt-get install -y make
     - npm install
 
 test:

.prettierrc

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

CHANGELOG.md

@@ -0,0 +1,493 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to
+[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [6.5.0] - 2024-11-13
+
+### Added
+
+-   Added & updated Weblate translations
+-   Added RichTable component with pagination and sorting
+-   Added @tanstack/react-table v8.20.5 to dependencies
+
+### Changed
+
+-   Updated documentation
+-   Replaced RebootButton with ActionButtonWithModal component
+-   Fixed import path for CustomizationContextMock in customTestRender.js
+
+## [6.4.0] - 2024-10-02
+
+### Changed
+
+-   Refactored Alert component to include dismiss animation and timeout
+-   Refactored ThreeDotsMenu component to include additional props
+
+## [6.3.0] - 2024-09-27
+
+### Added
+
+-   Added ThreeDotsMenu component
+
+### Changed
+
+-   Refactored EmailInput description
+-   Refactored RadioSet & ignore Radio component
+-   Refactored npm package badge in introduction.md
+-   NPM audit fix
+
+## [6.2.1] - 2024-09-25
+
+### Added
+
+-   Added & updated Weblate translations
+
+### Changed
+
+-   Refactored CopyInput component
+-   Refactored ForisURLs to include new URLs for Overview page
+
+## [6.2.0] - 2024-09-20
+
+### Added
+
+-   Added useFocusTrap hook
+-   Added extendSession endpoint
+
+### Changed
+
+-   Refactored Spinner.css to use CSS variable for color
+-   Refactored Modal component to use useFocusTrap hook
+-   Refactored Alert component to use useFocusTrap hook
+
+## [6.1.1] - 2024-08-30
+
+### Added
+
+-   Added & updated Weblate translations
+
+### Changed
+
+-   Updated icon color classes to use "text-secondary" instead of "text-dark"
+-   Updated Wi-Fi QRCodeModal component to use new styles & added close button
+-   Refactored WiFiGuestForm component to get rid of obsolete div element
+-   NPM audit fix
+
+## [6.1.0] - 2024-08-23
+
+### Added
+
+-   Added & updated Weblate translations
+
+### Changed
+
+-   Migrated to Font Awesome v6
+-   NPM audit fix
+
+## [6.0.3] - 2024-07-26
+
+### Changed
+
+-   Updated WiFiQRCode component
+
+## [6.0.2] - 2024-06-28
+
+### Added
+
+-   Added className prop to CheckBox and Radio components
+
+## [6.0.1] - 2024-06-26
+
+### Added
+
+-   Added className prop to Switch component
+
+### Changed
+
+-   Updated dependencies in package.json
+-   NPM audit fix
+
+## [6.0.0] - 2024-06-11
+
+### Added
+
+-   Added CHANGELOG.md
+-   Added JS_DIR variable to Makefile
+-   Added support for shared reForis ESLint configuration
+
+### Changed
+
+-   Updated dependencies in package.json
+-   Updated Spinner.css styles for better positioning and responsiveness
+-   Migrated to Bootstrap 5
+-   NPM audit fix
+-   Other small improvements
+
+## [5.6.1] - 2024-01-19
+
+-   Added & updated Weblate translations
+-   Fixed loading state & button's layout
+-   Updated bootstrap library to version 4.6.2
+-   Used custom reforis-image in GitLab CI/CD
+-   NPM audit fix
+
+## [5.6.0] - 2022-12-29
+
+-   Add & update Weblate translations
+-   Add CustomizationContext and custom hook
+-   Update caniuse-lite
+-   Remove testUtils from .gitignore
+-   Make ieee80211w_disabled as optional in WiFiForm
+-   Move contexts in a context folder
+-   NPM audit fix
+
+## [5.5.0] - 2022-12-02
+
+-   Add & update translations
+-   Add a switch to disable Management Frame Protection (802.11w)
+-   Improved Foris JS documentation
+-   NPM audit fix
+
+## [5.4.1] - 2022-06-03
+
+-   Add Weblate translations
+-   Update PropType peer dependency
+-   NPM audit fix
+
+## [5.4.0] - 2022-05-20
+
+-   Add & update translations
+-   Add CopyInput bootstrap component
+-   Update WiFiForm labels and description for wifi ax
+-   Make WS path in lighttpd mode configurable
+-   Fix Wi-Fi password helptext string
+-   NPM audit fix
+
+## [5.3.0] - 2022-02-21
+
+-   Added & update translations
+-   Added rest of the props to DownloadButton component
+-   Added hostname validation
+-   Added wifi 802.11ax HE modes
+-   Set best Wi-Fi HT mode depending on the checked frequency
+-   Improved domain name RegEx pattern
+-   Removed customOrder prop in Select component
+-   Fixed Wi-Fi translation strings
+-   Fixed autocomplete attribute in PasswordInput
+-   Fixed WiFi password max length check
+-   Fixed documentation build
+-   Fixed access token in publish script
+-   Refined & restructure Makefile
+-   Updated GitLab CI image to Node.js v16
+-   NPM update (several dependencies)
+-   NPM audit fix
+
+## [5.2.0] - 2021-12-15
+
+-   Remove login page
+-   NPM audit fix
+
+## [5.1.16] - 2021-11-18
+
+-   Revert bad NPM audit fix
+-   NPM audit fix
+
+## [5.1.15] - 2021-11-03
+
+-   Add WPA3 option
+-   Add custom order ability of Select options
+-   NPM audit fix
+
+## [5.1.14] - 2021-07-30
+
+-   Add & update translations
+-   Fix infinity redirect loop when WS error occurs
+-   NPM audit fix
+
+## [5.1.13] - 2021-06-30
+
+-   Add sentinelAgreement endpoint to forisUrls
+-   NPM audit fix
+
+## [5.1.12] - 2021-05-14
+
+-   Add & update translations
+-   Add & fix obsolete links
+-   Expend library with the ResetWifiSettings function
+-   Fix switching Wi-Fi modes depending on bands in WiFiForm
+-   Fix translation sources in WiFiForm
+-   NPM audit fix
+-   Other small improvements
+
+## [5.1.11] - 2021-01-04
+
+-   Remove duplicated file for Norwegian language
+-   Fix translations inconsistency
+
+## [5.1.10] - 2021-12-29
+
+-   Add and update translations
+
+## [5.1.9] - 2021-12-20
+
+-   Increase bottom margin of formFieldsSize
+-   Change formFieldsSize of ResetWiFiSettings card
+-   Fix trailing space in Modal classes
+
+## [5.1.8] - 2020-12-19
+
+-   Add isPluginInstalled function
+
+## [5.1.7] - 2020-11-27
+
+## [5.1.6] - 2020-11-25
+
+-   NPM audit fix
+-   Add displayCard function to utils
+-   Add optional sizes to Modal
+-   Add information about optional sizes to docs
+-   Remove redundant merge.py
+
+## [5.1.5] - 2020-09-25
+
+-   Fix DateTime import
+-   Fix extra empty space in Switch's classes
+
+## [5.1.4] - 2020-09-25
+
+-   Add inline option to Wi-Fi's RadioSet
+-   Fix Alert's dismissible class condition
+-   Add closing bootstrap modal using ESC
+-   Change reboot modal's heading to "Warning!"
+
+## [5.1.3] - 2020-09-11
+
+-   Add SSID validation for 32 bytes length
+-   Add helpText for SSID input
+
+## [5.1.2] - 2020-09-08
+
+-   Fix infinity loop caused by WebSockets
+-   Resolve small issues
+
+## [5.1.1] - 2020-08-31
+
+-   Add "inline" option to RadioSet
+-   NPM audit fix
+
+## [5.1.0] - 2020-08-25
+
+-   Add new Switch component
+-   Swap checkboxes for switches on Wi-Fi page
+-   Decrease button width on different breakpoints
+-   Add integration of Prettier + ESLint + reForis Style Guide
+-   Add appropriate links to dropdown headers
+-   Add semantic & accessibility structure for headings
+-   NPM audit & Update packages
+-   GitLab CI: image update to node 10
+
+## [5.0.3] - 2020-09-23
+
+-   Fixes issue with WebSockets
+
+## [5.0.2] - 2020-09-22
+
+-   Fix infinity loop caused by WebSockets
+
+## [5.0.1] - 2020-07-21
+
+-   Fix Wi-Fi Form
+-   NPM audit fix & update of packages
+
+## [5.0.0] - 2020-05-07
+
+-   I've realized that it should be major update due to broken API.
+
+## [4.5.1] - 2020-05-07
+
+-   Add initialData to ForisForm children.
+-   Update translations .pot file.
+
+## [4.5.0] - 2020-03-25
+
+-   Use exposed pdfmake.
+-   NPM audit fix & update of packages.
+
+## [4.4.0] - 2020-03-13
+
+-   Update domain validation.
+
+## [4.3.1] - 2020-03-06
+
+-   Add logout link.
+
+## [4.3.0] - 2020-02-26
+
+-   Allow RadioSet accept elements as children.
+-   Add option to make modal scrollable.
+
+## [4.2.0] - 2020-02-21
+
+-   Add translations.
+-   Improve datatime localization.
+
+## [4.1.0] - 2020-02-20
+
+-   Added date and time utilities.
+
+## [4.0.0] - 2020-02-20
+
+-   Throw an error if unhandled exception happens during API request.
+
+## [3.4.0] - 2020-02-17
+
+-   Display actual GET error response within the form.
+-   Added styles extracted from reForis.
+-   Added reference to form element (for programmatically submitting it).
+
+## [3.2.0] - 2020-01-17
+
+-   Swapped react-router with react-router-dom. Prepared Foris JS for using
+    react-router-dom exposed by reForis.
+-   Added controller ID filter to WebSocket hook.
+-   Updated translation messages after moving WiFi form.
+-   Increased request timeout to 30.5 sec.
+
+## [3.1.1] - 2020-01-10
+
+-   Fixed package dependencies related to exposing libraries via reForis
+
+## [3.1.0] - 2020-01-09
+
+-   Added Wi-Fi settings form
+-   Fixed path to index.js file in package.json
+
+## [3.0.0] - 2020-01-07
+
+-   Removal of Babel compiler
+-   Fixed width of ForisForm, removed default sizing for form widgets (like
+    buttons)
+
+## [2.1.1] - 2020-01-06
+
+-   Display date and time picker above input element
+
+## [2.1.0] - 2019-12-19
+
+-   Set WebSocket logging to debug level
+-   Added hook that detects clicking outside of component
+-   Added Radio to list of publicly available components
+-   Fixed link to git repository in package.json
+
+## [2.0.0] - 2019-12-09
+
+-   Added dynamic suffix for API URLs (allowing to use one hook for different
+    resources with e.g. PUT)
+-   Added unsubscribe method to WebSocket client
+-   Added custom class to SpinnerElement
+-   Improved documentation
+-   Published README.md
+
+## [1.4.0] - 2019-11-29
+
+-   Add reboot button.
+-   Fix Foris URLs prefixes
+
+## [1.3.3] - 2019-11-22
+
+-   Add translations from Weblate.
+
+## [1.3.2] - 2019-11-20
+
+-   Expose only AlertContext.
+-   Add hook for API pooling.
+
+## [1.3.1] - 2019-11-14
+
+## [1.2.0] - 2019-10-24
+
+## [1.1.0] - 2019-10-22
+
+## [1.0.0] - 2019-10-07
+
+## [0.0.7] - 2019-09-02
+
+[unreleased]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.5.0...dev
+[6.5.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.4.0...v6.5.0
+[6.4.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.3.0...v6.4.0
+[6.3.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.2.1...v6.3.0
+[6.2.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.2.0...v6.2.1
+[6.2.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.1...v6.2.0
+[6.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.1.0...v6.1.1
+[6.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.3...v6.1.0
+[6.0.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.2...v6.0.3
+[6.0.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.1...v6.0.2
+[6.0.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.0...v6.0.1
+[6.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.1...v6.0.0
+[5.6.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.0...v5.6.1
+[5.6.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.5.0...v5.6.0
+[5.5.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.4.1...v5.5.0
+[5.4.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.4.0...v5.4.1
+[5.4.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.3.0...v5.4.0
+[5.3.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.2.0...v5.3.0
+[5.2.0]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.16...v5.2.0
+[5.1.16]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.15...v5.1.16
+[5.1.15]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.14...v5.1.15
+[5.1.14]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.13...v5.1.14
+[5.1.13]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.12...v5.1.13
+[5.1.12]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.11...v5.1.12
+[5.1.11]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.10...v5.1.11
+[5.1.10]:
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.9...v5.1.10
+[5.1.9]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.8...v5.1.9
+[5.1.8]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.7...v5.1.8
+[5.1.7]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.6...v5.1.7
+[5.1.6]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.5...v5.1.6
+[5.1.5]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.4...v5.1.5
+[5.1.4]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.3...v5.1.4
+[5.1.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.2...v5.1.3
+[5.1.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.1...v5.1.2
+[5.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.1.0...v5.1.1
+[5.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.0.3...v5.1.0
+[5.0.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.0.2...v5.0.3
+[5.0.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.0.1...v5.0.2
+[5.0.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.5.0...v5.0.1
+[5.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.5.1...v5.0.0
+[4.5.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.5.0...v4.5.1
+[4.5.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.4.0...v4.5.0
+[4.4.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.3.1...v4.4.0
+[4.3.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.3.0...v4.3.1
+[4.3.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.2.0...v4.3.0
+[4.2.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.1.0...v4.2.0
+[4.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v4.0.0...v4.1.0
+[4.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v3.4.0...v4.0.0
+[3.4.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v3.2.0...v3.4.0
+[3.2.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v3.1.1...v3.2.0
+[3.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v3.1.0...v3.1.1
+[3.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v3.0.0...v3.1.0
+[3.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v2.1.1...v3.0.0
+[2.1.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v2.1.0...v2.1.1
+[2.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v2.0.0...v2.1.0
+[2.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.4.0...v2.0.0
+[1.4.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.3.3...v1.4.0
+[1.3.3]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.3.2...v1.3.3
+[1.3.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.3.1...v1.3.2
+[1.3.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.2.0...v1.3.1
+[1.2.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.1.0...v1.2.0
+[1.1.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v1.0.0...v1.1.0
+[1.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v0.0.7...v1.0.0
+[0.0.7]: https://gitlab.nic.cz/turris/reforis/foris-js/-/tags/v0.0.7

Makefile

@@ -11,6 +11,7 @@ MSGID_BUGS_ADDRESS="tech.support@turris.cz"
 
 DEV_PYTHON=python3
 VENV_NAME?=venv
+JS_DIR=js
 VENV_BIN=$(shell pwd)/$(VENV_NAME)/bin
 
 .PHONY: all

docs/components/Logo.js

@@ -0,0 +1,36 @@
+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

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

docs/development.md

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

@@ -0,0 +1,4 @@
+<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

@@ -1,6 +0,0 @@
-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

@@ -0,0 +1,36 @@
+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
+```
+
+[![npm version](https://badge.fury.io/js/foris.svg)](https://badge.fury.io/js/foris)

jest.config.js

@@ -19,6 +19,7 @@ module.exports = {
     collectCoverageFrom: ["src/**/*.{js,jsx}"],
     coverageDirectory: "coverage",
     testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/", "/dist/"],
+    testEnvironment: "jsdom",
     verbose: false,
     setupFilesAfterEnv: [
         "@testing-library/react/cleanup-after-each",

package.json

@@ -1,7 +1,7 @@
 {
     "name": "foris",
-    "version": "5.4.0",
+    "version": "6.5.0",
-    "description": "Set of components and utils for Foris and its plugins.",
+    "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
         "type": "git",
@@ -14,49 +14,52 @@
     "license": "GPL-3.0",
     "main": "./src/index.js",
     "dependencies": {
-        "axios": "^0.21.1",
+        "@fortawesome/fontawesome-svg-core": "^6.6.0",
-        "immutability-helper": "3.0.1",
+        "@fortawesome/free-regular-svg-icons": "^6.6.0",
-        "moment": "^2.24.0",
+        "@fortawesome/free-solid-svg-icons": "^6.6.0",
-        "qrcode.react": "^1.0.1",
+        "@fortawesome/react-fontawesome": "^0.2.2",
-        "react-datetime": "^3.1.1",
+        "@tanstack/react-table": "^8.20.5",
-        "react-uid": "^2.2.0"
+        "axios": "^1.7.2",
+        "immutability-helper": "^3.1.1",
+        "moment": "^2.30.1",
+        "qrcode.react": "^3.1.0",
+        "react-datetime": "^3.2.0",
+        "react-uid": "^2.3.3"
     },
     "peerDependencies": {
-        "bootstrap": "4.4.1",
+        "bootstrap": "^5.3.3",
-        "prop-types": "15.7.2",
+        "prop-types": "15.8.1",
         "react": "16.9.0",
         "react-dom": "16.9.0",
         "react-router-dom": "^5.1.2"
     },
     "devDependencies": {
-        "@babel/cli": "^7.12.10",
+        "@babel/cli": "^7.24.7",
-        "@babel/core": "^7.9.0",
+        "@babel/core": "^7.24.7",
-        "@babel/plugin-transform-runtime": "^7.9.0",
+        "@babel/plugin-transform-runtime": "^7.24.7",
-        "@babel/preset-env": "^7.9.0",
+        "@babel/preset-env": "^7.24.7",
-        "@babel/preset-react": "^7.9.4",
+        "@babel/preset-react": "^7.24.7",
-        "@fortawesome/fontawesome-free": "^5.13.0",
         "@testing-library/react": "^8.0.9",
         "babel-loader": "^8.1.0",
         "babel-polyfill": "^6.26.0",
-        "bootstrap": "^4.5.0",
+        "bootstrap": "^5.3.3",
         "css-loader": "^5.2.4",
-        "eslint": "^6.8.0",
+        "eslint": "^8.57.0",
-        "eslint-config-prettier": "^6.11.0",
+        "eslint-config-reforis": "^2.1.1",
-        "eslint-config-reforis": "^1.0.0",
-        "eslint-plugin-prettier": "^3.1.4",
         "file-loader": "^6.0.0",
-        "jest": "^25.2.0",
+        "jest": "^29.7.0",
-        "jest-mock-axios": "^3.2.0",
+        "jest-environment-jsdom": "^29.7.0",
-        "moment-timezone": "^0.5.34",
+        "jest-mock-axios": "^4.7.3",
-        "prettier": "2.0.5",
+        "moment-timezone": "^0.5.45",
-        "prop-types": "15.7.2",
+        "prettier": "^3.3.2",
+        "prop-types": "15.8.1",
         "react": "16.9.0",
         "react-dom": "16.9.0",
         "react-router-dom": "^5.1.2",
-        "react-styleguidist": "^11.2.0",
+        "react-styleguidist": "^12.0.1",
-        "snapshot-diff": "^0.7.0",
+        "snapshot-diff": "^0.10.0",
         "style-loader": "^1.2.1",
-        "webpack": "^5.68.0"
+        "webpack": "^5.92.1"
     },
     "scripts": {
         "lint": "eslint src",

prettier.config.js

@@ -0,0 +1 @@
+module.exports = require("eslint-config-reforis/prettier.config");

src/api/hooks.js

@@ -111,9 +111,8 @@ const useAPIPatch = createAPIHook("PATCH");
 const useAPIPut = createAPIHook("PUT");
 const useAPIDelete = createAPIHook("DELETE");
 
-export { useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete };
+/* eslint-disable default-param-last */
-
+function useAPIPolling(endpoint, delay = 1000, until) {
-export function useAPIPolling(endpoint, delay = 1000, until) {
     // delay ms
     const [state, setState] = useState({ state: API_STATE.INIT });
     const [getResponse, get] = useAPIGet(endpoint);
@@ -133,3 +132,12 @@ export function useAPIPolling(endpoint, delay = 1000, until) {
 
     return [state];
 }
+
+export {
+    useAPIGet,
+    useAPIPost,
+    useAPIPatch,
+    useAPIPut,
+    useAPIDelete,
+    useAPIPolling,
+};

src/bootstrap/Alert.js

@@ -1,13 +1,16 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+import React, { useRef, useEffect, useState } from "react";
+
 import PropTypes from "prop-types";
 
+import { useFocusTrap } from "../utils/hooks";
+
 export const ALERT_TYPES = Object.freeze({
     PRIMARY: "primary",
     SECONDARY: "secondary",
@@ -35,21 +38,44 @@ Alert.defaultProps = {
     type: ALERT_TYPES.DANGER,
 };
 
-export function Alert({ type, onDismiss, children }) {
+function Alert({ type, onDismiss, children }) {
+    const alertRef = useRef();
+    const [isVisible, setIsVisible] = useState(true);
+    useFocusTrap(alertRef, !!onDismiss);
+
+    useEffect(() => {
+        if (onDismiss) {
+            const timeout = setTimeout(() => setIsVisible(false), 7000);
+            return () => clearTimeout(timeout);
+        }
+    }, [onDismiss]);
+
+    const handleAnimationEnd = () => {
+        if (!isVisible && onDismiss) {
+            onDismiss();
+        }
+    };
+
     return (
         <div
-            className={`alert ${
+            ref={alertRef}
+            className={`alert alert-${type} ${isVisible ? "alert-fade-in" : "alert-slide-out-top"} ${
                 onDismiss ? "alert-dismissible" : ""
-            } alert-${type}`}
+            }`.trim()}
+            role="alert"
+            onAnimationEnd={handleAnimationEnd}
         >
-            {onDismiss ? (
+            {onDismiss && (
-                <button type="button" className="close" onClick={onDismiss}>
+                <button
-                    &times;
+                    type="button"
-                </button>
+                    className="btn-close"
-            ) : (
+                    onClick={() => setIsVisible(false)}
-                false
+                    aria-label={_("Close")}
+                />
             )}
             {children}
         </div>
     );
 }
+
+export default Alert;

src/bootstrap/Button.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
 Button.propTypes = {
@@ -24,31 +25,28 @@ Button.propTypes = {
     ]).isRequired,
 };
 
-export function Button({
+function Button({ className, loading, forisFormSize, children, ...props }) {
-    className,
+    let buttonClass = className ? `btn ${className}` : "btn btn-primary";
-    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-12 col-md-3 col-lg-2`;
     }
 
-    const span = loading ? (
-        <span
-            className="spinner-border spinner-border-sm"
-            role="status"
-            aria-hidden="true"
-        />
-    ) : null;
-
     return (
-        <button type="button" className={buttonClass} {...props}>
+        <button
-            {span}
+            type="button"
-            {span ? " " : null}
+            className={`${buttonClass} d-inline-flex justify-content-center align-items-center`}
-            {children}
+            {...props}
+        >
+            {loading && (
+                <span
+                    className="spinner-border spinner-border-sm me-1"
+                    role="status"
+                    aria-hidden="true"
+                />
+            )}
+            <span>{children}</span>
         </button>
     );
 }
+
+export default Button;

src/bootstrap/CheckBox.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 import { useUID } from "react-uid";
 
@@ -16,33 +17,36 @@ CheckBox.propTypes = {
     helpText: PropTypes.string,
     /** Control if checkbox is clickable */
     disabled: PropTypes.bool,
+    /** Additional class name */
+    className: PropTypes.string,
 };
 
 CheckBox.defaultProps = {
     disabled: false,
 };
 
-export function CheckBox({ label, helpText, disabled, ...props }) {
+function CheckBox({ label, helpText, disabled, className, ...props }) {
     const uid = useUID();
+
     return (
-        <div className="form-group">
+        <div className={`${className || "mb-3"} form-check`.trim()}>
-            <div className="custom-control custom-checkbox ">
+            <input
-                <input
+                className="form-check-input"
-                    className="custom-control-input"
+                type="checkbox"
-                    type="checkbox"
+                id={uid}
-                    id={uid}
+                disabled={disabled}
-                    disabled={disabled}
+                {...props}
-                    {...props}
+            />
-                />
+            <label className="form-check-label" htmlFor={uid}>
-                <label className="custom-control-label" htmlFor={uid}>
+                {label}
-                    {label}
+            </label>
-                    {helpText && (
+            {helpText && (
-                        <small className="form-text text-muted">
+                <div className="form-text">
-                            {helpText}
+                    <small>{helpText}</small>
-                        </small>
+                </div>
-                    )}
+            )}
-                </label>
-            </div>
         </div>
     );
 }
+
+export default CheckBox;

src/bootstrap/CopyInput.js

@@ -1,13 +1,15 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2024 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";
+
+import Input from "./Input";
 
 CopyInput.propTypes = {
     /** Field label. */
@@ -22,7 +24,7 @@ CopyInput.propTypes = {
     readOnly: PropTypes.bool,
 };
 
-export function CopyInput({ value, ...props }) {
+function CopyInput({ value, ...props }) {
     const inputTextRef = useRef();
     const [isCopied, setIsCopied] = useState(false);
 
@@ -46,15 +48,15 @@ export function CopyInput({ value, ...props }) {
 
     return (
         <Input type="text" value={value} ref={inputTextRef} {...props}>
-            <div className="input-group-append">
+            <button
-                <button
+                className="btn btn-outline-secondary"
-                    className="btn btn-outline-secondary"
+                type="button"
-                    type="button"
+                onClick={handleCopyClick}
-                    onClick={handleCopyClick}
+            >
-                >
+                <span>{isCopied ? _("Copied!") : _("Copy")}</span>
-                    <span>{isCopied ? _("Copied!") : _("Copy")}</span>
+            </button>
-                </button>
-            </div>
         </Input>
     );
 }
+
+export default CopyInput;

src/bootstrap/DataTimeInput.js

@@ -1,18 +1,19 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
+import moment from "moment/moment";
 import PropTypes from "prop-types";
 import Datetime from "react-datetime";
-import moment from "moment/moment";
 import "react-datetime/css/react-datetime.css";
 import "./DataTimeInput.css";
 
-import { Input } from "./Input";
+import Input from "./Input";
 
 DataTimeInput.propTypes = {
     /** Field label. */
@@ -37,7 +38,7 @@ DataTimeInput.propTypes = {
 const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
 const DEFAULT_TIME_FORMAT = "HH:mm:ss";
 
-export function DataTimeInput({
+function DataTimeInput({
     value,
     onChange,
     isValidDate,
@@ -46,13 +47,13 @@ export function DataTimeInput({
     children,
     ...props
 }) {
-    function renderInput(datetimeProps) {
+    const renderInput = (datetimeProps) => {
         return (
             <Input {...props} {...datetimeProps}>
                 {children}
             </Input>
         );
-    }
+    };
 
     return (
         <Datetime
@@ -70,3 +71,5 @@ export function DataTimeInput({
         />
     );
 }
+
+export default DataTimeInput;

src/bootstrap/DownloadButton.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
 DownloadButton.propTypes = {
@@ -21,7 +22,7 @@ DownloadButton.defaultProps = {
     className: "btn-primary",
 };
 
-export function DownloadButton({ href, className, children, ...props }) {
+function DownloadButton({ href, className, children, ...props }) {
     return (
         <a
             href={href}
@@ -33,3 +34,5 @@ export function DownloadButton({ href, className, children, ...props }) {
         </a>
     );
 }
+
+export default DownloadButton;

src/bootstrap/EmailInput.js

@@ -6,11 +6,14 @@
  */
 
 import React from "react";
+
 import PropTypes from "prop-types";
 
-import { Input } from "./Input";
+import Input from "./Input";
 
-export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;
+function EmailInput({ ...props }) {
+    return <Input type="email" {...props} />;
+}
 
 EmailInput.propTypes = {
     /** Field label. */
@@ -22,3 +25,5 @@ EmailInput.propTypes = {
     /** Email value. */
     value: PropTypes.string,
 };
+
+export default EmailInput;

src/bootstrap/EmailInput.md

@@ -6,6 +6,7 @@ All additional `props` are passed to the `<input type="email">` HTML component.
 
 ```js
 import { useState } from "react";
+import Button from "./Button";
 const [email, setEmail] = useState("Wrong email");
 <form onSubmit={(e) => e.preventDefault()}>
     <EmailInput
@@ -14,6 +15,6 @@ const [email, setEmail] = useState("Wrong email");
         helpText="Read the small text!"
         onChange={(event) => setEmail(event.target.value)}
     />
-    <button type="submit">Try to submit</button>
+    <Button type="submit">Try to submit</Button>
 </form>;
 ```

src/bootstrap/FileInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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.
@@ -8,7 +8,8 @@
 import React from "react";
 
 import PropTypes from "prop-types";
-import { Input } from "./Input";
+
+import Input from "./Input";
 
 FileInput.propTypes = {
     /** Field label. */
@@ -23,7 +24,7 @@ FileInput.propTypes = {
     multiple: PropTypes.bool,
 };
 
-export function FileInput({ ...props }) {
+function FileInput({ ...props }) {
     return (
         <Input
             type="file"
@@ -34,3 +35,5 @@ export function FileInput({ ...props }) {
         />
     );
 }
+
+export default FileInput;

src/bootstrap/Input.js

@@ -6,11 +6,12 @@
  */
 
 import React, { forwardRef } from "react";
-import { useUID } from "react-uid";
+
 import PropTypes from "prop-types";
+import { useUID } from "react-uid";
 
 /** Base bootstrap input component. */
-export const Input = forwardRef(
+const Input = forwardRef(
     (
         {
             type,
@@ -27,18 +28,21 @@ export const Input = forwardRef(
     ) => {
         const uid = useUID();
 
-        const inputClassName = `form-control ${className || ""} ${
+        const inputClassName = `${className || ""} ${
             error ? "is-invalid" : ""
         }`.trim();
 
         return (
-            <div className="form-group">
+            <div className="mb-3">
-                <label className={labelClassName} htmlFor={uid}>
+                <label
+                    className={`form-label ${labelClassName || ""}`.trim()}
+                    htmlFor={uid}
+                >
                     {label}
                 </label>
                 <div className={`input-group ${groupClassName || ""}`.trim()}>
                     <input
-                        className={inputClassName}
+                        className={`form-control ${inputClassName}`.trim()}
                         type={type}
                         id={uid}
                         ref={ref}
@@ -46,15 +50,19 @@ export const Input = forwardRef(
                     />
                     {children}
                 </div>
-                {error ? <div className="invalid-feedback">{error}</div> : null}
+                {error && <div className="invalid-feedback">{error}</div>}
-                {helpText ? (
+                {helpText && (
-                    <small className="form-text text-muted">{helpText}</small>
+                    <div className="form-text">
-                ) : null}
+                        <small>{helpText}</small>
+                    </div>
+                )}
             </div>
         );
     }
 );
 
+Input.displayName = "Input";
+
 Input.propTypes = {
     type: PropTypes.string.isRequired,
     label: PropTypes.string.isRequired,
@@ -68,3 +76,5 @@ Input.propTypes = {
     labelClassName: PropTypes.string,
     groupClassName: PropTypes.string,
 };
+
+export default Input;

src/bootstrap/Modal.js

@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2020-2024 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, { useRef, useEffect } from "react";
+
 import PropTypes from "prop-types";
 
-import { Portal } from "../utils/Portal";
+import { useClickOutside, useFocusTrap } from "../utils/hooks";
-import { useClickOutside } from "../utils/hooks";
+import Portal from "../utils/Portal";
 import "./Modal.css";
 
 Modal.propTypes = {
@@ -28,10 +29,11 @@ Modal.propTypes = {
 };
 
 export function Modal({ shown, setShown, scrollable, size, children }) {
-    const dialogRef = useRef();
+    const modalRef = useRef();
     let modalSize = "modal-";
 
-    useClickOutside(dialogRef, () => setShown(false));
+    useClickOutside(modalRef, () => setShown(false));
+    useFocusTrap(modalRef, shown);
 
     useEffect(() => {
         const handleEsc = (event) => {
@@ -64,11 +66,13 @@ export function Modal({ shown, setShown, scrollable, size, children }) {
     return (
         <Portal containerId="modal-container">
             <div
+                ref={modalRef}
                 className={`modal fade ${shown ? "show" : ""}`.trim()}
                 role="dialog"
+                aria-modal="true"
+                aria-labelledby="modal-title"
             >
                 <div
-                    ref={dialogRef}
                     className={`${modalSize.trim()} modal-dialog modal-dialog-centered ${
                         scrollable ? "modal-dialog-scrollable" : ""
                     }`.trim()}
@@ -89,14 +93,13 @@ ModalHeader.propTypes = {
 export function ModalHeader({ setShown, title }) {
     return (
         <div className="modal-header">
-            <h5 className="modal-title">{title}</h5>
+            <h1 className="modal-title fs-5">{title}</h1>
             <button
                 type="button"
-                className="close"
+                className="btn-close"
                 onClick={() => setShown(false)}
-            >
+                aria-label={_("Close")}
-                <span aria-hidden="true">&times;</span>
+            />
-            </button>
         </div>
     );
 }

src/bootstrap/NumberInput.js

@@ -1,15 +1,18 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
+import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import PropTypes from "prop-types";
 
+import Input from "./Input";
 import { useConditionalTimeout } from "../utils/hooks";
-import { Input } from "./Input";
 import "./NumberInput.css";
 
 NumberInput.propTypes = {
@@ -23,7 +26,7 @@ NumberInput.propTypes = {
     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. */
+    /** Additional description displayed to the right of input value. */
     inlineText: PropTypes.string,
 };
 
@@ -31,7 +34,7 @@ NumberInput.defaultProps = {
     value: 0,
 };
 
-export function NumberInput({ onChange, inlineText, value, ...props }) {
+function NumberInput({ onChange, inlineText, value, ...props }) {
     function updateValue(initialValue, difference) {
         onChange({ target: { value: initialValue + difference } });
     }
@@ -49,27 +52,29 @@ export function NumberInput({ onChange, inlineText, value, ...props }) {
 
     return (
         <Input type="number" onChange={onChange} value={value} {...props}>
-            <div className="input-group-append">
+            {inlineText && (
-                {inlineText && <p className="input-group-text">{inlineText}</p>}
+                <span className="input-group-text">{inlineText}</span>
-                <button
+            )}
-                    type="button"
+            <button
-                    className="btn btn-outline-secondary"
+                type="button"
-                    onMouseDown={() => enableIncrease(true)}
+                className="btn btn-outline-secondary"
-                    onMouseUp={() => enableIncrease(false)}
+                onMouseDown={() => enableIncrease(true)}
-                    aria-label="Increase"
+                onMouseUp={() => enableIncrease(false)}
-                >
+                aria-label="Increase"
-                    <i className="fas fa-plus" />
+            >
-                </button>
+                <FontAwesomeIcon icon={faPlus} />
-                <button
+            </button>
-                    type="button"
+            <button
-                    className="btn btn-outline-secondary"
+                type="button"
-                    onMouseDown={() => enableDecrease(true)}
+                className="btn btn-outline-secondary"
-                    onMouseUp={() => enableDecrease(false)}
+                onMouseDown={() => enableDecrease(true)}
-                    aria-label="Decrease"
+                onMouseUp={() => enableDecrease(false)}
-                >
+                aria-label="Decrease"
-                    <i className="fas fa-minus" />
+            >
-                </button>
+                <FontAwesomeIcon icon={faMinus} />
-            </div>
+            </button>
         </Input>
     );
 }
+
+export default NumberInput;

src/bootstrap/PasswordInput.js

@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 } from "react";
+
+import { faEye, faEyeSlash } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import PropTypes from "prop-types";
 
-import { Input } from "./Input";
+import Input from "./Input";
 
 PasswordInput.propTypes = {
     /** Field label. */
@@ -25,7 +28,7 @@ PasswordInput.propTypes = {
     newPass: PropTypes.bool,
 };
 
-export function PasswordInput({ withEye, newPass, ...props }) {
+function PasswordInput({ withEye, newPass, ...props }) {
     const [isHidden, setHidden] = useState(true);
 
     return (
@@ -34,24 +37,24 @@ export function PasswordInput({ withEye, newPass, ...props }) {
             autoComplete={newPass ? "new-password" : "current-password"}
             {...props}
         >
-            {withEye ? (
+            {withEye && (
-                <div className="input-group-append">
+                <button
-                    <button
+                    type="button"
-                        type="button"
+                    className="input-group-text"
-                        className="input-group-text"
+                    onClick={(e) => {
-                        onClick={(e) => {
+                        e.preventDefault();
-                            e.preventDefault();
+                        setHidden((shouldBeHidden) => !shouldBeHidden);
-                            setHidden((shouldBeHidden) => !shouldBeHidden);
+                    }}
-                        }}
+                >
-                    >
+                    <FontAwesomeIcon
-                        <i
+                        icon={isHidden ? faEye : faEyeSlash}
-                            className={`fa ${
+                        style={{ width: "1.25rem" }}
-                                isHidden ? "fa-eye" : "fa-eye-slash"
+                        className="text-secondary"
-                            }`}
+                    />
-                        />
+                </button>
-                    </button>
+            )}
-                </div>
-            ) : null}
         </Input>
     );
 }
+
+export default PasswordInput;

src/bootstrap/Radio.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2024 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 from "react";
+
+import PropTypes from "prop-types";
+
+Radio.propTypes = {
+    label: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.element,
+        PropTypes.node,
+        PropTypes.arrayOf(PropTypes.node),
+    ]).isRequired,
+    id: PropTypes.string.isRequired,
+    inline: PropTypes.bool,
+    helpText: PropTypes.string,
+    className: PropTypes.string,
+};
+
+function Radio({ label, id, helpText, inline, className, ...props }) {
+    return (
+        <div
+            className={`${className || "mb-3"} ${inline ? "form-check form-check-inline" : ""}`.trim()}
+        >
+            <input
+                id={id}
+                className="form-check-input me-2"
+                type="radio"
+                {...props}
+            />
+            <label className="form-check-label" htmlFor={id}>
+                {label}
+                {helpText && (
+                    <div className="form-text">
+                        <small>{helpText}</small>
+                    </div>
+                )}
+            </label>
+        </div>
+    );
+}
+
+export default Radio;

src/bootstrap/RadioSet.js

@@ -1,14 +1,17 @@
 /*
- * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2020-2024 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 from "react";
+
 import PropTypes from "prop-types";
 import { useUID } from "react-uid";
 
+import Radio from "./Radio";
+
 RadioSet.propTypes = {
     /** Name attribute of the input HTML tag. */
     name: PropTypes.string.isRequired,
@@ -17,7 +20,7 @@ RadioSet.propTypes = {
     /** Choices . */
     choices: PropTypes.arrayOf(
         PropTypes.shape({
-            /** Choice lable . */
+            /** Choice label . */
             label: PropTypes.oneOfType([
                 PropTypes.string,
                 PropTypes.element,
@@ -36,15 +39,7 @@ RadioSet.propTypes = {
     inline: PropTypes.bool,
 };
 
-export function RadioSet({
+function RadioSet({ name, label, choices, value, helpText, inline, ...props }) {
-    name,
-    label,
-    choices,
-    value,
-    helpText,
-    inline,
-    ...props
-}) {
     const uid = useUID();
     const radios = choices.map((choice, key) => {
         const id = `${name}-${key}`;
@@ -64,7 +59,7 @@ export function RadioSet({
     });
 
     return (
-        <div className="form-group">
+        <div className="mb-3">
             {label && (
                 <label htmlFor={uid} className="d-block">
                     {label}
@@ -72,47 +67,12 @@ export function RadioSet({
             )}
             {radios}
             {helpText && (
-                <small className="form-text text-muted">{helpText}</small>
+                <div className="form-text">
+                    <small>{helpText}</small>
+                </div>
             )}
         </div>
     );
 }
 
-Radio.propTypes = {
+export default RadioSet;
-    label: PropTypes.oneOfType([
-        PropTypes.string,
-        PropTypes.element,
-        PropTypes.node,
-        PropTypes.arrayOf(PropTypes.node),
-    ]).isRequired,
-    id: PropTypes.string.isRequired,
-    inline: PropTypes.bool,
-    helpText: PropTypes.string,
-};
-
-export function Radio({ label, id, helpText, inline, ...props }) {
-    return (
-        <>
-            <div
-                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}
-                </label>
-                {helpText && (
-                    <small className="form-text text-muted mt-0 mb-3">
-                        {helpText}
-                    </small>
-                )}
-            </div>
-        </>
-    );
-}

src/bootstrap/Select.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 import { useUID } from "react-uid";
 
@@ -20,7 +21,7 @@ Select.propTypes = {
     helpText: PropTypes.string,
 };
 
-export function Select({ label, choices, helpText, ...props }) {
+function Select({ label, choices, helpText, ...props }) {
     const uid = useUID();
 
     const options = Object.keys(choices).map((choice) => (
@@ -30,14 +31,20 @@ export function Select({ label, choices, helpText, ...props }) {
     ));
 
     return (
-        <div className="form-group">
+        <div className="mb-3">
-            <label htmlFor={uid}>{label}</label>
+            <label className="form-label" htmlFor={uid}>
-            <select className="custom-select" id={uid} {...props}>
+                {label}
+            </label>
+            <select className="form-select" id={uid} {...props}>
                 {options}
             </select>
-            {helpText ? (
+            {helpText && (
-                <small className="form-text text-muted">{helpText}</small>
+                <div className="form-text">
-            ) : null}
+                    <small>{helpText}</small>
+                </div>
+            )}
         </div>
     );
 }
+
+export default Select;

src/bootstrap/Spinner.css

@@ -1,16 +1,22 @@
+.spinner-fs-wrapper {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 1101; /* increase z-index by 1 to ensure it's on top of spinner-fs-background */
+}
+
 .spinner-wrapper .spinner-border {
     width: 4rem;
     height: 4rem;
-    color: #00a2e2;
+    color: var(--bs-primary);
 }
 
 .spinner-fs-background {
     background-color: rgba(2, 2, 2, 0.5);
     color: rgb(230, 230, 230);
-    position: fixed;
+    width: 100vw;
-    width: 100%;
+    height: 100vh;
-    height: 100%;
-    top: 0;
 
     display: flex;
     align-items: center;
@@ -31,3 +37,7 @@
 .spinner-fs-wrapper .spinner-text {
     margin: 1rem;
 }
+
+.spinner-border-sm {
+    min-width: 16px;
+}

src/bootstrap/Spinner.js

@@ -6,6 +6,7 @@
  */
 
 import React from "react";
+
 import PropTypes from "prop-types";
 
 import "./Spinner.css";
@@ -16,7 +17,7 @@ Spinner.propTypes = {
         PropTypes.arrayOf(PropTypes.node),
         PropTypes.node,
     ]),
-    /** Render component with full-screen mode (using apropriate `.css` styles) */
+    /** Render component with full-screen mode (using appropriate `.css` styles) */
     fullScreen: PropTypes.bool.isRequired,
     className: PropTypes.string,
 };

src/bootstrap/Switch.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (c) 2020-2024 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 from "react";
+
 import PropTypes from "prop-types";
 import { useUID } from "react-uid";
 
@@ -18,32 +19,35 @@ Switch.propTypes = {
     ]).isRequired,
     helpText: PropTypes.string,
     switchHeading: PropTypes.bool,
+    className: PropTypes.string,
 };
 
-export function Switch({ label, helpText, switchHeading, ...props }) {
+function Switch({ label, helpText, switchHeading, className, ...props }) {
     const uid = useUID();
+
     return (
-        <div className={`form-group ${switchHeading ? "switch" : ""}`.trim()}>
+        <div
-            <div
+            className={`form-check form-switch ${className || "mb-3"} ${
-                className={`custom-control custom-switch ${
+                switchHeading ? "d-flex align-items-center" : ""
-                    !helpText ? "custom-control-inline" : ""
+            }`.trim()}
-                } ${switchHeading ? "switch-heading" : ""}`.trim()}
+        >
-            >
+            <input
-                <input
+                type="checkbox"
-                    type="checkbox"
+                className={`form-check-input ${switchHeading ? "me-2" : ""}`.trim()}
-                    className="custom-control-input"
+                role="switch"
-                    id={uid}
+                id={uid}
-                    {...props}
+                {...props}
-                />
+            />
-                <label className="custom-control-label" htmlFor={uid}>
+            <label className="form-check-label" htmlFor={uid}>
-                    {label}
+                {label}
-                </label>
+            </label>
-                {helpText && (
+            {helpText && (
-                    <small className="form-text text-muted mt-0 mb-3">
+                <div className="form-text">
-                        {helpText}
+                    <small>{helpText}</small>
-                    </small>
+                </div>
-                )}
+            )}
-            </div>
         </div>
     );
 }
+
+export default Switch;

src/bootstrap/Switch.md

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

src/bootstrap/TextInput.js

@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
-import { Input } from "./Input";
+import Input from "./Input";
 
-export const TextInput = ({ ...props }) => <Input type="text" {...props} />;
+function TextInput({ ...props }) {
+    return <Input type="text" {...props} />;
+}
 
 TextInput.propTypes = {
     /** Field label. */
@@ -20,3 +23,5 @@ TextInput.propTypes = {
     /** Help text message. */
     helpText: PropTypes.string,
 };
+
+export default TextInput;

src/bootstrap/ThreeDotsMenu.js

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 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 from "react";
+
+import { faEllipsisVertical } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import PropTypes from "prop-types";
+
+import Button from "./Button";
+
+ThreeDotsMenu.propTypes = {
+    /** Menu items. */
+    children: PropTypes.arrayOf(PropTypes.node).isRequired,
+};
+
+function ThreeDotsMenu({ children, ...props }) {
+    return (
+        <div className="dropdown position-static" {...props}>
+            <Button
+                className="btn-sm btn-link text-body"
+                data-bs-toggle="dropdown"
+                aria-expanded="false"
+            >
+                <FontAwesomeIcon icon={faEllipsisVertical} />
+            </Button>
+            <ul className="dropdown-menu">
+                {children.map((child) => (
+                    <li key={child.key || child.props.id || Math.random()}>
+                        {child}
+                    </li>
+                ))}
+            </ul>
+        </div>
+    );
+}
+
+export default ThreeDotsMenu;

src/bootstrap/ThreeDotsMenu.md

@@ -0,0 +1,40 @@
+ThreeDotsMenu Bootstrap component is a dropdown menu that appears when the user
+clicks on three dots. It is used to display a list of actions that can be
+performed on a particular item.
+
+```js
+import { useState } from "react";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
+
+const threeDotsMenuItems = [
+    {
+        text: "Edit",
+        icon: faEdit,
+        onClick: () => {
+            alert("Edit clicked");
+        },
+    },
+    {
+        text: "Delete",
+        icon: faTrash,
+        onClick: () => {
+            alert("Delete clicked");
+        },
+    },
+];
+
+<ThreeDotsMenu>
+    {threeDotsMenuItems.map((item, index) => (
+        <button key={index} onClick={item.onClick} className="dropdown-item">
+            <FontAwesomeIcon
+                icon={item.icon}
+                className="me-1"
+                width="1rem"
+                size="sm"
+            />
+            {item.text}
+        </button>
+    ))}
+</ThreeDotsMenu>;
+```

src/bootstrap/__tests__/Button.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { Button } from "../Button";
+import Button from "../Button";
 
 describe("<Button />", () => {
     it("Render button correctly", () => {

src/bootstrap/__tests__/CheckBox.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { CheckBox } from "../CheckBox";
+import CheckBox from "../CheckBox";
 
 describe("<Checkbox/>", () => {
     it("Render checkbox", () => {

src/bootstrap/__tests__/DownloadButton.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { DownloadButton } from "../DownloadButton";
+import DownloadButton from "../DownloadButton";
 
 describe("<DownloadButton />", () => {
     it("should have download attribute", () => {

src/bootstrap/__tests__/NumberInput.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render, fireEvent, getByLabelText, wait } from "customTestRender";
 
-import { NumberInput } from "../NumberInput";
+import NumberInput from "../NumberInput";
 
 describe("<NumberInput/>", () => {
     const onChangeMock = jest.fn();

src/bootstrap/__tests__/PasswordInput.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { PasswordInput } from "../PasswordInput";
+import PasswordInput from "../PasswordInput";
 
 describe("<PasswordInput/>", () => {
     it("Render password input", () => {

src/bootstrap/__tests__/RadioSet.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { RadioSet } from "../RadioSet";
+import RadioSet from "../RadioSet";
 
 const TEST_CHOICES = [
     {

src/bootstrap/__tests__/Select.test.js

@@ -14,7 +14,7 @@ import {
     render,
 } from "customTestRender";
 
-import { Select } from "../Select";
+import Select from "../Select";
 
 const TEST_CHOICES = {
     1: "one",

src/bootstrap/__tests__/Switch.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { Switch } from "../Switch";
+import Switch from "../Switch";
 
 describe("<Switch/>", () => {
     it("Render switch", () => {

src/bootstrap/__tests__/TextInput.test.js

@@ -9,7 +9,7 @@ import React from "react";
 
 import { render } from "customTestRender";
 
-import { TextInput } from "../TextInput";
+import TextInput from "../TextInput";
 
 describe("<TextInput/>", () => {
     it("Render text input", () => {

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

@@ -2,33 +2,38 @@
 
 exports[`<Button /> Render button correctly 1`] = `
 <button
-  class="btn btn-primary "
+  class="btn btn-primary d-inline-flex justify-content-center align-items-center"
   type="button"
 >
-  Test Button
+  <span>
+    Test Button
+  </span>
 </button>
 `;
 
 exports[`<Button /> Render button with custom classes 1`] = `
 <button
-  class="btn one two three"
+  class="btn one two three d-inline-flex justify-content-center align-items-center"
   type="button"
 >
-  Test Button
+  <span>
+    Test Button
+  </span>
 </button>
 `;
 
 exports[`<Button /> Render button with spinner 1`] = `
 <button
-  class="btn btn-primary "
+  class="btn btn-primary d-inline-flex justify-content-center align-items-center"
   type="button"
 >
   <span
     aria-hidden="true"
-    class="spinner-border spinner-border-sm"
+    class="spinner-border spinner-border-sm me-1"
     role="status"
   />
-   
+  <span>
-  Test Button
+    Test Button
+  </span>
 </button>
 `;

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

@@ -2,55 +2,51 @@
 
 exports[`<Checkbox/> Render checkbox 1`] = `
 <div
-  class="form-group"
+  class="mb-3 form-check"
 >
-  <div
+  <input
-    class="custom-control custom-checkbox "
+    checked=""
+    class="form-check-input"
+    id="1"
+    type="checkbox"
+  />
+  <label
+    class="form-check-label"
+    for="1"
   >
-    <input
+    Test label
-      checked=""
+  </label>
-      class="custom-control-input"
+  <div
-      id="1"
+    class="form-text"
-      type="checkbox"
+  >
-    />
+    <small>
-    <label
+      Some help text
-      class="custom-control-label"
+    </small>
-      for="1"
-    >
-      Test label
-      <small
-        class="form-text text-muted"
-      >
-        Some help text
-      </small>
-    </label>
   </div>
 </div>
 `;
 
 exports[`<Checkbox/> Render uncheked checkbox 1`] = `
 <div
-  class="form-group"
+  class="mb-3 form-check"
 >
-  <div
+  <input
-    class="custom-control custom-checkbox "
+    class="form-check-input"
+    id="1"
+    type="checkbox"
+  />
+  <label
+    class="form-check-label"
+    for="1"
   >
-    <input
+    Test label
-      class="custom-control-input"
+  </label>
-      id="1"
+  <div
-      type="checkbox"
+    class="form-text"
-    />
+  >
-    <label
+    <small>
-      class="custom-control-label"
+      Some help text
-      for="1"
+    </small>
-    >
-      Test label
-      <small
-        class="form-text text-muted"
-      >
-        Some help text
-      </small>
-    </label>
   </div>
 </div>
 `;

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

@@ -2,9 +2,10 @@
 
 exports[`<NumberInput/> Render number input 1`] = `
 <div
-  class="form-group"
+  class="mb-3"
 >
   <label
+    class="form-label"
     for="1"
   >
     Test label
@@ -18,33 +19,31 @@ exports[`<NumberInput/> Render number input 1`] = `
       type="number"
       value="1"
     />
-    <div
+    <button
-      class="input-group-append"
+      aria-label="Increase"
+      class="btn btn-outline-secondary"
+      type="button"
     >
-      <button
+      <i
-        aria-label="Increase"
+        class="fa"
-        class="btn btn-outline-secondary"
+      />
-        type="button"
+    </button>
-      >
+    <button
-        <i
+      aria-label="Decrease"
-          class="fas fa-plus"
+      class="btn btn-outline-secondary"
-        />
+      type="button"
-      </button>
+    >
-      <button
+      <i
-        aria-label="Decrease"
+        class="fa"
-        class="btn btn-outline-secondary"
+      />
-        type="button"
+    </button>
-      >
-        <i
-          class="fas fa-minus"
-        />
-      </button>
-    </div>
   </div>
-  <small
+  <div
-    class="form-text text-muted"
+    class="form-text"
   >
-    Some help text
+    <small>
-  </small>
+      Some help text
+    </small>
+  </div>
 </div>
 `;

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

@@ -2,9 +2,10 @@
 
 exports[`<PasswordInput/> Render password input 1`] = `
 <div
-  class="form-group"
+  class="mb-3"
 >
   <label
+    class="form-label"
     for="1"
   >
     Test label
@@ -20,10 +21,12 @@ exports[`<PasswordInput/> Render password input 1`] = `
       value="Some password"
     />
   </div>
-  <small
+  <div
-    class="form-text text-muted"
+    class="form-text"
   >
-    Some help text
+    <small>
-  </small>
+      Some help text
+    </small>
+  </div>
 </div>
 `;

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

@@ -2,7 +2,7 @@
 
 exports[`<RadioSet/> Render radio set 1`] = `
 <div
-  class="form-group"
+  class="mb-3"
 >
   <label
     class="d-block"
@@ -11,61 +11,63 @@ exports[`<RadioSet/> Render radio set 1`] = `
     Radios set label
   </label>
   <div
-    class="custom-control custom-radio"
+    class="mb-3"
   >
     <input
       checked=""
-      class="custom-control-input"
+      class="form-check-input me-2"
       id="test_name-0"
       name="test_name"
       type="radio"
       value="value"
     />
     <label
-      class="custom-control-label"
+      class="form-check-label"
       for="test_name-0"
     >
       label
     </label>
   </div>
   <div
-    class="custom-control custom-radio"
+    class="mb-3"
   >
     <input
-      class="custom-control-input"
+      class="form-check-input me-2"
       id="test_name-1"
       name="test_name"
       type="radio"
       value="another value"
     />
     <label
-      class="custom-control-label"
+      class="form-check-label"
       for="test_name-1"
     >
       another label
     </label>
   </div>
   <div
-    class="custom-control custom-radio"
+    class="mb-3"
   >
     <input
-      class="custom-control-input"
+      class="form-check-input me-2"
       id="test_name-2"
       name="test_name"
       type="radio"
       value="another on value"
     />
     <label
-      class="custom-control-label"
+      class="form-check-label"
       for="test_name-2"
     >
       another one  label
     </label>
   </div>
-  <small
+  <div
-    class="form-text text-muted"
+    class="form-text"
   >
-    Some help text
+    <small>
-  </small>
+      Some help text
+    </small>
+  </div>
 </div>
 `;

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

@@ -3,15 +3,16 @@
 exports[`<Select/> Test with snapshot. 1`] = `
 <div>
   <div
-    class="form-group"
+    class="mb-3"
   >
     <label
+      class="form-label"
       for="1"
     >
       Test label
     </label>
     <select
-      class="custom-select"
+      class="form-select"
       id="1"
     >
       <option
@@ -30,11 +31,13 @@ exports[`<Select/> Test with snapshot. 1`] = `
         three
       </option>
     </select>
-    <small
+    <div
-      class="form-text text-muted"
+      class="form-text"
     >
-      Help text
+      <small>
-    </small>
+        Help text
+      </small>
+    </div>
   </div>
 </div>
 `;

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

@@ -2,26 +2,25 @@
 
 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-group"
+  class="form-check form-switch mb-3"
 >
-  <div
+  <input
-    class="custom-control custom-switch"
+    checked=""
+    class="form-check-input"
+    id="1"
+    role="switch"
+    type="checkbox"
+  />
+  <label
+    class="form-check-label"
+    for="1"
   >
-    <input
+    Test label
-      checked=""
+  </label>
-      class="custom-control-input"
+  <div
-      id="1"
+    class="form-text"
-      type="checkbox"
+  >
-    />
+    <small>
-    <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>
@@ -30,25 +29,24 @@ exports[`<Switch/> Render switch 1`] = `
 
 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-group"
+  class="form-check form-switch mb-3"
 >
-  <div
+  <input
-    class="custom-control custom-switch"
+    class="form-check-input"
+    id="1"
+    role="switch"
+    type="checkbox"
+  />
+  <label
+    class="form-check-label"
+    for="1"
   >
-    <input
+    Test label
-      class="custom-control-input"
+  </label>
-      id="1"
+  <div
-      type="checkbox"
+    class="form-text"
-    />
+  >
-    <label
+    <small>
-      class="custom-control-label"
-      for="1"
-    >
-      Test label
-    </label>
-    <small
-      class="form-text text-muted mt-0 mb-3"
-    >
       Some help text
     </small>
   </div>

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

@@ -2,9 +2,10 @@
 
 exports[`<TextInput/> Render text input 1`] = `
 <div
-  class="form-group"
+  class="mb-3"
 >
   <label
+    class="form-label"
     for="1"
   >
     Test label
@@ -19,10 +20,12 @@ exports[`<TextInput/> Render text input 1`] = `
       value="Some text"
     />
   </div>
-  <small
+  <div
-    class="form-text text-muted"
+    class="form-text"
   >
-    Some help text
+    <small>
-  </small>
+      Some help text
+    </small>
+  </div>
 </div>
 `;

src/bootstrap/constants.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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.
  */
 
 /** Bootstrap column size for form fields */
-// eslint-disable-next-line import/prefer-default-export
+const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
-export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
+const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";
-export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";
+
+export { formFieldsSize, buttonFormFieldsSize };

src/common/ActionButtonWithModal/ActionButtonWithModal.js

@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2019-2024 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, useEffect } from "react";
+
+import PropTypes from "prop-types";
+
+import { useAPIPost } from "../../api/hooks";
+import { API_STATE } from "../../api/utils";
+import Button from "../../bootstrap/Button";
+import {
+    Modal,
+    ModalHeader,
+    ModalBody,
+    ModalFooter,
+} from "../../bootstrap/Modal";
+import { useAlert } from "../../context/alertContext/AlertContext";
+
+ActionButtonWithModal.propTypes = {
+    /** Component that triggers the action. */
+    actionTrigger: PropTypes.elementType.isRequired,
+    /** URL to send the action to. */
+    actionUrl: PropTypes.string.isRequired,
+    /** Title of the modal. */
+    modalTitle: PropTypes.string.isRequired,
+    /** Message of the modal. */
+    modalMessage: PropTypes.string.isRequired,
+    /** Text of the action button in the modal. */
+    modalActionText: PropTypes.string,
+    /** Props for the action button in the modal. */
+    modalActionProps: PropTypes.object,
+    /** Message to display on successful action. */
+    successMessage: PropTypes.string,
+    /** Message to display on failed action. */
+    errorMessage: PropTypes.string,
+};
+
+function ActionButtonWithModal({
+    actionTrigger: ActionTriggerComponent,
+    actionUrl,
+    modalTitle,
+    modalMessage,
+    modalActionText,
+    modalActionProps,
+    successMessage,
+    errorMessage,
+}) {
+    const [triggered, setTriggered] = useState(false);
+    const [modalShown, setModalShown] = useState(false);
+    const [triggerActionStatus, triggerAction] = useAPIPost(actionUrl);
+
+    const [setAlert] = useAlert();
+    useEffect(() => {
+        if (triggerActionStatus.state === API_STATE.SUCCESS) {
+            setAlert(
+                successMessage || _("Action successful."),
+                API_STATE.SUCCESS
+            );
+        }
+        if (triggerActionStatus.state === API_STATE.ERROR) {
+            setAlert(errorMessage || _("Action failed."));
+        }
+    }, [triggerActionStatus, setAlert, successMessage, errorMessage]);
+
+    const actionHandler = () => {
+        setTriggered(true);
+        triggerAction();
+        setModalShown(false);
+    };
+
+    return (
+        <>
+            <ActionModal
+                shown={modalShown}
+                setShown={setModalShown}
+                onAction={actionHandler}
+                title={modalTitle}
+                message={modalMessage}
+                actionText={modalActionText}
+                actionProps={modalActionProps}
+            />
+            <ActionTriggerComponent
+                loading={triggered}
+                disabled={triggered}
+                onClick={() => setModalShown(true)}
+            />
+        </>
+    );
+}
+
+ActionModal.propTypes = {
+    shown: PropTypes.bool.isRequired,
+    setShown: PropTypes.func.isRequired,
+    onAction: PropTypes.func.isRequired,
+    title: PropTypes.string.isRequired,
+    message: PropTypes.string.isRequired,
+    actionText: PropTypes.string,
+    actionProps: PropTypes.object,
+};
+
+function ActionModal({
+    shown,
+    setShown,
+    onAction,
+    title,
+    message,
+    actionText,
+    actionProps,
+}) {
+    return (
+        <Modal shown={shown} setShown={setShown}>
+            <ModalHeader setShown={setShown} title={title} />
+            <ModalBody>
+                <p className="mb-0">{message}</p>
+            </ModalBody>
+            <ModalFooter>
+                <Button
+                    className="btn-secondary"
+                    onClick={() => setShown(false)}
+                >
+                    {_("Cancel")}
+                </Button>
+                <Button onClick={onAction} {...actionProps}>
+                    {actionText || _("Confirm")}
+                </Button>
+            </ModalFooter>
+        </Modal>
+    );
+}
+
+export default ActionButtonWithModal;

src/common/ActionButtonWithModal/ActionButtonWithModal.md

@@ -0,0 +1,39 @@
+RebootButton component is a button that opens a modal dialog to confirm the
+reboot of the device.
+
+## Usage
+
+```jsx
+import React, { useEffect, createContext } from "react";
+
+import Button from "../../bootstrap/Button";
+import { AlertContextProvider } from "../../context/alertContext/AlertContext";
+import ActionButtonWithModal from "./ActionButtonWithModal";
+
+window.AlertContext = React.createContext();
+
+const RebootButtonExample = () => {
+    const ActionButton = (props) => {
+        return <Button {...props}>Action</Button>;
+    };
+
+    return (
+        <AlertContextProvider>
+            <div id="modal-container" />
+            <div id="alert-container" />
+            <ActionButtonWithModal
+                actionTrigger={ActionButton}
+                actionUrl="/reforis/api/action"
+                modalTitle="Warning!"
+                modalMessage="Are you sure you want to perform this action?"
+                modalActionText="Confirm action"
+                modalActionProps={{ className: "btn-danger" }}
+                successMessage="Action request succeeded."
+                errorMessage="Action request failed."
+            />
+        </AlertContextProvider>
+    );
+};
+
+<RebootButtonExample />;
+```

src/common/RebootButton.js

@@ -1,78 +0,0 @@
-/*
- * 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, { useState, useEffect } from "react";
-import PropTypes from "prop-types";
-
-import { useAPIPost } from "../api/hooks";
-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 { useAlert } from "../alertContext/AlertContext";
-
-export function RebootButton(props) {
-    const [triggered, setTriggered] = useState(false);
-    const [modalShown, setModalShown] = useState(false);
-    const [triggerRebootStatus, triggerReboot] = useAPIPost(ForisURLs.reboot);
-
-    const [setAlert] = useAlert();
-    useEffect(() => {
-        if (triggerRebootStatus.state === API_STATE.ERROR) {
-            setAlert(_("Reboot request failed."));
-        }
-    });
-
-    function rebootHandler() {
-        setTriggered(true);
-        triggerReboot();
-        setModalShown(false);
-    }
-
-    return (
-        <>
-            <RebootModal
-                shown={modalShown}
-                setShown={setModalShown}
-                onReboot={rebootHandler}
-            />
-            <Button
-                className="btn-danger"
-                loading={triggered}
-                disabled={triggered}
-                onClick={() => setModalShown(true)}
-                {...props}
-            >
-                {_("Reboot")}
-            </Button>
-        </>
-    );
-}
-
-RebootModal.propTypes = {
-    shown: PropTypes.bool.isRequired,
-    setShown: PropTypes.func.isRequired,
-    onReboot: PropTypes.func.isRequired,
-};
-
-function RebootModal({ shown, setShown, onReboot }) {
-    return (
-        <Modal shown={shown} setShown={setShown}>
-            <ModalHeader setShown={setShown} title={_("Warning!")} />
-            <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}>
-                    {_("Confirm reboot")}
-                </Button>
-            </ModalFooter>
-        </Modal>
-    );
-}

src/common/RichTable/RichTable.js

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2019-2024 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, { useMemo, useState } from "react";
+
+import {
+    flexRender,
+    getCoreRowModel,
+    getSortedRowModel,
+    getPaginationRowModel,
+    useReactTable,
+} from "@tanstack/react-table";
+import PropTypes from "prop-types";
+
+import RichTableBody from "./RichTableBody";
+import RichTableHeader from "./RichTableHeader";
+import RichTablePagination from "./RichTablePagination";
+
+const fallbackData = [];
+
+RichTable.propTypes = {
+    /** Columns to be displayed in the table */
+    columns: PropTypes.array.isRequired,
+    /** Data to be displayed in the table */
+    data: PropTypes.array.isRequired,
+    /** Whether to display pagination */
+    withPagination: PropTypes.bool,
+    /** Number of rows per page */
+    pageSize: PropTypes.number,
+    /** Index of the current page */
+    pageIndex: PropTypes.number,
+};
+
+function RichTable({
+    columns,
+    data,
+    withPagination,
+    pageSize = 5,
+    pageIndex = 0,
+}) {
+    const tableColumns = useMemo(() => columns, [columns]);
+    const [tableData] = useState(data ?? fallbackData);
+    const [sorting, setSorting] = useState([]);
+    const [pagination, setPagination] = useState({
+        pageIndex,
+        pageSize,
+    });
+
+    const table = useReactTable({
+        data: tableData,
+        columns: tableColumns,
+        getCoreRowModel: getCoreRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getPaginationRowModel: getPaginationRowModel(),
+        onPaginationChange: setPagination,
+        onSortingChange: setSorting,
+        state: {
+            sorting,
+            pagination,
+        },
+    });
+
+    return (
+        <div className="table-responsive">
+            <table className="table table-hover text-nowrap">
+                <RichTableHeader table={table} flexRender={flexRender} />
+                <RichTableBody table={table} flexRender={flexRender} />
+            </table>
+            {withPagination && (
+                <RichTablePagination
+                    table={table}
+                    tablePageSize={pageSize}
+                    allRows={tableData.length}
+                />
+            )}
+        </div>
+    );
+}
+
+export default RichTable;

src/common/RichTable/RichTable.md

@@ -0,0 +1,135 @@
+### Description
+
+Rich Table is a table component based on
+[Tanstack React Table](https://tanstack.com/table/). It adds some features to
+the table component, such as:
+
+-   **Pagination**: The table can be paginated.
+-   **Sorting**: The table can be sorted by columns.
+-   **Row Expansion**: The table rows can be expanded. (To be implemented)
+
+### Example
+
+```js
+import RichTable from "./RichTable";
+
+const columns = [
+    {
+        header: "Name",
+        accessorKey: "name",
+    },
+    {
+        header: "Surname",
+        accessorKey: "surname",
+    },
+    {
+        header: "Age",
+        accessorKey: "age",
+    },
+    {
+        header: "Phone",
+        accessorKey: "phone",
+    },
+];
+
+const data = [
+    {
+        name: "John",
+        surname: "Coltrane",
+        age: 30,
+        phone: "123456789",
+    },
+    {
+        name: "Jane",
+        surname: "Doe",
+        age: 25,
+        phone: "987654321",
+    },
+    {
+        name: "Alice",
+        surname: "Smith",
+        age: 35,
+        phone: "123456789",
+    },
+    {
+        name: "Bob",
+        surname: "Smith",
+        age: 40,
+        phone: "987654321",
+    },
+    {
+        name: "Charlie",
+        surname: "Brown",
+        age: 45,
+        phone: "123456789",
+    },
+    {
+        name: "Daisy",
+        surname: "Brown",
+        age: 50,
+        phone: "987654321",
+    },
+    {
+        name: "Eve",
+        surname: "Johnson",
+        age: 55,
+        phone: "123456789",
+    },
+    {
+        name: "Frank",
+        surname: "Johnson",
+        age: 60,
+        phone: "987654321",
+    },
+    {
+        name: "Grace",
+        surname: "Williams",
+        age: 65,
+        phone: "123456789",
+    },
+    {
+        name: "Henry",
+        surname: "Williams",
+        age: 70,
+        phone: "987654321",
+    },
+    {
+        name: "Ivy",
+        surname: "Brown",
+        age: 75,
+        phone: "123456789",
+    },
+    {
+        name: "Jack",
+        surname: "Brown",
+        age: 80,
+        phone: "987654321",
+    },
+    {
+        name: "Kelly",
+        surname: "Johnson",
+        age: 85,
+        phone: "123456789",
+    },
+    {
+        name: "Liam",
+        surname: "Johnson",
+        age: 90,
+        phone: "987654321",
+    },
+    {
+        name: "Mia",
+        surname: "Williams",
+        age: 95,
+        phone: "123456789",
+    },
+    {
+        name: "Nathan",
+        surname: "Williams",
+        age: 100,
+        phone: "987654321",
+    },
+];
+
+<RichTable columns={columns} data={data} withPagination />;
+```

src/common/RichTable/RichTableBody.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019-2024 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 from "react";
+
+import propTypes from "prop-types";
+
+RichTableBody.propTypes = {
+    table: propTypes.shape({
+        getRowModel: propTypes.func.isRequired,
+    }).isRequired,
+    flexRender: propTypes.func.isRequired,
+};
+
+function RichTableBody({ table, flexRender }) {
+    return (
+        <tbody>
+            {table.getRowModel().rows.map((row) => {
+                return (
+                    <tr key={row.id} className="align-middle">
+                        {row.getVisibleCells().map((cell) => {
+                            return (
+                                <td
+                                    key={cell.id}
+                                    {...(cell.column.columnDef.className && {
+                                        className:
+                                            cell.column.columnDef.className,
+                                    })}
+                                >
+                                    {flexRender(
+                                        cell.column.columnDef.cell,
+                                        cell.getContext()
+                                    )}
+                                </td>
+                            );
+                        })}
+                    </tr>
+                );
+            })}
+        </tbody>
+    );
+}
+
+export default RichTableBody;

src/common/RichTable/RichTableHeader.js

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2019-2024 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 from "react";
+
+import {
+    faSquareCaretUp,
+    faSquareCaretDown,
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import propTypes from "prop-types";
+
+RichTableHeader.propTypes = {
+    table: propTypes.shape({
+        getHeaderGroups: propTypes.func.isRequired,
+    }).isRequired,
+    flexRender: propTypes.func.isRequired,
+};
+
+function RichTableHeader({ table, flexRender }) {
+    const getThTitle = (header) => {
+        if (!header.column.getCanSort()) return undefined;
+
+        const nextSortingOrder = header.column.getNextSortingOrder();
+        if (nextSortingOrder === "asc") return _("Sort ascending");
+        if (nextSortingOrder === "desc") return _("Sort descending");
+        return _("Clear sort");
+    };
+
+    return (
+        <thead className="thead-light">
+            {table.getHeaderGroups().map((headerGroup) => (
+                <tr key={headerGroup.id} role="row">
+                    {headerGroup.headers.map((header) => (
+                        <th
+                            key={header.id}
+                            colSpan={header.colSpan}
+                            {...(header.column.columnDef.headerClassName && {
+                                className:
+                                    header.column.columnDef.headerClassName,
+                            })}
+                        >
+                            {header.isPlaceholder ||
+                            header.column.columnDef.headerIsHidden ? (
+                                <div className="d-none" aria-hidden="true">
+                                    {flexRender(
+                                        header.column.columnDef.header,
+                                        header.getContext()
+                                    )}
+                                </div>
+                            ) : (
+                                <button
+                                    type="button"
+                                    className={`btn btn-link text-decoration-none text-reset fw-bold p-0 d-flex align-items-center
+                                                    ${
+                                                        header.column.getCanSort()
+                                                            ? "d-flex align-items-center"
+                                                            : ""
+                                                    }
+                                                `}
+                                    onClick={header.column.getToggleSortingHandler()}
+                                    title={getThTitle(header)}
+                                >
+                                    {flexRender(
+                                        header.column.columnDef.header,
+                                        header.getContext()
+                                    )}
+                                    {{
+                                        asc: (
+                                            <FontAwesomeIcon
+                                                icon={faSquareCaretUp}
+                                                className="ms-1 text-primary"
+                                            />
+                                        ),
+                                        desc: (
+                                            <FontAwesomeIcon
+                                                icon={faSquareCaretDown}
+                                                className="ms-1 text-primary"
+                                            />
+                                        ),
+                                    }[header.column.getIsSorted()] ?? null}
+                                </button>
+                            )}
+                        </th>
+                    ))}
+                </tr>
+            ))}
+        </thead>
+    );
+}
+
+export default RichTableHeader;

src/common/RichTable/RichTablePagination.js

@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2019-2024 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, { useMemo } from "react";
+
+import {
+    faAngleLeft,
+    faAnglesLeft,
+    faAngleRight,
+    faAnglesRight,
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import propTypes from "prop-types";
+
+RichTablePagination.propTypes = {
+    table: propTypes.shape({
+        getState: propTypes.func.isRequired,
+        getCanPreviousPage: propTypes.func.isRequired,
+        getCanNextPage: propTypes.func.isRequired,
+        firstPage: propTypes.func.isRequired,
+        previousPage: propTypes.func.isRequired,
+        nextPage: propTypes.func.isRequired,
+        lastPage: propTypes.func.isRequired,
+        setPageSize: propTypes.func.isRequired,
+        getPageCount: propTypes.func.isRequired,
+    }).isRequired,
+    tablePageSize: propTypes.number,
+    allRows: propTypes.number,
+};
+
+function RichTablePagination({ table, tablePageSize, allRows }) {
+    const { pagination } = table.getState();
+    const prevPagBtnDisabled = !table.getCanPreviousPage();
+    const nextPagBtnDisabled = !table.getCanNextPage();
+
+    const pageSizes = useMemo(() => {
+        return [tablePageSize ?? 5, 10, 25].filter(
+            (value, index, self) => self.indexOf(value) === index
+        );
+    }, [tablePageSize]);
+
+    const renderPaginationButton = (icon, ariaLabel, onClick, disabled) => (
+        <li
+            className={`page-item ${disabled ? "disabled" : ""}`}
+            style={{ cursor: disabled ? "not-allowed" : "pointer" }}
+        >
+            <button
+                type="button"
+                className="page-link"
+                aria-label={ariaLabel}
+                onClick={onClick}
+                disabled={disabled}
+            >
+                <FontAwesomeIcon icon={icon} />
+            </button>
+        </li>
+    );
+
+    return (
+        <nav
+            aria-label={_("Pagination navigation bar")}
+            className="d-flex gap-2 justify-content-start align-items-center mx-2 mb-1 text-nowrap"
+        >
+            <ul className="pagination pagination-sm mb-0">
+                {renderPaginationButton(
+                    faAnglesLeft,
+                    _("First page"),
+                    () => table.firstPage(),
+                    prevPagBtnDisabled
+                )}
+                {renderPaginationButton(
+                    faAngleLeft,
+                    _("Previous page"),
+                    () => table.previousPage(),
+                    prevPagBtnDisabled
+                )}
+                {renderPaginationButton(
+                    faAngleRight,
+                    _("Next page"),
+                    () => table.nextPage(),
+                    nextPagBtnDisabled
+                )}
+                {renderPaginationButton(
+                    faAnglesRight,
+                    _("Last page"),
+                    () => table.lastPage(),
+                    nextPagBtnDisabled
+                )}
+            </ul>
+            <span>
+                {_("Page")}&nbsp;
+                <span className="fw-bold">
+                    {pagination.pageIndex + 1}
+                    &nbsp;{_("of")}&nbsp;
+                    {table.getPageCount().toLocaleString()}
+                </span>
+            </span>
+            <div
+                className="vr mx-1 align-self-center"
+                style={{ height: "1.5rem" }}
+            />
+            <span>{_("Rows per page:")}</span>
+            <select
+                className="form-select form-select-sm w-auto"
+                aria-label={_("Select rows per page")}
+                value={pagination.pageSize}
+                onChange={(e) => {
+                    table.setPageSize(Number(e.target.value));
+                }}
+            >
+                {pageSizes.map((pageSize) => (
+                    <option key={pageSize} value={pageSize}>
+                        {pageSize}
+                    </option>
+                ))}
+                <option key={allRows} value={allRows}>
+                    {_("All")}
+                </option>
+            </select>
+        </nav>
+    );
+}
+
+export default RichTablePagination;

src/common/WiFiSettings/ResetWiFiSettings.js

@@ -1,26 +1,27 @@
 /*
- * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2024 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, { useEffect, useState } from "react";
+
 import PropTypes from "prop-types";
 
-import { Button } from "../../bootstrap/Button";
-import { useAlert } from "../../alertContext/AlertContext";
-import { ALERT_TYPES } from "../../bootstrap/Alert";
 import { useAPIPost } from "../../api/hooks";
 import { API_STATE } from "../../api/utils";
+import { ALERT_TYPES } from "../../bootstrap/Alert";
+import Button from "../../bootstrap/Button";
 import { formFieldsSize } from "../../bootstrap/constants";
+import { useAlert } from "../../context/alertContext/AlertContext";
 
 ResetWiFiSettings.propTypes = {
     ws: PropTypes.object.isRequired,
     endpoint: PropTypes.string.isRequired,
 };
 
-export function ResetWiFiSettings({ ws, endpoint }) {
+function ResetWiFiSettings({ ws, endpoint }) {
     const [isLoading, setIsLoading] = useState(false);
 
     useEffect(() => {
@@ -44,11 +45,11 @@ export function ResetWiFiSettings({ ws, endpoint }) {
         }
     }, [postResetResponse, setAlert]);
 
-    function onReset() {
+    const onReset = () => {
         dismissAlert();
         setIsLoading(true);
         postReset();
-    }
+    };
 
     return (
         <div className={formFieldsSize}>
@@ -58,7 +59,7 @@ export function ResetWiFiSettings({ ws, endpoint }) {
                     "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="text-end">
                 <Button
                     className="btn-primary"
                     forisFormSize
@@ -72,3 +73,5 @@ export function ResetWiFiSettings({ ws, endpoint }) {
         </div>
     );
 }
+
+export default ResetWiFiSettings;

src/common/WiFiSettings/WiFiForm.js

@@ -1,21 +1,22 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
 import React from "react";
+
 import PropTypes from "prop-types";
-import { Switch } from "../../bootstrap/Switch";
+
-import { CheckBox } from "../../bootstrap/CheckBox";
+import { HELP_TEXTS, HTMODES, BANDS, ENCRYPTIONMODES } from "./constants";
-import { PasswordInput } from "../../bootstrap/PasswordInput";
-import { RadioSet } from "../../bootstrap/RadioSet";
-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 WiFiQRCode from "./WiFiQRCode";
+import PasswordInput from "../../bootstrap/PasswordInput";
+import RadioSet from "../../bootstrap/RadioSet";
+import Select from "../../bootstrap/Select";
+import Switch from "../../bootstrap/Switch";
+import TextInput from "../../bootstrap/TextInput";
 
 WiFiForm.propTypes = {
     formData: PropTypes.shape({ devices: PropTypes.arrayOf(PropTypes.object) })
@@ -59,12 +60,13 @@ DeviceForm.propTypes = {
         SSID: PropTypes.string.isRequired,
         password: PropTypes.string.isRequired,
         hidden: PropTypes.bool.isRequired,
-        hwmode: PropTypes.string.isRequired,
+        band: PropTypes.string.isRequired,
         htmode: PropTypes.string.isRequired,
         channel: PropTypes.string.isRequired,
         guest_wifi: PropTypes.object.isRequired,
         encryption: PropTypes.string.isRequired,
         available_bands: PropTypes.array.isRequired,
+        ieee80211w_disabled: PropTypes.bool,
     }),
     formErrors: PropTypes.object.isRequired,
     setFormValue: PropTypes.func.isRequired,
@@ -92,7 +94,7 @@ function DeviceForm({
     return (
         <>
             <Switch
-                label={<h2>{_(`Wi-Fi ${deviceID + 1}`)}</h2>}
+                label={<h2 className="mb-0">{_(`Wi-Fi ${deviceID + 1}`)}</h2>}
                 checked={formData.enabled}
                 onChange={setFormValue((value) => ({
                     devices: {
@@ -102,7 +104,7 @@ function DeviceForm({
                 switchHeading
                 {...props}
             />
-            {formData.enabled ? (
+            {formData.enabled && (
                 <>
                     <TextInput
                         label="SSID"
@@ -119,12 +121,10 @@ function DeviceForm({
                         }))}
                         {...props}
                     >
-                        <div className="input-group-append">
+                        <WiFiQRCode
-                            <WiFiQRCode
+                            SSID={formData.SSID}
-                                SSID={formData.SSID}
+                            password={formData.password}
-                                password={formData.password}
+                        />
-                            />
-                        </div>
                     </TextInput>
 
                     <PasswordInput
@@ -142,7 +142,7 @@ function DeviceForm({
                         {...props}
                     />
 
-                    <CheckBox
+                    <Switch
                         label={_("Hide SSID")}
                         helpText={HELP_TEXTS.hidden}
                         checked={formData.hidden}
@@ -155,11 +155,11 @@ function DeviceForm({
                     />
 
                     <RadioSet
-                        name={`hwmode-${deviceID}`}
+                        name={`band-${deviceID}`}
                         label="GHz"
-                        choices={getHwmodeChoices(formData)}
+                        choices={getBandChoices(formData)}
-                        value={formData.hwmode}
+                        value={formData.band}
-                        helpText={HELP_TEXTS.hwmode}
+                        helpText={HELP_TEXTS.band}
                         inline
                         onChange={setFormValue((value) => {
                             // Get the last item in an array of available HT modes
@@ -168,7 +168,7 @@ function DeviceForm({
                             return {
                                 devices: {
                                     [deviceIndex]: {
-                                        hwmode: { $set: value },
+                                        band: { $set: value },
                                         channel: { $set: "0" },
                                         htmode: {
                                             $set:
@@ -220,6 +220,25 @@ function DeviceForm({
                         {...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.ieee80211w_disabled}
+                            onChange={setFormValue((value) => ({
+                                devices: {
+                                    [deviceIndex]: {
+                                        ieee80211w_disabled: { $set: value },
+                                    },
+                                },
+                            }))}
+                            {...props}
+                        />
+                    )}
+
                     {hasGuestNetwork && (
                         <WifiGuestForm
                             formData={{
@@ -232,8 +251,8 @@ function DeviceForm({
                         />
                     )}
                 </>
-            ) : null}
+            )}
-            {divider ? <hr /> : null}
+            {divider && <hr />}
         </>
     );
 }
@@ -244,14 +263,14 @@ function getChannelChoices(device) {
     };
 
     device.available_bands.forEach((availableBand) => {
-        if (availableBand.hwmode !== device.hwmode) return;
+        if (availableBand.band !== device.band) return;
 
         availableBand.available_channels.forEach((availableChannel) => {
             channelChoices[availableChannel.number.toString()] = `
                         ${availableChannel.number}
                         (${availableChannel.frequency} MHz ${
-                availableChannel.radar ? " ,DFS" : ""
+                            availableChannel.radar ? " ,DFS" : ""
-            })
+                        })
                     `;
         });
     });
@@ -263,7 +282,7 @@ function getHtmodeChoices(device) {
     const htmodeChoices = {};
 
     device.available_bands.forEach((availableBand) => {
-        if (availableBand.hwmode !== device.hwmode) return;
+        if (availableBand.band !== device.band) return;
 
         availableBand.available_htmodes.forEach((availableHtmod) => {
             htmodeChoices[availableHtmod] = HTMODES[availableHtmod];
@@ -272,10 +291,10 @@ function getHtmodeChoices(device) {
     return htmodeChoices;
 }
 
-function getHwmodeChoices(device) {
+function getBandChoices(device) {
     return device.available_bands.map((availableBand) => ({
-        label: HWMODES[availableBand.hwmode],
+        label: BANDS[availableBand.band],
-        value: availableBand.hwmode,
+        value: availableBand.band,
     }));
 }
 

src/common/WiFiSettings/WiFiGuestForm.js

@@ -1,18 +1,19 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
-import { TextInput } from "../../bootstrap/TextInput";
-import { Switch } from "../../bootstrap/Switch";
-import { PasswordInput } from "../../bootstrap/PasswordInput";
-import WiFiQRCode from "./WiFiQRCode";
 import { HELP_TEXTS } from "./constants";
+import WiFiQRCode from "./WiFiQRCode";
+import PasswordInput from "../../bootstrap/PasswordInput";
+import Switch from "../../bootstrap/Switch";
+import TextInput from "../../bootstrap/TextInput";
 
 WifiGuestForm.propTypes = {
     formData: PropTypes.shape({
@@ -67,14 +68,11 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     >
-                        <div className="input-group-append">
+                        <WiFiQRCode
-                            <WiFiQRCode
+                            SSID={formData.SSID}
-                                SSID={formData.SSID}
+                            password={formData.password}
-                                password={formData.password}
+                        />
-                            />
-                        </div>
                     </TextInput>
-
                     <PasswordInput
                         withEye
                         label={_("Password")}

src/common/WiFiSettings/WiFiQRCode.js

@@ -1,31 +1,30 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 } from "react";
-import QRCode from "qrcode.react";
-import PropTypes from "prop-types";
 
-import { ForisURLs } from "../../utils/forisUrls";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { Button } from "../../bootstrap/Button";
+import PropTypes from "prop-types";
+import QRCode from "qrcode.react";
+
+import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers";
+import Button from "../../bootstrap/Button";
 import {
     Modal,
     ModalBody,
     ModalFooter,
     ModalHeader,
 } from "../../bootstrap/Modal";
-import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers";
 
 WiFiQRCode.propTypes = {
     SSID: PropTypes.string.isRequired,
     password: PropTypes.string.isRequired,
 };
 
-const QR_ICON_PATH = `${ForisURLs.static}/imgs/QR_icon.svg`;
-
 export default function WiFiQRCode({ SSID, password }) {
     const [modal, setModal] = useState(false);
 
@@ -39,11 +38,11 @@ export default function WiFiQRCode({ SSID, password }) {
                     setModal(true);
                 }}
             >
-                <img
+                <FontAwesomeIcon
-                    width="20"
+                    icon="fa-solid fa-qrcode"
-                    src={QR_ICON_PATH}
+                    title={_("Show QR code")}
-                    alt="QR"
+                    aria-label={_("Show QR code")}
-                    style={{ opacity: 0.67 }}
+                    className="text-secondary"
                 />
             </button>
             {modal ? (
@@ -71,23 +70,35 @@ function QRCodeModal({ shown, setShown, SSID, password }) {
             <ModalHeader setShown={setShown} title={_("Wi-Fi QR Code")} />
             <ModalBody>
                 <QRCode
+                    className="d-block mx-auto img-logo-black"
                     renderAs="svg"
                     value={toQRCodeContent(SSID, password)}
                     level="M"
                     size={350}
                     includeMargin
-                    style={{ display: "block", margin: "auto" }}
                 />
             </ModalBody>
             <ModalFooter>
                 <Button
-                    className="btn-outline-primary"
+                    className="btn-secondary"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        setShown(false);
+                    }}
+                >
+                    {_("Close")}
+                </Button>
+                <Button
+                    className="btn-primary"
                     onClick={(e) => {
                         e.preventDefault();
                         createAndDownloadPdf(SSID, password);
                     }}
                 >
-                    <i className="fas fa-arrow-down mr-2" />
+                    <FontAwesomeIcon
+                        icon="fa-solid fa-file-download"
+                        className="me-2"
+                    />
                     {_("Download PDF")}
                 </Button>
             </ModalFooter>

src/common/WiFiSettings/WiFiSettings.js

@@ -1,16 +1,17 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
-import { ForisForm } from "../../form/components/ForisForm";
+import ResetWiFiSettings from "./ResetWiFiSettings";
 import WiFiForm from "./WiFiForm";
-import { ResetWiFiSettings } from "./ResetWiFiSettings";
+import ForisForm from "../../form/components/ForisForm";
 
 WiFiSettings.propTypes = {
     ws: PropTypes.object.isRequired,
@@ -19,7 +20,7 @@ WiFiSettings.propTypes = {
     hasGuestNetwork: PropTypes.bool,
 };
 
-export function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
+function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
     return (
         <>
             <ForisForm
@@ -59,6 +60,10 @@ function prepDataToSubmit(formData) {
 
         if (!device.guest_wifi.enabled)
             formData.devices[idx].guest_wifi = { enabled: false };
+
+        if (device.encryption === "WPA2") {
+            delete formData.devices[idx].ieee80211w_disabled;
+        }
     });
     return formData;
 }
@@ -113,3 +118,5 @@ export function validator(formData) {
     });
     return JSON.stringify(formErrors).match(/\[[{},?]+\]/) ? null : formErrors;
 }
+
+export default WiFiSettings;

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

@@ -9,12 +9,12 @@ import React from "react";
 import { render, fireEvent, wait } from "customTestRender";
 
 import mockAxios from "jest-mock-axios";
-import { WebSockets } from "webSockets/WebSockets";
+import WebSockets from "webSockets/WebSockets";
 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();

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

@@ -10,7 +10,7 @@ import diffSnapshot from "snapshot-diff";
 import mockAxios from "jest-mock-axios";
 
 import { fireEvent, render, wait } from "customTestRender";
-import { WebSockets } from "webSockets/WebSockets";
+import WebSockets from "webSockets/WebSockets";
 import { mockJSONError } from "testUtils/network";
 
 import {
@@ -19,7 +19,7 @@ import {
     twoDevices,
     threeDevices,
 } from "./__fixtures__/wifiSettings";
-import { WiFiSettings, validator, byteCount } from "../WiFiSettings";
+import WiFiSettings, { validator, byteCount } from "../WiFiSettings";
 
 describe("<WiFiSettings/>", () => {
     let firstRender;
@@ -118,7 +118,7 @@ describe("<WiFiSettings/>", () => {
                     guest_wifi: { enabled: false },
                     hidden: false,
                     htmode: "HT80",
-                    hwmode: "11a",
+                    band: "5g",
                     id: 0,
                     password: "TestPass",
                     encryption: "WPA3",
@@ -148,7 +148,7 @@ describe("<WiFiSettings/>", () => {
                     guest_wifi: { enabled: false },
                     hidden: false,
                     htmode: "VHT80",
-                    hwmode: "11g",
+                    band: "2g",
                     id: 0,
                     password: "TestPass",
                     encryption: "WPA3",
@@ -185,7 +185,7 @@ describe("<WiFiSettings/>", () => {
                     },
                     hidden: false,
                     htmode: "HT80",
-                    hwmode: "11a",
+                    band: "5g",
                     id: 0,
                     password: "TestPass",
                     encryption: "WPA3",

src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js

@@ -77,7 +77,7 @@ export function wifiSettingsFixture() {
                             "VHT40",
                             "VHT80",
                         ],
-                        hwmode: "11g",
+                        band: "2g",
                     },
                     {
                         available_channels: [
@@ -215,7 +215,7 @@ export function wifiSettingsFixture() {
                             "VHT40",
                             "VHT80",
                         ],
-                        hwmode: "11a",
+                        band: "5g",
                     },
                 ],
                 channel: 60,
@@ -227,7 +227,7 @@ export function wifiSettingsFixture() {
                 },
                 hidden: false,
                 htmode: "HT80",
-                hwmode: "11a",
+                band: "5g",
                 id: 0,
                 password: "TestPass",
                 encryption: "WPA3",
@@ -294,7 +294,7 @@ export function wifiSettingsFixture() {
                             },
                         ],
                         available_htmodes: ["NOHT", "HT20", "HT40"],
-                        hwmode: "11g",
+                        band: "2g",
                     },
                 ],
                 channel: 11,
@@ -306,7 +306,7 @@ export function wifiSettingsFixture() {
                 },
                 hidden: false,
                 htmode: "HT40",
-                hwmode: "11g",
+                band: "2g",
                 id: 1,
                 password: "TestPass",
                 encryption: "WPA3",
@@ -323,7 +323,7 @@ const oneDevice = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 0,
             password: "TestPass",
             encryption: "WPA3",
@@ -340,7 +340,7 @@ const twoDevices = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 0,
             password: "TestPass",
             encryption: "WPA3",
@@ -352,7 +352,7 @@ const twoDevices = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 1,
             password: "TestPass",
             encryption: "WPA3",
@@ -369,7 +369,7 @@ const threeDevices = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 0,
             password: "TestPass",
             encryption: "WPA3",
@@ -381,7 +381,7 @@ const threeDevices = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 1,
             password: "TestPass",
             encryption: "WPA3",
@@ -393,7 +393,7 @@ const threeDevices = {
             guest_wifi: { enabled: false },
             hidden: false,
             htmode: "HT40",
-            hwmode: "11a",
+            band: "5g",
             id: 2,
             password: "",
             encryption: "WPA3",

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-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -18,9 +18,10 @@ export const HTMODES = {
     HE80: _("802.11ax - 80 MHz wide channel"),
     HE160: _("802.11ax - 160 MHz wide channel"),
 };
-export const HWMODES = {
+export const BANDS = {
-    "11g": "2.4",
+    "2g": "2.4",
-    "11a": "5",
+    "5g": "5",
+    "6g": "6",
 };
 export const ENCRYPTIONMODES = {
     WPA3: _("WPA3 only"),
@@ -37,7 +38,7 @@ export const HELP_TEXTS = {
     hidden: _(
         "If set, network is not visible when scanning for available networks."
     ),
-    hwmode: _(
+    band: _(
         "The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a newer standard and may not be supported by all your devices. It usually has less interference, but the signal does not carry so well indoors."
     ),
     htmode: _(

src/common/__tests__/ActionButtonWithModal.test.js

@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2019-2024 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 from "react";
+
+import Button from "bootstrap/Button";
+
+import {
+    fireEvent,
+    getByText,
+    queryByText,
+    render,
+    wait,
+} from "customTestRender";
+import mockAxios from "jest-mock-axios";
+import { mockJSONError } from "testUtils/network";
+import { mockSetAlert } from "testUtils/alertContextMock";
+
+import ActionButtonWithModal from "../ActionButtonWithModal/ActionButtonWithModal";
+
+describe("<ActionButtonWithModal/>", () => {
+    let componentContainer;
+    const ActionButton = (props) => (
+        <Button type="button" {...props}>
+            Action
+        </Button>
+    );
+
+    beforeEach(() => {
+        const { container } = render(
+            <>
+                <div id="modal-container" />
+                <div id="alert-container" />
+                <ActionButtonWithModal
+                    actionTrigger={ActionButton}
+                    actionUrl="/reforis/api/action"
+                    modalTitle="Warning!"
+                    modalMessage="Are you sure you want to perform this action?"
+                    modalActionText="Confirm action"
+                    modalActionProps={{ className: "btn-danger" }}
+                    successMessage="Action request succeeded."
+                    errorMessage="Action request failed."
+                />
+            </>
+        );
+        componentContainer = container;
+    });
+
+    it("Render button.", () => {
+        expect(componentContainer).toMatchSnapshot();
+    });
+
+    it("Render modal.", () => {
+        fireEvent.click(getByText(componentContainer, "Action"));
+        expect(componentContainer).toMatchSnapshot();
+    });
+
+    it("Confirm action.", () => {
+        fireEvent.click(getByText(componentContainer, "Action"));
+        fireEvent.click(getByText(componentContainer, "Confirm action"));
+        expect(mockAxios.post).toHaveBeenCalledWith(
+            "/reforis/api/action",
+            undefined,
+            expect.anything()
+        );
+    });
+
+    it("Hold error.", async () => {
+        fireEvent.click(getByText(componentContainer, "Action"));
+        fireEvent.click(getByText(componentContainer, "Confirm action"));
+        mockJSONError();
+        await wait(() =>
+            expect(mockSetAlert).toBeCalledWith("Action request failed.")
+        );
+    });
+
+    it("Show success alert on successful action.", async () => {
+        fireEvent.click(getByText(componentContainer, "Action"));
+        fireEvent.click(getByText(componentContainer, "Confirm action"));
+        mockAxios.mockResponse({ status: 200 });
+        await wait(() =>
+            expect(mockSetAlert).toBeCalledWith(
+                "Action request succeeded.",
+                "success"
+            )
+        );
+    });
+});

src/common/__tests__/RebootButton.test.js

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

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

@@ -0,0 +1,99 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<ActionButtonWithModal/> Render button. 1`] = `
+<div>
+  <div
+    id="modal-container"
+  />
+  <div
+    id="alert-container"
+  />
+  <button
+    class="btn btn-primary d-inline-flex justify-content-center align-items-center"
+    type="button"
+  >
+    <span>
+      Action
+    </span>
+  </button>
+</div>
+`;
+
+exports[`<ActionButtonWithModal/> Render modal. 1`] = `
+<div>
+  <div
+    id="modal-container"
+  >
+    <div
+      aria-labelledby="modal-title"
+      aria-modal="true"
+      class="modal fade show"
+      role="dialog"
+    >
+      <div
+        class="modal-dialog modal-dialog-centered"
+        role="document"
+      >
+        <div
+          class="modal-content"
+        >
+          <div
+            class="modal-header"
+          >
+            <h1
+              class="modal-title fs-5"
+            >
+              Warning!
+            </h1>
+            <button
+              aria-label="Close"
+              class="btn-close"
+              type="button"
+            />
+          </div>
+          <div
+            class="modal-body"
+          >
+            <p
+              class="mb-0"
+            >
+              Are you sure you want to perform this action?
+            </p>
+          </div>
+          <div
+            class="modal-footer"
+          >
+            <button
+              class="btn btn-secondary d-inline-flex justify-content-center align-items-center"
+              type="button"
+            >
+              <span>
+                Cancel
+              </span>
+            </button>
+            <button
+              class="btn btn-danger d-inline-flex justify-content-center align-items-center"
+              type="button"
+            >
+              <span>
+                Confirm action
+              </span>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    id="alert-container"
+  />
+  <button
+    class="btn btn-primary d-inline-flex justify-content-center align-items-center"
+    type="button"
+  >
+    <span>
+      Action
+    </span>
+  </button>
+</div>
+`;

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

@@ -1,86 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<RebootButton/> Render modal. 1`] = `
-<div>
-  <div
-    id="modal-container"
-  >
-    <div
-      class="modal fade show"
-      role="dialog"
-    >
-      <div
-        class="modal-dialog modal-dialog-centered"
-        role="document"
-      >
-        <div
-          class="modal-content"
-        >
-          <div
-            class="modal-header"
-          >
-            <h5
-              class="modal-title"
-            >
-              Warning!
-            </h5>
-            <button
-              class="close"
-              type="button"
-            >
-              <span
-                aria-hidden="true"
-              >
-                ×
-              </span>
-            </button>
-          </div>
-          <div
-            class="modal-body"
-          >
-            <p>
-              Are you sure you want to restart the router?
-            </p>
-          </div>
-          <div
-            class="modal-footer"
-          >
-            <button
-              class="btn btn-primary "
-              type="button"
-            >
-              Cancel
-            </button>
-            <button
-              class="btn btn-danger"
-              type="button"
-            >
-              Confirm reboot
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <button
-    class="btn btn-danger"
-    type="button"
-  >
-    Reboot
-  </button>
-</div>
-`;
-
-exports[`<RebootButton/> Render. 1`] = `
-<div>
-  <div
-    id="modal-container"
-  />
-  <button
-    class="btn btn-danger"
-    type="button"
-  >
-    Reboot
-  </button>
-</div>
-`;

src/context/alertContext/AlertContext.js

@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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, useContext, useCallback } from "react";
+import React, { useState, useContext, useCallback, useMemo } from "react";
+
 import PropTypes from "prop-types";
 
-import { Alert, ALERT_TYPES } from "../bootstrap/Alert";
+import Alert, { ALERT_TYPES } from "../../bootstrap/Alert";
-import { Portal } from "../utils/Portal";
+import Portal from "../../utils/Portal";
 
 AlertContextProvider.propTypes = {
     children: PropTypes.oneOfType([
@@ -30,6 +31,10 @@ function AlertContextProvider({ children }) {
     );
 
     const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
+    const contextValue = useMemo(
+        () => [setAlertWrapper, dismissAlert],
+        [setAlertWrapper, dismissAlert]
+    );
 
     return (
         <>
@@ -40,7 +45,7 @@ function AlertContextProvider({ children }) {
                     </Alert>
                 </Portal>
             )}
-            <AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
+            <AlertContext.Provider value={contextValue}>
                 {children}
             </AlertContext.Provider>
         </>

src/context/alertContext/__tests__/AlertContext.test.js

@@ -43,14 +43,17 @@ describe("AlertContext", () => {
         expect(componentContainer).toMatchSnapshot();
     });
 
-    it("should dismiss alert with alert button", () => {
+    it("should dismiss alert with alert button", async () => {
         fireEvent.click(getByText(componentContainer, "Set alert"));
         // Alert is present
         expect(getByText(componentContainer, "Alert content")).toBeDefined();
 
-        fireEvent.click(componentContainer.querySelector(".close"));
+        fireEvent.click(componentContainer.querySelector(".btn-close"));
         // Alert is gone
-        expect(queryByText(componentContainer, "Alert content")).toBeNull();
+        await (() =>
+            expect(
+                queryByText(componentContainer, "Alert content")
+            ).toBeNull());
     });
 
     it("should dismiss alert with external button", () => {

src/context/alertContext/__tests__/__snapshots__/AlertContext.test.js.snap

@@ -6,14 +6,14 @@ exports[`AlertContext should render alert 1`] = `
     id="alert-container"
   >
     <div
-      class="alert alert-dismissible alert-danger"
+      class="alert alert-danger alert-fade-in alert-dismissible"
+      role="alert"
     >
       <button
-        class="close"
+        aria-label="Close"
+        class="btn-close"
         type="button"
-      >
+      />
-        ×
-      </button>
       Alert content
     </div>
   </div>

src/context/customizationContext/CustomizationContext.js

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2019-2024 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, { useContext, useEffect, useMemo } from "react";
+
+import PropTypes from "prop-types";
+
+import { useAPIGet } from "../../api/hooks";
+import { Spinner } from "../../bootstrap/Spinner";
+import { ForisURLs } from "../../utils/forisUrls";
+
+CustomizationContextProvider.propTypes = {
+    children: PropTypes.oneOfType([
+        PropTypes.arrayOf(PropTypes.node),
+        PropTypes.node,
+    ]),
+};
+
+function CustomizationContextProvider({ children }) {
+    const { CustomizationContext } = window;
+    const [getCustomizationResponse, getCustomization] = useAPIGet(
+        ForisURLs.about
+    );
+
+    useEffect(() => {
+        getCustomization();
+    }, [getCustomization]);
+
+    const deviceDetails = useMemo(
+        () => getCustomizationResponse.data || {},
+        [getCustomizationResponse.data]
+    );
+
+    const isCustomized = useMemo(
+        () =>
+            !!(
+                deviceDetails.customization !== undefined &&
+                deviceDetails.customization === "shield"
+            ),
+        [deviceDetails.customization]
+    );
+
+    const contextValue = useMemo(
+        () => ({ deviceDetails, isCustomized }),
+        [deviceDetails, isCustomized]
+    );
+
+    if (getCustomizationResponse.state !== "success") {
+        return <Spinner fullScreen />;
+    }
+
+    return (
+        <CustomizationContext.Provider value={contextValue}>
+            {children}
+        </CustomizationContext.Provider>
+    );
+}
+
+function useCustomizationContext() {
+    const { CustomizationContext } = window;
+    return useContext(CustomizationContext);
+}
+
+export { CustomizationContextProvider, useCustomizationContext };

src/context/customizationContext/CustomizationContext.md

@@ -0,0 +1,3 @@
+It provides customization context to the children. `CustomizationContext` allows
+using `useCustomizationContext` in components to check if the reForis UI is
+customized or not for specific devices.

src/context/customizationContext/__tests__/CustomizationContext.test.js

@@ -0,0 +1,53 @@
+/*
+ * 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 from "react";
+
+import { render, wait, getByText } from "customTestRender";
+import mockAxios from "jest-mock-axios";
+
+import {
+    useCustomizationContext,
+    CustomizationContextProvider,
+} from "../CustomizationContext";
+
+const CUSTOM = "Description / component for customized reForis (Shield)";
+const ORIGINAL = "Description / component for original reForis (other devices)";
+
+const CustomizationTest = () => {
+    const { isCustomized } = useCustomizationContext();
+
+    return <p>{isCustomized ? CUSTOM : ORIGINAL}</p>;
+};
+
+describe("CustomizationContext", () => {
+    let componentContainer;
+    beforeEach(() => {
+        const { container } = render(
+            <CustomizationContextProvider>
+                <CustomizationTest />
+            </CustomizationContextProvider>
+        );
+        componentContainer = container;
+    });
+
+    it("should render component without customization", async () => {
+        mockAxios.mockResponse({ data: {} });
+
+        await wait(() => getByText(componentContainer, ORIGINAL));
+
+        expect(componentContainer).toMatchSnapshot();
+    });
+
+    it("should render customized component", async () => {
+        mockAxios.mockResponse({ data: { customization: "shield" } });
+
+        await wait(() => getByText(componentContainer, CUSTOM));
+
+        expect(componentContainer).toMatchSnapshot();
+    });
+});

src/context/customizationContext/__tests__/__snapshots__/CustomizationContext.test.js.snap

@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CustomizationContext should render component without customization 1`] = `
+<div>
+  <p>
+    Description / component for original reForis (other devices)
+  </p>
+</div>
+`;
+
+exports[`CustomizationContext should render customized component 1`] = `
+<div>
+  <p>
+    Description / component for customized reForis (Shield)
+  </p>
+</div>
+`;

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

@@ -3,17 +3,18 @@
 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-12 col-md-3 col-lg-2 d-inline-flex justify-content-center align-items-center"
     disabled=""
     type="submit"
   >
     <span
       aria-hidden="true"
-      class="spinner-border spinner-border-sm"
+      class="spinner-border spinner-border-sm me-1"
       role="status"
     />
-     
+    <span>
-    Load settings
+      Load settings
+    </span>
   </button>
 </div>
 `;
@@ -21,10 +22,12 @@ 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-12 col-md-3 col-lg-2 d-inline-flex justify-content-center align-items-center"
     type="submit"
   >
-    Save
+    <span>
+      Save
+    </span>
   </button>
 </div>
 `;
@@ -32,17 +35,18 @@ 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-12 col-md-3 col-lg-2 d-inline-flex justify-content-center align-items-center"
     disabled=""
     type="submit"
   >
     <span
       aria-hidden="true"
-      class="spinner-border spinner-border-sm"
+      class="spinner-border spinner-border-sm me-1"
       role="status"
     />
-     
+    <span>
-    Updating
+      Updating
+    </span>
   </button>
 </div>
 `;

src/form/__tests__/hooks.test.js

@@ -9,8 +9,8 @@ import React from "react";
 
 import { act, fireEvent, render, waitForElement } from "customTestRender";
 import mockAxios from "jest-mock-axios";
-import { WebSockets } from "webSockets/WebSockets";
+import WebSockets from "webSockets/WebSockets";
-import { ForisForm } from "../components/ForisForm";
+import ForisForm from "../components/ForisForm";
 
 // It's possible to unittest each hooks via react-hooks-testing-library.
 // But it's better and easier to test it by test components which uses this hooks.

src/form/components/ForisForm.js

@@ -1,24 +1,24 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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, { useEffect } from "react";
+
 import PropTypes from "prop-types";
 import { Prompt } from "react-router-dom";
 
-import { ALERT_TYPES } from "../../bootstrap/Alert";
+import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
+import { useAPIPost } from "../../api/hooks";
 import { API_STATE } from "../../api/utils";
+import { ALERT_TYPES } from "../../bootstrap/Alert";
 import { formFieldsSize } from "../../bootstrap/constants";
 import { Spinner } from "../../bootstrap/Spinner";
-import { useAlert } from "../../alertContext/AlertContext";
+import { useAlert } from "../../context/alertContext/AlertContext";
-import { useAPIPost } from "../../api/hooks";
+import ErrorMessage from "../../utils/ErrorMessage";
-
 import { useForisModule, useForm } from "../hooks";
-import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
-import { ErrorMessage } from "../../utils/ErrorMessage";
 
 ForisForm.propTypes = {
     /** Optional WebSocket object. See `scr/common/WebSockets.js`.
@@ -89,7 +89,7 @@ ForisForm.defaultProps = {
  * use exposed `ReactRouterDOM` object from `react-router-dom` library which is exposed by reForis.
  * See README for more information.
  * */
-export function ForisForm({
+function ForisForm({
     ws,
     forisConfig,
     prepData,
@@ -131,16 +131,16 @@ export function ForisForm({
         return <Spinner />;
     }
 
-    function onSubmitHandler(event) {
+    const onSubmitHandler = (event) => {
         event.preventDefault();
         resetFormData();
         dismissAlert();
         const copiedFormData = JSON.parse(JSON.stringify(formState.data));
         const preparedData = prepDataToSubmit(copiedFormData);
         post({ data: preparedData });
-    }
+    };
 
-    function getSubmitButtonState() {
+    const getSubmitButtonState = () => {
         if (postState.state === API_STATE.SENDING) {
             return SUBMIT_BUTTON_STATES.SAVING;
         }
@@ -148,7 +148,7 @@ export function ForisForm({
             return SUBMIT_BUTTON_STATES.LOAD;
         }
         return SUBMIT_BUTTON_STATES.READY;
-    }
+    };
 
     const formIsDisabled =
         disabled ||
@@ -174,7 +174,7 @@ export function ForisForm({
           )
         : onSubmitHandler;
 
-    function getMessageOnLeavingPage() {
+    const getMessageOnLeavingPage = () => {
         if (
             JSON.stringify(formState.data) ===
             JSON.stringify(formState.initialData)
@@ -183,14 +183,14 @@ export function ForisForm({
         return _(
             "Changes you made may not be saved. Are you sure you want to leave?"
         );
-    }
+    };
 
     return (
         <div className={formFieldsSize}>
             <Prompt message={getMessageOnLeavingPage} />
             <form onSubmit={onSubmit} ref={formReference}>
                 {childrenWithFormProps}
-                <div className="text-right">
+                <div className="text-end">
                     <SubmitButton
                         state={getSubmitButtonState()}
                         disabled={submitButtonIsDisabled}
@@ -200,3 +200,5 @@ export function ForisForm({
         </div>
     );
 }
+
+export default ForisForm;

src/form/components/SubmitButton.js

@@ -6,9 +6,10 @@
  */
 
 import React from "react";
+
 import PropTypes from "prop-types";
 
-import { Button } from "../../bootstrap/Button";
+import Button from "../../bootstrap/Button";
 
 export const STATES = {
     READY: 1,

src/form/hooks.js

@@ -1,15 +1,16 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 { useCallback, useEffect, useReducer } from "react";
+
 import update from "immutability-helper";
 
 import { useAPIGet } from "../api/hooks";
-import { useWSForisModule } from "../webSockets/hooks";
+import useWSForisModule from "../webSockets/hooks";
 
 const FORM_ACTIONS = {
     updateValue: 1,

src/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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.
@@ -17,32 +17,35 @@ export {
 export { API_STATE } from "./api/utils";
 
 // Bootstrap
-export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
+export { default as Alert, ALERT_TYPES } from "./bootstrap/Alert";
-export { Button } from "./bootstrap/Button";
+export { default as Button } from "./bootstrap/Button";
-export { CheckBox } from "./bootstrap/CheckBox";
+export { default as CheckBox } from "./bootstrap/CheckBox";
-export { CopyInput } from "./bootstrap/CopyInput";
+export { default as CopyInput } from "./bootstrap/CopyInput";
-export { DownloadButton } from "./bootstrap/DownloadButton";
+export { default as DownloadButton } from "./bootstrap/DownloadButton";
-export { DataTimeInput } from "./bootstrap/DataTimeInput";
+export { default as DataTimeInput } from "./bootstrap/DataTimeInput";
-export { EmailInput } from "./bootstrap/EmailInput";
+export { default as EmailInput } from "./bootstrap/EmailInput";
-export { FileInput } from "./bootstrap/FileInput";
+export { default as FileInput } from "./bootstrap/FileInput";
-export { Input } from "./bootstrap/Input";
+export { default as Input } from "./bootstrap/Input";
-export { NumberInput } from "./bootstrap/NumberInput";
+export { default as NumberInput } from "./bootstrap/NumberInput";
-export { PasswordInput } from "./bootstrap/PasswordInput";
+export { default as PasswordInput } from "./bootstrap/PasswordInput";
-export { Radio, RadioSet } from "./bootstrap/RadioSet";
+export { default as Radio } from "./bootstrap/Radio";
-export { Select } from "./bootstrap/Select";
+export { default as RadioSet } from "./bootstrap/RadioSet";
-export { TextInput } from "./bootstrap/TextInput";
+export { default as Select } from "./bootstrap/Select";
+export { default as TextInput } from "./bootstrap/TextInput";
 export { formFieldsSize, buttonFormFieldsSize } from "./bootstrap/constants";
-export { Switch } from "./bootstrap/Switch";
+export { default as Switch } from "./bootstrap/Switch";
+export { default as ThreeDotsMenu } from "./bootstrap/ThreeDotsMenu";
 
 export { Spinner, SpinnerElement } from "./bootstrap/Spinner";
 export { Modal, ModalBody, ModalFooter, ModalHeader } from "./bootstrap/Modal";
 
 // Common
-export { RebootButton } from "./common/RebootButton";
+export { default as ActionButtonWithModal } from "./common/ActionButtonWithModal/ActionButtonWithModal";
-export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
+export { default as WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
-export { ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
+export { default as ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
+export { default as RichTable } from "./common/RichTable/RichTable";
 // Form
-export { ForisForm } from "./form/components/ForisForm";
+export { default as ForisForm } from "./form/components/ForisForm";
 export {
     SubmitButton,
     STATES as SUBMIT_BUTTON_STATES,
@@ -50,11 +53,11 @@ export {
 export { useForisModule, useForm } from "./form/hooks";
 
 // WebSockets
-export { useWSForisModule } from "./webSockets/hooks";
+export { default as useWSForisModule } from "./webSockets/hooks";
-export { WebSockets } from "./webSockets/WebSockets";
+export { default as WebSockets } from "./webSockets/WebSockets";
 
 // Utils
-export { Portal } from "./utils/Portal";
+export { default as Portal } from "./utils/Portal";
 export {
     undefinedIfEmpty,
     withoutUndefinedKeys,
@@ -68,11 +71,11 @@ export {
     withError,
     withErrorMessage,
 } from "./utils/conditionalHOCs";
-export { ErrorMessage } from "./utils/ErrorMessage";
+export { default as ErrorMessage } from "./utils/ErrorMessage";
 export { useClickOutside } from "./utils/hooks";
-export { toLocaleDateString } from "./utils/datetime";
+export { default as toLocaleDateString } from "./utils/datetime";
-export { displayCard } from "./utils/displayCard";
+export { default as displayCard } from "./utils/displayCard";
-export { isPluginInstalled } from "./utils/isPluginInstalled";
+export { default as isPluginInstalled } from "./utils/isPluginInstalled";
 
 // Foris URL
 export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
@@ -90,4 +93,13 @@ export {
 } from "./utils/validations";
 
 // Alert context
-export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";
+export {
+    AlertContextProvider,
+    useAlert,
+} from "./context/alertContext/AlertContext";
+
+// Customization context
+export {
+    CustomizationContextProvider,
+    useCustomizationContext,
+} from "./context/customizationContext/CustomizationContext";

src/testUtils/customTestRender.js

@@ -14,6 +14,7 @@ import { render } from "@testing-library/react";
 import PropTypes from "prop-types";
 
 import { AlertContextMock } from "./alertContextMock";
+import { CustomizationContextMock } from "./customizationContextMock";
 
 Wrapper.propTypes = {
     children: PropTypes.oneOfType([
@@ -24,11 +25,13 @@ Wrapper.propTypes = {
 
 function Wrapper({ children }) {
     return (
-        <AlertContextMock>
+        <CustomizationContextMock>
-            <StaticRouter>
+            <AlertContextMock>
-                <UIDReset>{children}</UIDReset>
+                <StaticRouter>
-            </StaticRouter>
+                    <UIDReset>{children}</UIDReset>
-        </AlertContextMock>
+                </StaticRouter>
+            </AlertContextMock>
+        </CustomizationContextMock>
     );
 }
 

src/testUtils/customizationContextMock.js

@@ -0,0 +1,34 @@
+/*
+ * 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 from "react";
+
+window.CustomizationContext = React.createContext();
+
+const deviceDetails = {
+    kernel: "5.x.x",
+    model: "Turris Omnia",
+    os_branch: {
+        mode: "branch",
+        value: "hbs",
+    },
+    os_version: "6.x.x",
+    reforis_version: "1.x.x",
+    serial: 123456789,
+};
+
+const isCustomized = false;
+
+function CustomizationContextMock({ children }) {
+    return (
+        <CustomizationContext.Provider value={{ deviceDetails, isCustomized }}>
+            {children}
+        </CustomizationContext.Provider>
+    );
+}
+
+export { CustomizationContextMock };

src/testUtils/setup.js

@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
 import mockAxios from "jest-mock-axios";
 import moment from "moment-timezone";
 import "./mockGlobals";
@@ -26,3 +26,8 @@ jest.doMock("moment", () => {
     return moment;
 });
 Date.now = jest.fn(() => new Date(Date.UTC(2019, 1, 1, 12, 13, 14)).valueOf());
+
+// Mock Font Awesome v6 library
+jest.mock("@fortawesome/react-fontawesome", () => ({
+    FontAwesomeIcon: () => <i className="fa" />,
+}));

src/utils/ErrorMessage.js

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 from "react";
+
 import PropTypes from "prop-types";
 
 ErrorMessage.propTypes = {
@@ -16,6 +17,8 @@ ErrorMessage.defaultProps = {
     message: _("An error occurred while fetching data."),
 };
 
-export function ErrorMessage({ message }) {
+function ErrorMessage({ message }) {
     return <p className="text-center text-danger">{message}</p>;
 }
+
+export default ErrorMessage;

src/utils/Portal.js

@@ -1,14 +1,22 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2024 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 PropTypes from "prop-types";
 import ReactDOM from "react-dom";
 
-export function Portal({ containerId, children }) {
+Portal.propTypes = {
+    containerId: PropTypes.string.isRequired,
+    children: PropTypes.node.isRequired,
+};
+
+function Portal({ containerId, children }) {
     const container = document.getElementById(containerId);
     if (container) return ReactDOM.createPortal(children, container);
     return null;
 }
+
+export default Portal;

src/utils/__tests__/datetime.test.js

@@ -5,7 +5,7 @@
  * See /LICENSE for more information.
  */
 
-import { toLocaleDateString } from "../datetime";
+import toLocaleDateString from "../datetime";
 
 describe("toLocaleDateString", () => {
     it("should work with different locale", () => {