Merge branch 'bump-version-600' into 'dev'

Bump v6.0.0

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

.eslintrc.js

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

.prettierrc

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

package-lock.json

@@ -29,7 +29,9 @@
                 "bootstrap": "^5.3.3",
                 "css-loader": "^5.2.4",
                 "eslint": "^8.57.0",
+                "eslint-config-prettier": "^9.1.0",
                 "eslint-config-reforis": "^2.1.1",
+                "eslint-plugin-prettier": "^5.1.3",
                 "file-loader": "^6.0.0",
                 "jest": "^29.7.0",
                 "jest-environment-jsdom": "^29.7.0",

package.json

@@ -41,7 +41,9 @@
         "bootstrap": "^5.3.3",
         "css-loader": "^5.2.4",
         "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
         "eslint-config-reforis": "^2.1.1",
+        "eslint-plugin-prettier": "^5.1.3",
         "file-loader": "^6.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",

prettier.config.js

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

src/api/hooks.js

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

src/bootstrap/Alert.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -36,7 +36,7 @@ Alert.defaultProps = {
     type: ALERT_TYPES.DANGER,
 };
 
-function Alert({ type, onDismiss, children }) {
+export function Alert({ type, onDismiss, children }) {
     return (
         <div
             className={`alert alert-${type} ${
@@ -55,5 +55,3 @@ function Alert({ type, onDismiss, children }) {
         </div>
     );
 }
-
-export default Alert;

src/bootstrap/Button.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2023 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.
@@ -25,7 +25,13 @@ Button.propTypes = {
     ]).isRequired,
 };
 
-function Button({ className, loading, forisFormSize, children, ...props }) {
+export function Button({
+    className,
+    loading,
+    forisFormSize,
+    children,
+    ...props
+}) {
     let buttonClass = className ? `btn ${className}` : "btn btn-primary";
     if (forisFormSize) {
         buttonClass = `${buttonClass} col-12 col-md-3 col-lg-2`;
@@ -48,5 +54,3 @@ function Button({ className, loading, forisFormSize, children, ...props }) {
         </button>
     );
 }
-
-export default Button;

src/bootstrap/CheckBox.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -23,7 +23,7 @@ CheckBox.defaultProps = {
     disabled: false,
 };
 
-function CheckBox({ label, helpText, disabled, ...props }) {
+export function CheckBox({ label, helpText, disabled, ...props }) {
     const uid = useUID();
 
     return (
@@ -46,5 +46,3 @@ function CheckBox({ label, helpText, disabled, ...props }) {
         </div>
     );
 }
-
-export default CheckBox;

src/bootstrap/CopyInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://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.
@@ -9,7 +9,7 @@ import React, { useState, useRef } from "react";
 
 import PropTypes from "prop-types";
 
-import Input from "./Input";
+import { Input } from "./Input";
 
 CopyInput.propTypes = {
     /** Field label. */
@@ -24,7 +24,7 @@ CopyInput.propTypes = {
     readOnly: PropTypes.bool,
 };
 
-function CopyInput({ value, ...props }) {
+export function CopyInput({ value, ...props }) {
     const inputTextRef = useRef();
     const [isCopied, setIsCopied] = useState(false);
 
@@ -60,5 +60,3 @@ function CopyInput({ value, ...props }) {
         </Input>
     );
 }
-
-export default CopyInput;

src/bootstrap/DataTimeInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -13,7 +13,7 @@ import Datetime from "react-datetime";
 import "react-datetime/css/react-datetime.css";
 import "./DataTimeInput.css";
 
-import Input from "./Input";
+import { Input } from "./Input";
 
 DataTimeInput.propTypes = {
     /** Field label. */
@@ -38,7 +38,7 @@ DataTimeInput.propTypes = {
 const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
 const DEFAULT_TIME_FORMAT = "HH:mm:ss";
 
-function DataTimeInput({
+export function DataTimeInput({
     value,
     onChange,
     isValidDate,
@@ -71,5 +71,3 @@ function DataTimeInput({
         />
     );
 }
-
-export default DataTimeInput;

src/bootstrap/DownloadButton.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -22,7 +22,7 @@ DownloadButton.defaultProps = {
     className: "btn-primary",
 };
 
-function DownloadButton({ href, className, children, ...props }) {
+export function DownloadButton({ href, className, children, ...props }) {
     return (
         <a
             href={href}
@@ -34,5 +34,3 @@ function DownloadButton({ href, className, children, ...props }) {
         </a>
     );
 }
-
-export default DownloadButton;

src/bootstrap/EmailInput.js

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

src/bootstrap/FileInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,7 +9,7 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import Input from "./Input";
+import { Input } from "./Input";
 
 FileInput.propTypes = {
     /** Field label. */
@@ -24,7 +24,7 @@ FileInput.propTypes = {
     multiple: PropTypes.bool,
 };
 
-function FileInput({ ...props }) {
+export function FileInput({ ...props }) {
     return (
         <Input
             type="file"
@@ -35,5 +35,3 @@ function FileInput({ ...props }) {
         />
     );
 }
-
-export default FileInput;

src/bootstrap/Input.js

@@ -61,8 +61,6 @@ const Input = forwardRef(
     }
 );
 
-Input.displayName = "Input";
-
 Input.propTypes = {
     type: PropTypes.string.isRequired,
     label: PropTypes.string.isRequired,
@@ -77,4 +75,4 @@ Input.propTypes = {
     groupClassName: PropTypes.string,
 };
 
-export default Input;
+export { Input };

src/bootstrap/Modal.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -10,7 +10,7 @@ import React, { useRef, useEffect } from "react";
 import PropTypes from "prop-types";
 
 import { useClickOutside } from "../utils/hooks";
-import Portal from "../utils/Portal";
+import { Portal } from "../utils/Portal";
 import "./Modal.css";
 
 Modal.propTypes = {

src/bootstrap/NumberInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,7 +9,7 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import Input from "./Input";
+import { Input } from "./Input";
 import { useConditionalTimeout } from "../utils/hooks";
 import "./NumberInput.css";
 
@@ -32,7 +32,7 @@ NumberInput.defaultProps = {
     value: 0,
 };
 
-function NumberInput({ onChange, inlineText, value, ...props }) {
+export function NumberInput({ onChange, inlineText, value, ...props }) {
     function updateValue(initialValue, difference) {
         onChange({ target: { value: initialValue + difference } });
     }
@@ -74,5 +74,3 @@ function NumberInput({ onChange, inlineText, value, ...props }) {
         </Input>
     );
 }
-
-export default NumberInput;

src/bootstrap/PasswordInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://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.
@@ -9,7 +9,7 @@ import React, { useState } from "react";
 
 import PropTypes from "prop-types";
 
-import Input from "./Input";
+import { Input } from "./Input";
 
 PasswordInput.propTypes = {
     /** Field label. */
@@ -26,7 +26,7 @@ PasswordInput.propTypes = {
     newPass: PropTypes.bool,
 };
 
-function PasswordInput({ withEye, newPass, ...props }) {
+export function PasswordInput({ withEye, newPass, ...props }) {
     const [isHidden, setHidden] = useState(true);
 
     return (
@@ -52,5 +52,3 @@ function PasswordInput({ withEye, newPass, ...props }) {
         </Input>
     );
 }
-
-export default PasswordInput;

src/bootstrap/RadioSet.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -37,7 +37,15 @@ RadioSet.propTypes = {
     inline: PropTypes.bool,
 };
 
-function RadioSet({ name, label, choices, value, helpText, inline, ...props }) {
+export function RadioSet({
+    name,
+    label,
+    choices,
+    value,
+    helpText,
+    inline,
+    ...props
+}) {
     const uid = useUID();
     const radios = choices.map((choice, key) => {
         const id = `${name}-${key}`;
@@ -88,7 +96,9 @@ Radio.propTypes = {
 export function Radio({ label, id, helpText, inline, ...props }) {
     return (
         <div
-            className={`mb-2 ${inline ? "form-check form-check-inline" : ""}`.trim()}
+            className={`mb-2 ${
+                inline ? "form-check form-check-inline" : ""
+            }`.trim()}
         >
             <input
                 id={id}
@@ -107,5 +117,3 @@ export function Radio({ label, id, helpText, inline, ...props }) {
         </div>
     );
 }
-
-export default RadioSet;

src/bootstrap/Select.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://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.
@@ -21,7 +21,7 @@ Select.propTypes = {
     helpText: PropTypes.string,
 };
 
-function Select({ label, choices, helpText, ...props }) {
+export function Select({ label, choices, helpText, ...props }) {
     const uid = useUID();
 
     const options = Object.keys(choices).map((choice) => (
@@ -46,5 +46,3 @@ function Select({ label, choices, helpText, ...props }) {
         </div>
     );
 }
-
-export default Select;

src/bootstrap/Switch.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (c) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -21,7 +21,7 @@ Switch.propTypes = {
     switchHeading: PropTypes.bool,
 };
 
-function Switch({ label, helpText, switchHeading, ...props }) {
+export function Switch({ label, helpText, switchHeading, ...props }) {
     const uid = useUID();
 
     return (
@@ -32,7 +32,9 @@ function Switch({ label, helpText, switchHeading, ...props }) {
         >
             <input
                 type="checkbox"
-                className={`form-check-input ${switchHeading ? "me-2" : ""}`.trim()}
+                className={`form-check-input ${
+                    switchHeading ? "me-2" : ""
+                }`.trim()}
                 role="switch"
                 id={uid}
                 {...props}
@@ -48,5 +50,3 @@ function Switch({ label, helpText, switchHeading, ...props }) {
         </div>
     );
 }
-
-export default Switch;

src/bootstrap/TextInput.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,9 +9,9 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import Input from "./Input";
+import { Input } from "./Input";
 
-function TextInput({ ...props }) {
+export function TextInput({ ...props }) {
     return <Input type="text" {...props} />;
 }
 
@@ -23,5 +23,3 @@ TextInput.propTypes = {
     /** Help text message. */
     helpText: PropTypes.string,
 };
-
-export default TextInput;

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/constants.js

@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
 /** Bootstrap column size for form fields */
-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 { formFieldsSize, buttonFormFieldsSize };
+// eslint-disable-next-line import/prefer-default-export
+export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
+export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";

src/common/RebootButton.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -11,12 +11,12 @@ import PropTypes from "prop-types";
 
 import { useAPIPost } from "../api/hooks";
 import { API_STATE } from "../api/utils";
-import Button from "../bootstrap/Button";
+import { Button } from "../bootstrap/Button";
 import { Modal, ModalHeader, ModalBody, ModalFooter } from "../bootstrap/Modal";
 import { useAlert } from "../context/alertContext/AlertContext";
 import { ForisURLs } from "../utils/forisUrls";
 
-function RebootButton(props) {
+export function RebootButton(props) {
     const [triggered, setTriggered] = useState(false);
     const [modalShown, setModalShown] = useState(false);
     const [triggerRebootStatus, triggerReboot] = useAPIPost(ForisURLs.reboot);
@@ -28,11 +28,11 @@ function RebootButton(props) {
         }
     });
 
-    const rebootHandler = () => {
+    function rebootHandler() {
         setTriggered(true);
         triggerReboot();
         setModalShown(false);
-    };
+    }
 
     return (
         <>
@@ -76,5 +76,3 @@ function RebootModal({ shown, setShown, onReboot }) {
         </Modal>
     );
 }
-
-export default RebootButton;

src/common/WiFiSettings/ResetWiFiSettings.js

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

src/common/WiFiSettings/WiFiForm.js

@@ -12,11 +12,11 @@ import PropTypes from "prop-types";
 import { HELP_TEXTS, HTMODES, HWMODES, ENCRYPTIONMODES } from "./constants";
 import WifiGuestForm from "./WiFiGuestForm";
 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";
+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) })

src/common/WiFiSettings/WiFiGuestForm.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -11,9 +11,9 @@ import PropTypes from "prop-types";
 
 import { HELP_TEXTS } from "./constants";
 import WiFiQRCode from "./WiFiQRCode";
-import PasswordInput from "../../bootstrap/PasswordInput";
-import Switch from "../../bootstrap/Switch";
-import TextInput from "../../bootstrap/TextInput";
+import { PasswordInput } from "../../bootstrap/PasswordInput";
+import { Switch } from "../../bootstrap/Switch";
+import { TextInput } from "../../bootstrap/TextInput";
 
 WifiGuestForm.propTypes = {
     formData: PropTypes.shape({

src/common/WiFiSettings/WiFiQRCode.js

@@ -11,7 +11,7 @@ import PropTypes from "prop-types";
 import QRCode from "qrcode.react";
 
 import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers";
-import Button from "../../bootstrap/Button";
+import { Button } from "../../bootstrap/Button";
 import {
     Modal,
     ModalBody,

src/common/WiFiSettings/WiFiSettings.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -9,9 +9,9 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import ResetWiFiSettings from "./ResetWiFiSettings";
+import { ResetWiFiSettings } from "./ResetWiFiSettings";
 import WiFiForm from "./WiFiForm";
-import ForisForm from "../../form/components/ForisForm";
+import { ForisForm } from "../../form/components/ForisForm";
 
 WiFiSettings.propTypes = {
     ws: PropTypes.object.isRequired,
@@ -20,7 +20,7 @@ WiFiSettings.propTypes = {
     hasGuestNetwork: PropTypes.bool,
 };
 
-function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
+export function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
     return (
         <>
             <ForisForm
@@ -118,5 +118,3 @@ 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;

src/common/__tests__/RebootButton.test.js

@@ -18,7 +18,7 @@ import mockAxios from "jest-mock-axios";
 import { mockJSONError } from "testUtils/network";
 import { mockSetAlert } from "testUtils/alertContextMock";
 
-import RebootButton from "../RebootButton";
+import { RebootButton } from "../RebootButton";
 
 describe("<RebootButton/>", () => {
     let componentContainer;

src/context/alertContext/AlertContext.js

@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
-import React, { useState, useContext, useCallback, useMemo } from "react";
+import React, { useState, useContext, useCallback } from "react";
 
 import PropTypes from "prop-types";
 
-import Alert, { ALERT_TYPES } from "../../bootstrap/Alert";
-import Portal from "../../utils/Portal";
+import { Alert, ALERT_TYPES } from "../../bootstrap/Alert";
+import { Portal } from "../../utils/Portal";
 
 AlertContextProvider.propTypes = {
     children: PropTypes.oneOfType([
@@ -31,10 +31,6 @@ function AlertContextProvider({ children }) {
     );
 
     const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
-    const contextValue = useMemo(
-        () => [setAlertWrapper, dismissAlert],
-        [setAlertWrapper, dismissAlert]
-    );
 
     return (
         <>
@@ -45,7 +41,7 @@ function AlertContextProvider({ children }) {
                     </Alert>
                 </Portal>
             )}
-            <AlertContext.Provider value={contextValue}>
+            <AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
                 {children}
             </AlertContext.Provider>
         </>

src/context/customizationContext/CustomizationContext.js

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://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, { useContext, useEffect, useMemo } from "react";
+import React, { useContext, useEffect } from "react";
 
 import PropTypes from "prop-types";
 
@@ -30,31 +30,20 @@ function CustomizationContextProvider({ children }) {
         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 />;
     }
 
+    const deviceDetails = getCustomizationResponse.data || {};
+
+    const isCustomized = !!(
+        deviceDetails &&
+        deviceDetails.customization !== undefined &&
+        deviceDetails.customization === "shield"
+    );
+
     return (
-        <CustomizationContext.Provider value={contextValue}>
+        <CustomizationContext.Provider value={{ deviceDetails, isCustomized }}>
             {children}
         </CustomizationContext.Provider>
     );

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 ForisForm from "../components/ForisForm";
+import { WebSockets } from "webSockets/WebSockets";
+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,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -17,7 +17,7 @@ import { ALERT_TYPES } from "../../bootstrap/Alert";
 import { formFieldsSize } from "../../bootstrap/constants";
 import { Spinner } from "../../bootstrap/Spinner";
 import { useAlert } from "../../context/alertContext/AlertContext";
-import ErrorMessage from "../../utils/ErrorMessage";
+import { ErrorMessage } from "../../utils/ErrorMessage";
 import { useForisModule, useForm } from "../hooks";
 
 ForisForm.propTypes = {
@@ -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.
  * */
-function ForisForm({
+export function ForisForm({
     ws,
     forisConfig,
     prepData,
@@ -131,16 +131,16 @@ function ForisForm({
         return <Spinner />;
     }
 
-    const onSubmitHandler = (event) => {
+    function onSubmitHandler(event) {
         event.preventDefault();
         resetFormData();
         dismissAlert();
         const copiedFormData = JSON.parse(JSON.stringify(formState.data));
         const preparedData = prepDataToSubmit(copiedFormData);
         post({ data: preparedData });
-    };
+    }
 
-    const getSubmitButtonState = () => {
+    function getSubmitButtonState() {
         if (postState.state === API_STATE.SENDING) {
             return SUBMIT_BUTTON_STATES.SAVING;
         }
@@ -148,7 +148,7 @@ function ForisForm({
             return SUBMIT_BUTTON_STATES.LOAD;
         }
         return SUBMIT_BUTTON_STATES.READY;
-    };
+    }
 
     const formIsDisabled =
         disabled ||
@@ -174,7 +174,7 @@ function ForisForm({
           )
         : onSubmitHandler;
 
-    const getMessageOnLeavingPage = () => {
+    function getMessageOnLeavingPage() {
         if (
             JSON.stringify(formState.data) ===
             JSON.stringify(formState.initialData)
@@ -183,7 +183,7 @@ function ForisForm({
         return _(
             "Changes you made may not be saved. Are you sure you want to leave?"
         );
-    };
+    }
 
     return (
         <div className={formFieldsSize}>
@@ -200,5 +200,3 @@ function ForisForm({
         </div>
     );
 }
-
-export default ForisForm;

src/form/components/SubmitButton.js

@@ -9,7 +9,7 @@ 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,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -10,7 +10,7 @@ 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-2024 CZ.NIC z.s.p.o. (https://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.
@@ -17,32 +17,32 @@ export {
 export { API_STATE } from "./api/utils";
 
 // Bootstrap
-export { default as Alert, ALERT_TYPES } from "./bootstrap/Alert";
-export { default as Button } from "./bootstrap/Button";
-export { default as CheckBox } from "./bootstrap/CheckBox";
-export { default as CopyInput } from "./bootstrap/CopyInput";
-export { default as DownloadButton } from "./bootstrap/DownloadButton";
-export { default as DataTimeInput } from "./bootstrap/DataTimeInput";
-export { default as EmailInput } from "./bootstrap/EmailInput";
-export { default as FileInput } from "./bootstrap/FileInput";
-export { default as Input } from "./bootstrap/Input";
-export { default as NumberInput } from "./bootstrap/NumberInput";
-export { default as PasswordInput } from "./bootstrap/PasswordInput";
-export { default as RadioSet, Radio } from "./bootstrap/RadioSet";
-export { default as Select } from "./bootstrap/Select";
-export { default as TextInput } from "./bootstrap/TextInput";
+export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
+export { Button } from "./bootstrap/Button";
+export { CheckBox } from "./bootstrap/CheckBox";
+export { CopyInput } from "./bootstrap/CopyInput";
+export { DownloadButton } from "./bootstrap/DownloadButton";
+export { DataTimeInput } from "./bootstrap/DataTimeInput";
+export { EmailInput } from "./bootstrap/EmailInput";
+export { FileInput } from "./bootstrap/FileInput";
+export { Input } from "./bootstrap/Input";
+export { NumberInput } from "./bootstrap/NumberInput";
+export { PasswordInput } from "./bootstrap/PasswordInput";
+export { Radio, RadioSet } from "./bootstrap/RadioSet";
+export { Select } from "./bootstrap/Select";
+export { TextInput } from "./bootstrap/TextInput";
 export { formFieldsSize, buttonFormFieldsSize } from "./bootstrap/constants";
-export { default as Switch } from "./bootstrap/Switch";
+export { Switch } from "./bootstrap/Switch";
 
 export { Spinner, SpinnerElement } from "./bootstrap/Spinner";
 export { Modal, ModalBody, ModalFooter, ModalHeader } from "./bootstrap/Modal";
 
 // Common
-export { default as RebootButton } from "./common/RebootButton";
-export { default as WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
-export { default as ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
+export { RebootButton } from "./common/RebootButton";
+export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
+export { ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
 // Form
-export { default as ForisForm } from "./form/components/ForisForm";
+export { ForisForm } from "./form/components/ForisForm";
 export {
     SubmitButton,
     STATES as SUBMIT_BUTTON_STATES,
@@ -50,11 +50,11 @@ export {
 export { useForisModule, useForm } from "./form/hooks";
 
 // WebSockets
-export { default as useWSForisModule } from "./webSockets/hooks";
-export { default as WebSockets } from "./webSockets/WebSockets";
+export { useWSForisModule } from "./webSockets/hooks";
+export { WebSockets } from "./webSockets/WebSockets";
 
 // Utils
-export { default as Portal } from "./utils/Portal";
+export { Portal } from "./utils/Portal";
 export {
     undefinedIfEmpty,
     withoutUndefinedKeys,
@@ -68,11 +68,11 @@ export {
     withError,
     withErrorMessage,
 } from "./utils/conditionalHOCs";
-export { default as ErrorMessage } from "./utils/ErrorMessage";
+export { ErrorMessage } from "./utils/ErrorMessage";
 export { useClickOutside } from "./utils/hooks";
-export { default as toLocaleDateString } from "./utils/datetime";
-export { default as displayCard } from "./utils/displayCard";
-export { default as isPluginInstalled } from "./utils/isPluginInstalled";
+export { toLocaleDateString } from "./utils/datetime";
+export { displayCard } from "./utils/displayCard";
+export { isPluginInstalled } from "./utils/isPluginInstalled";
 
 // Foris URL
 export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";

src/utils/ErrorMessage.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -17,8 +17,6 @@ ErrorMessage.defaultProps = {
     message: _("An error occurred while fetching data."),
 };
 
-function ErrorMessage({ message }) {
+export function ErrorMessage({ message }) {
     return <p className="text-center text-danger">{message}</p>;
 }
-
-export default ErrorMessage;

src/utils/Portal.js

@@ -1,22 +1,14 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
-import PropTypes from "prop-types";
 import ReactDOM from "react-dom";
 
-Portal.propTypes = {
-    containerId: PropTypes.string.isRequired,
-    children: PropTypes.node.isRequired,
-};
-
-function Portal({ containerId, children }) {
+export 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", () => {

src/utils/conditionalHOCs.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -7,24 +7,18 @@
 
 import React from "react";
 
-import ErrorMessage from "./ErrorMessage";
+import { ErrorMessage } from "./ErrorMessage";
 import { API_STATE } from "../api/utils";
 import { Spinner } from "../bootstrap/Spinner";
 
 function withEither(conditionalFn, Either) {
-    return (Component) => {
-        function WithEither(props) {
+    return (Component) =>
+        function (props) {
             if (conditionalFn(props)) {
                 return <Either {...props} />;
             }
             return <Component {...props} />;
-        }
-
-        // Setting displayName for better debugging
-        WithEither.displayName = `WithEither(${Component.displayName || Component.name || "Component"})`;
-
-        return WithEither;
-    };
+        };
 }
 
 // Loading

src/utils/datetime.js

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

src/utils/displayCard.js

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
-function displayCard({ package_lists: packages }, cardName) {
+export function displayCard({ package_lists: packages }, cardName) {
     const enabledPackagesNames = [];
     packages
         .filter((item) => item.enabled)
@@ -21,5 +21,3 @@ function displayCard({ package_lists: packages }, cardName) {
         });
     return enabledPackagesNames.includes(cardName);
 }
-
-export default displayCard;

src/utils/isPluginInstalled.js

@@ -1,11 +1,9 @@
 /*
- * Copyright (C) 2020-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
  */
 
-const isPluginInstalled = (pluginName) =>
+export const isPluginInstalled = (pluginName) =>
     ForisPlugins.some((plugin) => plugin.name === pluginName);
-
-export default isPluginInstalled;

src/webSockets/WebSockets.js

@@ -10,12 +10,14 @@
 const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
 
 const URL = process.env.LIGHTTPD
-    ? `${PROTOCOL}://${window.location.host}/${process.env.WSPATH || "foris-ws"}`
+    ? `${PROTOCOL}://${window.location.host}/${
+          process.env.WSPATH || "foris-ws"
+      }`
     : `${PROTOCOL}://${window.location.hostname}:9081`;
 
 const WAITING_FOR_CONNECTION_TIMEOUT = 500;
 
-class WebSockets {
+export class WebSockets {
     constructor() {
         this.ws = new WebSocket(URL);
         this.ws.onerror = (e) => {
@@ -120,5 +122,3 @@ class WebSockets {
         this.ws.close();
     }
 }
-
-export default WebSockets;

src/webSockets/hooks.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -7,8 +7,7 @@
 
 import { useEffect, useState } from "react";
 
-/* eslint-disable default-param-last */
-function useWSForisModule(
+export function useWSForisModule(
     ws,
     module,
     action = "update_settings",
@@ -42,5 +41,3 @@ function useWSForisModule(
 
     return [data];
 }
-
-export default useWSForisModule;