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

Draft: WiFi API update

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

CHANGELOG.md

@@ -8,49 +8,6 @@ and this project adheres to
 
 ## [Unreleased]
 
-## [6.7.0] - 2025-03-11
-
-### Added
-
-- Added encryption property to guest WiFi settings in tests
-- Added global fuzzy search and columns visibility to RichTable
-
-### Changed
-
-- Made thead of RichTable lighter
-- Updated dependencies in package.json to latest versions
-- Enhanced ActionButtonWithModal to support dynamic methods
-- NPM audit fix
-
-## [6.6.2] - 2025-02-20
-
-### Changed
-
-- Enhanced SubmitButton component to accept a custom label prop
-- Refactored RichTable component to remove forwardRef and simplify data handling
-
-## [6.6.1] - 2025-02-17
-
-### Changed
-
-- Refactored RichTable component to use forwardRef
-
-## [6.6.0] - 2025-02-07
-
-### Added
-
-- Added & updated Weblate translations
-- Added Wi-Fi and LAN settings URLs to ForisURLs
-- Added Wi-Fi modes VHT/HE 80+80
-- Added encryption selection to WiFiGuestForm
-- Added optional close button to ModalHeader component
-
-### Changed
-
-- Updated Wi-Fi API
-- Enhanced NumberInput component with keyboard & touch accessibility
-- Refactored pagination condition in RichTable component
-
 ## [6.5.0] - 2024-11-13
 
 ### Added
@@ -462,11 +419,7 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02
 
 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.7.0...dev
-[6.7.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.6.2...v6.7.0
-[6.6.2]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.6.1...v6.6.2
-[6.6.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.6.0...v6.6.1
-[6.6.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.5.0...v6.6.0
+    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

jest.config.js

@@ -21,7 +21,10 @@ module.exports = {
     testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/", "/dist/"],
     testEnvironment: "jsdom",
     verbose: false,
-    setupFilesAfterEnv: ["<rootDir>/src/testUtils/setup"],
+    setupFilesAfterEnv: [
+        "@testing-library/react/cleanup-after-each",
+        "<rootDir>/src/testUtils/setup",
+    ],
     globals: {
         TZ: "utc",
     },

package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.7.0",
+    "version": "6.5.0",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {
@@ -14,18 +14,17 @@
     "license": "GPL-3.0",
     "main": "./src/index.js",
     "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^6.7.2",
-        "@fortawesome/free-regular-svg-icons": "^6.7.2",
-        "@fortawesome/free-solid-svg-icons": "^6.7.2",
+        "@fortawesome/fontawesome-svg-core": "^6.6.0",
+        "@fortawesome/free-regular-svg-icons": "^6.6.0",
+        "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@fortawesome/react-fontawesome": "^0.2.2",
-        "@tanstack/match-sorter-utils": "^8.19.4",
-        "@tanstack/react-table": "^8.21.2",
-        "axios": "^1.7.9",
+        "@tanstack/react-table": "^8.20.5",
+        "axios": "^1.7.2",
         "immutability-helper": "^3.1.1",
         "moment": "^2.30.1",
-        "qrcode.react": "^4.2.0",
-        "react-datetime": "^3.3.1",
-        "react-uid": "^2.4.0"
+        "qrcode.react": "^3.1.0",
+        "react-datetime": "^3.2.0",
+        "react-uid": "^2.3.3"
     },
     "peerDependencies": {
         "bootstrap": "^5.3.3",
@@ -35,32 +34,32 @@
         "react-router-dom": "^5.1.2"
     },
     "devDependencies": {
-        "@babel/cli": "^7.26.4",
-        "@babel/core": "^7.26.9",
-        "@babel/plugin-transform-runtime": "^7.26.9",
-        "@babel/preset-env": "^7.26.9",
-        "@babel/preset-react": "^7.26.3",
-        "@testing-library/react": "^12.1.5",
-        "babel-loader": "^9.2.1",
+        "@babel/cli": "^7.24.7",
+        "@babel/core": "^7.24.7",
+        "@babel/plugin-transform-runtime": "^7.24.7",
+        "@babel/preset-env": "^7.24.7",
+        "@babel/preset-react": "^7.24.7",
+        "@testing-library/react": "^8.0.9",
+        "babel-loader": "^8.1.0",
         "babel-polyfill": "^6.26.0",
         "bootstrap": "^5.3.3",
-        "css-loader": "^7.1.2",
+        "css-loader": "^5.2.4",
         "eslint": "^8.57.0",
-        "eslint-config-reforis": "^2.2.1",
+        "eslint-config-reforis": "^2.1.1",
         "file-loader": "^6.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "jest-mock-axios": "^4.8.0",
-        "moment-timezone": "^0.5.47",
-        "prettier": "^3.5.3",
+        "jest-mock-axios": "^4.7.3",
+        "moment-timezone": "^0.5.45",
+        "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": "^12.0.1",
         "snapshot-diff": "^0.10.0",
-        "style-loader": "^4.0.0",
-        "webpack": "^5.98.0"
+        "style-loader": "^1.2.1",
+        "webpack": "^5.92.1"
     },
     "scripts": {
         "lint": "eslint src",

src/bootstrap/Input.js

@@ -34,14 +34,12 @@ const Input = forwardRef(
 
         return (
             <div className="mb-3">
-                {label && (
                 <label
                     className={`form-label ${labelClassName || ""}`.trim()}
                     htmlFor={uid}
                 >
                     {label}
                 </label>
-                )}
                 <div className={`input-group ${groupClassName || ""}`.trim()}>
                     <input
                         className={`form-control ${inputClassName}`.trim()}
@@ -67,7 +65,7 @@ Input.displayName = "Input";
 
 Input.propTypes = {
     type: PropTypes.string.isRequired,
-    label: PropTypes.string,
+    label: PropTypes.string.isRequired,
     helpText: PropTypes.string,
     error: PropTypes.string,
     className: PropTypes.string,

src/bootstrap/Modal.js

@@ -88,21 +88,18 @@ export function Modal({ shown, setShown, scrollable, size, children }) {
 ModalHeader.propTypes = {
     setShown: PropTypes.func.isRequired,
     title: PropTypes.string.isRequired,
-    showCloseButton: PropTypes.bool,
 };
 
-export function ModalHeader({ setShown, title, showCloseButton = true }) {
+export function ModalHeader({ setShown, title }) {
     return (
         <div className="modal-header">
             <h1 className="modal-title fs-5">{title}</h1>
-            {showCloseButton && (
             <button
                 type="button"
                 className="btn-close"
                 onClick={() => setShown(false)}
                 aria-label={_("Close")}
             />
-            )}
         </div>
     );
 }

src/bootstrap/NumberInput.js

@@ -50,20 +50,6 @@ function NumberInput({ onChange, inlineText, value, ...props }) {
         -1
     );
 
-    function handleKeyDown(event, enableFunction) {
-        if (event.key === "Enter" || event.key === " ") {
-            event.preventDefault();
-            enableFunction(true);
-        }
-    }
-
-    function handleKeyUp(event, enableFunction) {
-        if (event.key === "Enter" || event.key === " ") {
-            event.preventDefault();
-            enableFunction(false);
-        }
-    }
-
     return (
         <Input type="number" onChange={onChange} value={value} {...props}>
             {inlineText && (
@@ -74,15 +60,7 @@ function NumberInput({ onChange, inlineText, value, ...props }) {
                 className="btn btn-outline-secondary"
                 onMouseDown={() => enableIncrease(true)}
                 onMouseUp={() => enableIncrease(false)}
-                onMouseLeave={() => enableIncrease(false)}
-                onTouchStart={() => enableIncrease(true)}
-                onTouchEnd={() => enableIncrease(false)}
-                onTouchCancel={() => enableIncrease(false)}
-                onKeyDown={(event) => handleKeyDown(event, enableIncrease)}
-                onKeyUp={(event) => handleKeyUp(event, enableIncrease)}
-                onBlur={() => enableIncrease(false)}
-                title={_("Increase value. Hint: Hold to increase faster.")}
-                aria-label={_("Increase value. Hint: Hold to increase faster.")}
+                aria-label="Increase"
             >
                 <FontAwesomeIcon icon={faPlus} />
             </button>
@@ -91,15 +69,7 @@ function NumberInput({ onChange, inlineText, value, ...props }) {
                 className="btn btn-outline-secondary"
                 onMouseDown={() => enableDecrease(true)}
                 onMouseUp={() => enableDecrease(false)}
-                onMouseLeave={() => enableDecrease(false)}
-                onTouchStart={() => enableDecrease(true)}
-                onTouchEnd={() => enableDecrease(false)}
-                onTouchCancel={() => enableDecrease(false)}
-                onKeyDown={(event) => handleKeyDown(event, enableDecrease)}
-                onKeyUp={(event) => handleKeyUp(event, enableDecrease)}
-                onBlur={() => enableDecrease(false)}
-                title={_("Decrease value. Hint: Hold to decrease faster.")}
-                aria-label={_("Decrease value. Hint: Hold to decrease faster.")}
+                aria-label="Decrease"
             >
                 <FontAwesomeIcon icon={faMinus} />
             </button>

src/bootstrap/__tests__/NumberInput.test.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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,7 +7,7 @@
 
 import React from "react";
 
-import { render, fireEvent, getByLabelText, waitFor } from "customTestRender";
+import { render, fireEvent, getByLabelText, wait } from "customTestRender";
 
 import NumberInput from "../NumberInput";
 
@@ -32,17 +32,17 @@ describe("<NumberInput/>", () => {
     });
 
     it("Increase number with button", async () => {
-        const increaseButton = getByLabelText(componentContainer, /Increase/);
+        const increaseButton = getByLabelText(componentContainer, "Increase");
         fireEvent.mouseDown(increaseButton);
-        await waitFor(() =>
+        await wait(() =>
             expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } })
         );
     });
 
     it("Decrease number with button", async () => {
-        const decreaseButton = getByLabelText(componentContainer, /Decrease/);
+        const decreaseButton = getByLabelText(componentContainer, "Decrease");
         fireEvent.mouseDown(decreaseButton);
-        await waitFor(() =>
+        await wait(() =>
             expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } })
         );
     });

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

@@ -20,9 +20,8 @@ exports[`<NumberInput/> Render number input 1`] = `
       value="1"
     />
     <button
-      aria-label="Increase value. Hint: Hold to increase faster."
+      aria-label="Increase"
       class="btn btn-outline-secondary"
-      title="Increase value. Hint: Hold to increase faster."
       type="button"
     >
       <i
@@ -30,9 +29,8 @@ exports[`<NumberInput/> Render number input 1`] = `
       />
     </button>
     <button
-      aria-label="Decrease value. Hint: Hold to decrease faster."
+      aria-label="Decrease"
       class="btn btn-outline-secondary"
-      title="Decrease value. Hint: Hold to decrease faster."
       type="button"
     >
       <i

src/common/ActionButtonWithModal/ActionButtonWithModal.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.
@@ -9,7 +9,7 @@ import React, { useState, useEffect } from "react";
 
 import PropTypes from "prop-types";
 
-import { useAPIPost, useAPIPut } from "../../api/hooks";
+import { useAPIPost } from "../../api/hooks";
 import { API_STATE } from "../../api/utils";
 import Button from "../../bootstrap/Button";
 import {
@@ -23,8 +23,6 @@ import { useAlert } from "../../context/alertContext/AlertContext";
 ActionButtonWithModal.propTypes = {
     /** Component that triggers the action. */
     actionTrigger: PropTypes.elementType.isRequired,
-    /** Method to use for the action. */
-    actionMethod: PropTypes.string,
     /** URL to send the action to. */
     actionUrl: PropTypes.string.isRequired,
     /** Title of the modal. */
@@ -43,7 +41,6 @@ ActionButtonWithModal.propTypes = {
 
 function ActionButtonWithModal({
     actionTrigger: ActionTriggerComponent,
-    actionMethod = "POST",
     actionUrl,
     modalTitle,
     modalMessage,
@@ -54,43 +51,24 @@ function ActionButtonWithModal({
 }) {
     const [triggered, setTriggered] = useState(false);
     const [modalShown, setModalShown] = useState(false);
-    const [triggerPostActionStatus, triggerPostAction] = useAPIPost(actionUrl);
-    const [triggerPutActionStatus, triggerPutAction] = useAPIPut(actionUrl);
+    const [triggerActionStatus, triggerAction] = useAPIPost(actionUrl);
 
     const [setAlert] = useAlert();
     useEffect(() => {
-        if (
-            triggerPostActionStatus.state === API_STATE.SUCCESS ||
-            triggerPutActionStatus.state === API_STATE.SUCCESS
-        ) {
+        if (triggerActionStatus.state === API_STATE.SUCCESS) {
             setAlert(
                 successMessage || _("Action successful."),
                 API_STATE.SUCCESS
             );
-            setTriggered(false);
         }
-        if (
-            triggerPostActionStatus.state === API_STATE.ERROR ||
-            triggerPutActionStatus.state === API_STATE.ERROR
-        ) {
+        if (triggerActionStatus.state === API_STATE.ERROR) {
             setAlert(errorMessage || _("Action failed."));
-            setTriggered(false);
         }
-    }, [
-        triggerPostActionStatus,
-        triggerPutActionStatus,
-        setAlert,
-        successMessage,
-        errorMessage,
-    ]);
+    }, [triggerActionStatus, setAlert, successMessage, errorMessage]);
 
     const actionHandler = () => {
         setTriggered(true);
-        if (actionMethod === "POST") {
-            triggerPostAction();
-        } else {
-            triggerPutAction();
-        }
+        triggerAction();
         setModalShown(false);
     };
 

src/common/RichTable/RichTable.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.
@@ -7,37 +7,35 @@
 
 import React, { useMemo, useState } from "react";
 
-import { rankItem } from "@tanstack/match-sorter-utils";
 import {
     flexRender,
     getCoreRowModel,
     getSortedRowModel,
-    getFilteredRowModel,
     getPaginationRowModel,
     useReactTable,
 } from "@tanstack/react-table";
 import PropTypes from "prop-types";
 
 import RichTableBody from "./RichTableBody";
-import RichTableColumnsDropdown from "./RichTableColumnsDropdown";
 import RichTableHeader from "./RichTableHeader";
 import RichTablePagination from "./RichTablePagination";
-import Input from "../../bootstrap/Input";
+
+const fallbackData = [];
 
 RichTable.propTypes = {
     /** Columns to be displayed in the table */
     columns: PropTypes.array.isRequired,
-    /** Data to be displayed in the table, must be passed as a stable reference, for example, useState */
+    /** Data to be displayed in the table */
     data: PropTypes.array.isRequired,
     /** Whether to display pagination */
     withPagination: PropTypes.bool,
-    /** Number of rows per page, the default is 5 */
+    /** Number of rows per page */
     pageSize: PropTypes.number,
     /** Index of the current page */
     pageIndex: PropTypes.number,
 };
 
-export default function RichTable({
+function RichTable({
     columns,
     data,
     withPagination,
@@ -45,74 +43,42 @@ export default function RichTable({
     pageIndex = 0,
 }) {
     const tableColumns = useMemo(() => columns, [columns]);
+    const [tableData] = useState(data ?? fallbackData);
     const [sorting, setSorting] = useState([]);
     const [pagination, setPagination] = useState({
         pageIndex,
         pageSize,
     });
-    const [globalFilter, setGlobalFilter] = useState("");
-    const [columnVisibility, setColumnVisibility] = useState({});
 
     const table = useReactTable({
-        data,
+        data: tableData,
         columns: tableColumns,
-        filterFns: {
-            fuzzy: fuzzyFilter,
-        },
-        globalFilterFn: "fuzzy",
         getCoreRowModel: getCoreRowModel(),
         getSortedRowModel: getSortedRowModel(),
         getPaginationRowModel: getPaginationRowModel(),
-        getFilteredRowModel: getFilteredRowModel(),
-        onSortingChange: setSorting,
         onPaginationChange: setPagination,
-        onGlobalFilterChange: setGlobalFilter,
-        onColumnVisibilityChange: setColumnVisibility,
+        onSortingChange: setSorting,
         state: {
             sorting,
             pagination,
-            globalFilter,
-            columnVisibility,
         },
     });
 
-    const paginationIsNeeded = data.length > pageSize && withPagination;
-
     return (
-        <div>
-            <div className="d-flex justify-content-between align-items-center">
-                <Input
-                    className="me-3"
-                    type="text"
-                    placeholder={_("Search…")}
-                    value={globalFilter ?? ""}
-                    onChange={(e) => setGlobalFilter(String(e.target.value))}
-                />
-                <RichTableColumnsDropdown columns={table.getAllLeafColumns()} />
-            </div>
         <div className="table-responsive">
             <table className="table table-hover text-nowrap">
                 <RichTableHeader table={table} flexRender={flexRender} />
-                    <RichTableBody
-                        table={table}
-                        columns={tableColumns}
-                        flexRender={flexRender}
-                    />
+                <RichTableBody table={table} flexRender={flexRender} />
             </table>
-                {paginationIsNeeded && (
+            {withPagination && (
                 <RichTablePagination
                     table={table}
                     tablePageSize={pageSize}
-                        allRows={data.length}
+                    allRows={tableData.length}
                 />
             )}
         </div>
-        </div>
     );
 }
 
-function fuzzyFilter(row, columnId, value, addMeta) {
-    const itemRank = rankItem(row.getValue(columnId), value);
-    addMeta({ itemRank });
-    return itemRank.passed;
-}
+export default RichTable;

src/common/RichTable/RichTableBody.js

@@ -13,23 +13,20 @@ RichTableBody.propTypes = {
     table: propTypes.shape({
         getRowModel: propTypes.func.isRequired,
     }).isRequired,
-    columns: propTypes.array.isRequired,
     flexRender: propTypes.func.isRequired,
 };
 
-function RichTableBody({ table, columns, flexRender }) {
+function RichTableBody({ table, flexRender }) {
     return (
         <tbody>
-            {table.getRowModel().rows?.length ? (
-                table.getRowModel().rows.map((row) => {
+            {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 && {
+                                    {...(cell.column.columnDef.className && {
                                         className:
                                             cell.column.columnDef.className,
                                     })}
@@ -43,14 +40,7 @@ function RichTableBody({ table, columns, flexRender }) {
                         })}
                     </tr>
                 );
-                })
-            ) : (
-                <tr>
-                    <td colSpan={columns.length} className="text-center py-4">
-                        <span>{_("No results.")}</span>
-                    </td>
-                </tr>
-            )}
+            })}
         </tbody>
     );
 }

src/common/RichTable/RichTableColumnsDropdown.js

@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2019-2025 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 { faCheck, faRotateLeft } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import PropTypes from "prop-types";
-
-import Button from "../../bootstrap/Button";
-
-RichTableColumnsDropdown.propTypes = {
-    columns: PropTypes.array.isRequired,
-};
-
-function RichTableColumnsDropdown({ columns }) {
-    return (
-        <div className="dropdown mb-3">
-            <Button
-                className="btn btn-outline-secondary dropdown-toggle"
-                data-bs-toggle="dropdown"
-            >
-                {_("Columns")}
-            </Button>
-            <ul className="dropdown-menu dropdown-menu-end">
-                {columns.map((column) => {
-                    return (
-                        <li key={column.id}>
-                            <button
-                                type="button"
-                                className="dropdown-item d-flex align-items-center"
-                                onClick={column.getToggleVisibilityHandler()}
-                                style={{ paddingLeft: "2rem" }}
-                                disabled={
-                                    column.columnDef?.enableHiding === false
-                                }
-                            >
-                                {column.getIsVisible() && (
-                                    <FontAwesomeIcon
-                                        icon={faCheck}
-                                        className="position-absolute text-secondary me-2"
-                                        style={{ left: "0.6rem" }}
-                                        width="1rem"
-                                    />
-                                )}
-                                <span>{column.columnDef.header}</span>
-                            </button>
-                        </li>
-                    );
-                })}
-                {columns.some((column) => !column.getIsVisible()) && (
-                    <>
-                        <li>
-                            <hr className="dropdown-divider" />
-                        </li>
-                        <li>
-                            <button
-                                type="button"
-                                className="dropdown-item d-flex align-items-center"
-                                style={{ paddingLeft: "2rem" }}
-                                onClick={() => {
-                                    // toggleVisibility for columns that are hidden
-                                    columns.forEach((column) => {
-                                        if (!column.getIsVisible()) {
-                                            column.toggleVisibility();
-                                        }
-                                    });
-                                }}
-                            >
-                                <FontAwesomeIcon
-                                    icon={faRotateLeft}
-                                    className="position-absolute text-secondary me-2"
-                                    width="1rem"
-                                    style={{ left: "0.6rem" }}
-                                />
-                                {_("Reset")}
-                            </button>
-                        </li>
-                    </>
-                )}
-            </ul>
-        </div>
-    );
-}
-
-export default RichTableColumnsDropdown;

src/common/RichTable/RichTableHeader.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.
@@ -32,7 +32,7 @@ function RichTableHeader({ table, flexRender }) {
     };
 
     return (
-        <thead className="table-light">
+        <thead className="thead-light">
             {table.getHeaderGroups().map((headerGroup) => (
                 <tr key={headerGroup.id} role="row">
                     {headerGroup.headers.map((header) => (
@@ -55,12 +55,6 @@ function RichTableHeader({ table, flexRender }) {
                             ) : (
                                 <button
                                     type="button"
-                                    style={
-                                        header.column.columnDef
-                                            .headerClassName === "text-center"
-                                            ? { justifySelf: "center" }
-                                            : {}
-                                    }
                                     className={`btn btn-link text-decoration-none text-reset fw-bold p-0 d-flex align-items-center
                                                     ${
                                                         header.column.getCanSort()

src/common/RichTable/RichTablePagination.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.

src/common/WiFiSettings/WiFiGuestForm.js

@@ -9,10 +9,9 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import { HELP_TEXTS, ENCRYPTIONMODES } from "./constants";
+import { HELP_TEXTS } from "./constants";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
-import Select from "../../bootstrap/Select";
 import Switch from "../../bootstrap/Switch";
 import TextInput from "../../bootstrap/TextInput";
 
@@ -22,7 +21,6 @@ WifiGuestForm.propTypes = {
         SSID: PropTypes.string.isRequired,
         password: PropTypes.string.isRequired,
         enabled: PropTypes.bool.isRequired,
-        encryption: PropTypes.string.isRequired,
     }),
     formErrors: PropTypes.shape({
         SSID: PropTypes.string,
@@ -91,20 +89,6 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     />
-                    <Select
-                        label={_("Encryption")}
-                        choices={ENCRYPTIONMODES}
-                        helpText={HELP_TEXTS.wpa3}
-                        value={formData.encryption}
-                        onChange={setFormValue((value) => ({
-                            devices: {
-                                [formData.id]: {
-                                    guest_wifi: { encryption: { $set: value } },
-                                },
-                            },
-                        }))}
-                        {...props}
-                    />
                 </>
             ) : null}
         </>

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

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2019-2025 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.
  */
 
 import React from "react";
-import { render, fireEvent, waitFor } from "customTestRender";
+import { render, fireEvent, wait } from "customTestRender";
 
 import mockAxios from "jest-mock-axios";
 import WebSockets from "webSockets/WebSockets";
@@ -35,7 +35,7 @@ describe("<ResetWiFiSettings/>", () => {
             expect.anything()
         );
         mockAxios.mockResponse({ data: { foo: "bar" } });
-        await waitFor(() =>
+        await wait(() =>
             expect(mockSetAlert).toBeCalledWith(
                 "Wi-Fi settings are set to defaults.",
                 ALERT_TYPES.SUCCESS
@@ -46,7 +46,7 @@ describe("<ResetWiFiSettings/>", () => {
     it("should display alert on open ports - failure", async () => {
         fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
         mockJSONError();
-        await waitFor(() =>
+        await wait(() =>
             expect(mockSetAlert).toBeCalledWith(
                 "An error occurred during resetting Wi-Fi settings."
             )

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

@@ -1,16 +1,15 @@
 /*
- * Copyright (C) 2019-2025 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.
  */
 
 import React from "react";
-
 import diffSnapshot from "snapshot-diff";
 import mockAxios from "jest-mock-axios";
 
-import { fireEvent, render, waitFor } from "customTestRender";
+import { fireEvent, render, wait } from "customTestRender";
 import WebSockets from "webSockets/WebSockets";
 import { mockJSONError } from "testUtils/network";
 
@@ -46,7 +45,7 @@ describe("<WiFiSettings/>", () => {
         getByLabelText = renderRes.getByLabelText;
         getByText = renderRes.getByText;
         mockAxios.mockResponse({ data: wifiSettingsFixture() });
-        await waitFor(() => renderRes.getByText("Wi-Fi 1"));
+        await wait(() => renderRes.getByText("Wi-Fi 1"));
         firstRender = renderRes.asFragment();
     });
 
@@ -61,7 +60,7 @@ describe("<WiFiSettings/>", () => {
         );
         const errorMessage = "An API error occurred.";
         mockJSONError(errorMessage);
-        await waitFor(() => {
+        await wait(() => {
             expect(getByText(errorMessage)).toBeTruthy();
         });
     });
@@ -182,7 +181,6 @@ describe("<WiFiSettings/>", () => {
                     guest_wifi: {
                         SSID: "TestGuestSSID",
                         enabled: true,
-                        encryption: "WPA2",
                         password: "test_password",
                     },
                     hidden: false,

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

@@ -223,7 +223,6 @@ export function wifiSettingsFixture() {
                 guest_wifi: {
                     SSID: "TestGuestSSID",
                     enabled: false,
-                    encryption: "WPA2",
                     password: "",
                 },
                 hidden: false,

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

@@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -524,10 +524,124 @@
+@@ -524,10 +524,87 @@
             <small>
               Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
             </small>
@@ -421,50 +421,13 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             WPA2/3 pre-shared key, that is required to connect to the network.
 +           </small>
 +         </div>
-+       </div>
-+       <div
-+         class="mb-3"
-+       >
-+         <label
-+           class="form-label"
-+           for="14"
-+         >
-+           Encryption
-+         </label>
-+         <select
-+           class="form-select"
-+           id="14"
-+         >
-+           <option
-+             value="WPA3"
-+           >
-+             WPA3 only
-+           </option>
-+           <option
-+             value="WPA2/3"
-+           >
-+             WPA3 with WPA2 as fallback (default)
-+           </option>
-+           <option
-+             value="WPA2"
-+           >
-+             WPA2 only
-+           </option>
-+         </select>
-+         <div
-+           class="form-text"
-+         >
-+           <small>
-+             The WPA3 standard is the new most secure encryption method that is suggested to be used with any device that supports it. The older devices without WPA3 support require older WPA2. If you experience issues with connecting older devices, try to enable WPA2.
-+           </small>
-+         </div>
 +       </div>
         <hr />
         <div
           class="form-check form-switch mb-3 d-flex align-items-center"
         >
           <input
-@@ -550,10 +664,11 @@
+@@ -550,10 +627,11 @@
         <div
           class="text-end"
         >

src/common/WiFiSettings/constants.js

@@ -12,12 +12,10 @@ export const HTMODES = {
     VHT20: _("802.11ac - 20 MHz wide channel"),
     VHT40: _("802.11ac - 40 MHz wide channel"),
     VHT80: _("802.11ac - 80 MHz wide channel"),
-    VHT80_80: _("802.11ac - 80+80 MHz wide channel"),
     VHT160: _("802.11ac - 160 MHz wide channel"),
     HE20: _("802.11ax - 20 MHz wide channel"),
     HE40: _("802.11ax - 40 MHz wide channel"),
     HE80: _("802.11ax - 80 MHz wide channel"),
-    HE80_80: _("802.11ax - 80+80 MHz wide channel"),
     HE160: _("802.11ax - 160 MHz wide channel"),
 };
 export const BANDS = {

src/common/__tests__/ActionButtonWithModal.test.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.
@@ -9,7 +9,13 @@ import React from "react";
 
 import Button from "bootstrap/Button";
 
-import { fireEvent, getByText, render, waitFor } from "customTestRender";
+import {
+    fireEvent,
+    getByText,
+    queryByText,
+    render,
+    wait,
+} from "customTestRender";
 import mockAxios from "jest-mock-axios";
 import { mockJSONError } from "testUtils/network";
 import { mockSetAlert } from "testUtils/alertContextMock";
@@ -67,7 +73,7 @@ describe("<ActionButtonWithModal/>", () => {
         fireEvent.click(getByText(componentContainer, "Action"));
         fireEvent.click(getByText(componentContainer, "Confirm action"));
         mockJSONError();
-        await waitFor(() =>
+        await wait(() =>
             expect(mockSetAlert).toBeCalledWith("Action request failed.")
         );
     });
@@ -76,7 +82,7 @@ describe("<ActionButtonWithModal/>", () => {
         fireEvent.click(getByText(componentContainer, "Action"));
         fireEvent.click(getByText(componentContainer, "Confirm action"));
         mockAxios.mockResponse({ status: 200 });
-        await waitFor(() =>
+        await wait(() =>
             expect(mockSetAlert).toBeCalledWith(
                 "Action request succeeded.",
                 "success"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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.
@@ -7,7 +7,7 @@
 
 import React from "react";
 
-import { render, waitFor, getByText } from "customTestRender";
+import { render, wait, getByText } from "customTestRender";
 import mockAxios from "jest-mock-axios";
 
 import {
@@ -38,7 +38,7 @@ describe("CustomizationContext", () => {
     it("should render component without customization", async () => {
         mockAxios.mockResponse({ data: {} });
 
-        await waitFor(() => getByText(componentContainer, ORIGINAL));
+        await wait(() => getByText(componentContainer, ORIGINAL));
 
         expect(componentContainer).toMatchSnapshot();
     });
@@ -46,7 +46,7 @@ describe("CustomizationContext", () => {
     it("should render customized component", async () => {
         mockAxios.mockResponse({ data: { customization: "shield" } });
 
-        await waitFor(() => getByText(componentContainer, CUSTOM));
+        await wait(() => getByText(componentContainer, CUSTOM));
 
         expect(componentContainer).toMatchSnapshot();
     });

src/form/__tests__/hooks.test.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 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,7 +7,7 @@
 
 import React from "react";
 
-import { act, fireEvent, render, waitFor } from "customTestRender";
+import { act, fireEvent, render, waitForElement } from "customTestRender";
 import mockAxios from "jest-mock-axios";
 import WebSockets from "webSockets/WebSockets";
 import ForisForm from "../components/ForisForm";
@@ -59,7 +59,7 @@ describe("useForm hook.", () => {
         );
         mockAxios.mockResponse({ field: "fetchedData" });
 
-        input = await waitFor(() => getByTestId("test-input"));
+        input = await waitForElement(() => getByTestId("test-input"));
         form = container.firstChild.firstChild;
     });
 

src/form/components/SubmitButton.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2025 CZ.NIC z.s.p.o. (https://www.nic.cz/)
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -20,15 +20,13 @@ export const STATES = {
 SubmitButton.propTypes = {
     disabled: PropTypes.bool,
     state: PropTypes.oneOf(Object.keys(STATES).map((key) => STATES[key])),
-    label: PropTypes.string,
 };
 
-export function SubmitButton({ disabled, state, label, ...props }) {
+export function SubmitButton({ disabled, state, ...props }) {
     const disableSubmitButton = disabled || state !== STATES.READY;
     const loadingSubmitButton = state !== STATES.READY;
 
-    let labelSubmitButton = label;
-    if (!labelSubmitButton) {
+    let labelSubmitButton;
     switch (state) {
         case STATES.SAVING:
             labelSubmitButton = _("Updating");
@@ -39,7 +37,6 @@ export function SubmitButton({ disabled, state, label, ...props }) {
         default:
             labelSubmitButton = _("Save");
     }
-    }
 
     return (
         <Button

src/utils/forisUrls.js

@@ -38,8 +38,6 @@ export const ForisURLs = {
     overview: "/overview",
     notifications: "/overview#notifications",
     notificationsSettings: "/administration/notifications-settings",
-    wifiSettings: "/network-settings/wifi",
-    lanSettings: "/network-settings/lan",
 
     approveUpdates: "/package-management/updates",
     languages: "/package-management/languages",

translations/cs/LC_MESSAGES/forisjs.po

@@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-11-13 14:06+0100\n"
-"PO-Revision-Date: 2024-11-15 06:01+0000\n"
-"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech <https://hosted.weblate.org/projects/turris/foris-js/cs/"
-">\n"
+"PO-Revision-Date: 2024-09-25 10:15+0000\n"
+"Last-Translator: Lukas Jelinek <lukas.jelinek@nic.cz>\n"
 "Language: cs\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/turris/foris-"
+"js/cs/>\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.9-dev\n"
 "Generated-By: Babel 2.16.0\n"
 
 #: src/api/utils.js:61
@@ -50,72 +49,74 @@ msgid "Copy"
 msgstr "Kopírovat"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:60
+#, fuzzy
 msgid "Action successful."
-msgstr "Akce úspěšná."
+msgstr "Nastavení úspěšně uložena"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:65
 msgid "Action failed."
-msgstr "Akce se nezdařila."
+msgstr ""
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:125
 msgid "Cancel"
 msgstr "Zrušit"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:128
+#, fuzzy
 msgid "Confirm"
-msgstr "Potvrdit"
+msgstr "Potvrdit restart"
 
 #: src/common/RichTable/RichTableHeader.js:29
 msgid "Sort ascending"
-msgstr "Seřadit vzestupně"
+msgstr ""
 
 #: src/common/RichTable/RichTableHeader.js:30
 msgid "Sort descending"
-msgstr "Seřadit sestupně"
+msgstr ""
 
 #: src/common/RichTable/RichTableHeader.js:31
 msgid "Clear sort"
-msgstr "Vyčistit řazení"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:65
 msgid "Pagination navigation bar"
-msgstr "Navigační pruh stránkování"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:71
 msgid "First page"
-msgstr "První stránka"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:77
 msgid "Previous page"
-msgstr "Předchozí stránka"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:83
 msgid "Next page"
-msgstr "Následující stránka"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:89
 msgid "Last page"
-msgstr "Poslední stránka"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:95
 msgid "Page"
-msgstr "Stránka"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:98
 msgid "of"
-msgstr "z"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:106
 msgid "Rows per page:"
-msgstr "Řádků na stránku:"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:109
 msgid "Select rows per page"
-msgstr "Vyberte řádky na stránku"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:121
 msgid "All"
-msgstr "Vše"
+msgstr ""
 
 #: src/common/WiFiSettings/ResetWiFiSettings.js:39
 msgid "An error occurred during resetting Wi-Fi settings."
@@ -136,9 +137,9 @@ msgid ""
 "Fi settings. Note that this will remove the current Wi-Fi configuration "
 "and restore the default values."
 msgstr ""
-"Pokud se počet bezdrátových karet neshoduje, můžete zkusit obnovit nastavení "
-"Wi-Fi. Je třeba upozornit, že se tím odstraní stávající nastavení Wi-Fi a "
-"obnoví se výchozí hodnoty."
+"Pokud se počet bezdrátových karet neshoduje, můžete zkusit obnovit "
+"nastavení Wi-Fi. Je třeba upozornit, že se tím odstraní aktuální "
+"konfigurace Wi-Fi a obnoví se výchozí hodnoty."
 
 #: src/common/WiFiSettings/WiFiForm.js:97
 msgid "Wi-Fi ${deviceID + 1}"
@@ -174,7 +175,7 @@ msgid ""
 "In case you have trouble connecting to WiFi Access Point, try disabling "
 "Management Frame Protection."
 msgstr ""
-"Pokud máte problémy při připojování k přístupovému bodu Wi-Fi, zkuste "
+"Máte-li problémy při připojování k přístupovému bodu Wi-Fi, zkuste "
 "vypnout Management Frame Protection."
 
 #: src/common/WiFiSettings/WiFiForm.js:262
@@ -225,7 +226,7 @@ msgstr "Je třeba, aby heslo obsahovalo alespoň 8 znaků"
 #: src/common/WiFiSettings/WiFiSettings.js:91
 #: src/common/WiFiSettings/WiFiSettings.js:110
 msgid "Password must not contain more than 63 symbols"
-msgstr "Heslo nemůže obsahovat více než 63 znaků"
+msgstr "Heslo nesmí obsahovat více než 63 znaků"
 
 #: src/common/WiFiSettings/constants.js:9
 msgid "Disabled"
@@ -362,11 +363,11 @@ msgstr ""
 
 #: src/form/components/SubmitButton.js:32
 msgid "Updating"
-msgstr "Aktualizuje se"
+msgstr "Aktualizuji"
 
 #: src/form/components/SubmitButton.js:35
 msgid "Load settings"
-msgstr "Načíst nastavení"
+msgstr "Načítám nastavení"
 
 #: src/form/components/SubmitButton.js:38
 msgid "Save"
@@ -398,7 +399,7 @@ msgstr "Toto není platné doménové jméno."
 
 #: src/utils/validations.js:18
 msgid "This is not a valid DUID."
-msgstr "Toto není platné DUID."
+msgstr "Tohle není platné DUID."
 
 #: src/utils/validations.js:19
 msgid "This is not a valid MAC address."
@@ -445,3 +446,4 @@ msgstr "Neobsahuje seznam e-mailů oddělených čárkou."
 
 #~ msgid "Are you sure you want to restart the router?"
 #~ msgstr "Opravdu chcete router restartovat?"
+

translations/de/LC_MESSAGES/forisjs.po

@@ -11,8 +11,8 @@ msgstr ""
 "PO-Revision-Date: 2024-01-04 21:08+0000\n"
 "Last-Translator: Erik Pfannenstein <debianignatz@gmx.de>\n"
 "Language: de\n"
-"Language-Team: German <https://hosted.weblate.org/projects/turris/foris-js/"
-"de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/turris/foris-"
+"js/de/>\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -35,16 +35,16 @@ msgstr "Keine Antwort erhalten."
 msgid "An unknown API error occurred."
 msgstr "Ein unbekannter API-Fehler ist aufgetreten."
 
-#: src/bootstrap/Alert.js:57 src/bootstrap/Modal.js:101
+#: src/bootstrap/Alert.js:73 src/bootstrap/Modal.js:101
 #: src/common/WiFiSettings/WiFiQRCode.js:89
 msgid "Close"
-msgstr "Schließen"
+msgstr ""
 
-#: src/bootstrap/CopyInput.js:56 src/bootstrap/CopyInput.js:57
+#: src/bootstrap/CopyInput.js:56
 msgid "Copied!"
 msgstr "Kopiert!"
 
-#: src/bootstrap/CopyInput.js:56 src/bootstrap/CopyInput.js:57
+#: src/bootstrap/CopyInput.js:56
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -58,7 +58,6 @@ msgid "Action failed."
 msgstr ""
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:125
-#: src/common/RebootButton.js:71
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -122,7 +121,8 @@ msgstr ""
 #: src/common/WiFiSettings/ResetWiFiSettings.js:39
 msgid "An error occurred during resetting Wi-Fi settings."
 msgstr ""
-"Ein Fehler ist während der Zurücksetzung der WLAN-Einstellungen aufgetreten."
+"Ein Fehler ist während der Zurücksetzung der WLAN-Einstellungen "
+"aufgetreten."
 
 #: src/common/WiFiSettings/ResetWiFiSettings.js:42
 msgid "Wi-Fi settings are set to defaults."
@@ -135,13 +135,13 @@ msgstr "WLAN-Einstellungen zurücksetzen"
 
 #: src/common/WiFiSettings/ResetWiFiSettings.js:58
 msgid ""
-"If a number of wireless cards doesn't match, you may try to reset the Wi-Fi "
-"settings. Note that this will remove the current Wi-Fi configuration and "
-"restore the default values."
+"If a number of wireless cards doesn't match, you may try to reset the Wi-"
+"Fi settings. Note that this will remove the current Wi-Fi configuration "
+"and restore the default values."
 msgstr ""
-"Falls die Anzahl der WLAN-Karten nicht korrekt ist, könnte es helfen, die "
-"WLAN-Einstellungen zurückzusetzen. Beachten Sie, dass dabei die aktuelle "
-"WLAN-Konfiguration mit den Werkseinstellungen überschrieben wird."
+"Falls die Anzahl der WLAN-Karten nicht korrekt ist, könnte es helfen, die"
+" WLAN-Einstellungen zurückzusetzen. Beachten Sie, dass dabei die aktuelle"
+" WLAN-Konfiguration mit den Werkseinstellungen überschrieben wird."
 
 #: src/common/WiFiSettings/WiFiForm.js:97
 msgid "Wi-Fi ${deviceID + 1}"
@@ -177,8 +177,8 @@ msgid ""
 "In case you have trouble connecting to WiFi Access Point, try disabling "
 "Management Frame Protection."
 msgstr ""
-"Falls Sie beim Verbinden mit dem WiFi-Access-Point Probleme haben, schalten "
-"Sie testweise die Management Frame Protection ab."
+"Falls Sie beim Verbinden mit dem WiFi-Access-Point Probleme haben, "
+"schalten Sie testweise die Management Frame Protection ab."
 
 #: src/common/WiFiSettings/WiFiForm.js:262
 msgid "auto"
@@ -194,8 +194,9 @@ msgstr "Gast-WLAN aktivieren"
 
 #: src/common/WiFiSettings/WiFiQRCode.js:43
 #: src/common/WiFiSettings/WiFiQRCode.js:44
+#, fuzzy
 msgid "Show QR code"
-msgstr "QR-Code anzeigen"
+msgstr "WLAN QR-Code"
 
 #: src/common/WiFiSettings/WiFiQRCode.js:70
 msgid "Wi-Fi QR Code"
@@ -296,8 +297,7 @@ msgstr ""
 
 #: src/common/WiFiSettings/constants.js:34
 msgid "WPA2/3 pre-shared key, that is required to connect to the network."
-msgstr ""
-"WPA2/3 Pre-Shard Key, der zum Verbinden mit dem Netzwerk notwendig ist."
+msgstr "WPA2/3 Pre-Shard Key, der zum Verbinden mit dem Netzwerk notwendig ist."
 
 #: src/common/WiFiSettings/constants.js:37
 msgid "If set, network is not visible when scanning for available networks."
@@ -307,54 +307,55 @@ msgstr ""
 
 #: src/common/WiFiSettings/constants.js:40
 msgid ""
-"The 2.4 GHz band is more widely supported by clients, but tends to have more "
-"interference. The 5 GHz band is a newer standard and may not be supported by "
-"all your devices. It usually has less interference, but the signal does not "
-"carry so well indoors."
+"The 2.4 GHz band is more widely supported by clients, but tends to have "
+"more interference. The 5 GHz band is a newer standard and may not be "
+"supported by all your devices. It usually has less interference, but the "
+"signal does not carry so well indoors."
 msgstr ""
-"Das 2,4 GHz-Band wird von allen Geräten unterstützt, ist aber tendenziell "
-"stärker mit Interferenzen belastet. Das 5-GHz-Band ist ein neuerer Standard, "
-"der möglicherweise nicht von allen Ihren Geräten unterstützt wird. Es hat in "
-"der Regel weniger Interferenzen, aber das Signal trägt nicht so gut in "
-"Innenräumen."
+"Das 2,4 GHz-Band wird von allen Geräten unterstützt, ist aber tendenziell"
+" stärker mit Interferenzen belastet. Das 5-GHz-Band ist ein neuerer "
+"Standard, der möglicherweise nicht von allen Ihren Geräten unterstützt "
+"wird. Es hat in der Regel weniger Interferenzen, aber das Signal trägt "
+"nicht so gut in Innenräumen."
 
 #: src/common/WiFiSettings/constants.js:43
 msgid ""
-"Change this to adjust 802.11n/ac/ax mode of operation. 802.11n with 40 MHz "
-"wide channels can yield higher throughput but can cause more interference in "
-"the network. If you don't know what to choose, use the default option with "
-"20 MHz wide channel."
+"Change this to adjust 802.11n/ac/ax mode of operation. 802.11n with 40 "
+"MHz wide channels can yield higher throughput but can cause more "
+"interference in the network. If you don't know what to choose, use the "
+"default option with 20 MHz wide channel."
 msgstr ""
-"Ändern Sie diese Option, um den 802.11n/ac/ax-Betriebsmodus anzupassen. 40 "
-"MHz breite Kanäle können bei 802.11n mehr Daten transportieren, jedoch zu "
-"mehr Interferenzen im Netzwerk führen. Wenn Sie nicht wissen, was Sie wählen "
-"sollen, verwenden Sie die Voreinstellung mit 20 MHz Kanalbreite."
+"Ändern Sie diese Option, um den 802.11n/ac/ax-Betriebsmodus anzupassen. "
+"40 MHz breite Kanäle können bei 802.11n mehr Daten transportieren, jedoch"
+" zu mehr Interferenzen im Netzwerk führen. Wenn Sie nicht wissen, was Sie"
+" wählen sollen, verwenden Sie die Voreinstellung mit 20 MHz Kanalbreite."
 
 #: src/common/WiFiSettings/constants.js:46
 msgid ""
 "Enables Wi-Fi for guests, which is separated from LAN network. Devices "
 "connected to this network are allowed to access the internet, but aren't "
 "allowed to access other devices and the configuration interface of the "
-"router. Parameters of the guest network can be set in the Guest network tab."
+"router. Parameters of the guest network can be set in the Guest network "
+"tab."
 msgstr ""
-"Ermöglicht ein Wi-Fi für Gäste, das vom LAN-Netzwerk getrennt ist. Geräte, "
-"die mit diesem Netzwerk verbunden sind, dürfen auf das Internet zugreifen, "
-"nicht jedoch auf andere Geräte oder die Konfigurationsschnittstelle des "
-"Routers. Die Parameter des Gastnetzwerks können auf der Gastnetzwerk-"
-"Registerkarte eingestellt werden."
+"Ermöglicht ein Wi-Fi für Gäste, das vom LAN-Netzwerk getrennt ist. "
+"Geräte, die mit diesem Netzwerk verbunden sind, dürfen auf das Internet "
+"zugreifen, nicht jedoch auf andere Geräte oder die "
+"Konfigurationsschnittstelle des Routers. Die Parameter des Gastnetzwerks "
+"können auf der Gastnetzwerk-Registerkarte eingestellt werden."
 
 #: src/common/WiFiSettings/constants.js:49
 msgid ""
-"The WPA3 standard is the new most secure encryption method that is suggested "
-"to be used with any device that supports it. The older devices without WPA3 "
-"support require older WPA2. If you experience issues with connecting older "
-"devices, try to enable WPA2."
+"The WPA3 standard is the new most secure encryption method that is "
+"suggested to be used with any device that supports it. The older devices "
+"without WPA3 support require older WPA2. If you experience issues with "
+"connecting older devices, try to enable WPA2."
 msgstr ""
 "Der WPA3-Standard ist die neue Verschlüsselungsmethode mit der besten "
 "Sicherheit. Er empfiehlt sich für jedes Gerät, das ihn unterstützt, aber "
-"ältere Geräte, bei denen das noch nicht der Fall ist, müssen auf das ältere "
-"WPA2 ausweichen. Falls Sie Probleme dabei haben, ältere Geräte mit dem WLAN "
-"zu verbinden, schalten Sie versuchsweise WPA2 ein."
+"ältere Geräte, bei denen das noch nicht der Fall ist, müssen auf das "
+"ältere WPA2 ausweichen. Falls Sie Probleme dabei haben, ältere Geräte mit"
+" dem WLAN zu verbinden, schalten Sie versuchsweise WPA2 ein."
 
 #: src/form/components/ForisForm.js:121
 msgid "Settings saved successfully"
@@ -414,25 +415,34 @@ msgstr "Dies ist keine gültige MAC-Adresse."
 msgid "Doesn't contain a list of emails separated by commas."
 msgstr "Enthält keine Liste von E-Mails, die durch Kommas getrennt sind."
 
-#: src/common/RebootButton.js:27
-msgid "Reboot request failed."
-msgstr "Neustart-Einleitung fehlgeschlagen."
+#~ msgid "An unknown error occurred. Check the console for more info."
+#~ msgstr ""
 
-#: src/common/RebootButton.js:51
-msgid "Reboot"
-msgstr "Systemneustart"
-
-#: src/common/RebootButton.js:66
-msgid "Warning!"
-msgstr "Warnung!"
-
-#: src/common/RebootButton.js:68
-msgid "Are you sure you want to restart the router?"
-msgstr "Sind Sie sicher, dass Sie den Router neu starten wollen?"
-
-#: src/common/RebootButton.js:73
-msgid "Confirm reboot"
-msgstr "Neustart bestätigen"
+#~ msgid "Reboot confirmation"
+#~ msgstr ""
 
 #~ msgid "Enable"
 #~ msgstr "Aktivieren"
+
+#~ msgid ""
+#~ "\n"
+#~ "If a number of wireless cards "
+#~ "doesn't match, you may try to "
+#~ "reset the Wi-Fi settings. Note "
+#~ "that this will remove the\n"
+#~ "current Wi-Fi configuration and restore the default values.\n"
+#~ "        "
+#~ msgstr ""
+
+#~ msgid "Reboot request failed."
+#~ msgstr "Neustart-Einleitung fehlgeschlagen."
+
+#~ msgid "Reboot"
+#~ msgstr "Systemneustart"
+
+#~ msgid "Warning!"
+#~ msgstr "Warnung!"
+
+#~ msgid "Are you sure you want to restart the router?"
+#~ msgstr "Sind Sie sicher, dass Sie den Router neu starten wollen?"
+

translations/el/LC_MESSAGES/forisjs.po

@@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-11-13 14:06+0100\n"
-"PO-Revision-Date: 2025-01-18 11:00+0000\n"
-"Last-Translator: Thanasis <thanasakis11mail@gmail.com>\n"
-"Language-Team: Greek <https://hosted.weblate.org/projects/turris/foris-js/el/"
-">\n"
+"PO-Revision-Date: 2021-02-09 16:50+0000\n"
+"Last-Translator: Michalis <michalisntovas@yahoo.gr>\n"
 "Language: el\n"
+"Language-Team: Greek <https://hosted.weblate.org/projects/turris/foris-"
+"js/el/>\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
 "Generated-By: Babel 2.16.0\n"
 
 #: src/api/utils.js:61
@@ -39,7 +38,7 @@ msgstr ""
 #: src/bootstrap/Alert.js:73 src/bootstrap/Modal.js:101
 #: src/common/WiFiSettings/WiFiQRCode.js:89
 msgid "Close"
-msgstr "Κλείσιμο"
+msgstr ""
 
 #: src/bootstrap/CopyInput.js:56
 msgid "Copied!"
@@ -180,7 +179,7 @@ msgstr ""
 
 #: src/common/WiFiSettings/WiFiForm.js:303
 msgid "Custom"
-msgstr "Προσαρμοσμένο"
+msgstr ""
 
 #: src/common/WiFiSettings/WiFiGuestForm.js:43
 msgid "Enable Guest Wi-Fi"
@@ -226,7 +225,7 @@ msgstr ""
 
 #: src/common/WiFiSettings/constants.js:9
 msgid "Disabled"
-msgstr "Απενεργοποιημένο"
+msgstr ""
 
 #: src/common/WiFiSettings/constants.js:10
 msgid "802.11n - 20 MHz wide channel"
@@ -484,3 +483,4 @@ msgstr ""
 
 #~ msgid "Are you sure you want to restart the router?"
 #~ msgstr "Είστε βέβαιοι ότι θέλετε να κάνετε επανεκκίνηση του δρομολογητή;"
+

translations/fr/LC_MESSAGES/forisjs.po

@@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-11-13 14:06+0100\n"
-"PO-Revision-Date: 2024-12-14 10:00+0000\n"
-"Last-Translator: ButterflyOfFire <boffire@users.noreply.hosted.weblate.org>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/turris/foris-js/"
-"fr/>\n"
+"PO-Revision-Date: 2024-07-27 01:09+0000\n"
+"Last-Translator: Moha684 <nahil82466@gmail.com>\n"
 "Language: fr\n"
+"Language-Team: French <https://hosted.weblate.org/projects/turris/foris-"
+"js/fr/>\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-rc\n"
 "Generated-By: Babel 2.16.0\n"
 
 #: src/api/utils.js:61
@@ -39,7 +38,7 @@ msgstr "Une erreur d’API inconnue s’est produite."
 #: src/bootstrap/Alert.js:73 src/bootstrap/Modal.js:101
 #: src/common/WiFiSettings/WiFiQRCode.js:89
 msgid "Close"
-msgstr "Fermer"
+msgstr ""
 
 #: src/bootstrap/CopyInput.js:56
 msgid "Copied!"
@@ -50,12 +49,13 @@ msgid "Copy"
 msgstr "Copier"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:60
+#, fuzzy
 msgid "Action successful."
-msgstr "Paramètres enregistrés avec succès."
+msgstr "Paramètres enregistrés avec succès"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:65
 msgid "Action failed."
-msgstr "L'enregistrement des paramètres a échoué."
+msgstr ""
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:125
 msgid "Cancel"
@@ -84,39 +84,39 @@ msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:71
 msgid "First page"
-msgstr "Première page"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:77
 msgid "Previous page"
-msgstr "Page précédente"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:83
 msgid "Next page"
-msgstr "Page suivante"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:89
 msgid "Last page"
-msgstr "Dernière page"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:95
 msgid "Page"
-msgstr "Page"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:98
 msgid "of"
-msgstr "de"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:106
 msgid "Rows per page:"
-msgstr "Lignes par page :"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:109
 msgid "Select rows per page"
-msgstr "Sélectionnez les lignes par page"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:121
 msgid "All"
-msgstr "Tout"
+msgstr ""
 
 #: src/common/WiFiSettings/ResetWiFiSettings.js:39
 msgid "An error occurred during resetting Wi-Fi settings."
@@ -473,3 +473,4 @@ msgstr ""
 
 #~ msgid "Are you sure you want to restart the router?"
 #~ msgstr "Voulez-vous vraiment redémarrer le routeur ?"
+

translations/sk/LC_MESSAGES/forisjs.po

@@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2024-11-13 14:06+0100\n"
-"PO-Revision-Date: 2024-12-14 10:00+0000\n"
+"PO-Revision-Date: 2024-09-09 18:09+0000\n"
 "Last-Translator: Atec <dr.atec@gmail.com>\n"
-"Language-Team: Slovak <https://hosted.weblate.org/projects/turris/foris-js/"
-"sk/>\n"
 "Language: sk\n"
+"Language-Team: Slovak <https://hosted.weblate.org/projects/turris/foris-"
+"js/sk/>\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
-"X-Generator: Weblate 5.9-rc\n"
 "Generated-By: Babel 2.16.0\n"
 
 #: src/api/utils.js:61
@@ -50,72 +49,74 @@ msgid "Copy"
 msgstr "Kopírovať"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:60
+#, fuzzy
 msgid "Action successful."
-msgstr "Akcia úspešná."
+msgstr "Nastavenia boli úspešne uložené"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:65
 msgid "Action failed."
-msgstr "Akcia neúspešná."
+msgstr ""
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:125
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #: src/common/ActionButtonWithModal/ActionButtonWithModal.js:128
+#, fuzzy
 msgid "Confirm"
-msgstr "Potvrdiť"
+msgstr "Potvrdiť reštart"
 
 #: src/common/RichTable/RichTableHeader.js:29
 msgid "Sort ascending"
-msgstr "Zoradiť vzostupne"
+msgstr ""
 
 #: src/common/RichTable/RichTableHeader.js:30
 msgid "Sort descending"
-msgstr "Zoradiť zostupne"
+msgstr ""
 
 #: src/common/RichTable/RichTableHeader.js:31
 msgid "Clear sort"
-msgstr "Vymazať zoradenie"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:65
 msgid "Pagination navigation bar"
-msgstr "Navigačný pás stránkovania"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:71
 msgid "First page"
-msgstr "Prvá strana"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:77
 msgid "Previous page"
-msgstr "Predchádzajúca strana"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:83
 msgid "Next page"
-msgstr "Nasledujúca strana"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:89
 msgid "Last page"
-msgstr "Posledná strana"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:95
 msgid "Page"
-msgstr "Strana"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:98
 msgid "of"
-msgstr "z"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:106
 msgid "Rows per page:"
-msgstr "Počet riadkov na stranu:"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:109
 msgid "Select rows per page"
-msgstr "Vyberte počet riadkov na stranu"
+msgstr ""
 
 #: src/common/RichTable/RichTablePagination.js:121
 msgid "All"
-msgstr "Všetky"
+msgstr ""
 
 #: src/common/WiFiSettings/ResetWiFiSettings.js:39
 msgid "An error occurred during resetting Wi-Fi settings."
@@ -446,3 +447,4 @@ msgstr "Neobsahuje zoznam e-mailov oddelených čiarkami."
 
 #~ msgid "Are you sure you want to restart the router?"
 #~ msgstr "Naozaj sa má router reštartovať?"
+