mirror of
https://gitlab.nic.cz/turris/reforis/foris-js.git
synced 2025-06-15 13:36:35 +02:00
Compare commits
30 Commits
Author | SHA1 | Date | |
---|---|---|---|
b8555247f2 | |||
de8462429b | |||
5fd0d3626a | |||
9dcc689491 | |||
35f307200d | |||
afb5366dd7 | |||
1e6278abdf | |||
6769e84e62 | |||
71b0a9a5fa | |||
418e38de31 | |||
56a4c47948 | |||
c67ad164ce | |||
6374fd5adf | |||
cc13e9c164 | |||
bb90800945 | |||
6d4bff2b4f | |||
92f560b69f | |||
32e3a57bd7 | |||
dd27802056 | |||
bd4e1953e3 | |||
68e4368ae3 | |||
51ba380cf0 | |||
4eae1ed8d2 | |||
3d290114fa | |||
3f87e9e4b4 | |||
6d5cb6a951 | |||
8d3be8df67 | |||
90509f2a23 | |||
73f84a2d81 | |||
cea7325427 |
7
Makefile
7
Makefile
@ -35,11 +35,6 @@ $(VENV_NAME)/bin/activate:
|
|||||||
install-js: package.json
|
install-js: package.json
|
||||||
npm install --save-dev
|
npm install --save-dev
|
||||||
|
|
||||||
watch-js:
|
|
||||||
npm run build:watch
|
|
||||||
build-js:
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
collect-files:
|
collect-files:
|
||||||
sh scripts/collect_files.sh
|
sh scripts/collect_files.sh
|
||||||
pack: collect-files
|
pack: collect-files
|
||||||
@ -51,6 +46,8 @@ publish-latest: collect-files
|
|||||||
|
|
||||||
lint:
|
lint:
|
||||||
npm run lint
|
npm run lint
|
||||||
|
lint-js-fix:
|
||||||
|
npm run lint:fix
|
||||||
|
|
||||||
test:
|
test:
|
||||||
npm test
|
npm test
|
||||||
|
@ -15,7 +15,7 @@ module.exports = {
|
|||||||
clearMocks: true,
|
clearMocks: true,
|
||||||
collectCoverageFrom: ["src/**/*.{js,jsx}"],
|
collectCoverageFrom: ["src/**/*.{js,jsx}"],
|
||||||
coverageDirectory: "coverage",
|
coverageDirectory: "coverage",
|
||||||
testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/"],
|
testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/", "/dist/"],
|
||||||
verbose: false,
|
verbose: false,
|
||||||
setupFilesAfterEnv: [
|
setupFilesAfterEnv: [
|
||||||
"@testing-library/react/cleanup-after-each",
|
"@testing-library/react/cleanup-after-each",
|
||||||
@ -28,4 +28,7 @@ module.exports = {
|
|||||||
"^.+\\.js$": "babel-jest",
|
"^.+\\.js$": "babel-jest",
|
||||||
"^.+\\.css$": "jest-transform-css",
|
"^.+\\.css$": "jest-transform-css",
|
||||||
},
|
},
|
||||||
|
transformIgnorePatterns: [
|
||||||
|
"node_modules/(?!(react-datetime)/)",
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
2138
package-lock.json
generated
2138
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
17
package.json
17
package.json
@ -1,18 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "foris",
|
"name": "foris",
|
||||||
"version": "2.0.0",
|
"version": "3.1.0",
|
||||||
"description": "Set of components and utils for Foris and its plugins.",
|
"description": "Set of components and utils for Foris and its plugins.",
|
||||||
"author": "CZ.NIC, z.s.p.o.",
|
"author": "CZ.NIC, z.s.p.o.",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://gitlab.labs.nic.cz/turris/reforis/forisjs.git"
|
"url": "https://gitlab.labs.nic.cz/turris/reforis/foris-js.git"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"foris",
|
"foris",
|
||||||
"reforis"
|
"reforis"
|
||||||
],
|
],
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"main": "index.js",
|
"main": "./src/index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^0.19.0",
|
"axios": "^0.19.0",
|
||||||
"jest-transform-css": "^2.0.0",
|
"jest-transform-css": "^2.0.0",
|
||||||
@ -25,6 +25,8 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"immutability-helper": "3.0.1",
|
"immutability-helper": "3.0.1",
|
||||||
|
"pdfmake": "^0.1.63",
|
||||||
|
"qrcode.react": "^0.9.3",
|
||||||
"react": "16.9.0",
|
"react": "16.9.0",
|
||||||
"react-dom": "16.9.0"
|
"react-dom": "16.9.0"
|
||||||
},
|
},
|
||||||
@ -44,7 +46,7 @@
|
|||||||
"babel-plugin-react-transform": "^3.0.0",
|
"babel-plugin-react-transform": "^3.0.0",
|
||||||
"babel-polyfill": "^6.26.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"bootstrap": "^4.3.1",
|
"bootstrap": "^4.3.1",
|
||||||
"copy-webpack-plugin": "^5.0.4",
|
"copy-webpack-plugin": "^5.1.1",
|
||||||
"css-loader": "^3.2.0",
|
"css-loader": "^3.2.0",
|
||||||
"eslint": "^6.1.0",
|
"eslint": "^6.1.0",
|
||||||
"eslint-config-reforis": "^1.0.0",
|
"eslint-config-reforis": "^1.0.0",
|
||||||
@ -54,17 +56,18 @@
|
|||||||
"jest-mock-axios": "^3.0.0",
|
"jest-mock-axios": "^3.0.0",
|
||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
"moment-timezone": "^0.5.25",
|
"moment-timezone": "^0.5.25",
|
||||||
|
"pdfmake": "^0.1.63",
|
||||||
|
"qrcode.react": "^0.9.3",
|
||||||
"react": "16.9.0",
|
"react": "16.9.0",
|
||||||
"react-dom": "16.9.0",
|
"react-dom": "16.9.0",
|
||||||
"react-styleguidist": "^9.1.16",
|
"react-styleguidist": "^10.3.2",
|
||||||
"snapshot-diff": "^0.5.1",
|
"snapshot-diff": "^0.5.1",
|
||||||
"style-loader": "^1.0.0",
|
"style-loader": "^1.0.0",
|
||||||
"webpack": "^4.41.0"
|
"webpack": "^4.41.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "rm -rf dist; babel src --out-dir dist --source-maps inline --copy-files",
|
|
||||||
"build:watch": "babel src --verbose --watch --out-dir dist --source-maps inline --copy-files",
|
|
||||||
"lint": "eslint src",
|
"lint": "eslint src",
|
||||||
|
"lint:fix": "eslint --fix src",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"test:watch": "jest --watch",
|
"test:watch": "jest --watch",
|
||||||
"test:coverage": "jest --coverage --colors",
|
"test:coverage": "jest --coverage --colors",
|
||||||
|
@ -1,9 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Collect files
|
# Collect files
|
||||||
npm run build
|
mkdir -p dist
|
||||||
cp package.json README.md dist
|
cp -rf ./src/* dist
|
||||||
|
cp package.json package-lock.json README.md dist
|
||||||
|
sed -i 's/\/src//g' dist/package.json # remove ./src from main js file path
|
||||||
|
|
||||||
cp -rf translations dist
|
cp -rf translations dist
|
||||||
|
|
||||||
# Remove unwanted files
|
# Remove unwanted files
|
||||||
rm -rf dist/**/__tests__
|
find dist -type d -name __tests__ -exec rm -r {} +
|
||||||
rm -rf dist/__mocks__
|
rm -rf dist/__mocks__
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
import React, { useState, useContext, useCallback } from "react";
|
import React, { useState, useContext, useCallback } from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { Alert, ALERT_TYPES } from "bootstrap/Alert";
|
import { Alert, ALERT_TYPES } from "../bootstrap/Alert";
|
||||||
import { Portal } from "utils/Portal";
|
import { Portal } from "../utils/Portal";
|
||||||
|
|
||||||
AlertContextProvider.propTypes = {
|
AlertContextProvider.propTypes = {
|
||||||
children: PropTypes.oneOfType([
|
children: PropTypes.oneOfType([
|
||||||
|
@ -6,7 +6,9 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { render, getByText, queryByText, fireEvent } from "customTestRender";
|
import {
|
||||||
|
render, getByText, queryByText, fireEvent,
|
||||||
|
} from "customTestRender";
|
||||||
|
|
||||||
import { useAlert, AlertContextProvider } from "../AlertContext";
|
import { useAlert, AlertContextProvider } from "../AlertContext";
|
||||||
|
|
||||||
@ -20,7 +22,7 @@ function AlertTest() {
|
|||||||
<button onClick={dismissAlert}>Dismiss alert</button>
|
<button onClick={dismissAlert}>Dismiss alert</button>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
|
||||||
describe("AlertContext", () => {
|
describe("AlertContext", () => {
|
||||||
let componentContainer;
|
let componentContainer;
|
||||||
@ -29,7 +31,7 @@ describe("AlertContext", () => {
|
|||||||
const { container } = render(
|
const { container } = render(
|
||||||
<AlertContextProvider>
|
<AlertContextProvider>
|
||||||
<AlertTest />
|
<AlertTest />
|
||||||
</AlertContextProvider>
|
</AlertContextProvider>,
|
||||||
);
|
);
|
||||||
componentContainer = container;
|
componentContainer = container;
|
||||||
});
|
});
|
||||||
|
@ -9,7 +9,7 @@ import {
|
|||||||
useCallback, useEffect, useReducer, useState,
|
useCallback, useEffect, useReducer, useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
|
|
||||||
import { ForisURLs } from "forisUrls";
|
import { ForisURLs } from "../forisUrls";
|
||||||
import {
|
import {
|
||||||
API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
|
API_ACTIONS, API_METHODS, API_STATE, getErrorPayload, HEADERS, TIMEOUT,
|
||||||
} from "./utils";
|
} from "./utils";
|
||||||
|
@ -8,11 +8,6 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
const OFFSET = 8;
|
|
||||||
const SIZE = 3;
|
|
||||||
const SIZE_CLASS = ` offset-lg-${OFFSET} col-lg-${SIZE}`;
|
|
||||||
const SIZE_CLASS_SM = " col-sm-12";
|
|
||||||
|
|
||||||
Button.propTypes = {
|
Button.propTypes = {
|
||||||
/** Additional class name. */
|
/** Additional class name. */
|
||||||
className: PropTypes.string,
|
className: PropTypes.string,
|
||||||
@ -32,14 +27,16 @@ Button.propTypes = {
|
|||||||
export function Button({
|
export function Button({
|
||||||
className, loading, forisFormSize, children, ...props
|
className, loading, forisFormSize, children, ...props
|
||||||
}) {
|
}) {
|
||||||
className = className ? `btn ${className}` : "btn btn-primary ";
|
let buttonClass = className ? `btn ${className}` : "btn btn-primary ";
|
||||||
if (forisFormSize) className += SIZE_CLASS + SIZE_CLASS_SM;
|
if (forisFormSize) {
|
||||||
|
buttonClass = `${buttonClass} col-sm-12 col-lg-3`;
|
||||||
|
}
|
||||||
|
|
||||||
const span = loading
|
const span = loading
|
||||||
? <span className="spinner-border spinner-border-sm" role="status" aria-hidden="true" /> : null;
|
? <span className="spinner-border spinner-border-sm" role="status" aria-hidden="true" /> : null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<button type="button" className={className} {...props}>
|
<button type="button" className={buttonClass} {...props}>
|
||||||
{span}
|
{span}
|
||||||
{" "}
|
{" "}
|
||||||
{span ? " " : null}
|
{span ? " " : null}
|
||||||
|
@ -9,30 +9,25 @@ import React from "react";
|
|||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import { useUID } from "react-uid";
|
import { useUID } from "react-uid";
|
||||||
|
|
||||||
import { formFieldsSize } from "./constants";
|
|
||||||
|
|
||||||
CheckBox.propTypes = {
|
CheckBox.propTypes = {
|
||||||
/** Label message */
|
/** Label message */
|
||||||
label: PropTypes.string.isRequired,
|
label: PropTypes.string.isRequired,
|
||||||
/** Help text message */
|
/** Help text message */
|
||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
/** Apply default size (full-width) */
|
|
||||||
useDefaultSize: PropTypes.bool,
|
|
||||||
/** Control if checkbox is clickable */
|
/** Control if checkbox is clickable */
|
||||||
disabled: PropTypes.bool,
|
disabled: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
CheckBox.defaultProps = {
|
CheckBox.defaultProps = {
|
||||||
useDefaultSize: true,
|
|
||||||
disabled: false,
|
disabled: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function CheckBox({
|
export function CheckBox({
|
||||||
label, helpText, useDefaultSize, disabled, ...props
|
label, helpText, disabled, ...props
|
||||||
}) {
|
}) {
|
||||||
const uid = useUID();
|
const uid = useUID();
|
||||||
return (
|
return (
|
||||||
<div className={`form-group ${useDefaultSize ? formFieldsSize : ""}`.trim()}>
|
<div className="form-group">
|
||||||
<div className="custom-control custom-checkbox ">
|
<div className="custom-control custom-checkbox ">
|
||||||
<input
|
<input
|
||||||
className="custom-control-input"
|
className="custom-control-input"
|
||||||
|
4
src/bootstrap/DataTimeInput.css
Normal file
4
src/bootstrap/DataTimeInput.css
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/* Override defaults from "react-datetime" - display picker above input */
|
||||||
|
.rdtPicker {
|
||||||
|
bottom: 0;
|
||||||
|
}
|
@ -10,6 +10,7 @@ import PropTypes from "prop-types";
|
|||||||
import Datetime from "react-datetime/DateTime";
|
import Datetime from "react-datetime/DateTime";
|
||||||
import moment from "moment/moment";
|
import moment from "moment/moment";
|
||||||
import "react-datetime/css/react-datetime.css";
|
import "react-datetime/css/react-datetime.css";
|
||||||
|
import "./DataTimeInput.css";
|
||||||
|
|
||||||
import { Input } from "./Input";
|
import { Input } from "./Input";
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { Input } from "./Input";
|
import { Input } from "./Input";
|
||||||
|
|
||||||
export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;
|
export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;
|
||||||
|
@ -9,8 +9,6 @@ import React from "react";
|
|||||||
import { useUID } from "react-uid";
|
import { useUID } from "react-uid";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { formFieldsSize } from "./constants";
|
|
||||||
|
|
||||||
Input.propTypes = {
|
Input.propTypes = {
|
||||||
type: PropTypes.string.isRequired,
|
type: PropTypes.string.isRequired,
|
||||||
label: PropTypes.string.isRequired,
|
label: PropTypes.string.isRequired,
|
||||||
@ -32,7 +30,7 @@ export function Input({
|
|||||||
const uid = useUID();
|
const uid = useUID();
|
||||||
const inputClassName = `form-control ${className || ""} ${(error ? "is-invalid" : "")}`.trim();
|
const inputClassName = `form-control ${className || ""} ${(error ? "is-invalid" : "")}`.trim();
|
||||||
return (
|
return (
|
||||||
<div className={`form-group ${formFieldsSize}`}>
|
<div className="form-group">
|
||||||
<label className={labelClassName} htmlFor={uid}>{label}</label>
|
<label className={labelClassName} htmlFor={uid}>{label}</label>
|
||||||
<div className={`input-group ${groupClassName || ""}`.trim()}>
|
<div className={`input-group ${groupClassName || ""}`.trim()}>
|
||||||
<input
|
<input
|
||||||
|
@ -5,10 +5,11 @@
|
|||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, { useEffect, useRef } from "react";
|
import React, { useRef } from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { Portal } from "utils/Portal";
|
import { Portal } from "../utils/Portal";
|
||||||
|
import { useClickOutside } from "../utils/hooks";
|
||||||
|
|
||||||
Modal.propTypes = {
|
Modal.propTypes = {
|
||||||
/** Is modal shown value */
|
/** Is modal shown value */
|
||||||
@ -26,16 +27,7 @@ Modal.propTypes = {
|
|||||||
export function Modal({ shown, setShown, children }) {
|
export function Modal({ shown, setShown, children }) {
|
||||||
const dialogRef = useRef();
|
const dialogRef = useRef();
|
||||||
|
|
||||||
useEffect(() => {
|
useClickOutside(dialogRef, () => setShown(false));
|
||||||
function handleClickOutsideDialog(e) {
|
|
||||||
if (!dialogRef.current.contains(e.target)) setShown(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener("mousedown", handleClickOutsideDialog);
|
|
||||||
return () => {
|
|
||||||
document.removeEventListener("mousedown", handleClickOutsideDialog);
|
|
||||||
};
|
|
||||||
}, [setShown]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Portal containerId="modal-container">
|
<Portal containerId="modal-container">
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { useConditionalTimeout } from "utils/hooks";
|
import { useConditionalTimeout } from "../utils/hooks";
|
||||||
import { Input } from "./Input";
|
import { Input } from "./Input";
|
||||||
import "./NumberInput.css";
|
import "./NumberInput.css";
|
||||||
|
|
||||||
|
@ -9,8 +9,6 @@ import React from "react";
|
|||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import { useUID } from "react-uid";
|
import { useUID } from "react-uid";
|
||||||
|
|
||||||
import { formFieldsSize } from "./constants";
|
|
||||||
|
|
||||||
RadioSet.propTypes = {
|
RadioSet.propTypes = {
|
||||||
/** Name attribute of the input HTML tag. */
|
/** Name attribute of the input HTML tag. */
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
@ -51,7 +49,7 @@ export function RadioSet({
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`form-group ${formFieldsSize}`}>
|
<div className="form-group">
|
||||||
{label && <label htmlFor={uid} className="d-block">{label}</label>}
|
{label && <label htmlFor={uid} className="d-block">{label}</label>}
|
||||||
{radios}
|
{radios}
|
||||||
{helpText && <small className="form-text text-muted">{helpText}</small>}
|
{helpText && <small className="form-text text-muted">{helpText}</small>}
|
||||||
@ -65,7 +63,7 @@ Radio.propTypes = {
|
|||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
function Radio({
|
export function Radio({
|
||||||
label, id, helpText, ...props
|
label, id, helpText, ...props
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
|
@ -33,7 +33,7 @@ export function Select({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="form-group col-sm-12 offset-lg-1 col-lg-10">
|
<div className="form-group">
|
||||||
<label htmlFor={uid}>{label}</label>
|
<label htmlFor={uid}>{label}</label>
|
||||||
<select
|
<select
|
||||||
className="custom-select"
|
className="custom-select"
|
||||||
|
@ -25,7 +25,7 @@ describe("<Button />", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("Render button with spinner", () => {
|
it("Render button with spinner", () => {
|
||||||
const { container } = render(<Button loading={true}>Test Button</Button>);
|
const { container } = render(<Button loading>Test Button</Button>);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
@ -20,7 +20,7 @@ describe("<Checkbox/>", () => {
|
|||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
@ -31,7 +31,7 @@ describe("<Checkbox/>", () => {
|
|||||||
<CheckBox
|
<CheckBox
|
||||||
label="Test label"
|
label="Test label"
|
||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
|
@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
import { render, fireEvent, getByLabelText, wait } from "customTestRender";
|
import {
|
||||||
|
render, fireEvent, getByLabelText, wait,
|
||||||
|
} from "customTestRender";
|
||||||
|
|
||||||
import { NumberInput } from "../NumberInput";
|
import { NumberInput } from "../NumberInput";
|
||||||
|
|
||||||
@ -22,7 +24,7 @@ describe("<NumberInput/>", () => {
|
|||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
value={1}
|
value={1}
|
||||||
onChange={onChangeMock}
|
onChange={onChangeMock}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
componentContainer = container;
|
componentContainer = container;
|
||||||
});
|
});
|
||||||
@ -34,12 +36,12 @@ describe("<NumberInput/>", () => {
|
|||||||
it("Increase number with button", async () => {
|
it("Increase number with button", async () => {
|
||||||
const increaseButton = getByLabelText(componentContainer, "Increase");
|
const increaseButton = getByLabelText(componentContainer, "Increase");
|
||||||
fireEvent.mouseDown(increaseButton);
|
fireEvent.mouseDown(increaseButton);
|
||||||
await wait(() => expect(onChangeMock).toHaveBeenCalledWith({"target": {"value": 2}}));
|
await wait(() => expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } }));
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Decrease number with button", async () => {
|
it("Decrease number with button", async () => {
|
||||||
const decreaseButton = getByLabelText(componentContainer, "Decrease");
|
const decreaseButton = getByLabelText(componentContainer, "Decrease");
|
||||||
fireEvent.mouseDown(decreaseButton);
|
fireEvent.mouseDown(decreaseButton);
|
||||||
await wait(() => expect(onChangeMock).toHaveBeenCalledWith({"target": {"value": 0}}));
|
await wait(() => expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } }));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -20,7 +20,7 @@ describe("<PasswordInput/>", () => {
|
|||||||
value="Some password"
|
value="Some password"
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
|
@ -14,30 +14,30 @@ import { RadioSet } from "../RadioSet";
|
|||||||
const TEST_CHOICES = [
|
const TEST_CHOICES = [
|
||||||
{
|
{
|
||||||
label: "label",
|
label: "label",
|
||||||
value: "value"
|
value: "value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "another label",
|
label: "another label",
|
||||||
value: "another value"
|
value: "another value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "another one label",
|
label: "another one label",
|
||||||
value: "another on value"
|
value: "another on value",
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
describe("<RadioSet/>", () => {
|
describe("<RadioSet/>", () => {
|
||||||
it("Render radio set", () => {
|
it("Render radio set", () => {
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<RadioSet
|
<RadioSet
|
||||||
name={"test_name"}
|
name="test_name"
|
||||||
label='Radios set label'
|
label="Radios set label"
|
||||||
value='value'
|
value="value"
|
||||||
choices={TEST_CHOICES}
|
choices={TEST_CHOICES}
|
||||||
helpText={"Some help text"}
|
helpText="Some help text"
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
|
@ -7,29 +7,31 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
import { fireEvent, getByDisplayValue, getByText, render } from "customTestRender";
|
import {
|
||||||
|
fireEvent, getByDisplayValue, getByText, render,
|
||||||
|
} from "customTestRender";
|
||||||
|
|
||||||
import { Select } from "../Select";
|
import { Select } from "../Select";
|
||||||
|
|
||||||
const TEST_CHOICES = {
|
const TEST_CHOICES = {
|
||||||
"1": "one",
|
1: "one",
|
||||||
"2": "two",
|
2: "two",
|
||||||
"3": "three",
|
3: "three",
|
||||||
};
|
};
|
||||||
|
|
||||||
describe("<Select/>", () => {
|
describe("<Select/>", () => {
|
||||||
var selectContainer;
|
let selectContainer;
|
||||||
const onChangeHandler = jest.fn();
|
const onChangeHandler = jest.fn();
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<Select
|
<Select
|
||||||
label='Test label'
|
label="Test label"
|
||||||
value='1'
|
value="1"
|
||||||
choices={TEST_CHOICES}
|
choices={TEST_CHOICES}
|
||||||
helpText='Help text'
|
helpText="Help text"
|
||||||
|
|
||||||
onChange={onChangeHandler}
|
onChange={onChangeHandler}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
selectContainer = container;
|
selectContainer = container;
|
||||||
});
|
});
|
||||||
|
@ -20,7 +20,7 @@ describe("<TextInput/>", () => {
|
|||||||
value="Some text"
|
value="Some text"
|
||||||
onChange={() => {
|
onChange={() => {
|
||||||
}}
|
}}
|
||||||
/>
|
/>,
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
exports[`<Checkbox/> Render checkbox 1`] = `
|
exports[`<Checkbox/> Render checkbox 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="custom-control custom-checkbox "
|
class="custom-control custom-checkbox "
|
||||||
@ -30,7 +30,7 @@ exports[`<Checkbox/> Render checkbox 1`] = `
|
|||||||
|
|
||||||
exports[`<Checkbox/> Render uncheked checkbox 1`] = `
|
exports[`<Checkbox/> Render uncheked checkbox 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="custom-control custom-checkbox "
|
class="custom-control custom-checkbox "
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
exports[`<NumberInput/> Render number input 1`] = `
|
exports[`<NumberInput/> Render number input 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="1"
|
for="1"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
exports[`<PasswordInput/> Render password input 1`] = `
|
exports[`<PasswordInput/> Render password input 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="1"
|
for="1"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
exports[`<RadioSet/> Render radio set 1`] = `
|
exports[`<RadioSet/> Render radio set 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
class="d-block"
|
class="d-block"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
exports[`<Select/> Test with snapshot. 1`] = `
|
exports[`<Select/> Test with snapshot. 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="1"
|
for="1"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
exports[`<TextInput/> Render text input 1`] = `
|
exports[`<TextInput/> Render text input 1`] = `
|
||||||
<div
|
<div
|
||||||
class="form-group col-sm-12 offset-lg-1 col-lg-10"
|
class="form-group"
|
||||||
>
|
>
|
||||||
<label
|
<label
|
||||||
for="1"
|
for="1"
|
||||||
|
@ -7,4 +7,4 @@
|
|||||||
|
|
||||||
/** Bootstrap column size for form fields */
|
/** Bootstrap column size for form fields */
|
||||||
// eslint-disable-next-line import/prefer-default-export
|
// eslint-disable-next-line import/prefer-default-export
|
||||||
export const formFieldsSize = "col-sm-12 offset-lg-1 col-lg-10";
|
export const formFieldsSize = "col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3";
|
||||||
|
@ -8,15 +8,15 @@
|
|||||||
import React, { useState, useEffect } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { useAPIPost } from "api/hooks";
|
import { useAPIPost } from "../api/hooks";
|
||||||
import { API_STATE } from "api/utils";
|
import { API_STATE } from "../api/utils";
|
||||||
import { ForisURLs } from "forisUrls";
|
import { ForisURLs } from "../forisUrls";
|
||||||
|
|
||||||
import { Button } from "bootstrap/Button";
|
import { Button } from "../bootstrap/Button";
|
||||||
import {
|
import {
|
||||||
Modal, ModalHeader, ModalBody, ModalFooter,
|
Modal, ModalHeader, ModalBody, ModalFooter,
|
||||||
} from "bootstrap/Modal";
|
} from "../bootstrap/Modal";
|
||||||
import { useAlert } from "alertContext/AlertContext";
|
import { useAlert } from "../alertContext/AlertContext";
|
||||||
|
|
||||||
RebootButton.propTypes = {
|
RebootButton.propTypes = {
|
||||||
forisFormSize: PropTypes.bool,
|
forisFormSize: PropTypes.bool,
|
||||||
|
74
src/common/WiFiSettings/ResetWiFiSettings.js
Normal file
74
src/common/WiFiSettings/ResetWiFiSettings.js
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* 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, { useEffect, useState } from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { Button } from "../../bootstrap/Button";
|
||||||
|
import { useAlert } from "../../alertContext/AlertContext";
|
||||||
|
import { ALERT_TYPES } from "../../bootstrap/Alert";
|
||||||
|
import { useAPIPost } from "../../api/hooks";
|
||||||
|
import { API_STATE } from "../../api/utils";
|
||||||
|
import { formFieldsSize } from "../../bootstrap/constants";
|
||||||
|
|
||||||
|
ResetWiFiSettings.propTypes = {
|
||||||
|
ws: PropTypes.object.isRequired,
|
||||||
|
endpoint: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function ResetWiFiSettings({ ws, endpoint }) {
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const module = "wifi";
|
||||||
|
ws.subscribe(module)
|
||||||
|
.bind(module, "reset", () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
// eslint-disable-next-line no-restricted-globals
|
||||||
|
setTimeout(() => location.reload(), 1000);
|
||||||
|
});
|
||||||
|
}, [ws]);
|
||||||
|
|
||||||
|
const [postResetResponse, postReset] = useAPIPost(endpoint);
|
||||||
|
const [setAlert, dismissAlert] = useAlert();
|
||||||
|
useEffect(() => {
|
||||||
|
if (postResetResponse.state === API_STATE.ERROR) {
|
||||||
|
setAlert(_("An error occurred during resetting Wi-Fi settings."));
|
||||||
|
} else if (postResetResponse.state === API_STATE.SUCCESS) {
|
||||||
|
setAlert(_("Wi-Fi settings are set to defaults."), ALERT_TYPES.SUCCESS);
|
||||||
|
}
|
||||||
|
}, [postResetResponse, setAlert]);
|
||||||
|
|
||||||
|
function onReset() {
|
||||||
|
dismissAlert();
|
||||||
|
postReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h4>{_("Reset Wi-Fi Settings")}</h4>
|
||||||
|
<p>
|
||||||
|
{_(`
|
||||||
|
If a number of wireless cards doesn't match, you may try to reset the Wi-Fi settings. Note that this will remove the
|
||||||
|
current Wi-Fi configuration and restore the default values.
|
||||||
|
`)}
|
||||||
|
</p>
|
||||||
|
<div className={`${formFieldsSize} text-right`}>
|
||||||
|
<Button
|
||||||
|
className="btn-warning"
|
||||||
|
forisFormSize
|
||||||
|
loading={isLoading}
|
||||||
|
disabled={isLoading}
|
||||||
|
|
||||||
|
onClick={onReset}
|
||||||
|
>
|
||||||
|
{_("Reset Wi-Fi Settings")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
250
src/common/WiFiSettings/WiFiForm.js
Normal file
250
src/common/WiFiSettings/WiFiForm.js
Normal file
@ -0,0 +1,250 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { CheckBox } from "../../bootstrap/CheckBox";
|
||||||
|
import { PasswordInput } from "../../bootstrap/PasswordInput";
|
||||||
|
import { RadioSet } from "../../bootstrap/RadioSet";
|
||||||
|
import { Select } from "../../bootstrap/Select";
|
||||||
|
import { TextInput } from "../../bootstrap/TextInput";
|
||||||
|
import WiFiQRCode from "./WiFiQRCode";
|
||||||
|
import WifiGuestForm from "./WiFiGuestForm";
|
||||||
|
import { HELP_TEXTS, HTMODES, HWMODES } from "./constants";
|
||||||
|
|
||||||
|
WiFiForm.propTypes = {
|
||||||
|
formData: PropTypes.shape(
|
||||||
|
{ devices: PropTypes.arrayOf(PropTypes.object) },
|
||||||
|
).isRequired,
|
||||||
|
formErrors: PropTypes.oneOfType([
|
||||||
|
PropTypes.object,
|
||||||
|
PropTypes.array,
|
||||||
|
]),
|
||||||
|
setFormValue: PropTypes.func.isRequired,
|
||||||
|
hasGuestNetwork: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
WiFiForm.defaultProps = {
|
||||||
|
formData: { devices: [] },
|
||||||
|
setFormValue: () => {},
|
||||||
|
hasGuestNetwork: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function WiFiForm({
|
||||||
|
formData, formErrors, setFormValue, hasGuestNetwork, ...props
|
||||||
|
}) {
|
||||||
|
return formData.devices.map((device) => (
|
||||||
|
<DeviceForm
|
||||||
|
key={device.id}
|
||||||
|
formData={device}
|
||||||
|
formErrors={(formErrors || [])[device.id]}
|
||||||
|
setFormValue={setFormValue}
|
||||||
|
hasGuestNetwork={hasGuestNetwork}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
DeviceForm.propTypes = {
|
||||||
|
formData: PropTypes.shape({
|
||||||
|
id: PropTypes.number.isRequired,
|
||||||
|
enabled: PropTypes.bool.isRequired,
|
||||||
|
SSID: PropTypes.string.isRequired,
|
||||||
|
password: PropTypes.string.isRequired,
|
||||||
|
hidden: PropTypes.bool.isRequired,
|
||||||
|
hwmode: PropTypes.string.isRequired,
|
||||||
|
htmode: PropTypes.string.isRequired,
|
||||||
|
channel: PropTypes.string.isRequired,
|
||||||
|
guest_wifi: PropTypes.object.isRequired,
|
||||||
|
}),
|
||||||
|
formErrors: PropTypes.object.isRequired,
|
||||||
|
setFormValue: PropTypes.func.isRequired,
|
||||||
|
hasGuestNetwork: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
DeviceForm.defaultProps = {
|
||||||
|
formErrors: {},
|
||||||
|
hasGuestNetwork: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
function DeviceForm({
|
||||||
|
formData, formErrors, setFormValue, hasGuestNetwork, ...props
|
||||||
|
}) {
|
||||||
|
const deviceID = formData.id;
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h3>{_(`Wi-Fi ${deviceID + 1}`)}</h3>
|
||||||
|
<CheckBox
|
||||||
|
label={_("Enable")}
|
||||||
|
checked={formData.enabled}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => ({ devices: { [deviceID]: { enabled: { $set: value } } } }),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
{formData.enabled
|
||||||
|
? (
|
||||||
|
<>
|
||||||
|
<TextInput
|
||||||
|
label="SSID"
|
||||||
|
value={formData.SSID}
|
||||||
|
error={formErrors.SSID || null}
|
||||||
|
required
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => ({ devices: { [deviceID]: { SSID: { $set: value } } } }),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<div className="input-group-append">
|
||||||
|
<WiFiQRCode
|
||||||
|
SSID={formData.SSID}
|
||||||
|
password={formData.password}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</TextInput>
|
||||||
|
|
||||||
|
<PasswordInput
|
||||||
|
withEye
|
||||||
|
label="Password"
|
||||||
|
value={formData.password}
|
||||||
|
error={formErrors.password}
|
||||||
|
helpText={HELP_TEXTS.password}
|
||||||
|
required
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => (
|
||||||
|
{ devices: { [deviceID]: { password: { $set: value } } } }
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
label="Hide SSID"
|
||||||
|
helpText={HELP_TEXTS.hidden}
|
||||||
|
checked={formData.hidden}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => (
|
||||||
|
{ devices: { [deviceID]: { hidden: { $set: value } } } }
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<RadioSet
|
||||||
|
name={`hwmode-${deviceID}`}
|
||||||
|
label="GHz"
|
||||||
|
choices={getHwmodeChoices(formData)}
|
||||||
|
value={formData.hwmode}
|
||||||
|
helpText={HELP_TEXTS.hwmode}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceID]: {
|
||||||
|
hwmode: { $set: value },
|
||||||
|
channel: { $set: "0" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
label="802.11n/ac mode"
|
||||||
|
choices={getHtmodeChoices(formData)}
|
||||||
|
value={formData.htmode}
|
||||||
|
helpText={HELP_TEXTS.htmode}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => (
|
||||||
|
{ devices: { [deviceID]: { htmode: { $set: value } } } }
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
label="Channel"
|
||||||
|
choices={getChannelChoices(formData)}
|
||||||
|
value={formData.channel}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => (
|
||||||
|
{ devices: { [deviceID]: { channel: { $set: value } } } }
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{hasGuestNetwork && (
|
||||||
|
<WifiGuestForm
|
||||||
|
formData={{ id: deviceID, ...formData.guest_wifi }}
|
||||||
|
formErrors={formErrors.guest_wifi || {}}
|
||||||
|
|
||||||
|
setFormValue={setFormValue}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
: null}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getChannelChoices(device) {
|
||||||
|
const channelChoices = {
|
||||||
|
0: _("auto"),
|
||||||
|
};
|
||||||
|
|
||||||
|
device.available_bands.forEach((availableBand) => {
|
||||||
|
if (availableBand.hwmode !== device.hwmode) return;
|
||||||
|
|
||||||
|
availableBand.available_channels.forEach((availableChannel) => {
|
||||||
|
channelChoices[availableChannel.number.toString()] = `
|
||||||
|
${availableChannel.number}
|
||||||
|
(${availableChannel.frequency} MHz ${availableChannel.radar ? " ,DFS" : ""})
|
||||||
|
`;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return channelChoices;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHtmodeChoices(device) {
|
||||||
|
const htmodeChoices = {};
|
||||||
|
|
||||||
|
device.available_bands.forEach((availableBand) => {
|
||||||
|
if (availableBand.hwmode !== device.hwmode) return;
|
||||||
|
|
||||||
|
availableBand.available_htmodes.forEach((availableHtmod) => {
|
||||||
|
htmodeChoices[availableHtmod] = HTMODES[availableHtmod];
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return htmodeChoices;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHwmodeChoices(device) {
|
||||||
|
return device.available_bands.map((availableBand) => ({
|
||||||
|
label: HWMODES[availableBand.hwmode],
|
||||||
|
value: availableBand.hwmode,
|
||||||
|
}));
|
||||||
|
}
|
100
src/common/WiFiSettings/WiFiGuestForm.js
Normal file
100
src/common/WiFiSettings/WiFiGuestForm.js
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { CheckBox } from "../../bootstrap/CheckBox";
|
||||||
|
import { TextInput } from "../../bootstrap/TextInput";
|
||||||
|
import { PasswordInput } from "../../bootstrap/PasswordInput";
|
||||||
|
import WiFiQRCode from "./WiFiQRCode";
|
||||||
|
import { HELP_TEXTS } from "./constants";
|
||||||
|
|
||||||
|
WifiGuestForm.propTypes = {
|
||||||
|
formData: PropTypes.shape({
|
||||||
|
id: PropTypes.number.isRequired,
|
||||||
|
SSID: PropTypes.string.isRequired,
|
||||||
|
password: PropTypes.string.isRequired,
|
||||||
|
enabled: PropTypes.bool.isRequired,
|
||||||
|
}),
|
||||||
|
formErrors: PropTypes.shape({
|
||||||
|
SSID: PropTypes.string,
|
||||||
|
password: PropTypes.string,
|
||||||
|
}),
|
||||||
|
setFormValue: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function WifiGuestForm({
|
||||||
|
formData, formErrors, setFormValue, ...props
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<CheckBox
|
||||||
|
label={_("Enable Guest Wifi")}
|
||||||
|
checked={formData.enabled}
|
||||||
|
helpText={HELP_TEXTS.guest_wifi_enabled}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => (
|
||||||
|
{ devices: { [formData.id]: { guest_wifi: { enabled: { $set: value } } } } }
|
||||||
|
),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
{formData.enabled
|
||||||
|
? (
|
||||||
|
<>
|
||||||
|
<TextInput
|
||||||
|
label="SSID"
|
||||||
|
value={formData.SSID}
|
||||||
|
error={formErrors.SSID}
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => ({
|
||||||
|
devices: {
|
||||||
|
[formData.id]: { guest_wifi: { SSID: { $set: value } } },
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<div className="input-group-append">
|
||||||
|
<WiFiQRCode
|
||||||
|
SSID={formData.SSID}
|
||||||
|
password={formData.password}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</TextInput>
|
||||||
|
|
||||||
|
<PasswordInput
|
||||||
|
withEye
|
||||||
|
label={_("Password")}
|
||||||
|
value={formData.password}
|
||||||
|
helpText={HELP_TEXTS.password}
|
||||||
|
error={formErrors.password}
|
||||||
|
required
|
||||||
|
|
||||||
|
onChange={setFormValue(
|
||||||
|
(value) => ({
|
||||||
|
devices: {
|
||||||
|
[formData.id]: {
|
||||||
|
guest_wifi: { password: { $set: value } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)}
|
||||||
|
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
: null}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
85
src/common/WiFiSettings/WiFiQRCode.js
Normal file
85
src/common/WiFiSettings/WiFiQRCode.js
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
* 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 } from "react";
|
||||||
|
import QRCode from "qrcode.react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { ForisURLs } from "../../forisUrls";
|
||||||
|
import { Button } from "../../bootstrap/Button";
|
||||||
|
import {
|
||||||
|
Modal, ModalBody, ModalFooter, ModalHeader,
|
||||||
|
} from "../../bootstrap/Modal";
|
||||||
|
import { createAndDownloadPdf, toQRCodeContent } from "./qrCodeHelpers";
|
||||||
|
|
||||||
|
WiFiQRCode.propTypes = {
|
||||||
|
SSID: PropTypes.string.isRequired,
|
||||||
|
password: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
const QR_ICON_PATH = `${ForisURLs.static}/imgs/QR_icon.svg`;
|
||||||
|
|
||||||
|
export default function WiFiQRCode({ SSID, password }) {
|
||||||
|
const [modal, setModal] = useState(false);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="input-group-text"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setModal(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<img width="20" src={QR_ICON_PATH} alt="QR" style={{ opacity: 0.67 }} />
|
||||||
|
</button>
|
||||||
|
{modal
|
||||||
|
? <QRCodeModal setShown={setModal} shown={modal} SSID={SSID} password={password} />
|
||||||
|
: null}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
QRCodeModal.propTypes = {
|
||||||
|
SSID: PropTypes.string.isRequired,
|
||||||
|
password: PropTypes.string.isRequired,
|
||||||
|
shown: PropTypes.bool.isRequired,
|
||||||
|
setShown: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
function QRCodeModal({
|
||||||
|
shown, setShown, SSID, password,
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<Modal setShown={setShown} shown={shown}>
|
||||||
|
<ModalHeader setShown={setShown} title={_("Wi-Fi QR Code")} />
|
||||||
|
<ModalBody>
|
||||||
|
<QRCode
|
||||||
|
renderAs="svg"
|
||||||
|
value={toQRCodeContent(SSID, password)}
|
||||||
|
level="M"
|
||||||
|
size={350}
|
||||||
|
includeMargin
|
||||||
|
style={{ display: "block", margin: "auto" }}
|
||||||
|
/>
|
||||||
|
</ModalBody>
|
||||||
|
<ModalFooter>
|
||||||
|
<Button
|
||||||
|
className="btn-outline-primary"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
createAndDownloadPdf(SSID, password);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<i className="fas fa-arrow-down mr-2" />
|
||||||
|
{_("Download PDF")}
|
||||||
|
</Button>
|
||||||
|
</ModalFooter>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
93
src/common/WiFiSettings/WiFiSettings.js
Normal file
93
src/common/WiFiSettings/WiFiSettings.js
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { ForisForm } from "../../form/components/ForisForm";
|
||||||
|
import WiFiForm from "./WiFiForm";
|
||||||
|
import ResetWiFiSettings from "./ResetWiFiSettings";
|
||||||
|
|
||||||
|
WiFiSettings.propTypes = {
|
||||||
|
ws: PropTypes.object.isRequired,
|
||||||
|
endpoint: PropTypes.string.isRequired,
|
||||||
|
resetEndpoint: PropTypes.string.isRequired,
|
||||||
|
hasGuestNetwork: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
export function WiFiSettings({
|
||||||
|
ws, endpoint, resetEndpoint, hasGuestNetwork,
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ForisForm
|
||||||
|
ws={ws}
|
||||||
|
forisConfig={{
|
||||||
|
endpoint,
|
||||||
|
wsModule: "wifi",
|
||||||
|
}}
|
||||||
|
prepData={prepData}
|
||||||
|
prepDataToSubmit={prepDataToSubmit}
|
||||||
|
validator={validator}
|
||||||
|
>
|
||||||
|
<WiFiForm hasGuestNetwork={hasGuestNetwork} />
|
||||||
|
</ForisForm>
|
||||||
|
<ResetWiFiSettings ws={ws} endpoint={resetEndpoint} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function prepData(formData) {
|
||||||
|
formData.devices.forEach((device, idx) => {
|
||||||
|
formData.devices[idx].channel = device.channel.toString();
|
||||||
|
});
|
||||||
|
return formData;
|
||||||
|
}
|
||||||
|
|
||||||
|
function prepDataToSubmit(formData) {
|
||||||
|
formData.devices.forEach((device, idx) => {
|
||||||
|
delete device.available_bands;
|
||||||
|
|
||||||
|
formData.devices[idx].channel = parseInt(device.channel);
|
||||||
|
|
||||||
|
if (!device.enabled) {
|
||||||
|
formData.devices[idx] = { id: device.id, enabled: false };
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!device.guest_wifi.enabled) formData.devices[idx].guest_wifi = { enabled: false };
|
||||||
|
});
|
||||||
|
return formData;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validator(formData) {
|
||||||
|
const formErrors = formData.devices.map(
|
||||||
|
(device) => {
|
||||||
|
if (!device.enabled) return {};
|
||||||
|
|
||||||
|
const errors = {};
|
||||||
|
if (device.SSID.length > 32) errors.SSID = _("SSID can't be longer than 32 symbols");
|
||||||
|
if (device.SSID.length === 0) errors.SSID = _("SSID can't be empty");
|
||||||
|
|
||||||
|
if (device.password.length < 8) errors.password = _("Password must contain at least 8 symbols");
|
||||||
|
|
||||||
|
if (!device.guest_wifi.enabled) return errors;
|
||||||
|
|
||||||
|
const guest_wifi_errors = {};
|
||||||
|
if (device.guest_wifi.SSID.length > 32) guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
|
||||||
|
if (device.guest_wifi.SSID.length === 0) guest_wifi_errors.SSID = _("SSID can't be empty");
|
||||||
|
|
||||||
|
if (device.guest_wifi.password.length < 8) guest_wifi_errors.password = _("Password must contain at least 8 symbols");
|
||||||
|
|
||||||
|
if (guest_wifi_errors.SSID || guest_wifi_errors.password) {
|
||||||
|
errors.guest_wifi = guest_wifi_errors;
|
||||||
|
}
|
||||||
|
return errors;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return JSON.stringify(formErrors) === "[{},{}]" ? null : formErrors;
|
||||||
|
}
|
40
src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.js
Normal file
40
src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.js
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { render, fireEvent, wait } from "customTestRender";
|
||||||
|
|
||||||
|
import mockAxios from "jest-mock-axios";
|
||||||
|
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";
|
||||||
|
|
||||||
|
describe("<ResetWiFiSettings/>", () => {
|
||||||
|
const webSockets = new WebSockets();
|
||||||
|
const endpoint = "/reforis/api/wifi-reset";
|
||||||
|
let getAllByText;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
({ getAllByText } = render(<ResetWiFiSettings ws={webSockets} endpoint={endpoint} />));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should display alert on open ports - success", async () => {
|
||||||
|
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
|
||||||
|
expect(mockAxios.post).toBeCalledWith(endpoint, undefined, expect.anything());
|
||||||
|
mockAxios.mockResponse({ data: { foo: "bar" } });
|
||||||
|
await wait(() => expect(mockSetAlert).toBeCalledWith("Wi-Fi settings are set to defaults.", ALERT_TYPES.SUCCESS));
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should display alert on open ports - failure", async () => {
|
||||||
|
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
|
||||||
|
mockJSONError();
|
||||||
|
await wait(() => expect(mockSetAlert).toBeCalledWith("An error occurred during resetting Wi-Fi settings."));
|
||||||
|
});
|
||||||
|
});
|
161
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
Normal file
161
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import diffSnapshot from "snapshot-diff";
|
||||||
|
import mockAxios from "jest-mock-axios";
|
||||||
|
|
||||||
|
import { fireEvent, render, wait } from "customTestRender";
|
||||||
|
import { WebSockets } from "webSockets/WebSockets";
|
||||||
|
import { mockJSONError } from "testUtils/network";
|
||||||
|
|
||||||
|
import { wifiSettingsFixture } from "./__fixtures__/wifiSettings";
|
||||||
|
import { WiFiSettings } from "../WiFiSettings";
|
||||||
|
|
||||||
|
describe("<WiFiSettings/>", () => {
|
||||||
|
let firstRender;
|
||||||
|
let getAllByText;
|
||||||
|
let getAllByLabelText;
|
||||||
|
let getByText;
|
||||||
|
let asFragment;
|
||||||
|
const endpoint = "/reforis/api/wifi";
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const webSockets = new WebSockets();
|
||||||
|
const renderRes = render(<WiFiSettings ws={webSockets} endpoint={endpoint} resetEndpoint="foo" />);
|
||||||
|
asFragment = renderRes.asFragment;
|
||||||
|
getAllByText = renderRes.getAllByText;
|
||||||
|
getAllByLabelText = renderRes.getAllByLabelText;
|
||||||
|
getByText = renderRes.getByText;
|
||||||
|
mockAxios.mockResponse({ data: wifiSettingsFixture() });
|
||||||
|
await wait(() => renderRes.getByText("Wi-Fi 1"));
|
||||||
|
firstRender = renderRes.asFragment();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should handle error", async () => {
|
||||||
|
const webSockets = new WebSockets();
|
||||||
|
const { getByText } = render(<WiFiSettings ws={webSockets} ws={webSockets} endpoint={endpoint} resetEndpoint="foo" />);
|
||||||
|
mockJSONError();
|
||||||
|
await wait(() => {
|
||||||
|
expect(getByText("An error occurred while fetching data.")).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot both modules disabled.", () => {
|
||||||
|
expect(firstRender).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot one module enabled.", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
expect(diffSnapshot(firstRender, asFragment())).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot 2.4 GHz", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
const enabledRender = asFragment();
|
||||||
|
fireEvent.click(getAllByText("2.4")[0]);
|
||||||
|
expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot guest network.", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
const enabledRender = asFragment();
|
||||||
|
fireEvent.click(getAllByText("Enable Guest Wifi")[0]);
|
||||||
|
expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: both modules disabled.", () => {
|
||||||
|
fireEvent.click(getByText("Save"));
|
||||||
|
expect(mockAxios.post).toBeCalled();
|
||||||
|
const data = {
|
||||||
|
devices: [
|
||||||
|
{ enabled: false, id: 0 },
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: one module enabled.", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
|
||||||
|
fireEvent.click(getByText("Save"));
|
||||||
|
expect(mockAxios.post).toBeCalled();
|
||||||
|
const data = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "TestSSID1",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: 2.4 GHz", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
fireEvent.click(getAllByText("2.4")[0]);
|
||||||
|
|
||||||
|
fireEvent.click(getByText("Save"));
|
||||||
|
expect(mockAxios.post).toBeCalled();
|
||||||
|
const data = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "TestSSID1",
|
||||||
|
channel: 0,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11g",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: guest network.", () => {
|
||||||
|
fireEvent.click(getAllByText("Enable")[0]);
|
||||||
|
fireEvent.click(getAllByText("Enable Guest Wifi")[0]);
|
||||||
|
fireEvent.change(getAllByLabelText("Password")[1], { target: { value: "test_password" } });
|
||||||
|
|
||||||
|
fireEvent.click(getByText("Save"));
|
||||||
|
expect(mockAxios.post).toBeCalled();
|
||||||
|
const data = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "TestSSID1",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: {
|
||||||
|
SSID: "TestGuestSSID",
|
||||||
|
enabled: true,
|
||||||
|
password: "test_password",
|
||||||
|
},
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(endpoint, data, expect.anything());
|
||||||
|
});
|
||||||
|
});
|
318
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
Normal file
318
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
Normal file
@ -0,0 +1,318 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export function wifiSettingsFixture() {
|
||||||
|
return {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "TestSSID1",
|
||||||
|
available_bands: [
|
||||||
|
{
|
||||||
|
available_channels: [
|
||||||
|
{
|
||||||
|
frequency: 2412,
|
||||||
|
number: 1,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2417,
|
||||||
|
number: 2,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2422,
|
||||||
|
number: 3,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2427,
|
||||||
|
number: 4,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2432,
|
||||||
|
number: 5,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2437,
|
||||||
|
number: 6,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2442,
|
||||||
|
number: 7,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2447,
|
||||||
|
number: 8,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2452,
|
||||||
|
number: 9,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2457,
|
||||||
|
number: 10,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2462,
|
||||||
|
number: 11,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
available_htmodes: [
|
||||||
|
"NOHT",
|
||||||
|
"HT20",
|
||||||
|
"HT40",
|
||||||
|
"VHT20",
|
||||||
|
"VHT40",
|
||||||
|
"VHT80",
|
||||||
|
],
|
||||||
|
hwmode: "11g",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
available_channels: [
|
||||||
|
{
|
||||||
|
frequency: 5180,
|
||||||
|
number: 36,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5200,
|
||||||
|
number: 40,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5220,
|
||||||
|
number: 44,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5240,
|
||||||
|
number: 48,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5260,
|
||||||
|
number: 52,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5280,
|
||||||
|
number: 56,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5300,
|
||||||
|
number: 60,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5320,
|
||||||
|
number: 64,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5500,
|
||||||
|
number: 100,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5520,
|
||||||
|
number: 104,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5540,
|
||||||
|
number: 108,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5560,
|
||||||
|
number: 112,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5580,
|
||||||
|
number: 116,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5600,
|
||||||
|
number: 120,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5620,
|
||||||
|
number: 124,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5640,
|
||||||
|
number: 128,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5660,
|
||||||
|
number: 132,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5680,
|
||||||
|
number: 136,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5700,
|
||||||
|
number: 140,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5720,
|
||||||
|
number: 144,
|
||||||
|
radar: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5745,
|
||||||
|
number: 149,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5765,
|
||||||
|
number: 153,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5785,
|
||||||
|
number: 157,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5805,
|
||||||
|
number: 161,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 5825,
|
||||||
|
number: 165,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
available_htmodes: [
|
||||||
|
"NOHT",
|
||||||
|
"HT20",
|
||||||
|
"HT40",
|
||||||
|
"VHT20",
|
||||||
|
"VHT40",
|
||||||
|
"VHT80",
|
||||||
|
],
|
||||||
|
hwmode: "11a",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
channel: 60,
|
||||||
|
enabled: false,
|
||||||
|
guest_wifi: {
|
||||||
|
SSID: "TestGuestSSID",
|
||||||
|
enabled: false,
|
||||||
|
password: "",
|
||||||
|
},
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
SSID: "Turris",
|
||||||
|
available_bands: [
|
||||||
|
{
|
||||||
|
available_channels: [
|
||||||
|
{
|
||||||
|
frequency: 2412,
|
||||||
|
number: 1,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2417,
|
||||||
|
number: 2,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2422,
|
||||||
|
number: 3,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2427,
|
||||||
|
number: 4,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2432,
|
||||||
|
number: 5,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2437,
|
||||||
|
number: 6,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2442,
|
||||||
|
number: 7,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2447,
|
||||||
|
number: 8,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2452,
|
||||||
|
number: 9,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2457,
|
||||||
|
number: 10,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
frequency: 2462,
|
||||||
|
number: 11,
|
||||||
|
radar: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
available_htmodes: [
|
||||||
|
"NOHT",
|
||||||
|
"HT20",
|
||||||
|
"HT40",
|
||||||
|
],
|
||||||
|
hwmode: "11g",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
channel: 11,
|
||||||
|
enabled: false,
|
||||||
|
guest_wifi: {
|
||||||
|
SSID: "TestSSID",
|
||||||
|
enabled: false,
|
||||||
|
password: "",
|
||||||
|
},
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11g",
|
||||||
|
id: 1,
|
||||||
|
password: "TestPass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,912 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -246,207 +246,95 @@
|
||||||
|
value=\\"0\\"
|
||||||
|
>
|
||||||
|
auto
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"36\\"
|
||||||
|
+ value=\\"1\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 36
|
||||||
|
- (5180 MHz )
|
||||||
|
+ 1
|
||||||
|
+ (2412 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"40\\"
|
||||||
|
+ value=\\"2\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 40
|
||||||
|
- (5200 MHz )
|
||||||
|
+ 2
|
||||||
|
+ (2417 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"44\\"
|
||||||
|
+ value=\\"3\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 44
|
||||||
|
- (5220 MHz )
|
||||||
|
+ 3
|
||||||
|
+ (2422 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"48\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 48
|
||||||
|
- (5240 MHz )
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"52\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 52
|
||||||
|
- (5260 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"56\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 56
|
||||||
|
- (5280 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"60\\"
|
||||||
|
+ value=\\"4\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 60
|
||||||
|
- (5300 MHz ,DFS)
|
||||||
|
+ 4
|
||||||
|
+ (2427 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"64\\"
|
||||||
|
+ value=\\"5\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 64
|
||||||
|
- (5320 MHz ,DFS)
|
||||||
|
+ 5
|
||||||
|
+ (2432 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"100\\"
|
||||||
|
+ value=\\"6\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 100
|
||||||
|
- (5500 MHz ,DFS)
|
||||||
|
+ 6
|
||||||
|
+ (2437 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"104\\"
|
||||||
|
+ value=\\"7\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 104
|
||||||
|
- (5520 MHz ,DFS)
|
||||||
|
+ 7
|
||||||
|
+ (2442 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"108\\"
|
||||||
|
+ value=\\"8\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 108
|
||||||
|
- (5540 MHz ,DFS)
|
||||||
|
+ 8
|
||||||
|
+ (2447 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"112\\"
|
||||||
|
+ value=\\"9\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 112
|
||||||
|
- (5560 MHz ,DFS)
|
||||||
|
+ 9
|
||||||
|
+ (2452 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"116\\"
|
||||||
|
+ value=\\"10\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 116
|
||||||
|
- (5580 MHz ,DFS)
|
||||||
|
+ 10
|
||||||
|
+ (2457 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
- value=\\"120\\"
|
||||||
|
+ value=\\"11\\"
|
||||||
|
>
|
||||||
|
|
||||||
|
- 120
|
||||||
|
- (5600 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"124\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 124
|
||||||
|
- (5620 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"128\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 128
|
||||||
|
- (5640 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"132\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 132
|
||||||
|
- (5660 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"136\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 136
|
||||||
|
- (5680 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"140\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 140
|
||||||
|
- (5700 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"144\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 144
|
||||||
|
- (5720 MHz ,DFS)
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"149\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 149
|
||||||
|
- (5745 MHz )
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"153\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 153
|
||||||
|
- (5765 MHz )
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"157\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 157
|
||||||
|
- (5785 MHz )
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"161\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 161
|
||||||
|
- (5805 MHz )
|
||||||
|
-
|
||||||
|
- </option>
|
||||||
|
- <option
|
||||||
|
- value=\\"165\\"
|
||||||
|
- >
|
||||||
|
-
|
||||||
|
- 165
|
||||||
|
- (5825 MHz )
|
||||||
|
+ 11
|
||||||
|
+ (2462 MHz )
|
||||||
|
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
|
||||||
|
<DocumentFragment>
|
||||||
|
<div
|
||||||
|
class="col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3"
|
||||||
|
>
|
||||||
|
<form>
|
||||||
|
<h3>
|
||||||
|
Wi-Fi 1
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class="form-group"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-checkbox "
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="custom-control-input"
|
||||||
|
id="1"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="1"
|
||||||
|
>
|
||||||
|
Enable
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h3>
|
||||||
|
Wi-Fi 2
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class="form-group"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-checkbox "
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="custom-control-input"
|
||||||
|
id="2"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="2"
|
||||||
|
>
|
||||||
|
Enable
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="text-right"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn btn-primary col-sm-12 col-lg-3"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<h4>
|
||||||
|
Reset Wi-Fi Settings
|
||||||
|
</h4>
|
||||||
|
<p>
|
||||||
|
|
||||||
|
If a number of wireless cards doesn't match, you may try to reset the Wi-Fi settings. Note that this will remove the
|
||||||
|
current Wi-Fi configuration and restore the default values.
|
||||||
|
|
||||||
|
</p>
|
||||||
|
<div
|
||||||
|
class="col-sm-12 offset-lg-1 col-lg-10 p-0 mb-3 text-right"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn btn-warning col-sm-12 col-lg-3"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Reset Wi-Fi Settings
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</DocumentFragment>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -475,10 +475,89 @@
|
||||||
|
|
||||||
|
</small>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"20\\"
|
||||||
|
+ >
|
||||||
|
+ SSID
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"form-control\\"
|
||||||
|
+ id=\\"20\\"
|
||||||
|
+ type=\\"text\\"
|
||||||
|
+ value=\\"TestGuestSSID\\"
|
||||||
|
+ />
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group-append\\"
|
||||||
|
+ >
|
||||||
|
+ <button
|
||||||
|
+ class=\\"input-group-text\\"
|
||||||
|
+ type=\\"button\\"
|
||||||
|
+ >
|
||||||
|
+ <img
|
||||||
|
+ alt=\\"QR\\"
|
||||||
|
+ src=\\"/reforis/static/reforis/imgs/QR_icon.svg\\"
|
||||||
|
+ style=\\"opacity: 0.67;\\"
|
||||||
|
+ width=\\"20\\"
|
||||||
|
+ />
|
||||||
|
+ </button>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"21\\"
|
||||||
|
+ >
|
||||||
|
+ Password
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ autocomplete=\\"new-password\\"
|
||||||
|
+ class=\\"form-control is-invalid\\"
|
||||||
|
+ id=\\"21\\"
|
||||||
|
+ required=\\"\\"
|
||||||
|
+ type=\\"password\\"
|
||||||
|
+ value=\\"\\"
|
||||||
|
+ />
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group-append\\"
|
||||||
|
+ >
|
||||||
|
+ <button
|
||||||
|
+ class=\\"input-group-text\\"
|
||||||
|
+ type=\\"button\\"
|
||||||
|
+ >
|
||||||
|
+ <i
|
||||||
|
+ class=\\"fa fa-eye\\"
|
||||||
|
+ />
|
||||||
|
+ </button>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"invalid-feedback\\"
|
||||||
|
+ >
|
||||||
|
+ Password must contain at least 8 symbols
|
||||||
|
+ </div>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ WPA2 pre-shared key, that is required to connect to the network.
|
||||||
|
+
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
<h3>
|
||||||
|
Wi-Fi 2
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class=\\"form-group\\"
|
||||||
|
@@ -502,10 +581,11 @@
|
||||||
|
<div
|
||||||
|
class=\\"text-right\\"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class=\\"btn btn-primary col-sm-12 col-lg-3\\"
|
||||||
|
+ disabled=\\"\\"
|
||||||
|
type=\\"submit\\"
|
||||||
|
>
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
</div>"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -23,10 +23,462 @@
|
||||||
|
>
|
||||||
|
Enable
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"4\\"
|
||||||
|
+ >
|
||||||
|
+ SSID
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"form-control\\"
|
||||||
|
+ id=\\"4\\"
|
||||||
|
+ required=\\"\\"
|
||||||
|
+ type=\\"text\\"
|
||||||
|
+ value=\\"TestSSID1\\"
|
||||||
|
+ />
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group-append\\"
|
||||||
|
+ >
|
||||||
|
+ <button
|
||||||
|
+ class=\\"input-group-text\\"
|
||||||
|
+ type=\\"button\\"
|
||||||
|
+ >
|
||||||
|
+ <img
|
||||||
|
+ alt=\\"QR\\"
|
||||||
|
+ src=\\"/reforis/static/reforis/imgs/QR_icon.svg\\"
|
||||||
|
+ style=\\"opacity: 0.67;\\"
|
||||||
|
+ width=\\"20\\"
|
||||||
|
+ />
|
||||||
|
+ </button>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"5\\"
|
||||||
|
+ >
|
||||||
|
+ Password
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ autocomplete=\\"new-password\\"
|
||||||
|
+ class=\\"form-control\\"
|
||||||
|
+ id=\\"5\\"
|
||||||
|
+ required=\\"\\"
|
||||||
|
+ type=\\"password\\"
|
||||||
|
+ value=\\"TestPass\\"
|
||||||
|
+ />
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group-append\\"
|
||||||
|
+ >
|
||||||
|
+ <button
|
||||||
|
+ class=\\"input-group-text\\"
|
||||||
|
+ type=\\"button\\"
|
||||||
|
+ >
|
||||||
|
+ <i
|
||||||
|
+ class=\\"fa fa-eye\\"
|
||||||
|
+ />
|
||||||
|
+ </button>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ WPA2 pre-shared key, that is required to connect to the network.
|
||||||
|
+
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-checkbox \\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"6\\"
|
||||||
|
+ type=\\"checkbox\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"6\\"
|
||||||
|
+ >
|
||||||
|
+ Hide SSID
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+ If set, network is not visible when scanning for available networks.
|
||||||
|
+ </small>
|
||||||
|
+ </label>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ class=\\"d-block\\"
|
||||||
|
+ for=\\"7\\"
|
||||||
|
+ >
|
||||||
|
+ GHz
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-radio custom-control-inline\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"hwmode-0-0\\"
|
||||||
|
+ name=\\"hwmode-0\\"
|
||||||
|
+ type=\\"radio\\"
|
||||||
|
+ value=\\"11g\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"hwmode-0-0\\"
|
||||||
|
+ >
|
||||||
|
+ 2.4
|
||||||
|
+ </label>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-radio custom-control-inline\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ checked=\\"\\"
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"hwmode-0-1\\"
|
||||||
|
+ name=\\"hwmode-0\\"
|
||||||
|
+ type=\\"radio\\"
|
||||||
|
+ value=\\"11a\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"hwmode-0-1\\"
|
||||||
|
+ >
|
||||||
|
+ 5
|
||||||
|
+ </label>
|
||||||
|
+ </div>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
|
||||||
|
+ newer standard and may not be supported by all your devices. It usually has less interference, but the signal
|
||||||
|
+ does not carry so well indoors.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"8\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11n/ac mode
|
||||||
|
+ </label>
|
||||||
|
+ <select
|
||||||
|
+ class=\\"custom-select\\"
|
||||||
|
+ id=\\"8\\"
|
||||||
|
+ >
|
||||||
|
+ <option
|
||||||
|
+ value=\\"NOHT\\"
|
||||||
|
+ >
|
||||||
|
+ Disabled
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"HT20\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11n - 20 MHz wide channel
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"HT40\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11n - 40 MHz wide channel
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"VHT20\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11ac - 20 MHz wide channel
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"VHT40\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11ac - 40 MHz wide channel
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"VHT80\\"
|
||||||
|
+ >
|
||||||
|
+ 802.11ac - 80 MHz wide channel
|
||||||
|
+ </option>
|
||||||
|
+ </select>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
|
||||||
|
+ throughput but can cause more interference in the network. If you don't know what to choose, use the default
|
||||||
|
+ option with 20 MHz wide channel.
|
||||||
|
+
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"9\\"
|
||||||
|
+ >
|
||||||
|
+ Channel
|
||||||
|
+ </label>
|
||||||
|
+ <select
|
||||||
|
+ class=\\"custom-select\\"
|
||||||
|
+ id=\\"9\\"
|
||||||
|
+ >
|
||||||
|
+ <option
|
||||||
|
+ value=\\"0\\"
|
||||||
|
+ >
|
||||||
|
+ auto
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"36\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 36
|
||||||
|
+ (5180 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"40\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 40
|
||||||
|
+ (5200 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"44\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 44
|
||||||
|
+ (5220 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"48\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 48
|
||||||
|
+ (5240 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"52\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 52
|
||||||
|
+ (5260 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"56\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 56
|
||||||
|
+ (5280 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"60\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 60
|
||||||
|
+ (5300 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"64\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 64
|
||||||
|
+ (5320 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"100\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 100
|
||||||
|
+ (5500 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"104\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 104
|
||||||
|
+ (5520 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"108\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 108
|
||||||
|
+ (5540 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"112\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 112
|
||||||
|
+ (5560 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"116\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 116
|
||||||
|
+ (5580 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"120\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 120
|
||||||
|
+ (5600 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"124\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 124
|
||||||
|
+ (5620 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"128\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 128
|
||||||
|
+ (5640 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"132\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 132
|
||||||
|
+ (5660 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"136\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 136
|
||||||
|
+ (5680 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"140\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 140
|
||||||
|
+ (5700 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"144\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 144
|
||||||
|
+ (5720 MHz ,DFS)
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"149\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 149
|
||||||
|
+ (5745 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"153\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 153
|
||||||
|
+ (5765 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"157\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 157
|
||||||
|
+ (5785 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"161\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 161
|
||||||
|
+ (5805 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"165\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ 165
|
||||||
|
+ (5825 MHz )
|
||||||
|
+
|
||||||
|
+ </option>
|
||||||
|
+ </select>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-checkbox \\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"10\\"
|
||||||
|
+ type=\\"checkbox\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"10\\"
|
||||||
|
+ >
|
||||||
|
+ Enable Guest Wifi
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+
|
||||||
|
+ Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to
|
||||||
|
+ access the internet, but aren't allowed to access other devices and the configuration interface of the router.
|
||||||
|
+ Parameters of the guest network can be set in the Guest network tab.
|
||||||
|
+
|
||||||
|
+ </small>
|
||||||
|
+ </label>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
<h3>
|
||||||
|
Wi-Fi 2
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class=\\"form-group\\""
|
||||||
|
`;
|
39
src/common/WiFiSettings/constants.js
Normal file
39
src/common/WiFiSettings/constants.js
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const HTMODES = {
|
||||||
|
NOHT: _("Disabled"),
|
||||||
|
HT20: _("802.11n - 20 MHz wide channel"),
|
||||||
|
HT40: _("802.11n - 40 MHz wide channel"),
|
||||||
|
VHT20: _("802.11ac - 20 MHz wide channel"),
|
||||||
|
VHT40: _("802.11ac - 40 MHz wide channel"),
|
||||||
|
VHT80: _("802.11ac - 80 MHz wide channel"),
|
||||||
|
};
|
||||||
|
export const HWMODES = {
|
||||||
|
"11g": "2.4",
|
||||||
|
"11a": "5",
|
||||||
|
};
|
||||||
|
export const HELP_TEXTS = {
|
||||||
|
password: _(`
|
||||||
|
WPA2 pre-shared key, that is required to connect to the network.
|
||||||
|
`),
|
||||||
|
hidden: _("If set, network is not visible when scanning for available networks."),
|
||||||
|
hwmode: _(`
|
||||||
|
The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
|
||||||
|
newer standard and may not be supported by all your devices. It usually has less interference, but the signal
|
||||||
|
does not carry so well indoors.`),
|
||||||
|
htmode: _(`
|
||||||
|
Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
|
||||||
|
throughput but can cause more interference in the network. If you don't know what to choose, use the default
|
||||||
|
option with 20 MHz wide channel.
|
||||||
|
`),
|
||||||
|
guest_wifi_enabled: _(`
|
||||||
|
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.
|
||||||
|
`),
|
||||||
|
};
|
28
src/common/WiFiSettings/qrCodeHelpers.js
Normal file
28
src/common/WiFiSettings/qrCodeHelpers.js
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* 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 pdfMake from "pdfmake";
|
||||||
|
|
||||||
|
export function createAndDownloadPdf(SSID, password) {
|
||||||
|
const docDefinition = {
|
||||||
|
content: [
|
||||||
|
{
|
||||||
|
text: "Wi-Fi", style: "header", fontSize: 55, alignment: "center",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
qr: toQRCodeContent(SSID, password), fit: "350", margin: [0, 80], alignment: "center",
|
||||||
|
},
|
||||||
|
{ text: `SSID: ${SSID}`, fontSize: 25, alignment: "center" },
|
||||||
|
{ text: `Password: ${password}`, fontSize: 25, alignment: "center" },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
pdfMake.createPdf(docDefinition).download("wifi.pdf");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toQRCodeContent(SSID, password) {
|
||||||
|
return `WIFI:S:${SSID};T:WPA2;P:${password};;`;
|
||||||
|
}
|
@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
import { fireEvent, getByText, queryByText, render, wait } from "customTestRender";
|
import {
|
||||||
|
fireEvent, getByText, queryByText, render, wait,
|
||||||
|
} from "customTestRender";
|
||||||
import mockAxios from "jest-mock-axios";
|
import mockAxios from "jest-mock-axios";
|
||||||
import { mockJSONError } from "testUtils/network";
|
import { mockJSONError } from "testUtils/network";
|
||||||
import { mockSetAlert } from "testUtils/alertContextMock";
|
import { mockSetAlert } from "testUtils/alertContextMock";
|
||||||
@ -18,8 +20,8 @@ describe("<RebootButton/>", () => {
|
|||||||
let componentContainer;
|
let componentContainer;
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
const { container } = render(<>
|
const { container } = render(<>
|
||||||
<div id="modal-container"/>
|
<div id="modal-container" />
|
||||||
<RebootButton/>
|
<RebootButton />
|
||||||
</>);
|
</>);
|
||||||
componentContainer = container;
|
componentContainer = container;
|
||||||
});
|
});
|
||||||
@ -51,5 +53,4 @@ describe("<RebootButton/>", () => {
|
|||||||
await wait(() => expect(mockSetAlert)
|
await wait(() => expect(mockSetAlert)
|
||||||
.toBeCalledWith("Reboot request failed."));
|
.toBeCalledWith("Reboot request failed."));
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -12,17 +12,17 @@ import { STATES, SubmitButton } from "../components/SubmitButton";
|
|||||||
|
|
||||||
describe("<SubmitButton/>", () => {
|
describe("<SubmitButton/>", () => {
|
||||||
it("Render ready", () => {
|
it("Render ready", () => {
|
||||||
const { container } = render(<SubmitButton state={STATES.READY}/>);
|
const { container } = render(<SubmitButton state={STATES.READY} />);
|
||||||
expect(container)
|
expect(container)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
});
|
});
|
||||||
it("Render saving", () => {
|
it("Render saving", () => {
|
||||||
const { container } = render(<SubmitButton state={STATES.SAVING}/>);
|
const { container } = render(<SubmitButton state={STATES.SAVING} />);
|
||||||
expect(container)
|
expect(container)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
});
|
});
|
||||||
it("Render load", () => {
|
it("Render load", () => {
|
||||||
const { container } = render(<SubmitButton state={STATES.LOAD}/>);
|
const { container } = render(<SubmitButton state={STATES.LOAD} />);
|
||||||
expect(container)
|
expect(container)
|
||||||
.toMatchSnapshot();
|
.toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
exports[`<SubmitButton/> Render load 1`] = `
|
exports[`<SubmitButton/> Render load 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<button
|
<button
|
||||||
class="btn btn-primary offset-lg-8 col-lg-3 col-sm-12"
|
class="btn btn-primary col-sm-12 col-lg-3"
|
||||||
disabled=""
|
disabled=""
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
@ -23,7 +23,7 @@ exports[`<SubmitButton/> Render load 1`] = `
|
|||||||
exports[`<SubmitButton/> Render ready 1`] = `
|
exports[`<SubmitButton/> Render ready 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<button
|
<button
|
||||||
class="btn btn-primary offset-lg-8 col-lg-3 col-sm-12"
|
class="btn btn-primary col-sm-12 col-lg-3"
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ exports[`<SubmitButton/> Render ready 1`] = `
|
|||||||
exports[`<SubmitButton/> Render saving 1`] = `
|
exports[`<SubmitButton/> Render saving 1`] = `
|
||||||
<div>
|
<div>
|
||||||
<button
|
<button
|
||||||
class="btn btn-primary offset-lg-8 col-lg-3 col-sm-12"
|
class="btn btn-primary col-sm-12 col-lg-3"
|
||||||
disabled=""
|
disabled=""
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
|
@ -5,99 +5,98 @@
|
|||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from 'react';
|
import React from "react";
|
||||||
|
|
||||||
import { act, fireEvent, render, waitForElement } from 'customTestRender';
|
import {
|
||||||
import mockAxios from 'jest-mock-axios';
|
act, fireEvent, render, waitForElement,
|
||||||
|
} from "customTestRender";
|
||||||
|
import mockAxios from "jest-mock-axios";
|
||||||
|
import { WebSockets } from "webSockets/WebSockets";
|
||||||
import { ForisForm } from "../components/ForisForm";
|
import { ForisForm } from "../components/ForisForm";
|
||||||
|
|
||||||
|
|
||||||
// It's possible to unittest each hooks via react-hooks-testing-library.
|
// 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.
|
// But it's better and easier to test it by test components which uses this hooks.
|
||||||
|
|
||||||
const TestForm = ({formData, formErrors, setFormValue}) => {
|
const TestForm = ({ formData, formErrors, setFormValue }) => (
|
||||||
return <>
|
<>
|
||||||
<input
|
<input
|
||||||
data-testid='test-input'
|
data-testid="test-input"
|
||||||
value={formData.field}
|
value={formData.field}
|
||||||
onChange={setFormValue(value => ({field: {$set: value}}))}
|
onChange={setFormValue((value) => ({ field: { $set: value } }))}
|
||||||
/>
|
/>
|
||||||
<p>{formErrors.field}</p>
|
<p>{formErrors.field}</p>
|
||||||
</>
|
</>
|
||||||
};
|
);
|
||||||
|
|
||||||
describe('useForm hook.', () => {
|
describe("useForm hook.", () => {
|
||||||
let mockValidator;
|
let mockValidator;
|
||||||
let mockPrepData;
|
let mockPrepData;
|
||||||
let mockPrepDataToSubmit;
|
let mockPrepDataToSubmit;
|
||||||
let mockWebSockets;
|
|
||||||
let input;
|
let input;
|
||||||
let form;
|
let form;
|
||||||
const Child = jest.fn(props => <TestForm {...props}/>);
|
const Child = jest.fn((props) => <TestForm {...props} />);
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
mockPrepData = jest.fn(() => ({field: 'preparedData'}));
|
mockPrepData = jest.fn(() => ({ field: "preparedData" }));
|
||||||
mockPrepDataToSubmit = jest.fn(() => ({field: 'preparedDataToSubmit'}));
|
mockPrepDataToSubmit = jest.fn(() => ({ field: "preparedDataToSubmit" }));
|
||||||
mockValidator = jest.fn(data => data.field === 'invalidValue' ? {field: 'Error'} : {});
|
mockValidator = jest.fn((data) => (data.field === "invalidValue" ? { field: "Error" } : {}));
|
||||||
const {getByTestId, container} = render(
|
const { getByTestId, container } = render(
|
||||||
<ForisForm
|
<ForisForm
|
||||||
ws={mockWebSockets}
|
ws={new WebSockets()}
|
||||||
// Just some module which exists...
|
// Just some module which exists...
|
||||||
forisConfig={{
|
forisConfig={{
|
||||||
endpoint: 'testEndpoint',
|
endpoint: "testEndpoint",
|
||||||
wsModule: 'testWSModule'
|
wsModule: "testWSModule",
|
||||||
}}
|
}}
|
||||||
prepData={mockPrepData}
|
prepData={mockPrepData}
|
||||||
prepDataToSubmit={mockPrepDataToSubmit}
|
prepDataToSubmit={mockPrepDataToSubmit}
|
||||||
validator={mockValidator}
|
validator={mockValidator}
|
||||||
>
|
>
|
||||||
<Child/>
|
<Child />
|
||||||
</ForisForm>
|
</ForisForm>,
|
||||||
);
|
);
|
||||||
mockAxios.mockResponse({field: 'fetchedData'});
|
mockAxios.mockResponse({ field: "fetchedData" });
|
||||||
|
|
||||||
input = await waitForElement(() =>
|
input = await waitForElement(() => getByTestId("test-input"));
|
||||||
getByTestId('test-input')
|
form = container.firstChild.firstChild;
|
||||||
);
|
|
||||||
form = container.firstChild
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Validation on changing.', () => {
|
it("Validation on changing.", () => {
|
||||||
expect(mockValidator).toHaveBeenCalledTimes(1);
|
expect(mockValidator).toHaveBeenCalledTimes(1);
|
||||||
expect(Child).toHaveBeenCalledTimes(1);
|
expect(Child).toHaveBeenCalledTimes(1);
|
||||||
expect(Child.mock.calls[0][0].formErrors).toMatchObject({});
|
expect(Child.mock.calls[0][0].formErrors).toMatchObject({});
|
||||||
|
|
||||||
act(() => {
|
act(() => {
|
||||||
fireEvent.change(input, {target: {value: 'invalidValue', type: 'text'}});
|
fireEvent.change(input, { target: { value: "invalidValue", type: "text" } });
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(Child).toHaveBeenCalledTimes(2);
|
expect(Child).toHaveBeenCalledTimes(2);
|
||||||
expect(mockValidator).toHaveBeenCalledTimes(2);
|
expect(mockValidator).toHaveBeenCalledTimes(2);
|
||||||
expect(Child.mock.calls[1][0].formErrors).toMatchObject({field: 'Error'});
|
expect(Child.mock.calls[1][0].formErrors).toMatchObject({ field: "Error" });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Update text value.', () => {
|
it("Update text value.", () => {
|
||||||
fireEvent.change(input, {target: {value: 'newValue', type: 'text'}})
|
fireEvent.change(input, { target: { value: "newValue", type: "text" } });
|
||||||
expect(input.value).toBe('newValue');
|
expect(input.value).toBe("newValue");
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Update text value.', () => {
|
it("Update text value.", () => {
|
||||||
fireEvent.change(input, {target: {value: 123, type: 'number'}})
|
fireEvent.change(input, { target: { value: 123, type: "number" } });
|
||||||
expect(input.value).toBe('123');
|
expect(input.value).toBe("123");
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Update checkbox value.', () => {
|
it("Update checkbox value.", () => {
|
||||||
fireEvent.change(input, {target: {checked: true, type: 'checkbox'}})
|
fireEvent.change(input, { target: { checked: true, type: "checkbox" } });
|
||||||
expect(input.checked).toBe(true);
|
expect(input.checked).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Fetch data.', () => {
|
it("Fetch data.", () => {
|
||||||
expect(mockAxios.get).toHaveBeenCalledWith('testEndpoint', expect.anything());
|
expect(mockAxios.get).toHaveBeenCalledWith("testEndpoint", expect.anything());
|
||||||
expect(mockPrepData).toHaveBeenCalledTimes(1);
|
expect(mockPrepData).toHaveBeenCalledTimes(1);
|
||||||
expect(Child.mock.calls[0][0].formData).toMatchObject({field: 'preparedData'});
|
expect(Child.mock.calls[0][0].formData).toMatchObject({ field: "preparedData" });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Submit.', () => {
|
it("Submit.", () => {
|
||||||
expect(mockAxios.get).toHaveBeenCalledTimes(1);
|
expect(mockAxios.get).toHaveBeenCalledTimes(1);
|
||||||
expect(mockPrepDataToSubmit).toHaveBeenCalledTimes(0);
|
expect(mockPrepDataToSubmit).toHaveBeenCalledTimes(0);
|
||||||
|
|
||||||
@ -106,8 +105,8 @@ describe('useForm hook.', () => {
|
|||||||
expect(mockPrepDataToSubmit).toHaveBeenCalledTimes(1);
|
expect(mockPrepDataToSubmit).toHaveBeenCalledTimes(1);
|
||||||
expect(mockAxios.post).toHaveBeenCalledTimes(1);
|
expect(mockAxios.post).toHaveBeenCalledTimes(1);
|
||||||
expect(mockAxios.post).toHaveBeenCalledWith(
|
expect(mockAxios.post).toHaveBeenCalledWith(
|
||||||
'testEndpoint',
|
"testEndpoint",
|
||||||
{'field': 'preparedDataToSubmit'},
|
{ field: "preparedDataToSubmit" },
|
||||||
expect.anything(),
|
expect.anything(),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
@ -11,7 +11,7 @@ import {
|
|||||||
validateIPv4Address,
|
validateIPv4Address,
|
||||||
validateIPv6Address,
|
validateIPv6Address,
|
||||||
validateIPv6Prefix,
|
validateIPv6Prefix,
|
||||||
validateMAC
|
validateMAC,
|
||||||
} from "validations";
|
} from "validations";
|
||||||
|
|
||||||
describe("Validation functions", () => {
|
describe("Validation functions", () => {
|
||||||
@ -50,7 +50,6 @@ describe("Validation functions", () => {
|
|||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
expect(validateIPv6Address("::"))
|
expect(validateIPv6Address("::"))
|
||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
|
|
||||||
});
|
});
|
||||||
it("validateIPv6Address invalid", () => {
|
it("validateIPv6Address invalid", () => {
|
||||||
expect(validateIPv6Address("invalid"))
|
expect(validateIPv6Address("invalid"))
|
||||||
@ -85,7 +84,6 @@ describe("Validation functions", () => {
|
|||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
it("validateDomain valid", () => {
|
it("validateDomain valid", () => {
|
||||||
expect(validateDomain("example.com"))
|
expect(validateDomain("example.com"))
|
||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
@ -108,7 +106,6 @@ describe("Validation functions", () => {
|
|||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
expect(validateDUID("ABCDEF12AB"))
|
expect(validateDUID("ABCDEF12AB"))
|
||||||
.toBe(undefined);
|
.toBe(undefined);
|
||||||
|
|
||||||
});
|
});
|
||||||
it("validateDUID invalid", () => {
|
it("validateDUID invalid", () => {
|
||||||
expect(validateDUID("gggggggg"))
|
expect(validateDUID("gggggggg"))
|
||||||
|
@ -7,15 +7,16 @@
|
|||||||
|
|
||||||
import React, { useEffect } from "react";
|
import React, { useEffect } from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { Spinner } from "bootstrap/Spinner";
|
|
||||||
import { useAPIPost } from "api/hooks";
|
|
||||||
|
|
||||||
import { Prompt } from "react-router";
|
import { Prompt } from "react-router";
|
||||||
import { API_STATE } from "api/utils";
|
|
||||||
import { ErrorMessage } from "utils/ErrorMessage";
|
import { ALERT_TYPES } from "../../bootstrap/Alert";
|
||||||
import { useAlert } from "alertContext/AlertContext";
|
import { API_STATE } from "../../api/utils";
|
||||||
import { ALERT_TYPES } from "bootstrap/Alert";
|
import { ErrorMessage } from "../../utils/ErrorMessage";
|
||||||
|
import { formFieldsSize } from "../../bootstrap/constants";
|
||||||
|
import { Spinner } from "../../bootstrap/Spinner";
|
||||||
|
import { useAlert } from "../../alertContext/AlertContext";
|
||||||
|
import { useAPIPost } from "../../api/hooks";
|
||||||
|
|
||||||
import { useForisModule, useForm } from "../hooks";
|
import { useForisModule, useForm } from "../hooks";
|
||||||
import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
|
import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
|
||||||
|
|
||||||
@ -154,15 +155,17 @@ export function ForisForm({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<div className={formFieldsSize}>
|
||||||
<Prompt message={getMessageOnLeavingPage} />
|
<Prompt message={getMessageOnLeavingPage} />
|
||||||
<form onSubmit={onSubmit}>
|
<form onSubmit={onSubmit}>
|
||||||
{childrenWithFormProps}
|
{childrenWithFormProps}
|
||||||
<SubmitButton
|
<div className="text-right">
|
||||||
state={getSubmitButtonState()}
|
<SubmitButton
|
||||||
disabled={submitButtonIsDisabled}
|
state={getSubmitButtonState()}
|
||||||
/>
|
disabled={submitButtonIsDisabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
import { Button } from "bootstrap/Button";
|
import { Button } from "../../bootstrap/Button";
|
||||||
|
|
||||||
export const STATES = {
|
export const STATES = {
|
||||||
READY: 1,
|
READY: 1,
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
import { useCallback, useEffect, useReducer } from "react";
|
import { useCallback, useEffect, useReducer } from "react";
|
||||||
import update from "immutability-helper";
|
import update from "immutability-helper";
|
||||||
|
|
||||||
import { useAPIGet } from "api/hooks";
|
import { useAPIGet } from "../api/hooks";
|
||||||
import { useWSForisModule } from "webSockets/hooks";
|
import { useWSForisModule } from "../webSockets/hooks";
|
||||||
|
|
||||||
const FORM_ACTIONS = {
|
const FORM_ACTIONS = {
|
||||||
updateValue: 1,
|
updateValue: 1,
|
||||||
|
64
src/index.js
64
src/index.js
@ -13,58 +13,60 @@ export {
|
|||||||
useAPIPut,
|
useAPIPut,
|
||||||
useAPIDelete,
|
useAPIDelete,
|
||||||
useAPIPolling,
|
useAPIPolling,
|
||||||
} from "api/hooks";
|
} from "./api/hooks";
|
||||||
export { API_STATE } from "api/utils";
|
export { API_STATE } from "./api/utils";
|
||||||
|
|
||||||
// Bootstrap
|
// Bootstrap
|
||||||
export { Alert, ALERT_TYPES } from "bootstrap/Alert";
|
export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
|
||||||
export { Button } from "bootstrap/Button";
|
export { Button } from "./bootstrap/Button";
|
||||||
export { CheckBox } from "bootstrap/CheckBox";
|
export { CheckBox } from "./bootstrap/CheckBox";
|
||||||
export { DownloadButton } from "bootstrap/DownloadButton";
|
export { DownloadButton } from "./bootstrap/DownloadButton";
|
||||||
export { DataTimeInput } from "bootstrap/DataTimeInput";
|
export { DataTimeInput } from "./bootstrap/DataTimeInput";
|
||||||
export { EmailInput } from "bootstrap/EmailInput";
|
export { EmailInput } from "./bootstrap/EmailInput";
|
||||||
export { FileInput } from "bootstrap/FileInput";
|
export { FileInput } from "./bootstrap/FileInput";
|
||||||
export { Input } from "bootstrap/Input";
|
export { Input } from "./bootstrap/Input";
|
||||||
export { NumberInput } from "bootstrap/NumberInput";
|
export { NumberInput } from "./bootstrap/NumberInput";
|
||||||
export { PasswordInput } from "bootstrap/PasswordInput";
|
export { PasswordInput } from "./bootstrap/PasswordInput";
|
||||||
export { RadioSet } from "bootstrap/RadioSet";
|
export { Radio, RadioSet } from "./bootstrap/RadioSet";
|
||||||
export { Select } from "bootstrap/Select";
|
export { Select } from "./bootstrap/Select";
|
||||||
export { TextInput } from "bootstrap/TextInput";
|
export { TextInput } from "./bootstrap/TextInput";
|
||||||
export { formFieldsSize } from "bootstrap/constants";
|
export { formFieldsSize } from "./bootstrap/constants";
|
||||||
|
|
||||||
export {
|
export {
|
||||||
Spinner,
|
Spinner,
|
||||||
SpinnerElement,
|
SpinnerElement,
|
||||||
} from "bootstrap/Spinner";
|
} from "./bootstrap/Spinner";
|
||||||
export {
|
export {
|
||||||
Modal,
|
Modal,
|
||||||
ModalBody,
|
ModalBody,
|
||||||
ModalFooter,
|
ModalFooter,
|
||||||
ModalHeader,
|
ModalHeader,
|
||||||
} from "bootstrap/Modal";
|
} from "./bootstrap/Modal";
|
||||||
|
|
||||||
// Common
|
// Common
|
||||||
export { RebootButton } from "common/RebootButton";
|
export { RebootButton } from "./common/RebootButton";
|
||||||
|
export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
|
||||||
|
|
||||||
// Form
|
// Form
|
||||||
export { ForisForm } from "form/components/ForisForm";
|
export { ForisForm } from "./form/components/ForisForm";
|
||||||
export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "form/components/SubmitButton";
|
export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "./form/components/SubmitButton";
|
||||||
export { useForisModule, useForm } from "form/hooks";
|
export { useForisModule, useForm } from "./form/hooks";
|
||||||
|
|
||||||
// WebSockets
|
// WebSockets
|
||||||
export { useWSForisModule } from "webSockets/hooks";
|
export { useWSForisModule } from "./webSockets/hooks";
|
||||||
export { WebSockets } from "webSockets/WebSockets";
|
export { WebSockets } from "./webSockets/WebSockets";
|
||||||
|
|
||||||
// Utils
|
// Utils
|
||||||
export { Portal } from "utils/Portal";
|
export { Portal } from "./utils/Portal";
|
||||||
export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "utils/objectHelpers";
|
export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "./utils/objectHelpers";
|
||||||
export {
|
export {
|
||||||
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
|
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
|
||||||
} from "utils/conditionalHOCs";
|
} from "./utils/conditionalHOCs";
|
||||||
export { ErrorMessage } from "utils/ErrorMessage";
|
export { ErrorMessage } from "./utils/ErrorMessage";
|
||||||
|
export { useClickOutside } from "./utils/hooks";
|
||||||
|
|
||||||
// Foris URL
|
// Foris URL
|
||||||
export { ForisURLs, REFORIS_URL_PREFIX } from "forisUrls";
|
export { ForisURLs, REFORIS_URL_PREFIX } from "./forisUrls";
|
||||||
|
|
||||||
// Validation
|
// Validation
|
||||||
export {
|
export {
|
||||||
@ -75,7 +77,7 @@ export {
|
|||||||
validateDUID,
|
validateDUID,
|
||||||
validateMAC,
|
validateMAC,
|
||||||
validateMultipleEmails,
|
validateMultipleEmails,
|
||||||
} from "validations";
|
} from "./validations";
|
||||||
|
|
||||||
// Alert context
|
// Alert context
|
||||||
export { AlertContextProvider, useAlert } from "alertContext/AlertContext";
|
export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";
|
||||||
|
@ -15,7 +15,7 @@ window.AlertContext = React.createContext();
|
|||||||
function AlertContextMock({ children }) {
|
function AlertContextMock({ children }) {
|
||||||
return (
|
return (
|
||||||
<AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}>
|
<AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}>
|
||||||
{ children }
|
{ children }
|
||||||
</AlertContext.Provider>
|
</AlertContext.Provider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import mockAxios from 'jest-mock-axios';
|
import mockAxios from "jest-mock-axios";
|
||||||
|
|
||||||
export function mockJSONError(data) {
|
export function mockJSONError(data) {
|
||||||
mockAxios.mockError({ response: { data, headers: { "content-type": "application/json" } } });
|
mockAxios.mockError({ response: { data, headers: { "content-type": "application/json" } } });
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import mockAxios from 'jest-mock-axios';
|
import mockAxios from "jest-mock-axios";
|
||||||
import moment from 'moment-timezone';
|
import moment from "moment-timezone";
|
||||||
|
|
||||||
// Setup axios cleanup
|
// Setup axios cleanup
|
||||||
global.afterEach(() => {
|
global.afterEach(() => {
|
||||||
@ -14,9 +14,9 @@ global.afterEach(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// Mock babel (gettext)
|
// Mock babel (gettext)
|
||||||
global._ = str => str;
|
global._ = (str) => str;
|
||||||
global.ngettext = str => str;
|
global.ngettext = (str) => str;
|
||||||
global.babel = {format: (str) => str};
|
global.babel = { format: (str) => str };
|
||||||
global.ForisTranslations = {};
|
global.ForisTranslations = {};
|
||||||
|
|
||||||
// Mock web sockets
|
// Mock web sockets
|
||||||
@ -25,9 +25,9 @@ window.WebSocket = jest.fn();
|
|||||||
// Mock scrollIntoView
|
// Mock scrollIntoView
|
||||||
global.HTMLElement.prototype.scrollIntoView = () => {};
|
global.HTMLElement.prototype.scrollIntoView = () => {};
|
||||||
|
|
||||||
jest.doMock('moment', () => {
|
// Mock timezone utilities
|
||||||
moment.tz.setDefault('UTC');
|
jest.doMock("moment", () => {
|
||||||
|
moment.tz.setDefault("UTC");
|
||||||
return moment;
|
return moment;
|
||||||
});
|
});
|
||||||
|
|
||||||
Date.now = jest.fn(() => new Date(Date.UTC(2019, 1, 1, 12, 13, 14)).valueOf());
|
Date.now = jest.fn(() => new Date(Date.UTC(2019, 1, 1, 12, 13, 14)).valueOf());
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { render } from "customTestRender";
|
import { render } from "customTestRender";
|
||||||
|
import { API_STATE } from "api/utils";
|
||||||
import {
|
import {
|
||||||
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
|
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
|
||||||
} from "../conditionalHOCs";
|
} from "../conditionalHOCs";
|
||||||
import { API_STATE } from "api/utils";
|
|
||||||
|
|
||||||
describe("conditional HOCs", () => {
|
describe("conditional HOCs", () => {
|
||||||
const First = () => <p>First</p>;
|
const First = () => <p>First</p>;
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
import { Spinner } from "bootstrap/Spinner";
|
import { Spinner } from "../bootstrap/Spinner";
|
||||||
import { API_STATE } from "api/utils";
|
import { API_STATE } from "../api/utils";
|
||||||
import { ErrorMessage } from "./ErrorMessage";
|
import { ErrorMessage } from "./ErrorMessage";
|
||||||
|
|
||||||
function withEither(conditionalFn, Either) {
|
function withEither(conditionalFn, Either) {
|
||||||
|
@ -18,3 +18,19 @@ export function useConditionalTimeout({ callback, timeout = 125 }, ...callbackAr
|
|||||||
}, [condition, callback, timeout, callbackArgs]);
|
}, [condition, callback, timeout, callbackArgs]);
|
||||||
return setCondition;
|
return setCondition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Execute callback when user clicks outside specified element. */
|
||||||
|
export function useClickOutside(element, callback) {
|
||||||
|
function handleClickOutside(event) {
|
||||||
|
if (element.current && !element.current.contains(event.target)) {
|
||||||
|
callback(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.addEventListener("mousedown", handleClickOutside);
|
||||||
|
return () => {
|
||||||
|
document.removeEventListener("mousedown", handleClickOutside);
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
/* eslint no-console: "off" */
|
/* eslint no-console: "off" */
|
||||||
|
|
||||||
import { ForisURLs } from "forisUrls";
|
import { ForisURLs } from "../forisUrls";
|
||||||
|
|
||||||
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
|
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
|
||||||
|
|
||||||
@ -25,18 +25,18 @@ export class WebSockets {
|
|||||||
console.error("WS: Error observed, you aren't logged probably.");
|
console.error("WS: Error observed, you aren't logged probably.");
|
||||||
window.location.replace(ForisURLs.login);
|
window.location.replace(ForisURLs.login);
|
||||||
}
|
}
|
||||||
console.log(`WS: Error: ${e}`);
|
console.error(`WS: Error: ${e}`);
|
||||||
};
|
};
|
||||||
this.ws.onmessage = (e) => {
|
this.ws.onmessage = (e) => {
|
||||||
console.log(`WS: Received Message: ${e.data}`);
|
console.debug(`WS: Received Message: ${e.data}`);
|
||||||
const data = JSON.parse(e.data);
|
const data = JSON.parse(e.data);
|
||||||
this.dispatch(data);
|
this.dispatch(data);
|
||||||
};
|
};
|
||||||
this.ws.onopen = () => {
|
this.ws.onopen = () => {
|
||||||
console.log("WS: Connection open.");
|
console.debug("WS: Connection open.");
|
||||||
};
|
};
|
||||||
this.ws.onclose = () => {
|
this.ws.onclose = () => {
|
||||||
console.log("WS: Connection closed.");
|
console.debug("WS: Connection closed.");
|
||||||
};
|
};
|
||||||
|
|
||||||
// callbacks[module][action]
|
// callbacks[module][action]
|
||||||
@ -111,7 +111,7 @@ export class WebSockets {
|
|||||||
chain = this.callbacks[json.module][json.action];
|
chain = this.callbacks[json.module][json.action];
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof TypeError) {
|
if (error instanceof TypeError) {
|
||||||
console.log(`Callback for this message wasn't found:${error.data}`);
|
console.warn(`Callback for this message wasn't found:${error.data}`);
|
||||||
} else throw error;
|
} else throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user