GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-04-12 07:06:40 +02:00
Code Issues Releases Activity

Merge branch 'fix-table-header-color' into 'dev'

Browse Source 
Fix table header color

See merge request turris/reforis/foris-js!272
This commit is contained in:
Aleksandr Gumroian 2025-02-26 18:31:01 +01:00
commit 377b4279fd
11 changed files with 3137 additions and 3388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jest.config.js
View File

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

6419
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

42
package.json
View File

@ -14,17 +14,17 @@
"license": "GPL-3.0",
"main": "./src/index.js",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@tanstack/react-table": "^8.20.5",
"axios": "^1.7.2",
"@tanstack/react-table": "^8.21.2",
"axios": "^1.7.9",
"immutability-helper": "^3.1.1",
"moment": "^2.30.1",
"qrcode.react": "^3.1.0",
"react-datetime": "^3.2.0",
"react-uid": "^2.3.3"
"qrcode.react": "^4.2.0",
"react-datetime": "^3.3.1",
"react-uid": "^2.4.0"
},
"peerDependencies": {
"bootstrap": "^5.3.3",
@ -34,32 +34,32 @@
"react-router-dom": "^5.1.2"
},
"devDependencies": {
"@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/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-polyfill": "^6.26.0",
"bootstrap": "^5.3.3",
"css-loader": "^5.2.4",
"css-loader": "^7.1.2",
"eslint": "^8.57.0",
"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.7.3",
"moment-timezone": "^0.5.45",
"prettier": "^3.3.2",
"jest-mock-axios": "^4.8.0",
"moment-timezone": "^0.5.47",
"prettier": "^3.5.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": "^1.2.1",
"webpack": "^5.92.1"
"style-loader": "^4.0.0",
"webpack": "^5.98.0"
},
"scripts": {
"lint": "eslint src",

8
src/bootstrap/__tests__/NumberInput.test.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
* 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.
@ -7,7 +7,7 @@
import React from "react";
import { render, fireEvent, getByLabelText, wait } from "customTestRender";
import { render, fireEvent, getByLabelText, waitFor } from "customTestRender";
import NumberInput from "../NumberInput";
@ -34,7 +34,7 @@ describe("<NumberInput/>", () => {
it("Increase number with button", async () => {
const increaseButton = getByLabelText(componentContainer, /Increase/);
fireEvent.mouseDown(increaseButton);
await wait(() =>
await waitFor(() =>
expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } })
);
});
@ -42,7 +42,7 @@ describe("<NumberInput/>", () => {
it("Decrease number with button", async () => {
const decreaseButton = getByLabelText(componentContainer, /Decrease/);
fireEvent.mouseDown(decreaseButton);
await wait(() =>
await waitFor(() =>
expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } })
);
});

4
src/common/RichTable/RichTableHeader.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2024 CZ.NIC z.s.p.o. (https://www.nic.cz/)
* 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.
@ -32,7 +32,7 @@ function RichTableHeader({ table, flexRender }) {
};
return (
<thead className="thead-light">
<thead className="table-light">
{table.getHeaderGroups().map((headerGroup) => (
<tr key={headerGroup.id} role="row">
{headerGroup.headers.map((header) => (

8
src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.js
View File

@ -1,12 +1,12 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* 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 { render, fireEvent, wait } from "customTestRender";
import { render, fireEvent, waitFor } 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 wait(() =>
await waitFor(() =>
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 wait(() =>
await waitFor(() =>
expect(mockSetAlert).toBeCalledWith(
"An error occurred during resetting Wi-Fi settings."
)

10
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
View File

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

1
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
View File

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

14
src/common/__tests__/ActionButtonWithModal.test.js
View File

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

8
src/context/customizationContext/__tests__/CustomizationContext.test.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
* 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.
@ -7,7 +7,7 @@
import React from "react";
import { render, wait, getByText } from "customTestRender";
import { render, waitFor, 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 wait(() => getByText(componentContainer, ORIGINAL));
await waitFor(() => getByText(componentContainer, ORIGINAL));
expect(componentContainer).toMatchSnapshot();
});
@ -46,7 +46,7 @@ describe("CustomizationContext", () => {
it("should render customized component", async () => {
mockAxios.mockResponse({ data: { customization: "shield" } });
await wait(() => getByText(componentContainer, CUSTOM));
await waitFor(() => getByText(componentContainer, CUSTOM));
expect(componentContainer).toMatchSnapshot();
});

6
src/form/__tests__/hooks.test.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* 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.
@ -7,7 +7,7 @@
import React from "react";
import { act, fireEvent, render, waitForElement } from "customTestRender";
import { act, fireEvent, render, waitFor } 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 waitForElement(() => getByTestId("test-input"));
input = await waitFor(() => getByTestId("test-input"));
form = container.firstChild.firstChild;
});