mirror of
https://gitlab.nic.cz/turris/reforis/foris-js.git
synced 2025-06-15 13:36:35 +02:00
Compare commits
439 Commits
Author | SHA1 | Date | |
---|---|---|---|
efb3fa80ce | |||
9c3dcaf6b5 | |||
fb41c9629e | |||
620eee3f53 | |||
f6ec82609c | |||
0b47c38f21 | |||
6183669c9b | |||
f3694bb62c | |||
0f2344a005 | |||
f2ae6c4d0a | |||
f382e743aa | |||
d71f4a7967 | |||
aeabc0bf06 | |||
46fe75d3cf | |||
c469d8dfde | |||
f327428765 | |||
5a359661da | |||
3d30e2720e | |||
badb043554 | |||
ab692e5c4d | |||
2e398388b5 | |||
5e539de03f | |||
87f5557ef6 | |||
f128c5c7d6 | |||
7a633574da | |||
ee40697e2b | |||
4525c6bc66 | |||
1d6987b21b | |||
67fc2d32ce | |||
ab13b7aa08 | |||
2a73502710 | |||
003606cb8c | |||
aeddd9ce74 | |||
a4fd74bf38 | |||
b0e2f62a41 | |||
caf8af44d1 | |||
fd7cd49790 | |||
d95fdf8517 | |||
68c560078b | |||
83caf505d9 | |||
f3a1090dbd | |||
d588291f1c | |||
bc044df7a8 | |||
b4c6a7fb70 | |||
d6563d2ffd | |||
af90d8d09d | |||
006d6ce8d9 | |||
cee08f48ce | |||
2d0ca58057 | |||
db4a6fb763 | |||
caaa154d21 | |||
518fa30306 | |||
fb3562373a | |||
5afbbac74c | |||
f25832432b | |||
926cb2505f | |||
985fd08b46 | |||
da019b6d86 | |||
514f02a5f6 | |||
c6557aae5e | |||
92ed7f1ee7 | |||
46ce6ebbb9 | |||
1a4ba03ff5 | |||
e24cd76009 | |||
ae6b495683 | |||
272c97dc8a | |||
fd25ae04a8 | |||
cc1b0b3f81 | |||
3ba279f42c | |||
0167b7ce66 | |||
9db509ace3 | |||
d42347f169 | |||
82c34e5d42 | |||
7867a1a494 | |||
1bb8abd633 | |||
536ccc0f03 | |||
671c711a33 | |||
e2f3e6857e | |||
fe4ab298d8 | |||
0f7f89dfc0 | |||
be2e3fe3f0 | |||
577ad70c06 | |||
d17638eb6e | |||
13869336db | |||
7c46abcd5d | |||
894d92b683 | |||
ca335ab3a5 | |||
2161fc0b32 | |||
0a23506a38 | |||
d23c7cb790 | |||
129327cfcf | |||
0a143e7de6 | |||
7ec1c46a63 | |||
7ceccd5222 | |||
f868881b3d | |||
188ed87fc0 | |||
c0f64e8c6c | |||
b95cfb664d | |||
52cdaf5bc5 | |||
175a07a865 | |||
f952e25205 | |||
01eeb06f9e | |||
839e227feb | |||
4b239ed195 | |||
2bcbe0ae59 | |||
b1ff608337 | |||
b662ba5b52 | |||
a4115245fe | |||
e1a893874a | |||
dd383ef1b2 | |||
b6e2cb71bb | |||
048e686185 | |||
eacb2f66a3 | |||
2433641f56 | |||
185d2e6436 | |||
7f262d4941 | |||
72356bb6c1 | |||
13c94caeb5 | |||
c24e58fae8 | |||
6329b5a104 | |||
fbac503586 | |||
550af8967c | |||
3640d6a90a | |||
7b2bc43f3f | |||
1e693b0963 | |||
afde04c662 | |||
22fb7dcf58 | |||
b557b67308 | |||
cc6e5e2933 | |||
60f850a095 | |||
a1e9f23620 | |||
579ed5ea8c | |||
c2eda33998 | |||
f49529018c | |||
a66a2f4708 | |||
2e473003bd | |||
43cb5bff50 | |||
c67ea089fd | |||
4b25f6eafc | |||
c1e807bc74 | |||
69da5afffe | |||
1669ac8576 | |||
6e6c349866 | |||
5207029462 | |||
53aec6372d | |||
a7d7e59028 | |||
0beb1f0418 | |||
2644f6fd70 | |||
585fec4e3e | |||
682abc126a | |||
a9f3f77bd5 | |||
4703721c5c | |||
aff1ba7b6d | |||
9eb7197035 | |||
462a86b31d | |||
cbce4c1ec1 | |||
aee19694b5 | |||
f3b1ef741a | |||
c35a4a8236 | |||
67b8386cd0 | |||
f67edc39e1 | |||
6f0f344eb4 | |||
3a39e44c34 | |||
cff5f1e5e1 | |||
b7bab92d5d | |||
75dd0fec92 | |||
3619532124 | |||
ce62fd1043 | |||
c5bac99d8e | |||
f7146e3b14 | |||
18ba90567c | |||
2e9da55df7 | |||
da10a34d64 | |||
764a6c86cd | |||
6059ce9e7b | |||
4368bea2c2 | |||
9dd6bbca90 | |||
d5bb99570c | |||
e1260a5ea1 | |||
02f2c5be4f | |||
ce04f6c27e | |||
80d4dd914d | |||
7f82b2e73c | |||
ac8646a4e7 | |||
7505302875 | |||
adc6bbca14 | |||
86f98148c6 | |||
f623b98acc | |||
3be1213b3b | |||
09007b922e | |||
f6231370b9 | |||
449b93ce41 | |||
764c8dedd8 | |||
9bfd20ef0c | |||
0289c5010f | |||
1733b8609b | |||
d5c3365fdb | |||
0ba4814275 | |||
fca410ec82 | |||
4f09c2da9a | |||
57ef9c4ea0 | |||
b7695cc854 | |||
fd8b8b926a | |||
b91ec527d1 | |||
7369d906b5 | |||
45fee77426 | |||
b12cba893e | |||
09d1698647 | |||
83c05c6c89 | |||
a08de54ca1 | |||
cb5fa4ce34 | |||
fb32c84dc2 | |||
4060b3c916 | |||
7abfd627e4 | |||
0fbc3df247 | |||
bc9c00d3a1 | |||
8d75b5ec6e | |||
c1aa1948b4 | |||
8c110ebf52 | |||
abb5be53aa | |||
af0fb80e45 | |||
688192504f | |||
b8e5dbec8d | |||
bcb5365d08 | |||
037d1993c8 | |||
2287ddc420 | |||
fde751a25f | |||
79006cfb99 | |||
de398901f3 | |||
bea429d6ac | |||
e818120986 | |||
56173d4959 | |||
7c837d041e | |||
473c81f9a4 | |||
ba9abca5cf | |||
15567a7dde | |||
e2695d49a1 | |||
a87e6858bf | |||
e864de5a24 | |||
5469e6ec80 | |||
4898016388 | |||
e0fab75c69 | |||
6480a39cdb | |||
6f05d5d136 | |||
96150fe230 | |||
0892a1534a | |||
1bac60e054 | |||
328e568ab3 | |||
c68389359e | |||
e03e0f44cc | |||
1e04d34645 | |||
187ecc54e5 | |||
ed7cf34e76 | |||
aaf4087c96 | |||
240db88661 | |||
913a7d7b75 | |||
bdc8726791 | |||
1c986519f6 | |||
defc363f01 | |||
ef66fb43cc | |||
69723f6b0b | |||
c32137e29a | |||
03cf73be6e | |||
be7349661f | |||
5186385b9f | |||
002786d073 | |||
4d246540c1 | |||
35b97ec0fe | |||
d2688532af | |||
e1d75d8328 | |||
0f85713483 | |||
c3cdafce13 | |||
b96b434a3e | |||
0ea5f7de84 | |||
0c7997f6c0 | |||
90ce866869 | |||
ad99a2034d | |||
4ff814f0fd | |||
896277b62a | |||
b0365e3b06 | |||
8bd71a08af | |||
1903016f13 | |||
443f14d26c | |||
f1feffb4bb | |||
61b349c6cc | |||
7a98ab0c2d | |||
5de05fe4eb | |||
50943e0b11 | |||
f64419c643 | |||
a0f7a312e5 | |||
f8726e6012 | |||
e41da48b1a | |||
a434ecac18 | |||
5ae129b0f5 | |||
a2acac255d | |||
c1b1d8c079 | |||
e422acc92f | |||
705ed5ac80 | |||
1dd1805ae0 | |||
e858b30994 | |||
8a56d71c51 | |||
d34c465787 | |||
cbf37dd747 | |||
f9cfb248d3 | |||
9be880aeaa | |||
a4bb41d585 | |||
c3b09b01e5 | |||
12b862c568 | |||
54f9f984f1 | |||
5dbc58d44b | |||
e7f9fbca96 | |||
8d40dbb841 | |||
cea8aa0c12 | |||
16a7a6c52d | |||
597b6fcf4c | |||
5eb6b90ed4 | |||
48c323c1a1 | |||
3d57b38808 | |||
ae8baddbdd | |||
67e4abe4d1 | |||
57f1ccced8 | |||
1e95bff7ff | |||
0f253ecc19 | |||
a5e096dc00 | |||
074ddf8a8b | |||
182cbe698f | |||
982eb371ad | |||
2786f856f7 | |||
48b080dc26 | |||
71beeb46f1 | |||
060a0489e1 | |||
ae49b246cd | |||
27c37eb74b | |||
cd708fa294 | |||
8ec0392852 | |||
27a5e62d9a | |||
aeaad4aa72 | |||
256a000d61 | |||
c78ed9a5d0 | |||
bded10211a | |||
25ac6cf1e9 | |||
9a2547a6c2 | |||
7968c7af4a | |||
4b94c470c3 | |||
e1b5a25ddd | |||
95af86c776 | |||
02b5583712 | |||
2f4d757a1a | |||
3c7a67783f | |||
4500e85a40 | |||
ce955095fd | |||
00b861531e | |||
fad5b97a2e | |||
aa639596d4 | |||
1ee41f4f14 | |||
bf8c2d28bf | |||
dbb840d51c | |||
ba772be869 | |||
70da1c3c00 | |||
8e68bbc91f | |||
0af8c4aa28 | |||
a9114caf9e | |||
3c81264024 | |||
0330b39f2e | |||
a7dcced08b | |||
c453a35763 | |||
d97248c6ec | |||
9fbc4e8383 | |||
57bebc92c7 | |||
5939e9dd0e | |||
0665869c30 | |||
199b27d63a | |||
2b28434712 | |||
388860d51e | |||
8b7c459855 | |||
83409b0118 | |||
c1cd90dff6 | |||
01fb897180 | |||
716c323b28 | |||
55dbf8f8bb | |||
85e42980ec | |||
3dee532ea2 | |||
3aac48d2bf | |||
ee33d33738 | |||
605f682356 | |||
a0a775996e | |||
532acf9d86 | |||
cbc3c2f3e7 | |||
556e12c964 | |||
813a865f62 | |||
c495aa97ac | |||
2d375b1690 | |||
e7e389e843 | |||
8679749e0f | |||
6d8e0cec70 | |||
5091eecedf | |||
75bfbb88ae | |||
e5cbbc9019 | |||
7ab1d2aaa4 | |||
e62accc4b3 | |||
03e071d5ee | |||
d83ba3bfd3 | |||
3e2c89cac7 | |||
e3d159d6a3 | |||
afa9b5a402 | |||
b8555247f2 | |||
de8462429b | |||
5fd0d3626a | |||
9dcc689491 | |||
35f307200d | |||
afb5366dd7 | |||
1e6278abdf | |||
6769e84e62 | |||
71b0a9a5fa | |||
418e38de31 | |||
56a4c47948 | |||
c67ad164ce | |||
6374fd5adf | |||
cc13e9c164 | |||
bb90800945 | |||
6d4bff2b4f | |||
92f560b69f | |||
a318f12352 | |||
32e3a57bd7 | |||
dd27802056 | |||
bd4e1953e3 | |||
68e4368ae3 | |||
51ba380cf0 | |||
4eae1ed8d2 | |||
3d290114fa | |||
3f87e9e4b4 | |||
6d5cb6a951 | |||
8d3be8df67 | |||
90509f2a23 | |||
73f84a2d81 | |||
cea7325427 | |||
cffa0a2b80 | |||
7579fc3b8c | |||
6601cd55e0 |
@ -1,6 +1,8 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
extends: "eslint-config-reforis",
|
extends: ["eslint-config-reforis", "prettier"],
|
||||||
|
plugins: ["prettier"],
|
||||||
rules: {
|
rules: {
|
||||||
|
"prettier/prettier": ["error"],
|
||||||
"import/prefer-default-export": "off",
|
"import/prefer-default-export": "off",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -1,44 +1,44 @@
|
|||||||
image: node:8-alpine
|
image: node:16-alpine
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
- build
|
- build
|
||||||
- publish
|
- publish
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- apk add make
|
- apk add make
|
||||||
- npm install
|
- npm install
|
||||||
|
|
||||||
test:
|
test:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- make test
|
- make test
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- make lint
|
- make lint
|
||||||
|
|
||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- make pack
|
- make pack
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- dist/foris-*.tgz
|
- dist/foris-*.tgz
|
||||||
|
|
||||||
publish_beta:
|
publish_beta:
|
||||||
stage: publish
|
stage: publish
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- dev
|
- dev
|
||||||
script:
|
script:
|
||||||
- make publish-beta
|
- make publish-beta
|
||||||
|
|
||||||
publish_latest:
|
publish_latest:
|
||||||
stage: publish
|
stage: publish
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- master
|
- master
|
||||||
script:
|
script:
|
||||||
- make publish-latest
|
- make publish-latest
|
||||||
|
11
.prettierrc
Normal file
11
.prettierrc
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"singleQuote": false,
|
||||||
|
"printWidth": 80,
|
||||||
|
"proseWrap": "always",
|
||||||
|
"tabWidth": 4,
|
||||||
|
"useTabs": false,
|
||||||
|
"trailingComma": "es5",
|
||||||
|
"bracketSpacing": true,
|
||||||
|
"jsxBracketSameLine": false,
|
||||||
|
"semi": true
|
||||||
|
}
|
3
.weblate
Normal file
3
.weblate
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[weblate]
|
||||||
|
url = https://hosted.weblate.org/api/
|
||||||
|
translation = turris/foris-js
|
95
Makefile
95
Makefile
@ -1,20 +1,30 @@
|
|||||||
.PHONY: all install-js watch-js build-js collect-files pack publish-beta publish-latest lint test test-js-update-snapshots create-messages update-messages docs docs-watch clean
|
# Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
#
|
||||||
|
# This is free software, licensed under the GNU General Public License v3.
|
||||||
|
# See /LICENSE for more information.
|
||||||
|
|
||||||
DEV_PYTHON=python3.7
|
PROJECT="Foris JS"
|
||||||
|
# Retrieve Foris JS version from package.json
|
||||||
|
VERSION= $(shell sed -En "s/.*version['\"]: ['\"](.+)['\"].*/\1/p" package.json)
|
||||||
|
COPYRIGHT_HOLDER="CZ.NIC, z.s.p.o. (https://www.nic.cz/)"
|
||||||
|
MSGID_BUGS_ADDRESS="tech.support@turris.cz"
|
||||||
|
|
||||||
|
DEV_PYTHON=python3
|
||||||
VENV_NAME?=venv
|
VENV_NAME?=venv
|
||||||
VENV_BIN=$(shell pwd)/$(VENV_NAME)/bin
|
VENV_BIN=$(shell pwd)/$(VENV_NAME)/bin
|
||||||
|
|
||||||
|
.PHONY: all
|
||||||
all:
|
all:
|
||||||
@echo "make install-js"
|
@echo "make install-js"
|
||||||
@echo " Install dependencies"
|
@echo " Install npm dependencies."
|
||||||
@echo "make watch-js"
|
@echo "make lint"
|
||||||
@echo " Compile JS in watch mode."
|
@echo " Run linter on the project."
|
||||||
@echo "make build-js"
|
@echo "make test"
|
||||||
@echo " Compile JS."
|
@echo " Run tests on the project."
|
||||||
@echo "make lint-js"
|
@echo "make test-js-watch"
|
||||||
@echo " Run linter"
|
@echo " Run tests on the project in watch mode."
|
||||||
@echo "make test-js"
|
@echo "make test-js-update-snapshots"
|
||||||
@echo " Run tests"
|
@echo " Update snapshots."
|
||||||
@echo "make create-messages"
|
@echo "make create-messages"
|
||||||
@echo " Create locale messages (.pot)."
|
@echo " Create locale messages (.pot)."
|
||||||
@echo "make update-messages"
|
@echo "make update-messages"
|
||||||
@ -26,46 +36,93 @@ all:
|
|||||||
@echo "make clean"
|
@echo "make clean"
|
||||||
@echo " Remove python artifacts and virtualenv."
|
@echo " Remove python artifacts and virtualenv."
|
||||||
|
|
||||||
|
|
||||||
|
# Preparation
|
||||||
|
|
||||||
|
.PHONY: venv
|
||||||
venv: $(VENV_NAME)/bin/activate
|
venv: $(VENV_NAME)/bin/activate
|
||||||
$(VENV_NAME)/bin/activate:
|
$(VENV_NAME)/bin/activate:
|
||||||
test -d $(VENV_NAME) || $(DEV_PYTHON) -m virtualenv -p $(DEV_PYTHON) $(VENV_NAME)
|
test -d $(VENV_NAME) || $(DEV_PYTHON) -m virtualenv -p $(DEV_PYTHON) $(VENV_NAME)
|
||||||
$(VENV_BIN)/$(DEV_PYTHON) -m pip install -r requirements.txt
|
$(VENV_BIN)/$(DEV_PYTHON) -m pip install -r requirements.txt
|
||||||
touch $(VENV_NAME)/bin/activate
|
touch $(VENV_NAME)/bin/activate
|
||||||
|
|
||||||
|
|
||||||
|
# Installation
|
||||||
|
|
||||||
|
.PHONY: install-js
|
||||||
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
|
|
||||||
|
|
||||||
|
# Publishing
|
||||||
|
|
||||||
|
.PHONY: collect-files
|
||||||
collect-files:
|
collect-files:
|
||||||
sh scripts/collect_files.sh
|
sh scripts/collect_files.sh
|
||||||
|
|
||||||
|
.PHONY: pack
|
||||||
pack: collect-files
|
pack: collect-files
|
||||||
cd dist && npm pack
|
cd dist && npm pack
|
||||||
|
|
||||||
|
.PHONY: publish-beta
|
||||||
publish-beta: collect-files
|
publish-beta: collect-files
|
||||||
sh scripts/publish.sh beta
|
sh scripts/publish.sh beta
|
||||||
|
|
||||||
|
.PHONY: publish-latest
|
||||||
publish-latest: collect-files
|
publish-latest: collect-files
|
||||||
sh scripts/publish.sh latest
|
sh scripts/publish.sh latest
|
||||||
|
|
||||||
|
|
||||||
|
# Linting
|
||||||
|
|
||||||
|
.PHONY: lint
|
||||||
lint:
|
lint:
|
||||||
npm run lint
|
npm run lint
|
||||||
|
|
||||||
|
.PHONY: lint-js-fix
|
||||||
|
lint-js-fix:
|
||||||
|
npm run lint:fix
|
||||||
|
|
||||||
|
|
||||||
|
# Testing
|
||||||
|
|
||||||
|
.PHONY: test
|
||||||
test:
|
test:
|
||||||
npm test
|
npm test
|
||||||
|
|
||||||
|
.PHONY: test-js-watch
|
||||||
|
test-js-watch:
|
||||||
|
cd $(JS_DIR); npm test -- --watch
|
||||||
|
|
||||||
|
.PHONY: test-js-update-snapshots
|
||||||
test-js-update-snapshots:
|
test-js-update-snapshots:
|
||||||
npm test -- -u
|
npm test -- -u
|
||||||
|
|
||||||
create-messages: venv
|
|
||||||
$(VENV_BIN)/pybabel extract -F babel.cfg -o ./translations/forisjs.pot .
|
|
||||||
update-messages: venv
|
|
||||||
$(VENV_BIN)/pybabel update -i ./translations/forisjs.pot -d ./translations -D forisjs
|
|
||||||
|
|
||||||
|
# Translations
|
||||||
|
|
||||||
|
.PHONY: create-messages
|
||||||
|
create-messages: venv
|
||||||
|
$(VENV_BIN)/pybabel extract -F babel.cfg -o ./translations/forisjs.pot . --project=$(PROJECT) --version=$(VERSION) --copyright-holder=$(COPYRIGHT_HOLDER) --msgid-bugs-address=$(MSGID_BUGS_ADDRESS)
|
||||||
|
|
||||||
|
.PHONY: update-messages
|
||||||
|
update-messages: venv
|
||||||
|
$(VENV_BIN)/pybabel update -i ./translations/forisjs.pot -d ./translations -D forisjs --update-header-comment
|
||||||
|
|
||||||
|
|
||||||
|
# Documentation
|
||||||
|
|
||||||
|
.PHONY: docs
|
||||||
docs:
|
docs:
|
||||||
npm run-script docs
|
npm run-script docs
|
||||||
|
|
||||||
|
.PHONY: docs-watch
|
||||||
docs-watch:
|
docs-watch:
|
||||||
npm run-script docs:watch
|
npm run-script docs:watch
|
||||||
|
|
||||||
|
|
||||||
|
# Other
|
||||||
|
|
||||||
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -rf node_modules dist
|
rm -rf node_modules dist
|
||||||
|
38
README.md
38
README.md
@ -1,4 +1,5 @@
|
|||||||
# foris-js
|
# foris-js
|
||||||
|
|
||||||
Set of utils and common React elements for reForis.
|
Set of utils and common React elements for reForis.
|
||||||
|
|
||||||
## Publishing package
|
## Publishing package
|
||||||
@ -6,13 +7,46 @@ Set of utils and common React elements for reForis.
|
|||||||
### Beta versions
|
### Beta versions
|
||||||
|
|
||||||
Each commit to `dev` branch will result in publishing a new version of library
|
Each commit to `dev` branch will result in publishing a new version of library
|
||||||
tagged `beta`. Versions names are based on commit SHA, e.g.
|
tagged `beta`. Versions names are based on commit SHA, e.g.
|
||||||
`foris@0.1.0-beta.d9073aa4`.
|
`foris@0.1.0-beta.d9073aa4`.
|
||||||
|
|
||||||
### Preparing a release
|
### Preparing a release
|
||||||
|
|
||||||
1. Crete a merge request to `dev` branch with version bumped
|
1. Crete a merge request to `dev` branch with version bumped
|
||||||
2. When merging add `[skip ci]` to commit message to prevent publishing
|
2. When merging add `[skip ci]` to commit message to prevent publishing
|
||||||
unnecessary version
|
unnecessary version
|
||||||
3. Create a merge request from `dev` to `master` branch
|
3. Create a merge request from `dev` to `master` branch
|
||||||
4. New version should be published automatically
|
4. New version should be published automatically
|
||||||
|
|
||||||
|
## Manually managed dependencies
|
||||||
|
|
||||||
|
Because of `<ForisForm />` component it's required to use exposed
|
||||||
|
`ReactRouterDOM` object from `react-router-dom` library. `ReactRouterDOM` is
|
||||||
|
exposed by
|
||||||
|
[reForis](https://gitlab.labs.nic.cz/turris/reforis/reforis/blob/master/js/webpack.config.js).
|
||||||
|
It can be done by following steps:
|
||||||
|
|
||||||
|
1. Setting `react-router-dom` as `peerDependencies` and `devDependencies` in
|
||||||
|
`package.json`.
|
||||||
|
2. Adding the following rules to `externals` in `webpack.conf.js` of the plugin:
|
||||||
|
|
||||||
|
```js
|
||||||
|
externals: {
|
||||||
|
...
|
||||||
|
"react-router-dom": "ReactRouterDOM",
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Docs
|
||||||
|
|
||||||
|
Build or watch docs to get more info about library:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make docs
|
||||||
|
```
|
||||||
|
|
||||||
|
or
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make docs-watch
|
||||||
|
```
|
||||||
|
@ -1,25 +1,4 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
presets: [
|
presets: ["@babel/preset-env", "@babel/preset-react"],
|
||||||
"@babel/preset-env",
|
plugins: ["@babel/plugin-transform-runtime"],
|
||||||
"@babel/preset-react",
|
|
||||||
],
|
|
||||||
plugins: [
|
|
||||||
"@babel/plugin-transform-runtime",
|
|
||||||
"@babel/plugin-syntax-export-default-from",
|
|
||||||
["module-resolver", {
|
|
||||||
root: ["./src"],
|
|
||||||
alias: {
|
|
||||||
test: "./test",
|
|
||||||
underscore: "lodash",
|
|
||||||
},
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
env: {
|
|
||||||
development: {
|
|
||||||
ignore: ["**/__tests__/**", "**/__mocks__/**"],
|
|
||||||
},
|
|
||||||
test: {
|
|
||||||
ignore: [],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
36
docs/components/Logo.js
Normal file
36
docs/components/Logo.js
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
import Styled from "rsg-components/Styled";
|
||||||
|
import logo from "./logo.svg";
|
||||||
|
|
||||||
|
const styles = ({ fontFamily }) => ({
|
||||||
|
logo: {
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
margin: 0,
|
||||||
|
fontFamily: fontFamily.base,
|
||||||
|
fontSize: 18,
|
||||||
|
fontWeight: "normal",
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
height: "1.3em",
|
||||||
|
marginLeft: "-0.2em",
|
||||||
|
marginRight: "0.2em",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export function LogoRenderer({ classes, children }) {
|
||||||
|
return (
|
||||||
|
<h1 className={classes.logo}>
|
||||||
|
<img className={classes.image} src={logo} alt="React logo" />
|
||||||
|
{children}
|
||||||
|
</h1>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
LogoRenderer.propTypes = {
|
||||||
|
classes: PropTypes.object.isRequired,
|
||||||
|
children: PropTypes.node,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Styled(styles)(LogoRenderer);
|
3
docs/components/logo.svg
Normal file
3
docs/components/logo.svg
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="1000" height="1000">
|
||||||
|
<path d="M288.258 240.0394L717.5586-.44c.803 62.277-1.8207 124.502-1.4996 186.7266 1.8208 7.6343-7.2288 10.1966-12.102 13.4908L286.4375 432.1518l1.8206-192.1124zm2.284 277.645L711 278.3176l-.8416 192.7742L457.357 614.514l-1.842 289.03-167.7097 95.8926 2.7365-481.753z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 349 B |
25
docs/development.md
Normal file
25
docs/development.md
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
Sooner or later, you will face with situation when you want/need to make some
|
||||||
|
changes in the library. Then the most important tool for you it's the
|
||||||
|
[`npm link`](https://docs.npmjs.com/cli/link).
|
||||||
|
|
||||||
|
Please, notice that it will not work if you link the library just from the root
|
||||||
|
of the repo. It happens due to the location of sources `./src`. You need to pack
|
||||||
|
the library first, `make pack` and then link it from the `./dist` directory.
|
||||||
|
|
||||||
|
Yeah, it's not such a comfortable solution for development. But it can be fixed
|
||||||
|
by writing a small script similar to making a pack but by linking every file and
|
||||||
|
directory from `./src` to the same directory and linking then from it. Notice
|
||||||
|
that you need to link a `package.json` and a `package-lock.json` as well.
|
||||||
|
|
||||||
|
So step by step:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make pack;
|
||||||
|
cd dist;
|
||||||
|
npm link;
|
||||||
|
|
||||||
|
cd $project_dir/js # Navigate to JS directory of the project where you want to link the library
|
||||||
|
npm link foris
|
||||||
|
```
|
||||||
|
|
||||||
|
And that's it ;)
|
4
docs/forisjs-npm.svg
Normal file
4
docs/forisjs-npm.svg
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" fill="white">
|
||||||
|
<path d="M49.5 171.722222222222h400v133.333333333333h-200v22.222222222223h-88.888888888889v-22.222222222223H49.5V171.722222222222zm22.222222222222 111.111111111111h44.444444444445v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-88.888888888889H71.722222222222v88.888888888889zm111.111111111111-88.888888888889v111.111111111111h44.444444444445v-22.222222222222h44.444444444444v-88.888888888889h-88.888888888889zm44.444444444445 22.222222222222H249.5v44.444444444445h-22.222222222222v-44.444444444445zm66.666666666666-22.222222222222v88.888888888889h44.444444444445v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-66.666666666667h22.222222222222v66.666666666667h22.222222222223v-88.888888888889H293.944444444444z" fill="#cb3837" />
|
||||||
|
<path d="M71.722222222222 282.833333333333h44.444444444444v-66.666666666667h22.222222222223v66.666666666667h22.222222222222v-88.888888888889H71.722222222222zm111.111111111111-88.888888888889v111.111111111111h44.444444444444v-22.222222222222h44.444444444445v-88.888888888889h-88.888888888889zM249.5 260.611111111111h-22.222222222223v-44.444444444445H249.5v44.444444444445zm44.444444444444-66.666666666667v88.888888888889h44.444444444444v-66.666666666667h22.222222222223v66.666666666667h22.222222222222v-66.666666666667h22.222222222222v66.666666666667h22.222222222222v-88.888888888889z" />
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.4 KiB |
@ -1 +0,0 @@
|
|||||||
Foris JS library is set of componets and utils for Foris JS application and plugins.
|
|
37
docs/introduction.md
Normal file
37
docs/introduction.md
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
Welcome! This is the official documentation for Foris JS.
|
||||||
|
|
||||||
|
## What Foris JS is
|
||||||
|
|
||||||
|
Foris JS library is a set of components and utils for reForis application and
|
||||||
|
plugins.
|
||||||
|
|
||||||
|
Please notice that all of these components or utils are used in reForis and
|
||||||
|
plugins. If you want to study them by example, I recommend you to full-text
|
||||||
|
search those repositories.
|
||||||
|
|
||||||
|
# Installation
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
Please make sure that [Node.js](https://nodejs.org/en/) is installed on your
|
||||||
|
system.
|
||||||
|
|
||||||
|
The current Long Term Support (LTS) release is an ideal starting point, see
|
||||||
|
[here](https://github.com/nodejs/Release#release-schedule).
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
To install the latest release:
|
||||||
|
|
||||||
|
```plain
|
||||||
|
npm install foris
|
||||||
|
```
|
||||||
|
|
||||||
|
To install a specific version:
|
||||||
|
|
||||||
|
```plain
|
||||||
|
npm install foris@version
|
||||||
|
```
|
||||||
|
|
||||||
|
<a target="_blank" href="https://www.npmjs.com/package/foris">Check
|
||||||
|
on<img width="100px" src="./docs/forisjs-npm.svg"></a>
|
@ -12,10 +12,13 @@ module.exports = {
|
|||||||
"<rootDir>/src/testUtils",
|
"<rootDir>/src/testUtils",
|
||||||
"<rootDir>/src/",
|
"<rootDir>/src/",
|
||||||
],
|
],
|
||||||
|
moduleNameMapper: {
|
||||||
|
"\\.(css|less)$": "<rootDir>/src/__mocks__/styleMock.js",
|
||||||
|
},
|
||||||
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",
|
||||||
@ -24,8 +27,5 @@ module.exports = {
|
|||||||
globals: {
|
globals: {
|
||||||
TZ: "utc",
|
TZ: "utc",
|
||||||
},
|
},
|
||||||
transform: {
|
transformIgnorePatterns: ["node_modules/(?!(react-datetime)/)"],
|
||||||
"^.+\\.js$": "babel-jest",
|
|
||||||
"^.+\\.css$": "jest-transform-css",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
46407
package-lock.json
generated
46407
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
140
package.json
140
package.json
@ -1,74 +1,70 @@
|
|||||||
{
|
{
|
||||||
"name": "foris",
|
"name": "foris",
|
||||||
"version": "2.0.0",
|
"version": "5.6.0",
|
||||||
"description": "Set of components and utils for Foris and its plugins.",
|
"description": "Foris JS library is a set of components and utils for reForis application and plugins.",
|
||||||
"author": "CZ.NIC, z.s.p.o.",
|
"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.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.21.1",
|
||||||
"jest-transform-css": "^2.0.0",
|
"immutability-helper": "3.0.1",
|
||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
"moment-timezone": "^0.5.25",
|
"qrcode.react": "^1.0.1",
|
||||||
"prop-types": "^15.7.2",
|
"react-datetime": "^3.1.1",
|
||||||
"react-datetime": "^2.16.3",
|
"react-uid": "^2.2.0"
|
||||||
"react-router": "^5.0.1",
|
},
|
||||||
"react-uid": "^2.2.0"
|
"peerDependencies": {
|
||||||
},
|
"bootstrap": "4.4.1",
|
||||||
"peerDependencies": {
|
"prop-types": "15.8.1",
|
||||||
"immutability-helper": "3.0.1",
|
"react": "16.9.0",
|
||||||
"react": "16.9.0",
|
"react-dom": "16.9.0",
|
||||||
"react-dom": "16.9.0"
|
"react-router-dom": "^5.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/cli": "^7.4.4",
|
"@babel/cli": "^7.12.10",
|
||||||
"@babel/core": "^7.4.5",
|
"@babel/core": "^7.9.0",
|
||||||
"@babel/plugin-proposal-class-properties": "^7.4.4",
|
"@babel/plugin-transform-runtime": "^7.9.0",
|
||||||
"@babel/plugin-syntax-export-default-from": "^7.2.0",
|
"@babel/preset-env": "^7.9.0",
|
||||||
"@babel/plugin-transform-runtime": "^7.4.4",
|
"@babel/preset-react": "^7.9.4",
|
||||||
"@babel/preset-env": "^7.4.5",
|
"@fortawesome/fontawesome-free": "^5.13.0",
|
||||||
"@babel/preset-react": "^7.0.0",
|
"@testing-library/react": "^8.0.9",
|
||||||
"@fortawesome/fontawesome-free": "^5.11.2",
|
"babel-loader": "^8.1.0",
|
||||||
"@testing-library/react": "^8.0.9",
|
"babel-polyfill": "^6.26.0",
|
||||||
"babel-jest": "^24.8.0",
|
"bootstrap": "^4.5.0",
|
||||||
"babel-loader": "^8.0.6",
|
"css-loader": "^5.2.4",
|
||||||
"babel-plugin-module-resolver": "^3.2.0",
|
"eslint": "^6.8.0",
|
||||||
"babel-plugin-react-transform": "^3.0.0",
|
"eslint-config-prettier": "^6.11.0",
|
||||||
"babel-polyfill": "^6.26.0",
|
"eslint-config-reforis": "^1.0.0",
|
||||||
"bootstrap": "^4.3.1",
|
"eslint-plugin-prettier": "^3.1.4",
|
||||||
"copy-webpack-plugin": "^5.0.4",
|
"file-loader": "^6.0.0",
|
||||||
"css-loader": "^3.2.0",
|
"jest": "^25.2.0",
|
||||||
"eslint": "^6.1.0",
|
"jest-mock-axios": "^3.2.0",
|
||||||
"eslint-config-reforis": "^1.0.0",
|
"moment-timezone": "^0.5.34",
|
||||||
"file-loader": "^4.2.0",
|
"prettier": "2.0.5",
|
||||||
"immutability-helper": "3.0.1",
|
"prop-types": "15.8.1",
|
||||||
"jest": "^24.8.0",
|
"react": "16.9.0",
|
||||||
"jest-mock-axios": "^3.0.0",
|
"react-dom": "16.9.0",
|
||||||
"moment": "^2.24.0",
|
"react-router-dom": "^5.1.2",
|
||||||
"moment-timezone": "^0.5.25",
|
"react-styleguidist": "^11.2.0",
|
||||||
"react": "16.9.0",
|
"snapshot-diff": "^0.7.0",
|
||||||
"react-dom": "16.9.0",
|
"style-loader": "^1.2.1",
|
||||||
"react-styleguidist": "^9.1.16",
|
"webpack": "^5.68.0"
|
||||||
"snapshot-diff": "^0.5.1",
|
},
|
||||||
"style-loader": "^1.0.0",
|
"scripts": {
|
||||||
"webpack": "^4.41.0"
|
"lint": "eslint src",
|
||||||
},
|
"lint:fix": "eslint --fix src",
|
||||||
"scripts": {
|
"test": "jest",
|
||||||
"build": "rm -rf dist; babel src --out-dir dist --source-maps inline --copy-files",
|
"test:watch": "jest --watch",
|
||||||
"build:watch": "babel src --verbose --watch --out-dir dist --source-maps inline --copy-files",
|
"test:coverage": "jest --coverage --colors",
|
||||||
"lint": "eslint src",
|
"docs": "npx styleguidist build ",
|
||||||
"test": "jest",
|
"docs:watch": "styleguidist server"
|
||||||
"test:watch": "jest --watch",
|
}
|
||||||
"test:coverage": "jest --coverage --colors",
|
|
||||||
"docs": "npx styleguidist build ",
|
|
||||||
"docs:watch": "styleguidist server"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -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__
|
||||||
|
@ -6,8 +6,7 @@ then
|
|||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
cd dist
|
cd dist
|
||||||
# Need to replace "_" with "-" as GitLab CI won't accept secret vars with "-"
|
echo "//registry.npmjs.org/:_authToken=$(echo "$NPM_TOKEN")" > .npmrc
|
||||||
echo "//registry.npmjs.org/:_authToken=$(echo "$NPM_TOKEN" | tr _ -)" > .npmrc
|
|
||||||
echo "unsafe-perm = true" >> ~/.npmrc
|
echo "unsafe-perm = true" >> ~/.npmrc
|
||||||
if test "$1" = "beta"
|
if test "$1" = "beta"
|
||||||
then
|
then
|
||||||
|
8
src/__mocks__/styleMock.js
Normal file
8
src/__mocks__/styleMock.js
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = {};
|
145
src/api/hooks.js
145
src/api/hooks.js
@ -1,17 +1,19 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {
|
import { useCallback, useEffect, useReducer, useState } from "react";
|
||||||
useCallback, useEffect, useReducer, useState,
|
|
||||||
} from "react";
|
|
||||||
|
|
||||||
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";
|
||||||
|
|
||||||
const DATA_METHODS = ["POST", "PATCH", "PUT"];
|
const DATA_METHODS = ["POST", "PATCH", "PUT"];
|
||||||
@ -23,69 +25,83 @@ function createAPIHook(method) {
|
|||||||
data: null,
|
data: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
const sendRequest = useCallback(async ({ data, suffix } = {}) => {
|
const sendRequest = useCallback(
|
||||||
const headers = { ...HEADERS };
|
async ({ data, suffix } = {}) => {
|
||||||
if (contentType) {
|
const headers = { ...HEADERS };
|
||||||
headers["Content-Type"] = contentType;
|
if (contentType) {
|
||||||
}
|
headers["Content-Type"] = contentType;
|
||||||
|
|
||||||
dispatch({ type: API_ACTIONS.INIT });
|
|
||||||
try {
|
|
||||||
// Prepare request
|
|
||||||
const request = API_METHODS[method];
|
|
||||||
const config = {
|
|
||||||
timeout: TIMEOUT,
|
|
||||||
headers,
|
|
||||||
};
|
|
||||||
const url = suffix ? `${urlRoot}/${suffix}` : urlRoot;
|
|
||||||
|
|
||||||
// Make request
|
|
||||||
let result;
|
|
||||||
if (DATA_METHODS.includes(method)) {
|
|
||||||
result = await request(url, data, config);
|
|
||||||
} else {
|
|
||||||
result = await request(url, config);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process request result
|
dispatch({ type: API_ACTIONS.INIT });
|
||||||
dispatch({
|
try {
|
||||||
type: API_ACTIONS.SUCCESS,
|
// Prepare request
|
||||||
payload: result.data,
|
const request = API_METHODS[method];
|
||||||
});
|
const config = {
|
||||||
} catch (error) {
|
timeout: TIMEOUT,
|
||||||
dispatch({
|
headers,
|
||||||
type: API_ACTIONS.FAILURE,
|
};
|
||||||
status: error.response && error.response.status,
|
const url = suffix ? `${urlRoot}/${suffix}` : urlRoot;
|
||||||
payload: getErrorPayload(error),
|
|
||||||
});
|
// Make request
|
||||||
}
|
let result;
|
||||||
}, [urlRoot, contentType]);
|
if (DATA_METHODS.includes(method)) {
|
||||||
|
result = await request(url, data, config);
|
||||||
|
} else {
|
||||||
|
result = await request(url, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process request result
|
||||||
|
dispatch({
|
||||||
|
type: API_ACTIONS.SUCCESS,
|
||||||
|
payload: result.data,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
const errorPayload = getErrorPayload(error);
|
||||||
|
dispatch({
|
||||||
|
type: API_ACTIONS.FAILURE,
|
||||||
|
status: error.response && error.response.status,
|
||||||
|
payload: errorPayload,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[urlRoot, contentType]
|
||||||
|
);
|
||||||
return [state, sendRequest];
|
return [state, sendRequest];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function APIReducer(state, action) {
|
function APIReducer(state, action) {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
case API_ACTIONS.INIT:
|
case API_ACTIONS.INIT:
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
state: API_STATE.SENDING,
|
state: API_STATE.SENDING,
|
||||||
};
|
};
|
||||||
case API_ACTIONS.SUCCESS:
|
case API_ACTIONS.SUCCESS:
|
||||||
return {
|
return {
|
||||||
state: API_STATE.SUCCESS,
|
state: API_STATE.SUCCESS,
|
||||||
data: action.payload,
|
data: action.payload,
|
||||||
};
|
};
|
||||||
case API_ACTIONS.FAILURE:
|
case API_ACTIONS.FAILURE:
|
||||||
if (action.status === 403) {
|
if (action.status === 401) {
|
||||||
window.location.assign(ForisURLs.login);
|
window.location.reload();
|
||||||
}
|
}
|
||||||
return {
|
|
||||||
state: API_STATE.ERROR,
|
// Not an API error - should be rethrown.
|
||||||
data: action.payload,
|
if (
|
||||||
};
|
action.payload &&
|
||||||
default:
|
action.payload.stack &&
|
||||||
throw new Error();
|
action.payload.message
|
||||||
|
) {
|
||||||
|
throw action.payload;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
state: API_STATE.ERROR,
|
||||||
|
data: action.payload,
|
||||||
|
};
|
||||||
|
default:
|
||||||
|
throw new Error();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,11 +111,10 @@ const useAPIPatch = createAPIHook("PATCH");
|
|||||||
const useAPIPut = createAPIHook("PUT");
|
const useAPIPut = createAPIHook("PUT");
|
||||||
const useAPIDelete = createAPIHook("DELETE");
|
const useAPIDelete = createAPIHook("DELETE");
|
||||||
|
|
||||||
export {
|
export { useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete };
|
||||||
useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete,
|
|
||||||
};
|
|
||||||
|
|
||||||
export function useAPIPolling(endpoint, delay = 1000, until) { // delay ms
|
export function useAPIPolling(endpoint, delay = 1000, until) {
|
||||||
|
// delay ms
|
||||||
const [state, setState] = useState({ state: API_STATE.INIT });
|
const [state, setState] = useState({ state: API_STATE.INIT });
|
||||||
const [getResponse, get] = useAPIGet(endpoint);
|
const [getResponse, get] = useAPIGet(endpoint);
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
@ -11,9 +11,10 @@ export const HEADERS = {
|
|||||||
Accept: "application/json",
|
Accept: "application/json",
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
"X-CSRFToken": getCookie("_csrf_token"),
|
"X-CSRFToken": getCookie("_csrf_token"),
|
||||||
|
"X-Requested-With": "json",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const TIMEOUT = 5000;
|
export const TIMEOUT = 30500;
|
||||||
|
|
||||||
export const API_ACTIONS = {
|
export const API_ACTIONS = {
|
||||||
INIT: 1,
|
INIT: 1,
|
||||||
@ -43,8 +44,10 @@ function getCookie(name) {
|
|||||||
for (let i = 0; i < cookies.length; i++) {
|
for (let i = 0; i < cookies.length; i++) {
|
||||||
const cookie = cookies[i].trim();
|
const cookie = cookies[i].trim();
|
||||||
// Does this cookie string begin with the name we want?
|
// Does this cookie string begin with the name we want?
|
||||||
if (cookie.substring(0, name.length + 1) === (`${name}=`)) {
|
if (cookie.substring(0, name.length + 1) === `${name}=`) {
|
||||||
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
|
cookieValue = decodeURIComponent(
|
||||||
|
cookie.substring(name.length + 1)
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -54,7 +57,7 @@ function getCookie(name) {
|
|||||||
|
|
||||||
export function getErrorPayload(error) {
|
export function getErrorPayload(error) {
|
||||||
if (error.response) {
|
if (error.response) {
|
||||||
if (error.response.status === 403) {
|
if (error.response.status === 401) {
|
||||||
return _("The session is expired. Please log in again.");
|
return _("The session is expired. Please log in again.");
|
||||||
}
|
}
|
||||||
return getJSONErrorMessage(error);
|
return getJSONErrorMessage(error);
|
||||||
@ -65,9 +68,8 @@ export function getErrorPayload(error) {
|
|||||||
if (error.request) {
|
if (error.request) {
|
||||||
return _("No response received.");
|
return _("No response received.");
|
||||||
}
|
}
|
||||||
/* eslint no-console: "off" */
|
// Return original error because it's not directly related to API request/response.
|
||||||
console.error(error);
|
return error;
|
||||||
return _("An unknown error occurred. Check the console for more info.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getJSONErrorMessage(error) {
|
export function getJSONErrorMessage(error) {
|
||||||
|
@ -35,12 +35,20 @@ Alert.defaultProps = {
|
|||||||
type: ALERT_TYPES.DANGER,
|
type: ALERT_TYPES.DANGER,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function Alert({
|
export function Alert({ type, onDismiss, children }) {
|
||||||
type, onDismiss, children,
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<div className={`alert alert-dismissible alert-${type}`}>
|
<div
|
||||||
{onDismiss ? <button type="button" className="close" onClick={onDismiss}>×</button> : false}
|
className={`alert ${
|
||||||
|
onDismiss ? "alert-dismissible" : ""
|
||||||
|
} alert-${type}`}
|
||||||
|
>
|
||||||
|
{onDismiss ? (
|
||||||
|
<button type="button" className="close" onClick={onDismiss}>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
false
|
||||||
|
)}
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
Bootstrap alert component.
|
Bootstrap alert component.
|
||||||
```jsx
|
|
||||||
import {useState} from 'react';
|
|
||||||
|
|
||||||
function AlertExample(){
|
```jsx
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
function AlertExample() {
|
||||||
const [alert, setAlert] = useState(true);
|
const [alert, setAlert] = useState(true);
|
||||||
if (alert)
|
if (alert)
|
||||||
return <Alert
|
return (
|
||||||
type='warning'
|
<Alert type="warning" onDismiss={() => setAlert(false)}>
|
||||||
message='Some warning out there!'
|
Some warning out there!
|
||||||
onDismiss={()=>setAlert(false)}
|
</Alert>
|
||||||
/>;
|
);
|
||||||
return <button
|
return (
|
||||||
className='btn btn-secondary'
|
<button className="btn btn-secondary" onClick={() => setAlert(true)}>
|
||||||
onClick={()=>setAlert(true)}
|
Show alert again
|
||||||
>Show alert again</button>;
|
</button>
|
||||||
};
|
);
|
||||||
<AlertExample/>
|
}
|
||||||
|
<AlertExample />;
|
||||||
```
|
```
|
||||||
|
@ -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,
|
||||||
@ -30,20 +25,29 @@ 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-md-3 col-lg-2`;
|
||||||
|
}
|
||||||
|
|
||||||
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}
|
||||||
{" "}
|
|
||||||
{children}
|
{children}
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
|
@ -11,5 +11,7 @@ Can be used without parameters:
|
|||||||
Using loading spinner:
|
Using loading spinner:
|
||||||
|
|
||||||
```jsx
|
```jsx
|
||||||
<Button loading disabled>Loading...</Button>
|
<Button loading disabled>
|
||||||
|
Loading...
|
||||||
|
</Button>
|
||||||
```
|
```
|
||||||
|
@ -9,42 +9,38 @@ 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, disabled, ...props }) {
|
||||||
label, helpText, useDefaultSize, 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"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
id={uid}
|
id={uid}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
<label className="custom-control-label" htmlFor={uid}>
|
<label className="custom-control-label" htmlFor={uid}>
|
||||||
{label}
|
{label}
|
||||||
{helpText && <small className="form-text text-muted">{helpText}</small>}
|
{helpText && (
|
||||||
|
<small className="form-text text-muted">
|
||||||
|
{helpText}
|
||||||
|
</small>
|
||||||
|
)}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,16 +1,17 @@
|
|||||||
Checkbox with label Bootstrap component with predefined sizes and structure for using in foris forms.
|
Checkbox with label Bootstrap component with predefined sizes and structure for
|
||||||
|
using in foris forms.
|
||||||
All additional `props` are passed to the `<input type="checkbox">` HTML component.
|
|
||||||
|
|
||||||
|
All additional `props` are passed to the `<input type="checkbox">` HTML
|
||||||
|
component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [value, setValue] = useState(false);
|
const [value, setValue] = useState(false);
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
value={value}
|
value={value}
|
||||||
label="Some label"
|
label="Some label"
|
||||||
helpText="Read the small text!"
|
helpText="Read the small text!"
|
||||||
onChange={event =>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>;
|
||||||
```
|
```
|
||||||
|
60
src/bootstrap/CopyInput.js
Normal file
60
src/bootstrap/CopyInput.js
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React, { useState, useRef } from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
import { Input } from "./Input";
|
||||||
|
|
||||||
|
CopyInput.propTypes = {
|
||||||
|
/** Field label. */
|
||||||
|
label: PropTypes.string.isRequired,
|
||||||
|
/** Field value. */
|
||||||
|
value: PropTypes.string,
|
||||||
|
/** Help text message. */
|
||||||
|
helpText: PropTypes.string,
|
||||||
|
/** Disable input field */
|
||||||
|
disabled: PropTypes.bool,
|
||||||
|
/** Readonly input field */
|
||||||
|
readOnly: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
export function CopyInput({ value, ...props }) {
|
||||||
|
const inputTextRef = useRef();
|
||||||
|
const [isCopied, setIsCopied] = useState(false);
|
||||||
|
|
||||||
|
const handleCopyClick = async () => {
|
||||||
|
// Clipboard API works only in a secure (HTTPS) context.
|
||||||
|
if (navigator.clipboard) {
|
||||||
|
await navigator.clipboard.writeText(value);
|
||||||
|
} else {
|
||||||
|
// Fallback to the "classic" copy to clipboard implementation.
|
||||||
|
inputTextRef.current.focus();
|
||||||
|
inputTextRef.current.select();
|
||||||
|
document.execCommand("copy");
|
||||||
|
inputTextRef.current.blur();
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsCopied(true);
|
||||||
|
setTimeout(() => {
|
||||||
|
setIsCopied(false);
|
||||||
|
}, 1500);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Input type="text" value={value} ref={inputTextRef} {...props}>
|
||||||
|
<div className="input-group-append">
|
||||||
|
<button
|
||||||
|
className="btn btn-outline-secondary"
|
||||||
|
type="button"
|
||||||
|
onClick={handleCopyClick}
|
||||||
|
>
|
||||||
|
<span>{isCopied ? _("Copied!") : _("Copy")}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</Input>
|
||||||
|
);
|
||||||
|
}
|
17
src/bootstrap/CopyInput.md
Normal file
17
src/bootstrap/CopyInput.md
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
CopyInput Bootstrap component contains input with a label, predefined sizes, and
|
||||||
|
structure for use in ForisForm and the "Copy" button (copy to clipboard). It can
|
||||||
|
be used with `readOnly` and `disabled` parameters, please see an example.
|
||||||
|
|
||||||
|
All additional `props` are passed to the `<input type="text">` HTML component.
|
||||||
|
|
||||||
|
```js
|
||||||
|
import React, { useState } from "react";
|
||||||
|
const [value, setValue] = useState("Text to appear in clipboard.");
|
||||||
|
|
||||||
|
<CopyInput
|
||||||
|
label="Copy me"
|
||||||
|
value={value}
|
||||||
|
helpText="Read the small text!"
|
||||||
|
readOnly
|
||||||
|
/>;
|
||||||
|
```
|
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;
|
||||||
|
}
|
@ -7,9 +7,10 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import Datetime from "react-datetime/DateTime";
|
import Datetime from "react-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";
|
||||||
|
|
||||||
@ -37,14 +38,17 @@ const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
|
|||||||
const DEFAULT_TIME_FORMAT = "HH:mm:ss";
|
const DEFAULT_TIME_FORMAT = "HH:mm:ss";
|
||||||
|
|
||||||
export function DataTimeInput({
|
export function DataTimeInput({
|
||||||
value, onChange, isValidDate, dateFormat, timeFormat, children, ...props
|
value,
|
||||||
|
onChange,
|
||||||
|
isValidDate,
|
||||||
|
dateFormat,
|
||||||
|
timeFormat,
|
||||||
|
children,
|
||||||
|
...props
|
||||||
}) {
|
}) {
|
||||||
function renderInput(datetimeProps) {
|
function renderInput(datetimeProps) {
|
||||||
return (
|
return (
|
||||||
<Input
|
<Input {...props} {...datetimeProps}>
|
||||||
{...props}
|
|
||||||
{...datetimeProps}
|
|
||||||
>
|
|
||||||
{children}
|
{children}
|
||||||
</Input>
|
</Input>
|
||||||
);
|
);
|
||||||
@ -53,8 +57,12 @@ export function DataTimeInput({
|
|||||||
return (
|
return (
|
||||||
<Datetime
|
<Datetime
|
||||||
locale={ForisTranslations.locale}
|
locale={ForisTranslations.locale}
|
||||||
dateFormat={dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT}
|
dateFormat={
|
||||||
timeFormat={timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT}
|
dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT
|
||||||
|
}
|
||||||
|
timeFormat={
|
||||||
|
timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT
|
||||||
|
}
|
||||||
value={value}
|
value={value}
|
||||||
onChange={onChange}
|
onChange={onChange}
|
||||||
isValidDate={isValidDate}
|
isValidDate={isValidDate}
|
||||||
|
@ -1,25 +1,26 @@
|
|||||||
Adopted from `react-datetime/DateTime` datatime picker component.
|
Adopted from `react-datetime/DateTime` datatime picker component. It uses
|
||||||
It uses `momentjs` see example.
|
`momentjs` see example.
|
||||||
|
|
||||||
It requires `ForisTranslations.locale` to be defined in order to use right locale.
|
It requires `ForisTranslations.locale` to be defined in order to use right
|
||||||
|
locale.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
ForisTranslations={locale:'en'};
|
ForisTranslations = { locale: "en" };
|
||||||
|
|
||||||
import {useState, useEffect} from 'react';
|
import { useState, useEffect } from "react";
|
||||||
import moment from 'moment/moment';
|
import moment from "moment/moment";
|
||||||
|
|
||||||
const [dataTime, setDataTime] = useState(moment());
|
const [dataTime, setDataTime] = useState(moment());
|
||||||
const [error, setError] = useState();
|
const [error, setError] = useState();
|
||||||
useEffect(()=>{
|
useEffect(() => {
|
||||||
dataTime.isValid() ? setError(null) : setError('Invalid value!');
|
dataTime.isValid() ? setError(null) : setError("Invalid value!");
|
||||||
},[dataTime]);
|
}, [dataTime]);
|
||||||
|
|
||||||
<DataTimeInput
|
<DataTimeInput
|
||||||
label='Time to sleep'
|
label="Time to sleep"
|
||||||
value={dataTime}
|
value={dataTime}
|
||||||
error={error}
|
error={error}
|
||||||
helpText='Example helptext...'
|
helpText="Example helptext..."
|
||||||
onChange={value => setDataTime(value)}
|
onChange={(value) => setDataTime(value)}
|
||||||
/>
|
/>;
|
||||||
```
|
```
|
||||||
|
@ -21,11 +21,12 @@ DownloadButton.defaultProps = {
|
|||||||
className: "btn-primary",
|
className: "btn-primary",
|
||||||
};
|
};
|
||||||
|
|
||||||
export function DownloadButton({ href, className, children }) {
|
export function DownloadButton({ href, className, children, ...props }) {
|
||||||
return (
|
return (
|
||||||
<a
|
<a
|
||||||
href={href}
|
href={href}
|
||||||
className={`btn ${className}`.trim()}
|
className={`btn ${className}`.trim()}
|
||||||
|
{...props}
|
||||||
download
|
download
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
Hyperlink with apperance of a button.
|
Hyperlink with apperance of a button.
|
||||||
|
|
||||||
It has `download` attribute, which prevents closing WebSocket connection on Firefox. See [related issue](https://bugzilla.mozilla.org/show_bug.cgi?id=858538) for more details.
|
It has `download` attribute, which prevents closing WebSocket connection on
|
||||||
|
Firefox. See
|
||||||
|
[related issue](https://bugzilla.mozilla.org/show_bug.cgi?id=858538) for more
|
||||||
|
details.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
<DownloadButton href="example.zip">Download</DownloadButton>
|
<DownloadButton href="example.zip">Download</DownloadButton>
|
||||||
|
@ -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} />;
|
||||||
|
@ -1,18 +1,19 @@
|
|||||||
Bootstrap component of email input with label with predefined sizes and structure for using in foris forms.
|
Bootstrap component of email input with label with predefined sizes and
|
||||||
It use built-in browser email address checking. It's only meaningful using inside `<form>`.
|
structure for using in foris forms. It use built-in browser email address
|
||||||
|
checking. It's only meaningful using inside `<form>`.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="email">` HTML component.
|
All additional `props` are passed to the `<input type="email">` HTML component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [email, setEmail] = useState('Wrong email');
|
const [email, setEmail] = useState("Wrong email");
|
||||||
<form onSubmit={e=>e.preventDefault()}>
|
<form onSubmit={(e) => e.preventDefault()}>
|
||||||
<EmailInput
|
<EmailInput
|
||||||
value={email}
|
value={email}
|
||||||
label="Some label"
|
label="Some label"
|
||||||
helpText="Read the small text!"
|
helpText="Read the small text!"
|
||||||
onChange={event =>setEmail(event.target.value)}
|
onChange={(event) => setEmail(event.target.value)}
|
||||||
/>
|
/>
|
||||||
<button type="submit">Try to submit</button>
|
<button type="submit">Try to submit</button>
|
||||||
</form>
|
</form>;
|
||||||
```
|
```
|
||||||
|
@ -19,6 +19,8 @@ FileInput.propTypes = {
|
|||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
/** Email value. */
|
/** Email value. */
|
||||||
value: PropTypes.string,
|
value: PropTypes.string,
|
||||||
|
/** Allow selecting multiple files. */
|
||||||
|
multiple: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function FileInput({ ...props }) {
|
export function FileInput({ ...props }) {
|
||||||
|
@ -1,15 +1,48 @@
|
|||||||
Bootstrap component for file input. Includes label and has predefined sizes and structure for using in foris forms.
|
Bootstrap component for file input. Includes label and has predefined sizes and
|
||||||
|
structure for using in foris forms.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="file">` HTML component.
|
All additional `props` are passed to the `<input type="file">` HTML component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
|
|
||||||
const [files, setFiles] = useState([]);
|
const [files, setFiles] = useState([]);
|
||||||
|
|
||||||
<FileInput
|
// Note that files is not an array but FileList.
|
||||||
files={files}
|
const label = files.length === 1 ? files[0].name : "Choose file";
|
||||||
label="Some file"
|
|
||||||
helpText="Will be uploaded"
|
<form className="col">
|
||||||
onChange={event =>setFiles(event.target.files)}
|
<FileInput
|
||||||
/>
|
files={files}
|
||||||
|
label={label}
|
||||||
|
helpText="Will be uploaded"
|
||||||
|
onChange={(event) => setFiles(event.target.files)}
|
||||||
|
/>
|
||||||
|
</form>;
|
||||||
|
```
|
||||||
|
|
||||||
|
### FileInput with multiple files
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
const [files, setFiles] = useState([]);
|
||||||
|
|
||||||
|
// Note that files is not an array but FileList.
|
||||||
|
const label =
|
||||||
|
files.length > 0
|
||||||
|
? Array.from(files)
|
||||||
|
.map((file) => file.name)
|
||||||
|
.join(", ")
|
||||||
|
: "Choose files";
|
||||||
|
|
||||||
|
<form className="col">
|
||||||
|
<FileInput
|
||||||
|
files={files}
|
||||||
|
label={label}
|
||||||
|
helpText="Will be uploaded"
|
||||||
|
onChange={(event) => setFiles(event.target.files)}
|
||||||
|
multiple
|
||||||
|
/>
|
||||||
|
</form>;
|
||||||
```
|
```
|
||||||
|
@ -1,15 +1,59 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React from "react";
|
import React, { forwardRef } 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";
|
/** Base bootstrap input component. */
|
||||||
|
export const Input = forwardRef(
|
||||||
|
(
|
||||||
|
{
|
||||||
|
type,
|
||||||
|
label,
|
||||||
|
helpText,
|
||||||
|
error,
|
||||||
|
className,
|
||||||
|
children,
|
||||||
|
labelClassName,
|
||||||
|
groupClassName,
|
||||||
|
...props
|
||||||
|
},
|
||||||
|
ref
|
||||||
|
) => {
|
||||||
|
const uid = useUID();
|
||||||
|
|
||||||
|
const inputClassName = `form-control ${className || ""} ${
|
||||||
|
error ? "is-invalid" : ""
|
||||||
|
}`.trim();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="form-group">
|
||||||
|
<label className={labelClassName} htmlFor={uid}>
|
||||||
|
{label}
|
||||||
|
</label>
|
||||||
|
<div className={`input-group ${groupClassName || ""}`.trim()}>
|
||||||
|
<input
|
||||||
|
className={inputClassName}
|
||||||
|
type={type}
|
||||||
|
id={uid}
|
||||||
|
ref={ref}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
{error ? <div className="invalid-feedback">{error}</div> : null}
|
||||||
|
{helpText ? (
|
||||||
|
<small className="form-text text-muted">{helpText}</small>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
Input.propTypes = {
|
Input.propTypes = {
|
||||||
type: PropTypes.string.isRequired,
|
type: PropTypes.string.isRequired,
|
||||||
@ -24,28 +68,3 @@ Input.propTypes = {
|
|||||||
labelClassName: PropTypes.string,
|
labelClassName: PropTypes.string,
|
||||||
groupClassName: PropTypes.string,
|
groupClassName: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Base bootstrap input component. */
|
|
||||||
export function Input({
|
|
||||||
type, label, helpText, error, className, children, labelClassName, groupClassName, ...props
|
|
||||||
}) {
|
|
||||||
const uid = useUID();
|
|
||||||
const inputClassName = `form-control ${className || ""} ${(error ? "is-invalid" : "")}`.trim();
|
|
||||||
return (
|
|
||||||
<div className={`form-group ${formFieldsSize}`}>
|
|
||||||
<label className={labelClassName} htmlFor={uid}>{label}</label>
|
|
||||||
<div className={`input-group ${groupClassName || ""}`.trim()}>
|
|
||||||
<input
|
|
||||||
className={inputClassName}
|
|
||||||
type={type}
|
|
||||||
id={uid}
|
|
||||||
|
|
||||||
{...props}
|
|
||||||
/>
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
{error ? <div className="invalid-feedback">{error}</div> : null}
|
|
||||||
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
15
src/bootstrap/Modal.css
Normal file
15
src/bootstrap/Modal.css
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
@keyframes modalFade {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal.show {
|
||||||
|
display: block;
|
||||||
|
animation-name: modalFade;
|
||||||
|
animation-duration: 0.3s;
|
||||||
|
background: rgba(0, 0, 0, 0.2);
|
||||||
|
}
|
@ -1,20 +1,24 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, { useEffect, useRef } from "react";
|
import React, { useRef, useEffect } 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";
|
||||||
|
import "./Modal.css";
|
||||||
|
|
||||||
Modal.propTypes = {
|
Modal.propTypes = {
|
||||||
/** Is modal shown value */
|
/** Is modal shown value */
|
||||||
shown: PropTypes.bool.isRequired,
|
shown: PropTypes.bool.isRequired,
|
||||||
/** Callback to manage modal visibility */
|
/** Callback to manage modal visibility */
|
||||||
setShown: PropTypes.func.isRequired,
|
setShown: PropTypes.func.isRequired,
|
||||||
|
scrollable: PropTypes.bool,
|
||||||
|
size: PropTypes.string,
|
||||||
|
|
||||||
/** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */
|
/** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */
|
||||||
children: PropTypes.oneOfType([
|
children: PropTypes.oneOfType([
|
||||||
@ -23,27 +27,54 @@ Modal.propTypes = {
|
|||||||
]).isRequired,
|
]).isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function Modal({ shown, setShown, children }) {
|
export function Modal({ shown, setShown, scrollable, size, children }) {
|
||||||
const dialogRef = useRef();
|
const dialogRef = useRef();
|
||||||
|
let modalSize = "modal-";
|
||||||
|
|
||||||
|
useClickOutside(dialogRef, () => setShown(false));
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function handleClickOutsideDialog(e) {
|
const handleEsc = (event) => {
|
||||||
if (!dialogRef.current.contains(e.target)) setShown(false);
|
if (event.keyCode === 27) {
|
||||||
}
|
setShown(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
window.addEventListener("keydown", handleEsc);
|
||||||
|
|
||||||
document.addEventListener("mousedown", handleClickOutsideDialog);
|
|
||||||
return () => {
|
return () => {
|
||||||
document.removeEventListener("mousedown", handleClickOutsideDialog);
|
window.removeEventListener("keydown", handleEsc);
|
||||||
};
|
};
|
||||||
}, [setShown]);
|
}, [setShown]);
|
||||||
|
|
||||||
|
switch (size) {
|
||||||
|
case "sm":
|
||||||
|
modalSize += "sm";
|
||||||
|
break;
|
||||||
|
case "lg":
|
||||||
|
modalSize += "lg";
|
||||||
|
break;
|
||||||
|
case "xl":
|
||||||
|
modalSize += "xl";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
modalSize = "";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Portal containerId="modal-container">
|
<Portal containerId="modal-container">
|
||||||
<div className={`modal fade ${shown ? "show" : ""}`} role="dialog">
|
<div
|
||||||
<div ref={dialogRef} className="modal-dialog modal-dialog-centered" role="document">
|
className={`modal fade ${shown ? "show" : ""}`.trim()}
|
||||||
<div className="modal-content">
|
role="dialog"
|
||||||
{children}
|
>
|
||||||
</div>
|
<div
|
||||||
|
ref={dialogRef}
|
||||||
|
className={`${modalSize.trim()} modal-dialog modal-dialog-centered ${
|
||||||
|
scrollable ? "modal-dialog-scrollable" : ""
|
||||||
|
}`.trim()}
|
||||||
|
role="document"
|
||||||
|
>
|
||||||
|
<div className="modal-content">{children}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Portal>
|
</Portal>
|
||||||
@ -59,7 +90,11 @@ export function ModalHeader({ setShown, title }) {
|
|||||||
return (
|
return (
|
||||||
<div className="modal-header">
|
<div className="modal-header">
|
||||||
<h5 className="modal-title">{title}</h5>
|
<h5 className="modal-title">{title}</h5>
|
||||||
<button type="button" className="close" onClick={() => setShown(false)}>
|
<button
|
||||||
|
type="button"
|
||||||
|
className="close"
|
||||||
|
onClick={() => setShown(false)}
|
||||||
|
>
|
||||||
<span aria-hidden="true">×</span>
|
<span aria-hidden="true">×</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -85,9 +120,5 @@ ModalFooter.propTypes = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function ModalFooter({ children }) {
|
export function ModalFooter({ children }) {
|
||||||
return (
|
return <div className="modal-footer">{children}</div>;
|
||||||
<div className="modal-footer">
|
|
||||||
{children}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
@ -1,33 +1,47 @@
|
|||||||
Bootstrap modal component.
|
Bootstrap modal component.
|
||||||
|
|
||||||
it's required to have an element `<div id={"modal-container"}/>` somewhere on the page since modals are rendered in portals.
|
It's required to have an element `<div id={"modal-container"}/>` somewhere on
|
||||||
|
the page since modals are rendered in portals.
|
||||||
|
|
||||||
|
Modals also have three optional sizes, which can be defined through the `size`
|
||||||
|
prop:
|
||||||
|
|
||||||
|
- small - `sm`
|
||||||
|
- large - `lg`
|
||||||
|
- extra-large - `xl`
|
||||||
|
|
||||||
|
For more details please visit Bootstrap
|
||||||
|
<a href="https://getbootstrap.com/docs/4.5/components/modal/#optional-sizes" target="_blank">
|
||||||
|
documentation</a>.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
<div id="modal-container"/>
|
<div id="modal-container" />
|
||||||
```
|
```
|
||||||
|
|
||||||
I have no idea why example doesn't work here but you can investigate HTML code and Foris project.
|
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {ModalHeader, ModalBody, ModalFooter} from './Modal';
|
import { ModalHeader, ModalBody, ModalFooter } from "./Modal";
|
||||||
|
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [shown, setShown] = useState(false);
|
const [shown, setShown] = useState(false);
|
||||||
|
|
||||||
<>
|
<>
|
||||||
<Modal setShown={setShown} shown={shown}>
|
<Modal setShown={setShown} shown={shown} size="sm">
|
||||||
<ModalHeader setShown={setShown} title='Warning!'/>
|
<ModalHeader setShown={setShown} title="Warning!" />
|
||||||
<ModalBody><p>Bla bla bla...</p></ModalBody>
|
<ModalBody>
|
||||||
|
<p>Bla bla bla...</p>
|
||||||
|
</ModalBody>
|
||||||
<ModalFooter>
|
<ModalFooter>
|
||||||
<button
|
<button
|
||||||
className='btn btn-secondary'
|
className="btn btn-secondary"
|
||||||
onClick={() => setShown(false)}
|
onClick={() => setShown(false)}
|
||||||
>Skip it</button>
|
>
|
||||||
|
Skip it
|
||||||
|
</button>
|
||||||
</ModalFooter>
|
</ModalFooter>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
||||||
<button className='btn btn-secondary' onClick={()=>setShown(true)}>
|
<button className="btn btn-secondary" onClick={() => setShown(true)}>
|
||||||
Show modal
|
Show modal
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>;
|
||||||
```
|
```
|
||||||
|
@ -4,7 +4,7 @@ input[type="number"] {
|
|||||||
appearance: textfield;
|
appearance: textfield;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=number]::-webkit-inner-spin-button,
|
input[type="number"]::-webkit-inner-spin-button,
|
||||||
input[type=number]::-webkit-outer-spin-button {
|
input[type="number"]::-webkit-outer-spin-button {
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
}
|
}
|
||||||
|
@ -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";
|
||||||
|
|
||||||
@ -20,10 +20,7 @@ NumberInput.propTypes = {
|
|||||||
/** Help text message. */
|
/** Help text message. */
|
||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
/** Number value. */
|
/** Number value. */
|
||||||
value: PropTypes.oneOfType([
|
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
|
||||||
PropTypes.string,
|
|
||||||
PropTypes.number,
|
|
||||||
]),
|
|
||||||
/** Function called when value changes. */
|
/** Function called when value changes. */
|
||||||
onChange: PropTypes.func.isRequired,
|
onChange: PropTypes.func.isRequired,
|
||||||
/** Additional description dispaled to the right of input value. */
|
/** Additional description dispaled to the right of input value. */
|
||||||
@ -34,15 +31,21 @@ NumberInput.defaultProps = {
|
|||||||
value: 0,
|
value: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function NumberInput({
|
export function NumberInput({ onChange, inlineText, value, ...props }) {
|
||||||
onChange, inlineText, value, ...props
|
|
||||||
}) {
|
|
||||||
function updateValue(initialValue, difference) {
|
function updateValue(initialValue, difference) {
|
||||||
onChange({ target: { value: initialValue + difference } });
|
onChange({ target: { value: initialValue + difference } });
|
||||||
}
|
}
|
||||||
|
|
||||||
const enableIncrease = useConditionalTimeout({ callback: updateValue }, value, 1);
|
const enableIncrease = useConditionalTimeout(
|
||||||
const enableDecrease = useConditionalTimeout({ callback: updateValue }, value, -1);
|
{ callback: updateValue },
|
||||||
|
value,
|
||||||
|
1
|
||||||
|
);
|
||||||
|
const enableDecrease = useConditionalTimeout(
|
||||||
|
{ callback: updateValue },
|
||||||
|
value,
|
||||||
|
-1
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Input type="number" onChange={onChange} value={value} {...props}>
|
<Input type="number" onChange={onChange} value={value} {...props}>
|
||||||
|
@ -1,17 +1,18 @@
|
|||||||
Bootstrap component of number input with label with predefined sizes and structure for using in foris forms.
|
Bootstrap component of number input with label with predefined sizes and
|
||||||
|
structure for using in foris forms.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="number">` HTML component.
|
All additional `props` are passed to the `<input type="number">` HTML component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [value, setValue] = useState(42);
|
const [value, setValue] = useState(42);
|
||||||
|
|
||||||
<NumberInput
|
<NumberInput
|
||||||
value={value}
|
value={value}
|
||||||
label="Some number"
|
label="Some number"
|
||||||
helpText="Read the small text!"
|
helpText="Read the small text!"
|
||||||
min='33'
|
min="33"
|
||||||
max='54'
|
max="54"
|
||||||
onChange={event =>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>;
|
||||||
```
|
```
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
@ -21,32 +21,37 @@ PasswordInput.propTypes = {
|
|||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
/** Use show/hide password button. */
|
/** Use show/hide password button. */
|
||||||
withEye: PropTypes.bool,
|
withEye: PropTypes.bool,
|
||||||
|
/** Use new-password in autocomplete attribute. */
|
||||||
|
newPass: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function PasswordInput({ withEye, ...props }) {
|
export function PasswordInput({ withEye, newPass, ...props }) {
|
||||||
const [isHidden, setHidden] = useState(true);
|
const [isHidden, setHidden] = useState(true);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Input
|
<Input
|
||||||
type={withEye && !isHidden ? "text" : "password"}
|
type={withEye && !isHidden ? "text" : "password"}
|
||||||
autoComplete={isHidden ? "new-password" : null}
|
autoComplete={newPass ? "new-password" : "current-password"}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
{withEye
|
{withEye ? (
|
||||||
? (
|
<div className="input-group-append">
|
||||||
<div className="input-group-append">
|
<button
|
||||||
<button
|
type="button"
|
||||||
type="button"
|
className="input-group-text"
|
||||||
className="input-group-text"
|
onClick={(e) => {
|
||||||
onClick={(e) => {
|
e.preventDefault();
|
||||||
e.preventDefault();
|
setHidden((shouldBeHidden) => !shouldBeHidden);
|
||||||
setHidden((shouldBeHidden) => !shouldBeHidden);
|
}}
|
||||||
}}
|
>
|
||||||
>
|
<i
|
||||||
<i className={`fa ${isHidden ? "fa-eye" : "fa-eye-slash"}`} />
|
className={`fa ${
|
||||||
</button>
|
isHidden ? "fa-eye" : "fa-eye-slash"
|
||||||
</div>
|
}`}
|
||||||
)
|
/>
|
||||||
: null}
|
</button>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
</Input>
|
</Input>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,18 @@
|
|||||||
Password Bootstrap component input with label and predefined sizes and structure for using in foris forms.
|
Password Bootstrap component input with label and predefined sizes and structure
|
||||||
Can be used with "eye" button, see example.
|
for using in foris forms. Can be used with "eye" button, see example.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="password">` HTML component.
|
All additional `props` are passed to the `<input type="password">` HTML
|
||||||
|
component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [value, setValue] = useState('secret');
|
const [value, setValue] = useState("secret");
|
||||||
|
|
||||||
<PasswordInput
|
<PasswordInput
|
||||||
withEye
|
withEye
|
||||||
value={value}
|
value={value}
|
||||||
label="Some password"
|
label="Some password"
|
||||||
helpText="Read the small text!"
|
helpText="Read the small text!"
|
||||||
onChange={event =>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>;
|
||||||
```
|
```
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
@ -9,28 +9,41 @@ 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,
|
||||||
/** RadioSet label . */
|
/** RadioSet label . */
|
||||||
label: PropTypes.string,
|
label: PropTypes.string,
|
||||||
/** Choices . */
|
/** Choices . */
|
||||||
choices: PropTypes.arrayOf(PropTypes.shape({
|
choices: PropTypes.arrayOf(
|
||||||
/** Choice lable . */
|
PropTypes.shape({
|
||||||
label: PropTypes.string.isRequired,
|
/** Choice lable . */
|
||||||
/** Choice value . */
|
label: PropTypes.oneOfType([
|
||||||
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
PropTypes.string,
|
||||||
})).isRequired,
|
PropTypes.element,
|
||||||
|
PropTypes.node,
|
||||||
|
PropTypes.arrayOf(PropTypes.node),
|
||||||
|
]).isRequired,
|
||||||
|
/** Choice value . */
|
||||||
|
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
|
||||||
|
.isRequired,
|
||||||
|
})
|
||||||
|
).isRequired,
|
||||||
/** Initial value . */
|
/** Initial value . */
|
||||||
value: PropTypes.string,
|
value: PropTypes.string,
|
||||||
/** Help text message . */
|
/** Help text message . */
|
||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
|
inline: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function RadioSet({
|
export function RadioSet({
|
||||||
name, label, choices, value, helpText, ...props
|
name,
|
||||||
|
label,
|
||||||
|
choices,
|
||||||
|
value,
|
||||||
|
helpText,
|
||||||
|
inline,
|
||||||
|
...props
|
||||||
}) {
|
}) {
|
||||||
const uid = useUID();
|
const uid = useUID();
|
||||||
const radios = choices.map((choice, key) => {
|
const radios = choices.map((choice, key) => {
|
||||||
@ -44,42 +57,61 @@ export function RadioSet({
|
|||||||
value={choice.value}
|
value={choice.value}
|
||||||
helpText={choice.helpText}
|
helpText={choice.helpText}
|
||||||
checked={choice.value === value}
|
checked={choice.value === value}
|
||||||
|
inline={inline}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
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>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Radio.propTypes = {
|
Radio.propTypes = {
|
||||||
label: PropTypes.string.isRequired,
|
label: PropTypes.oneOfType([
|
||||||
|
PropTypes.string,
|
||||||
|
PropTypes.element,
|
||||||
|
PropTypes.node,
|
||||||
|
PropTypes.arrayOf(PropTypes.node),
|
||||||
|
]).isRequired,
|
||||||
id: PropTypes.string.isRequired,
|
id: PropTypes.string.isRequired,
|
||||||
|
inline: PropTypes.bool,
|
||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
function Radio({
|
export function Radio({ label, id, helpText, inline, ...props }) {
|
||||||
label, id, helpText, ...props
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className={`custom-control custom-radio ${!helpText ? "custom-control-inline" : ""}`.trim()}>
|
<div
|
||||||
|
className={`custom-control custom-radio ${
|
||||||
|
inline ? "custom-control-inline" : ""
|
||||||
|
}`.trim()}
|
||||||
|
>
|
||||||
<input
|
<input
|
||||||
id={id}
|
id={id}
|
||||||
className="custom-control-input"
|
className="custom-control-input"
|
||||||
type="radio"
|
type="radio"
|
||||||
|
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
<label className="custom-control-label" htmlFor={id}>{label}</label>
|
<label className="custom-control-label" htmlFor={id}>
|
||||||
{helpText && <small className="form-text text-muted mt-0 mb-3">{helpText}</small>}
|
{label}
|
||||||
|
</label>
|
||||||
|
{helpText && (
|
||||||
|
<small className="form-text text-muted mt-0 mb-3">
|
||||||
|
{helpText}
|
||||||
|
</small>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
@ -1,15 +1,16 @@
|
|||||||
Set of radio Bootstrap component input with label and predefined sizes and structure for using in foris forms.
|
Set of radio Bootstrap component input with label and predefined sizes and
|
||||||
|
structure for using in foris forms.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="number">` HTML component.
|
All additional `props` are passed to the `<input type="number">` HTML component.
|
||||||
|
|
||||||
Unless `helpText` is set for one of the options they are displayed inline.
|
Unless `helpText` is set for one of the options they are displayed inline.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const CHOICES=[
|
const CHOICES = [
|
||||||
{value:'one',label:'1'},
|
{ value: "one", label: "1" },
|
||||||
{value:'two',label:'2'},
|
{ value: "two", label: "2" },
|
||||||
{value:'three',label:'3'},
|
{ value: "three", label: "3" },
|
||||||
];
|
];
|
||||||
const [value, setValue] = useState(CHOICES[0].value);
|
const [value, setValue] = useState(CHOICES[0].value);
|
||||||
|
|
||||||
@ -17,10 +18,10 @@ const [value, setValue] = useState(CHOICES[0].value);
|
|||||||
{/*Yeah, it gets event, not value!*/}
|
{/*Yeah, it gets event, not value!*/}
|
||||||
<RadioSet
|
<RadioSet
|
||||||
value={value}
|
value={value}
|
||||||
name='some-radio'
|
name="some-radio"
|
||||||
choices={CHOICES}
|
choices={CHOICES}
|
||||||
onChange={event =>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>
|
||||||
<p>Selected value: {value}</p>
|
<p>Selected value: {value}</p>
|
||||||
</>
|
</>;
|
||||||
```
|
```
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
@ -15,34 +15,29 @@ Select.propTypes = {
|
|||||||
/** Choices if form of {value : "Label",...}. */
|
/** Choices if form of {value : "Label",...}. */
|
||||||
choices: PropTypes.object.isRequired,
|
choices: PropTypes.object.isRequired,
|
||||||
/** Current value. */
|
/** Current value. */
|
||||||
value: PropTypes.oneOfType([
|
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||||
PropTypes.string,
|
|
||||||
PropTypes.number,
|
|
||||||
]).isRequired,
|
|
||||||
/** Help text message. */
|
/** Help text message. */
|
||||||
helpText: PropTypes.string,
|
helpText: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function Select({
|
export function Select({ label, choices, helpText, ...props }) {
|
||||||
label, choices, helpText, ...props
|
|
||||||
}) {
|
|
||||||
const uid = useUID();
|
const uid = useUID();
|
||||||
|
|
||||||
const options = Object.keys(choices).map(
|
const options = Object.keys(choices).map((choice) => (
|
||||||
(key) => <option key={key} value={key}>{choices[key]}</option>,
|
<option key={choice} value={choice}>
|
||||||
);
|
{choices[choice]}
|
||||||
|
</option>
|
||||||
|
));
|
||||||
|
|
||||||
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" id={uid} {...props}>
|
||||||
className="custom-select"
|
|
||||||
id={uid}
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
{options}
|
{options}
|
||||||
</select>
|
</select>
|
||||||
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
|
{helpText ? (
|
||||||
|
<small className="form-text text-muted">{helpText}</small>
|
||||||
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
Select with options Bootstrap component input with label and predefined sizes and structure for using in foris forms.
|
Select with options Bootstrap component input with label and predefined sizes
|
||||||
|
and structure for using in foris forms.
|
||||||
|
|
||||||
All additional `props` are passed to the `<select>` HTML component.
|
All additional `props` are passed to the `<select>` HTML component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const CHOICES={
|
const CHOICES = {
|
||||||
apple:'Apple',
|
apple: "Apple",
|
||||||
banana:'Banana',
|
banana: "Banana",
|
||||||
peach:'Peach',
|
peach: "Peach",
|
||||||
};
|
};
|
||||||
const [value, setValue] = useState(Object.keys(CHOICES)[0]);
|
const [value, setValue] = useState(Object.keys(CHOICES)[0]);
|
||||||
|
|
||||||
@ -17,9 +18,9 @@ const [value, setValue] = useState(Object.keys(CHOICES)[0]);
|
|||||||
label="Fruit"
|
label="Fruit"
|
||||||
value={value}
|
value={value}
|
||||||
choices={CHOICES}
|
choices={CHOICES}
|
||||||
onChange={event=>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>
|
||||||
<p>Selected choice label: {CHOICES[value]}</p>
|
<p>Selected choice label: {CHOICES[value]}</p>
|
||||||
<p>Selected choice value: {value}</p>
|
<p>Selected choice value: {value}</p>
|
||||||
</>
|
</>;
|
||||||
```
|
```
|
||||||
|
33
src/bootstrap/Spinner.css
Normal file
33
src/bootstrap/Spinner.css
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
.spinner-wrapper .spinner-border {
|
||||||
|
width: 4rem;
|
||||||
|
height: 4rem;
|
||||||
|
color: #00a2e2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-fs-background {
|
||||||
|
background-color: rgba(2, 2, 2, 0.5);
|
||||||
|
color: rgb(230, 230, 230);
|
||||||
|
position: fixed;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
top: 0;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
flex-direction: column;
|
||||||
|
/*
|
||||||
|
* Set to high value to me sure that it always overlaps all components
|
||||||
|
* https://getbootstrap.com/docs/4.3/layout/overview/#z-index
|
||||||
|
*/
|
||||||
|
z-index: 1100;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-fs-wrapper .spinner-border {
|
||||||
|
width: 6rem;
|
||||||
|
height: 6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.spinner-fs-wrapper .spinner-text {
|
||||||
|
margin: 1rem;
|
||||||
|
}
|
@ -8,6 +8,8 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import "./Spinner.css";
|
||||||
|
|
||||||
Spinner.propTypes = {
|
Spinner.propTypes = {
|
||||||
/** Children components put into `div` with "spinner-text" class. */
|
/** Children components put into `div` with "spinner-text" class. */
|
||||||
children: PropTypes.oneOfType([
|
children: PropTypes.oneOfType([
|
||||||
@ -23,12 +25,12 @@ Spinner.defaultProps = {
|
|||||||
fullScreen: false,
|
fullScreen: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function Spinner({
|
export function Spinner({ fullScreen, children, className }) {
|
||||||
fullScreen, children, className,
|
|
||||||
}) {
|
|
||||||
if (!fullScreen) {
|
if (!fullScreen) {
|
||||||
return (
|
return (
|
||||||
<div className={`spinner-wrapper ${className || "my-3 text-center"}`}>
|
<div
|
||||||
|
className={`spinner-wrapper ${className || "my-3 text-center"}`}
|
||||||
|
>
|
||||||
<SpinnerElement>{children}</SpinnerElement>
|
<SpinnerElement>{children}</SpinnerElement>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@ -59,7 +61,9 @@ export function SpinnerElement({ small, className, children }) {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
className={`spinner-border ${small ? "spinner-border-sm" : ""} ${className || ""}`.trim()}
|
className={`spinner-border ${
|
||||||
|
small ? "spinner-border-sm" : ""
|
||||||
|
} ${className || ""}`.trim()}
|
||||||
role="status"
|
role="status"
|
||||||
>
|
>
|
||||||
<span className="sr-only" />
|
<span className="sr-only" />
|
||||||
|
49
src/bootstrap/Switch.js
Normal file
49
src/bootstrap/Switch.js
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
import { useUID } from "react-uid";
|
||||||
|
|
||||||
|
Switch.propTypes = {
|
||||||
|
label: PropTypes.oneOfType([
|
||||||
|
PropTypes.string,
|
||||||
|
PropTypes.element,
|
||||||
|
PropTypes.node,
|
||||||
|
PropTypes.arrayOf(PropTypes.node),
|
||||||
|
]).isRequired,
|
||||||
|
helpText: PropTypes.string,
|
||||||
|
switchHeading: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
export function Switch({ label, helpText, switchHeading, ...props }) {
|
||||||
|
const uid = useUID();
|
||||||
|
return (
|
||||||
|
<div className={`form-group ${switchHeading ? "switch" : ""}`.trim()}>
|
||||||
|
<div
|
||||||
|
className={`custom-control custom-switch ${
|
||||||
|
!helpText ? "custom-control-inline" : ""
|
||||||
|
} ${switchHeading ? "switch-heading" : ""}`.trim()}
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
className="custom-control-input"
|
||||||
|
id={uid}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
<label className="custom-control-label" htmlFor={uid}>
|
||||||
|
{label}
|
||||||
|
</label>
|
||||||
|
{helpText && (
|
||||||
|
<small className="form-text text-muted mt-0 mb-3">
|
||||||
|
{helpText}
|
||||||
|
</small>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
5
src/bootstrap/Switch.md
Normal file
5
src/bootstrap/Switch.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
Switch example:
|
||||||
|
|
||||||
|
```js
|
||||||
|
<Switch label="Enable Switch" helpText="Toggle that switch!" />
|
||||||
|
```
|
@ -1,15 +1,16 @@
|
|||||||
Text Bootstrap component input with label and predefined sizes and structure for using in foris forms.
|
Text Bootstrap component input with label and predefined sizes and structure for
|
||||||
|
using in foris forms.
|
||||||
|
|
||||||
All additional `props` are passed to the `<input type="text">` HTML component.
|
All additional `props` are passed to the `<input type="text">` HTML component.
|
||||||
|
|
||||||
```js
|
```js
|
||||||
import {useState} from 'react';
|
import { useState } from "react";
|
||||||
const [value, setValue] = useState('Bla bla');
|
const [value, setValue] = useState("Bla bla");
|
||||||
|
|
||||||
<TextInput
|
<TextInput
|
||||||
value={value}
|
value={value}
|
||||||
label="Some text"
|
label="Some text"
|
||||||
helpText="Read the small text!"
|
helpText="Read the small text!"
|
||||||
onChange={event =>setValue(event.target.value)}
|
onChange={(event) => setValue(event.target.value)}
|
||||||
/>
|
/>;
|
||||||
```
|
```
|
||||||
|
@ -14,19 +14,18 @@ import { Button } from "../Button";
|
|||||||
describe("<Button />", () => {
|
describe("<Button />", () => {
|
||||||
it("Render button correctly", () => {
|
it("Render button correctly", () => {
|
||||||
const { container } = render(<Button>Test Button</Button>);
|
const { container } = render(<Button>Test Button</Button>);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Render button with custom classes", () => {
|
it("Render button with custom classes", () => {
|
||||||
const { container } = render(<Button className="one two three">Test Button</Button>);
|
const { container } = render(
|
||||||
expect(container.firstChild)
|
<Button className="one two three">Test Button</Button>
|
||||||
.toMatchSnapshot();
|
);
|
||||||
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
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();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -18,22 +18,16 @@ describe("<Checkbox/>", () => {
|
|||||||
label="Test label"
|
label="Test label"
|
||||||
checked
|
checked
|
||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
onChange={() => {
|
onChange={() => {}}
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Render uncheked checkbox", () => {
|
it("Render uncheked checkbox", () => {
|
||||||
const { container } = render(
|
const { container } = render(
|
||||||
<CheckBox
|
<CheckBox label="Test label" helpText="Some help text" />
|
||||||
label="Test label"
|
|
||||||
helpText="Some help text"
|
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -13,7 +13,11 @@ import { DownloadButton } from "../DownloadButton";
|
|||||||
|
|
||||||
describe("<DownloadButton />", () => {
|
describe("<DownloadButton />", () => {
|
||||||
it("should have download attribute", () => {
|
it("should have download attribute", () => {
|
||||||
const { container } = render(<DownloadButton href="http://example.com">Test Button</DownloadButton>);
|
const { container } = render(
|
||||||
|
<DownloadButton href="http://example.com">
|
||||||
|
Test Button
|
||||||
|
</DownloadButton>
|
||||||
|
);
|
||||||
expect(container.firstChild.getAttribute("download")).not.toBeNull();
|
expect(container.firstChild.getAttribute("download")).not.toBeNull();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -34,12 +34,16 @@ 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 } })
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -18,11 +18,9 @@ describe("<PasswordInput/>", () => {
|
|||||||
label="Test label"
|
label="Test label"
|
||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
value="Some password"
|
value="Some password"
|
||||||
onChange={() => {
|
onChange={() => {}}
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -14,32 +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,27 +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}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@ -35,21 +39,17 @@ describe("<Select/>", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("Test with snapshot.", () => {
|
it("Test with snapshot.", () => {
|
||||||
expect(selectContainer)
|
expect(selectContainer).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Test onChange handling.", () => {
|
it("Test onChange handling.", () => {
|
||||||
const select = getByDisplayValue(selectContainer, "one");
|
const select = getByDisplayValue(selectContainer, "one");
|
||||||
expect(select.value)
|
expect(select.value).toBe("1");
|
||||||
.toBe("1");
|
|
||||||
fireEvent.change(select, { target: { value: "2" } });
|
fireEvent.change(select, { target: { value: "2" } });
|
||||||
|
|
||||||
const option = getByText(selectContainer, "two");
|
const option = getByText(selectContainer, "two");
|
||||||
expect(onChangeHandler)
|
expect(onChangeHandler).toBeCalled();
|
||||||
.toBeCalled();
|
|
||||||
|
|
||||||
expect(option.value)
|
expect(option.value).toBe("2");
|
||||||
.toBe("2");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
33
src/bootstrap/__tests__/Switch.test.js
Normal file
33
src/bootstrap/__tests__/Switch.test.js
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
|
||||||
|
import { render } from "customTestRender";
|
||||||
|
|
||||||
|
import { Switch } from "../Switch";
|
||||||
|
|
||||||
|
describe("<Switch/>", () => {
|
||||||
|
it("Render switch", () => {
|
||||||
|
const { container } = render(
|
||||||
|
<Switch
|
||||||
|
label="Test label"
|
||||||
|
checked
|
||||||
|
helpText="Some help text"
|
||||||
|
onChange={() => {}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Render uncheked switch", () => {
|
||||||
|
const { container } = render(
|
||||||
|
<Switch label="Test label" helpText="Some help text" />
|
||||||
|
);
|
||||||
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
@ -18,11 +18,9 @@ describe("<TextInput/>", () => {
|
|||||||
label="Test label"
|
label="Test label"
|
||||||
helpText="Some help text"
|
helpText="Some help text"
|
||||||
value="Some text"
|
value="Some text"
|
||||||
onChange={() => {
|
onChange={() => {}}
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
expect(container.firstChild)
|
expect(container.firstChild).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -5,8 +5,6 @@ exports[`<Button /> Render button correctly 1`] = `
|
|||||||
class="btn btn-primary "
|
class="btn btn-primary "
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Test Button
|
Test Button
|
||||||
</button>
|
</button>
|
||||||
`;
|
`;
|
||||||
@ -16,8 +14,6 @@ exports[`<Button /> Render button with custom classes 1`] = `
|
|||||||
class="btn one two three"
|
class="btn one two three"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Test Button
|
Test Button
|
||||||
</button>
|
</button>
|
||||||
`;
|
`;
|
||||||
@ -33,8 +29,6 @@ exports[`<Button /> Render button with spinner 1`] = `
|
|||||||
role="status"
|
role="status"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Test Button
|
Test Button
|
||||||
</button>
|
</button>
|
||||||
`;
|
`;
|
||||||
|
@ -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"
|
||||||
@ -13,7 +13,7 @@ exports[`<PasswordInput/> Render password input 1`] = `
|
|||||||
class="input-group"
|
class="input-group"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
autocomplete="new-password"
|
autocomplete="current-password"
|
||||||
class="form-control"
|
class="form-control"
|
||||||
id="1"
|
id="1"
|
||||||
type="password"
|
type="password"
|
||||||
|
@ -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"
|
||||||
@ -11,7 +11,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
|
|||||||
Radios set label
|
Radios set label
|
||||||
</label>
|
</label>
|
||||||
<div
|
<div
|
||||||
class="custom-control custom-radio custom-control-inline"
|
class="custom-control custom-radio"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
checked=""
|
checked=""
|
||||||
@ -29,7 +29,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="custom-control custom-radio custom-control-inline"
|
class="custom-control custom-radio"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
class="custom-control-input"
|
class="custom-control-input"
|
||||||
@ -46,7 +46,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="custom-control custom-radio custom-control-inline"
|
class="custom-control custom-radio"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
class="custom-control-input"
|
class="custom-control-input"
|
||||||
|
@ -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"
|
||||||
|
56
src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
Normal file
56
src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`<Switch/> Render switch 1`] = `
|
||||||
|
<div
|
||||||
|
class="form-group"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-switch"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
checked=""
|
||||||
|
class="custom-control-input"
|
||||||
|
id="1"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="1"
|
||||||
|
>
|
||||||
|
Test label
|
||||||
|
</label>
|
||||||
|
<small
|
||||||
|
class="form-text text-muted mt-0 mb-3"
|
||||||
|
>
|
||||||
|
Some help text
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<Switch/> Render uncheked switch 1`] = `
|
||||||
|
<div
|
||||||
|
class="form-group"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-switch"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="custom-control-input"
|
||||||
|
id="1"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="1"
|
||||||
|
>
|
||||||
|
Test label
|
||||||
|
</label>
|
||||||
|
<small
|
||||||
|
class="form-text text-muted mt-0 mb-3"
|
||||||
|
>
|
||||||
|
Some help text
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
@ -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"
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
@ -7,4 +7,5 @@
|
|||||||
|
|
||||||
/** 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 = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
|
||||||
|
export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";
|
||||||
|
@ -8,19 +8,13 @@
|
|||||||
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 "../utils/forisUrls";
|
||||||
|
|
||||||
import { Button } from "bootstrap/Button";
|
import { Button } from "../bootstrap/Button";
|
||||||
import {
|
import { Modal, ModalHeader, ModalBody, ModalFooter } from "../bootstrap/Modal";
|
||||||
Modal, ModalHeader, ModalBody, ModalFooter,
|
import { useAlert } from "../context/alertContext/AlertContext";
|
||||||
} from "bootstrap/Modal";
|
|
||||||
import { useAlert } from "alertContext/AlertContext";
|
|
||||||
|
|
||||||
RebootButton.propTypes = {
|
|
||||||
forisFormSize: PropTypes.bool,
|
|
||||||
};
|
|
||||||
|
|
||||||
export function RebootButton(props) {
|
export function RebootButton(props) {
|
||||||
const [triggered, setTriggered] = useState(false);
|
const [triggered, setTriggered] = useState(false);
|
||||||
@ -42,13 +36,16 @@ export function RebootButton(props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<RebootModal shown={modalShown} setShown={setModalShown} onReboot={rebootHandler} />
|
<RebootModal
|
||||||
|
shown={modalShown}
|
||||||
|
setShown={setModalShown}
|
||||||
|
onReboot={rebootHandler}
|
||||||
|
/>
|
||||||
<Button
|
<Button
|
||||||
className="btn-danger"
|
className="btn-danger"
|
||||||
loading={triggered}
|
loading={triggered}
|
||||||
disabled={triggered}
|
disabled={triggered}
|
||||||
onClick={() => setModalShown(true)}
|
onClick={() => setModalShown(true)}
|
||||||
|
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
{_("Reboot")}
|
{_("Reboot")}
|
||||||
@ -66,11 +63,15 @@ RebootModal.propTypes = {
|
|||||||
function RebootModal({ shown, setShown, onReboot }) {
|
function RebootModal({ shown, setShown, onReboot }) {
|
||||||
return (
|
return (
|
||||||
<Modal shown={shown} setShown={setShown}>
|
<Modal shown={shown} setShown={setShown}>
|
||||||
<ModalHeader setShown={setShown} title={_("Reboot confirmation")} />
|
<ModalHeader setShown={setShown} title={_("Warning!")} />
|
||||||
<ModalBody><p>{_("Are you sure you want to restart the router?")}</p></ModalBody>
|
<ModalBody>
|
||||||
|
<p>{_("Are you sure you want to restart the router?")}</p>
|
||||||
|
</ModalBody>
|
||||||
<ModalFooter>
|
<ModalFooter>
|
||||||
<Button onClick={() => setShown(false)}>{_("Cancel")}</Button>
|
<Button onClick={() => setShown(false)}>{_("Cancel")}</Button>
|
||||||
<Button className="btn-danger" onClick={onReboot}>{_("Confirm reboot")}</Button>
|
<Button className="btn-danger" onClick={onReboot}>
|
||||||
|
{_("Confirm reboot")}
|
||||||
|
</Button>
|
||||||
</ModalFooter>
|
</ModalFooter>
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
|
74
src/common/WiFiSettings/ResetWiFiSettings.js
Normal file
74
src/common/WiFiSettings/ResetWiFiSettings.js
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { Button } from "../../bootstrap/Button";
|
||||||
|
import { useAlert } from "../../context/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 function ResetWiFiSettings({ ws, endpoint }) {
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const module = "wifi";
|
||||||
|
ws.subscribe(module).bind(module, "reset", () => {
|
||||||
|
// 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();
|
||||||
|
setIsLoading(true);
|
||||||
|
postReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={formFieldsSize}>
|
||||||
|
<h2>{_("Reset Wi-Fi Settings")}</h2>
|
||||||
|
<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="text-right">
|
||||||
|
<Button
|
||||||
|
className="btn-primary"
|
||||||
|
forisFormSize
|
||||||
|
loading={isLoading}
|
||||||
|
disabled={isLoading}
|
||||||
|
onClick={onReset}
|
||||||
|
>
|
||||||
|
{_("Reset Wi-Fi Settings")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
306
src/common/WiFiSettings/WiFiForm.js
Normal file
306
src/common/WiFiSettings/WiFiForm.js
Normal file
@ -0,0 +1,306 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
import { Switch } from "../../bootstrap/Switch";
|
||||||
|
import { PasswordInput } from "../../bootstrap/PasswordInput";
|
||||||
|
import { RadioSet } from "../../bootstrap/RadioSet";
|
||||||
|
import { Select } from "../../bootstrap/Select";
|
||||||
|
import { TextInput } from "../../bootstrap/TextInput";
|
||||||
|
import WiFiQRCode from "./WiFiQRCode";
|
||||||
|
import WifiGuestForm from "./WiFiGuestForm";
|
||||||
|
import { HELP_TEXTS, HTMODES, HWMODES, ENCRYPTIONMODES } from "./constants";
|
||||||
|
|
||||||
|
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,
|
||||||
|
disabled,
|
||||||
|
}) {
|
||||||
|
return formData.devices.map((device, index) => (
|
||||||
|
<DeviceForm
|
||||||
|
key={device.id}
|
||||||
|
formData={device}
|
||||||
|
deviceIndex={index}
|
||||||
|
formErrors={(formErrors || [])[index]}
|
||||||
|
setFormValue={setFormValue}
|
||||||
|
hasGuestNetwork={hasGuestNetwork}
|
||||||
|
disabled={disabled}
|
||||||
|
divider={index + 1 !== formData.devices.length}
|
||||||
|
/>
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
encryption: PropTypes.string.isRequired,
|
||||||
|
available_bands: PropTypes.array.isRequired,
|
||||||
|
ieee80211w_disabled: PropTypes.bool,
|
||||||
|
}),
|
||||||
|
formErrors: PropTypes.object.isRequired,
|
||||||
|
setFormValue: PropTypes.func.isRequired,
|
||||||
|
hasGuestNetwork: PropTypes.bool,
|
||||||
|
deviceIndex: PropTypes.number,
|
||||||
|
divider: PropTypes.bool,
|
||||||
|
};
|
||||||
|
|
||||||
|
DeviceForm.defaultProps = {
|
||||||
|
formErrors: {},
|
||||||
|
hasGuestNetwork: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
function DeviceForm({
|
||||||
|
formData,
|
||||||
|
formErrors,
|
||||||
|
setFormValue,
|
||||||
|
hasGuestNetwork,
|
||||||
|
deviceIndex,
|
||||||
|
divider,
|
||||||
|
...props
|
||||||
|
}) {
|
||||||
|
const deviceID = formData.id;
|
||||||
|
const bnds = formData.available_bands;
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Switch
|
||||||
|
label={<h2>{_(`Wi-Fi ${deviceID + 1}`)}</h2>}
|
||||||
|
checked={formData.enabled}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: { enabled: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
switchHeading
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
{formData.enabled && (
|
||||||
|
<>
|
||||||
|
<TextInput
|
||||||
|
label="SSID"
|
||||||
|
value={formData.SSID}
|
||||||
|
error={formErrors.SSID || null}
|
||||||
|
helpText={HELP_TEXTS.ssid}
|
||||||
|
required
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: {
|
||||||
|
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: {
|
||||||
|
[deviceIndex]: { password: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Switch
|
||||||
|
label={_("Hide SSID")}
|
||||||
|
helpText={HELP_TEXTS.hidden}
|
||||||
|
checked={formData.hidden}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: { hidden: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<RadioSet
|
||||||
|
name={`hwmode-${deviceID}`}
|
||||||
|
label="GHz"
|
||||||
|
choices={getHwmodeChoices(formData)}
|
||||||
|
value={formData.hwmode}
|
||||||
|
helpText={HELP_TEXTS.hwmode}
|
||||||
|
inline
|
||||||
|
onChange={setFormValue((value) => {
|
||||||
|
// Get the last item in an array of available HT modes
|
||||||
|
const [best2] = bnds[0].available_htmodes.slice(-1);
|
||||||
|
const [best5] = bnds[1].available_htmodes.slice(-1);
|
||||||
|
return {
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: {
|
||||||
|
hwmode: { $set: value },
|
||||||
|
channel: { $set: "0" },
|
||||||
|
htmode: {
|
||||||
|
$set:
|
||||||
|
// Set HT mode depending on checked frequency
|
||||||
|
value === "11a" ? best5 : best2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
})}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
label={_("802.11n/ac/ax mode")}
|
||||||
|
choices={getHtmodeChoices(formData)}
|
||||||
|
value={formData.htmode}
|
||||||
|
helpText={HELP_TEXTS.htmode}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: { htmode: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
label={_("Channel")}
|
||||||
|
choices={getChannelChoices(formData)}
|
||||||
|
value={formData.channel}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: { channel: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Select
|
||||||
|
label={_("Encryption")}
|
||||||
|
choices={getEncryptionChoices(formData)}
|
||||||
|
helpText={HELP_TEXTS.wpa3}
|
||||||
|
value={formData.encryption}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: { encryption: { $set: value } },
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{(formData.encryption === "WPA3" ||
|
||||||
|
formData.encryption === "WPA2/3") && (
|
||||||
|
<Switch
|
||||||
|
label={_("Disable Management Frame Protection")}
|
||||||
|
helpText={_(
|
||||||
|
"In case you have trouble connecting to WiFi Access Point, try disabling Management Frame Protection."
|
||||||
|
)}
|
||||||
|
checked={formData.ieee80211w_disabled}
|
||||||
|
onChange={setFormValue((value) => ({
|
||||||
|
devices: {
|
||||||
|
[deviceIndex]: {
|
||||||
|
ieee80211w_disabled: { $set: value },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}))}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{hasGuestNetwork && (
|
||||||
|
<WifiGuestForm
|
||||||
|
formData={{
|
||||||
|
id: deviceIndex,
|
||||||
|
...formData.guest_wifi,
|
||||||
|
}}
|
||||||
|
formErrors={formErrors.guest_wifi || {}}
|
||||||
|
setFormValue={setFormValue}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{divider && <hr />}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
function getEncryptionChoices(device) {
|
||||||
|
if (device.encryption === "custom") {
|
||||||
|
ENCRYPTIONMODES.custom = _("Custom");
|
||||||
|
}
|
||||||
|
return ENCRYPTIONMODES;
|
||||||
|
}
|
98
src/common/WiFiSettings/WiFiGuestForm.js
Normal file
98
src/common/WiFiSettings/WiFiGuestForm.js
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
/*
|
||||||
|
* 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 { TextInput } from "../../bootstrap/TextInput";
|
||||||
|
import { Switch } from "../../bootstrap/Switch";
|
||||||
|
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,
|
||||||
|
deviceIndex: PropTypes.string,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function WifiGuestForm({
|
||||||
|
formData,
|
||||||
|
formErrors,
|
||||||
|
setFormValue,
|
||||||
|
deviceIndex,
|
||||||
|
...props
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Switch
|
||||||
|
label={_("Enable Guest Wi-Fi")}
|
||||||
|
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}
|
||||||
|
helpText={HELP_TEXTS.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}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
96
src/common/WiFiSettings/WiFiQRCode.js
Normal file
96
src/common/WiFiSettings/WiFiQRCode.js
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* 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 "../../utils/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>
|
||||||
|
);
|
||||||
|
}
|
119
src/common/WiFiSettings/WiFiSettings.js
Normal file
119
src/common/WiFiSettings/WiFiSettings.js
Normal file
@ -0,0 +1,119 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import 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 };
|
||||||
|
|
||||||
|
if (device.encryption === "WPA2") {
|
||||||
|
delete formData.devices[idx].ieee80211w_disabled;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return formData;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function byteCount(string) {
|
||||||
|
const buffer = Buffer.from(string, "utf-8");
|
||||||
|
const count = buffer.byteLength;
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
export 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 (byteCount(device.SSID) > 32)
|
||||||
|
errors.SSID = _("SSID can't be longer than 32 bytes");
|
||||||
|
|
||||||
|
if (device.password.length < 8)
|
||||||
|
errors.password = _("Password must contain at least 8 symbols");
|
||||||
|
if (device.password.length >= 64)
|
||||||
|
errors.password = _(
|
||||||
|
"Password must not contain more than 63 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 (byteCount(device.guest_wifi.SSID) > 32)
|
||||||
|
guest_wifi_errors.SSID = _("SSID can't be longer than 32 bytes");
|
||||||
|
|
||||||
|
if (device.guest_wifi.password.length < 8)
|
||||||
|
guest_wifi_errors.password = _(
|
||||||
|
"Password must contain at least 8 symbols"
|
||||||
|
);
|
||||||
|
if (device.guest_wifi.password.length >= 64)
|
||||||
|
guest_wifi_errors.password = _(
|
||||||
|
"Password must not contain more than 63 symbols"
|
||||||
|
);
|
||||||
|
|
||||||
|
if (guest_wifi_errors.SSID || guest_wifi_errors.password) {
|
||||||
|
errors.guest_wifi = guest_wifi_errors;
|
||||||
|
}
|
||||||
|
return errors;
|
||||||
|
});
|
||||||
|
return JSON.stringify(formErrors).match(/\[[{},?]+\]/) ? null : formErrors;
|
||||||
|
}
|
55
src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.js
Normal file
55
src/common/WiFiSettings/__tests__/ResetWiFiSettings.test.js
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { render, fireEvent, 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."
|
||||||
|
)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
244
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
Normal file
244
src/common/WiFiSettings/__tests__/WiFiSettings.test.js
Normal file
@ -0,0 +1,244 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import diffSnapshot from "snapshot-diff";
|
||||||
|
import mockAxios from "jest-mock-axios";
|
||||||
|
|
||||||
|
import { fireEvent, render, wait } from "customTestRender";
|
||||||
|
import { WebSockets } from "webSockets/WebSockets";
|
||||||
|
import { mockJSONError } from "testUtils/network";
|
||||||
|
|
||||||
|
import {
|
||||||
|
wifiSettingsFixture,
|
||||||
|
oneDevice,
|
||||||
|
twoDevices,
|
||||||
|
threeDevices,
|
||||||
|
} from "./__fixtures__/wifiSettings";
|
||||||
|
import { WiFiSettings, validator, byteCount } from "../WiFiSettings";
|
||||||
|
|
||||||
|
describe("<WiFiSettings/>", () => {
|
||||||
|
let firstRender;
|
||||||
|
let getAllByText;
|
||||||
|
let getAllByLabelText;
|
||||||
|
let getByText;
|
||||||
|
let getByLabelText;
|
||||||
|
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;
|
||||||
|
getByLabelText = renderRes.getByLabelText;
|
||||||
|
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}
|
||||||
|
endpoint={endpoint}
|
||||||
|
resetEndpoint="foo"
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
const errorMessage = "An API error occurred.";
|
||||||
|
mockJSONError(errorMessage);
|
||||||
|
await wait(() => {
|
||||||
|
expect(getByText(errorMessage)).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot both modules disabled.", () => {
|
||||||
|
expect(firstRender).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot one module enabled.", () => {
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
expect(diffSnapshot(firstRender, asFragment())).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot 2.4 GHz", () => {
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
const enabledRender = asFragment();
|
||||||
|
fireEvent.click(getAllByText("2.4")[0]);
|
||||||
|
expect(diffSnapshot(enabledRender, asFragment())).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Snapshot guest network.", () => {
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
const enabledRender = asFragment();
|
||||||
|
fireEvent.click(getAllByText("Enable Guest Wi-Fi")[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(getByText("Wi-Fi 1"));
|
||||||
|
|
||||||
|
fireEvent.click(getByText("Save"));
|
||||||
|
expect(mockAxios.post).toBeCalled();
|
||||||
|
const data = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "TestSSID1",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT80",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(
|
||||||
|
endpoint,
|
||||||
|
data,
|
||||||
|
expect.anything()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: 2.4 GHz", () => {
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
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: "VHT80",
|
||||||
|
hwmode: "11g",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(
|
||||||
|
endpoint,
|
||||||
|
data,
|
||||||
|
expect.anything()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Post form: guest network.", () => {
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
fireEvent.click(getAllByText("Enable Guest Wi-Fi")[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: "HT80",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{ enabled: false, id: 1 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
expect(mockAxios.post).toHaveBeenCalledWith(
|
||||||
|
endpoint,
|
||||||
|
data,
|
||||||
|
expect.anything()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Validator function using regex for one device", () => {
|
||||||
|
expect(validator(oneDevice)).toEqual(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Validator function using regex for two devices", () => {
|
||||||
|
const twoDevicesFormErrors = [{ SSID: "SSID can't be empty" }, {}];
|
||||||
|
expect(validator(twoDevices)).toEqual(twoDevicesFormErrors);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Validator function using regex for three devices", () => {
|
||||||
|
const threeDevicesFormErrors = [
|
||||||
|
{},
|
||||||
|
{},
|
||||||
|
{ password: "Password must contain at least 8 symbols" },
|
||||||
|
];
|
||||||
|
expect(validator(threeDevices)).toEqual(threeDevicesFormErrors);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("ByteCount function", () => {
|
||||||
|
expect(byteCount("abc")).toEqual(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("Should validate password length", () => {
|
||||||
|
const shortErrorFeedback = /Password must contain/i;
|
||||||
|
const longErrorFeedback = /Password must not contain/i;
|
||||||
|
|
||||||
|
fireEvent.click(getByText("Wi-Fi 1"));
|
||||||
|
|
||||||
|
const passwordInput = getByLabelText("Password");
|
||||||
|
|
||||||
|
const changePassword = (value) =>
|
||||||
|
fireEvent.change(passwordInput, { target: { value } });
|
||||||
|
|
||||||
|
changePassword("12");
|
||||||
|
expect(getByText(shortErrorFeedback)).toBeDefined();
|
||||||
|
|
||||||
|
changePassword(
|
||||||
|
"longpasswordlongpasswordlongpasswordlongpasswordlongpasswordlong"
|
||||||
|
);
|
||||||
|
expect(getByText(longErrorFeedback)).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
404
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
Normal file
404
src/common/WiFiSettings/__tests__/__fixtures__/wifiSettings.js
Normal file
@ -0,0 +1,404 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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: "HT80",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
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",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const oneDevice = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "Turris1",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const twoDevices = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
SSID: "Turris2",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 1,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const threeDevices = {
|
||||||
|
devices: [
|
||||||
|
{
|
||||||
|
SSID: "Turris1",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 0,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
SSID: "Turris2",
|
||||||
|
channel: 60,
|
||||||
|
enabled: false,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 1,
|
||||||
|
password: "TestPass",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
SSID: "Turris3",
|
||||||
|
channel: 60,
|
||||||
|
enabled: true,
|
||||||
|
guest_wifi: { enabled: false },
|
||||||
|
hidden: false,
|
||||||
|
htmode: "HT40",
|
||||||
|
hwmode: "11a",
|
||||||
|
id: 2,
|
||||||
|
password: "",
|
||||||
|
encryption: "WPA3",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
export { oneDevice, twoDevices, threeDevices };
|
@ -0,0 +1,965 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -241,207 +241,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="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
|
||||||
|
>
|
||||||
|
<form>
|
||||||
|
<div
|
||||||
|
class="form-group switch"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-switch custom-control-inline switch-heading"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="custom-control-input"
|
||||||
|
id="1"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="1"
|
||||||
|
>
|
||||||
|
<h2>
|
||||||
|
Wi-Fi 1
|
||||||
|
</h2>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr />
|
||||||
|
<div
|
||||||
|
class="form-group switch"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="custom-control custom-switch custom-control-inline switch-heading"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="custom-control-input"
|
||||||
|
id="2"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<label
|
||||||
|
class="custom-control-label"
|
||||||
|
for="2"
|
||||||
|
>
|
||||||
|
<h2>
|
||||||
|
Wi-Fi 2
|
||||||
|
</h2>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="text-right"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn btn-primary col-sm-12 col-md-3 col-lg-2"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
|
||||||
|
>
|
||||||
|
<h2>
|
||||||
|
Reset Wi-Fi Settings
|
||||||
|
</h2>
|
||||||
|
<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="text-right"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn btn-primary col-sm-12 col-md-3 col-lg-2"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Reset Wi-Fi Settings
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</DocumentFragment>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -524,10 +524,92 @@
|
||||||
|
>
|
||||||
|
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>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"24\\"
|
||||||
|
+ >
|
||||||
|
+ SSID
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"form-control\\"
|
||||||
|
+ id=\\"24\\"
|
||||||
|
+ 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>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+ SSID which contains non-standard characters could cause problems on some devices.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"25\\"
|
||||||
|
+ >
|
||||||
|
+ Password
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ autocomplete=\\"current-password\\"
|
||||||
|
+ class=\\"form-control is-invalid\\"
|
||||||
|
+ id=\\"25\\"
|
||||||
|
+ 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/3 pre-shared key, that is required to connect to the network.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
<hr />
|
||||||
|
<div
|
||||||
|
class=\\"form-group switch\\"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
@@ -551,10 +633,11 @@
|
||||||
|
<div
|
||||||
|
class=\\"text-right\\"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class=\\"btn btn-primary col-sm-12 col-md-3 col-lg-2\\"
|
||||||
|
+ disabled=\\"\\"
|
||||||
|
type=\\"submit\\"
|
||||||
|
>
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
</div>"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
|
||||||
|
"Snapshot Diff:
|
||||||
|
- First value
|
||||||
|
+ Second value
|
||||||
|
|
||||||
|
@@ -22,10 +22,512 @@
|
||||||
|
Wi-Fi 1
|
||||||
|
</h2>
|
||||||
|
</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>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+ SSID which contains non-standard characters could cause problems on some devices.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"5\\"
|
||||||
|
+ >
|
||||||
|
+ Password
|
||||||
|
+ </label>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"input-group\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ autocomplete=\\"current-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/3 pre-shared key, that is required to connect to the network.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-switch\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"6\\"
|
||||||
|
+ type=\\"checkbox\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"6\\"
|
||||||
|
+ >
|
||||||
|
+ Hide SSID
|
||||||
|
+ </label>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted mt-0 mb-3\\"
|
||||||
|
+ >
|
||||||
|
+ If set, network is not visible when scanning for available networks.
|
||||||
|
+ </small>
|
||||||
|
+ </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/ax 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/ax mode of operation. 802.11n with 40 MHz wide channels can yield higher throughput but can cause more interference in the network. If you don't know what to choose, use the default option with 20 MHz wide channel.
|
||||||
|
+ </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\\"
|
||||||
|
+ >
|
||||||
|
+ <label
|
||||||
|
+ for=\\"10\\"
|
||||||
|
+ >
|
||||||
|
+ Encryption
|
||||||
|
+ </label>
|
||||||
|
+ <select
|
||||||
|
+ class=\\"custom-select\\"
|
||||||
|
+ id=\\"10\\"
|
||||||
|
+ >
|
||||||
|
+ <option
|
||||||
|
+ value=\\"WPA3\\"
|
||||||
|
+ >
|
||||||
|
+ WPA3 only
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"WPA2/3\\"
|
||||||
|
+ >
|
||||||
|
+ WPA3 with WPA2 as fallback (default)
|
||||||
|
+ </option>
|
||||||
|
+ <option
|
||||||
|
+ value=\\"WPA2\\"
|
||||||
|
+ >
|
||||||
|
+ WPA2 only
|
||||||
|
+ </option>
|
||||||
|
+ </select>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted\\"
|
||||||
|
+ >
|
||||||
|
+ The WPA3 standard is the new most secure encryption method that is suggested to be used with any device that supports it. The older devices without WPA3 support require older WPA2. If you experience issues with connecting older devices, try to enable WPA2.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-switch\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"11\\"
|
||||||
|
+ type=\\"checkbox\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"11\\"
|
||||||
|
+ >
|
||||||
|
+ Disable Management Frame Protection
|
||||||
|
+ </label>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted mt-0 mb-3\\"
|
||||||
|
+ >
|
||||||
|
+ In case you have trouble connecting to WiFi Access Point, try disabling Management Frame Protection.
|
||||||
|
+ </small>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
+ <div
|
||||||
|
+ class=\\"form-group\\"
|
||||||
|
+ >
|
||||||
|
+ <div
|
||||||
|
+ class=\\"custom-control custom-switch\\"
|
||||||
|
+ >
|
||||||
|
+ <input
|
||||||
|
+ class=\\"custom-control-input\\"
|
||||||
|
+ id=\\"12\\"
|
||||||
|
+ type=\\"checkbox\\"
|
||||||
|
+ />
|
||||||
|
+ <label
|
||||||
|
+ class=\\"custom-control-label\\"
|
||||||
|
+ for=\\"12\\"
|
||||||
|
+ >
|
||||||
|
+ Enable Guest Wi-Fi
|
||||||
|
+ </label>
|
||||||
|
+ <small
|
||||||
|
+ class=\\"form-text text-muted mt-0 mb-3\\"
|
||||||
|
+ >
|
||||||
|
+ 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>
|
||||||
|
+ </div>
|
||||||
|
+ </div>
|
||||||
|
<hr />
|
||||||
|
<div
|
||||||
|
class=\\"form-group switch\\"
|
||||||
|
>
|
||||||
|
<div"
|
||||||
|
`;
|
52
src/common/WiFiSettings/constants.js
Normal file
52
src/common/WiFiSettings/constants.js
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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"),
|
||||||
|
VHT160: _("802.11ac - 160 MHz wide channel"),
|
||||||
|
HE20: _("802.11ax - 20 MHz wide channel"),
|
||||||
|
HE40: _("802.11ax - 40 MHz wide channel"),
|
||||||
|
HE80: _("802.11ax - 80 MHz wide channel"),
|
||||||
|
HE160: _("802.11ax - 160 MHz wide channel"),
|
||||||
|
};
|
||||||
|
export const HWMODES = {
|
||||||
|
"11g": "2.4",
|
||||||
|
"11a": "5",
|
||||||
|
};
|
||||||
|
export const ENCRYPTIONMODES = {
|
||||||
|
WPA3: _("WPA3 only"),
|
||||||
|
"WPA2/3": _("WPA3 with WPA2 as fallback (default)"),
|
||||||
|
WPA2: _("WPA2 only"),
|
||||||
|
};
|
||||||
|
export const HELP_TEXTS = {
|
||||||
|
ssid: _(
|
||||||
|
"SSID which contains non-standard characters could cause problems on some devices."
|
||||||
|
),
|
||||||
|
password: _(
|
||||||
|
"WPA2/3 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/ax mode of operation. 802.11n with 40 MHz wide channels can yield higher throughput but can cause more interference in the network. If you don't know what to choose, use the default option with 20 MHz wide channel."
|
||||||
|
),
|
||||||
|
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."
|
||||||
|
),
|
||||||
|
wpa3: _(
|
||||||
|
"The WPA3 standard is the new most secure encryption method that is suggested to be used with any device that supports it. The older devices without WPA3 support require older WPA2. If you experience issues with connecting older devices, try to enable WPA2."
|
||||||
|
),
|
||||||
|
};
|
42
src/common/WiFiSettings/qrCodeHelpers.js
Normal file
42
src/common/WiFiSettings/qrCodeHelpers.js
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/*
|
||||||
|
* 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 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 is exposed by reForis main application. Thus we can use it from globals.
|
||||||
|
window.pdfMake.createPdf(docDefinition).download("wifi.pdf");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toQRCodeContent(SSID, password) {
|
||||||
|
return `WIFI:S:${SSID};T:WPA2;P:${password};;`;
|
||||||
|
}
|
@ -7,7 +7,13 @@
|
|||||||
|
|
||||||
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";
|
||||||
@ -17,39 +23,41 @@ import { RebootButton } from "../RebootButton";
|
|||||||
describe("<RebootButton/>", () => {
|
describe("<RebootButton/>", () => {
|
||||||
let componentContainer;
|
let componentContainer;
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
const { container } = render(<>
|
const { container } = render(
|
||||||
<div id="modal-container"/>
|
<>
|
||||||
<RebootButton/>
|
<div id="modal-container" />
|
||||||
</>);
|
<RebootButton />
|
||||||
|
</>
|
||||||
|
);
|
||||||
componentContainer = container;
|
componentContainer = container;
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Render.", () => {
|
it("Render.", () => {
|
||||||
expect(componentContainer)
|
expect(componentContainer).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Render modal.", () => {
|
it("Render modal.", () => {
|
||||||
expect(queryByText(componentContainer, "Confirm reboot"))
|
expect(queryByText(componentContainer, "Confirm reboot")).toBeNull();
|
||||||
.toBeNull();
|
|
||||||
fireEvent.click(getByText(componentContainer, "Reboot"));
|
fireEvent.click(getByText(componentContainer, "Reboot"));
|
||||||
expect(componentContainer)
|
expect(componentContainer).toMatchSnapshot();
|
||||||
.toMatchSnapshot();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Confirm reboot.", () => {
|
it("Confirm reboot.", () => {
|
||||||
fireEvent.click(getByText(componentContainer, "Reboot"));
|
fireEvent.click(getByText(componentContainer, "Reboot"));
|
||||||
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
|
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
|
||||||
expect(mockAxios.post)
|
expect(mockAxios.post).toHaveBeenCalledWith(
|
||||||
.toHaveBeenCalledWith("/reforis/api/reboot", undefined, expect.anything());
|
"/reforis/api/reboot",
|
||||||
|
undefined,
|
||||||
|
expect.anything()
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("Hold error.", async () => {
|
it("Hold error.", async () => {
|
||||||
fireEvent.click(getByText(componentContainer, "Reboot"));
|
fireEvent.click(getByText(componentContainer, "Reboot"));
|
||||||
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
|
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
|
||||||
mockJSONError();
|
mockJSONError();
|
||||||
await wait(() => expect(mockSetAlert)
|
await wait(() =>
|
||||||
.toBeCalledWith("Reboot request failed."));
|
expect(mockSetAlert).toBeCalledWith("Reboot request failed.")
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -22,7 +22,7 @@ exports[`<RebootButton/> Render modal. 1`] = `
|
|||||||
<h5
|
<h5
|
||||||
class="modal-title"
|
class="modal-title"
|
||||||
>
|
>
|
||||||
Reboot confirmation
|
Warning!
|
||||||
</h5>
|
</h5>
|
||||||
<button
|
<button
|
||||||
class="close"
|
class="close"
|
||||||
@ -49,16 +49,12 @@ exports[`<RebootButton/> Render modal. 1`] = `
|
|||||||
class="btn btn-primary "
|
class="btn btn-primary "
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="btn btn-danger"
|
class="btn btn-danger"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Confirm reboot
|
Confirm reboot
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -70,8 +66,6 @@ exports[`<RebootButton/> Render modal. 1`] = `
|
|||||||
class="btn btn-danger"
|
class="btn btn-danger"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Reboot
|
Reboot
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -86,8 +80,6 @@ exports[`<RebootButton/> Render. 1`] = `
|
|||||||
class="btn btn-danger"
|
class="btn btn-danger"
|
||||||
type="button"
|
type="button"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Reboot
|
Reboot
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -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([
|
||||||
@ -22,9 +22,12 @@ function AlertContextProvider({ children }) {
|
|||||||
const { AlertContext } = window;
|
const { AlertContext } = window;
|
||||||
const [alert, setAlert] = useState(null);
|
const [alert, setAlert] = useState(null);
|
||||||
|
|
||||||
const setAlertWrapper = useCallback((message, type = ALERT_TYPES.DANGER) => {
|
const setAlertWrapper = useCallback(
|
||||||
setAlert({ message, type });
|
(message, type = ALERT_TYPES.DANGER) => {
|
||||||
}, [setAlert]);
|
setAlert({ message, type });
|
||||||
|
},
|
||||||
|
[setAlert]
|
||||||
|
);
|
||||||
|
|
||||||
const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
|
const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
|
||||||
|
|
||||||
@ -38,7 +41,7 @@ function AlertContextProvider({ children }) {
|
|||||||
</Portal>
|
</Portal>
|
||||||
)}
|
)}
|
||||||
<AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
|
<AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
|
||||||
{ children }
|
{children}
|
||||||
</AlertContext.Provider>
|
</AlertContext.Provider>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
5
src/context/alertContext/AlertContext.md
Normal file
5
src/context/alertContext/AlertContext.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
It provides alert context to children. `AlertContext` allows using `useAlert` in
|
||||||
|
components.
|
||||||
|
|
||||||
|
Notice that `<div id="alert-container"/>` should be presented in HTML doc to get
|
||||||
|
it work (In reForis it's already done with base Jinja2 templates).
|
@ -20,7 +20,7 @@ function AlertTest() {
|
|||||||
<button onClick={dismissAlert}>Dismiss alert</button>
|
<button onClick={dismissAlert}>Dismiss alert</button>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
}
|
||||||
|
|
||||||
describe("AlertContext", () => {
|
describe("AlertContext", () => {
|
||||||
let componentContainer;
|
let componentContainer;
|
57
src/context/customizationContext/CustomizationContext.js
Normal file
57
src/context/customizationContext/CustomizationContext.js
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React, { useContext, useEffect } from "react";
|
||||||
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
|
import { useAPIGet } from "../../api/hooks";
|
||||||
|
import { ForisURLs } from "../../utils/forisUrls";
|
||||||
|
|
||||||
|
import { Spinner } from "../../bootstrap/Spinner";
|
||||||
|
|
||||||
|
CustomizationContextProvider.propTypes = {
|
||||||
|
children: PropTypes.oneOfType([
|
||||||
|
PropTypes.arrayOf(PropTypes.node),
|
||||||
|
PropTypes.node,
|
||||||
|
]),
|
||||||
|
};
|
||||||
|
|
||||||
|
function CustomizationContextProvider({ children }) {
|
||||||
|
const { CustomizationContext } = window;
|
||||||
|
const [getCustomizationResponse, getCustomization] = useAPIGet(
|
||||||
|
ForisURLs.about
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getCustomization();
|
||||||
|
}, [getCustomization]);
|
||||||
|
|
||||||
|
if (getCustomizationResponse.state !== "success") {
|
||||||
|
return <Spinner fullScreen />;
|
||||||
|
}
|
||||||
|
|
||||||
|
const deviceDetails = getCustomizationResponse.data || {};
|
||||||
|
|
||||||
|
const isCustomized = !!(
|
||||||
|
deviceDetails &&
|
||||||
|
deviceDetails.customization !== undefined &&
|
||||||
|
deviceDetails.customization === "shield"
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<CustomizationContext.Provider value={{ deviceDetails, isCustomized }}>
|
||||||
|
{children}
|
||||||
|
</CustomizationContext.Provider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function useCustomizationContext() {
|
||||||
|
const { CustomizationContext } = window;
|
||||||
|
return useContext(CustomizationContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
export { CustomizationContextProvider, useCustomizationContext };
|
3
src/context/customizationContext/CustomizationContext.md
Normal file
3
src/context/customizationContext/CustomizationContext.md
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
It provides customization context to the children. `CustomizationContext` allows
|
||||||
|
using `useCustomizationContext` in components to check if the reForis UI is
|
||||||
|
customized or not for specific devices.
|
@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
|
*
|
||||||
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
|
* See /LICENSE for more information.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
|
||||||
|
import { render, wait, getByText } from "customTestRender";
|
||||||
|
import mockAxios from "jest-mock-axios";
|
||||||
|
|
||||||
|
import {
|
||||||
|
useCustomizationContext,
|
||||||
|
CustomizationContextProvider,
|
||||||
|
} from "../CustomizationContext";
|
||||||
|
|
||||||
|
const CUSTOM = "Description / component for customized reForis (Shield)";
|
||||||
|
const ORIGINAL = "Description / component for original reForis (other devices)";
|
||||||
|
|
||||||
|
const CustomizationTest = () => {
|
||||||
|
const { isCustomized } = useCustomizationContext();
|
||||||
|
|
||||||
|
return <p>{isCustomized ? CUSTOM : ORIGINAL}</p>;
|
||||||
|
};
|
||||||
|
|
||||||
|
describe("CustomizationContext", () => {
|
||||||
|
let componentContainer;
|
||||||
|
beforeEach(() => {
|
||||||
|
const { container } = render(
|
||||||
|
<CustomizationContextProvider>
|
||||||
|
<CustomizationTest />
|
||||||
|
</CustomizationContextProvider>
|
||||||
|
);
|
||||||
|
componentContainer = container;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should render component without customization", async () => {
|
||||||
|
mockAxios.mockResponse({ data: {} });
|
||||||
|
|
||||||
|
await wait(() => getByText(componentContainer, ORIGINAL));
|
||||||
|
|
||||||
|
expect(componentContainer).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should render customized component", async () => {
|
||||||
|
mockAxios.mockResponse({ data: { customization: "shield" } });
|
||||||
|
|
||||||
|
await wait(() => getByText(componentContainer, CUSTOM));
|
||||||
|
|
||||||
|
expect(componentContainer).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
@ -0,0 +1,17 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`CustomizationContext should render component without customization 1`] = `
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
Description / component for original reForis (other devices)
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`CustomizationContext should render customized component 1`] = `
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
Description / component for customized reForis (Shield)
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
`;
|
@ -12,18 +12,15 @@ 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-md-3 col-lg-2"
|
||||||
disabled=""
|
disabled=""
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
@ -13,8 +13,6 @@ exports[`<SubmitButton/> Render load 1`] = `
|
|||||||
role="status"
|
role="status"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Load settings
|
Load settings
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -23,11 +21,9 @@ 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-md-3 col-lg-2"
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -36,7 +32,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-md-3 col-lg-2"
|
||||||
disabled=""
|
disabled=""
|
||||||
type="submit"
|
type="submit"
|
||||||
>
|
>
|
||||||
@ -46,8 +42,6 @@ exports[`<SubmitButton/> Render saving 1`] = `
|
|||||||
role="status"
|
role="status"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Updating
|
Updating
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -5,99 +5,113 @@
|
|||||||
* 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 { act, fireEvent, render, waitForElement } from "customTestRender";
|
||||||
import mockAxios from 'jest-mock-axios';
|
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(() => ({
|
||||||
mockValidator = jest.fn(data => data.field === 'invalidValue' ? {field: 'Error'} : {});
|
field: "preparedDataToSubmit",
|
||||||
const {getByTestId, container} = render(
|
}));
|
||||||
|
mockValidator = jest.fn((data) =>
|
||||||
|
data.field === "invalidValue" ? { field: "Error" } : {}
|
||||||
|
);
|
||||||
|
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, {
|
||||||
expect(input.value).toBe('newValue');
|
target: { value: "newValue", type: "text" },
|
||||||
|
});
|
||||||
|
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,9 +120,9 @@ 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()
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -1,138 +1,100 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
|
* Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
|
||||||
*
|
*
|
||||||
* This is free software, licensed under the GNU General Public License v3.
|
* This is free software, licensed under the GNU General Public License v3.
|
||||||
* See /LICENSE for more information.
|
* See /LICENSE for more information.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {
|
import {
|
||||||
validateDomain,
|
|
||||||
validateDUID,
|
|
||||||
validateIPv4Address,
|
validateIPv4Address,
|
||||||
validateIPv6Address,
|
validateIPv6Address,
|
||||||
validateIPv6Prefix,
|
validateIPv6Prefix,
|
||||||
validateMAC
|
validateDomain,
|
||||||
} from "validations";
|
validateHostname,
|
||||||
|
validateDUID,
|
||||||
|
validateMAC,
|
||||||
|
} from "utils/validations";
|
||||||
|
|
||||||
describe("Validation functions", () => {
|
describe("Validation functions", () => {
|
||||||
it("validateIPv4Address valid", () => {
|
it("validateIPv4Address valid", () => {
|
||||||
expect(validateIPv4Address("192.168.1.1"))
|
expect(validateIPv4Address("192.168.1.1")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv4Address("1.1.1.1")).toBe(undefined);
|
||||||
expect(validateIPv4Address("1.1.1.1"))
|
expect(validateIPv4Address("0.0.0.0")).toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv4Address("0.0.0.0"))
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
it("validateIPv4Address invalid", () => {
|
it("validateIPv4Address invalid", () => {
|
||||||
expect(validateIPv4Address("invalid"))
|
expect(validateIPv4Address("invalid")).not.toBe(undefined);
|
||||||
.not
|
expect(validateIPv4Address("192.256.1.1")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv4Address("192.168.256.1")).not.toBe(undefined);
|
||||||
expect(validateIPv4Address("192.256.1.1"))
|
expect(validateIPv4Address("192.168.1.256")).not.toBe(undefined);
|
||||||
.not
|
expect(validateIPv4Address("192.168.1.256")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv4Address("192.168.256.1"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv4Address("192.168.1.256"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv4Address("192.168.1.256"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("validateIPv6Address valid", () => {
|
it("validateIPv6Address valid", () => {
|
||||||
expect(validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
|
expect(
|
||||||
.toBe(undefined);
|
validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
|
||||||
expect(validateIPv6Address("0:0:0:0:0:0:0:1"))
|
).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv6Address("0:0:0:0:0:0:0:1")).toBe(undefined);
|
||||||
expect(validateIPv6Address("::1"))
|
expect(validateIPv6Address("::1")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv6Address("::")).toBe(undefined);
|
||||||
expect(validateIPv6Address("::"))
|
|
||||||
.toBe(undefined);
|
|
||||||
|
|
||||||
});
|
});
|
||||||
it("validateIPv6Address invalid", () => {
|
it("validateIPv6Address invalid", () => {
|
||||||
expect(validateIPv6Address("invalid"))
|
expect(validateIPv6Address("invalid")).not.toBe(undefined);
|
||||||
.not
|
expect(validateIPv6Address("1.1.1.1")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313")).not.toBe(
|
||||||
expect(validateIPv6Address("1.1.1.1"))
|
undefined
|
||||||
.not
|
);
|
||||||
.toBe(undefined);
|
expect(
|
||||||
expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313"))
|
validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313")
|
||||||
.not
|
).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("validateIPv6Prefix valid", () => {
|
it("validateIPv6Prefix valid", () => {
|
||||||
expect(validateIPv6Prefix("2002:0000::/16"))
|
expect(validateIPv6Prefix("2002:0000::/16")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateIPv6Prefix("0::/0")).toBe(undefined);
|
||||||
expect(validateIPv6Prefix("0::/0"))
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
it("validateIPv6Prefix invalid", () => {
|
it("validateIPv6Prefix invalid", () => {
|
||||||
expect(validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
|
expect(
|
||||||
.not
|
validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
|
||||||
.toBe(undefined);
|
).not.toBe(undefined);
|
||||||
expect(validateIPv6Prefix("::1"))
|
expect(validateIPv6Prefix("::1")).not.toBe(undefined);
|
||||||
.not
|
expect(validateIPv6Prefix("2002:0000::/999")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateIPv6Prefix("2002:0000::/999"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
it("validateDomain valid", () => {
|
it("validateDomain valid", () => {
|
||||||
expect(validateDomain("example.com"))
|
expect(validateDomain("example.com")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateDomain("one.two.three")).toBe(undefined);
|
||||||
expect(validateDomain("one.two.three"))
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
it("validateDomain invalid", () => {
|
it("validateDomain invalid", () => {
|
||||||
expect(validateDomain("test/"))
|
expect(validateDomain("test/")).not.toBe(undefined);
|
||||||
.not
|
expect(validateDomain(".")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
});
|
||||||
expect(validateDomain("."))
|
|
||||||
.not
|
it("validateHostname valid", () => {
|
||||||
.toBe(undefined);
|
expect(validateHostname("new-android")).toBe(undefined);
|
||||||
|
expect(validateHostname("local")).toBe(undefined);
|
||||||
|
});
|
||||||
|
it("validateHostname invalid", () => {
|
||||||
|
expect(validateHostname("-android")).not.toBe(undefined);
|
||||||
|
expect(validateHostname("local.")).not.toBe(undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("validateDUID valid", () => {
|
it("validateDUID valid", () => {
|
||||||
expect(validateDUID("abcdefAB"))
|
expect(validateDUID("abcdefAB")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateDUID("ABCDEF12")).toBe(undefined);
|
||||||
expect(validateDUID("ABCDEF12"))
|
expect(validateDUID("ABCDEF12AB")).toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateDUID("ABCDEF12AB"))
|
|
||||||
.toBe(undefined);
|
|
||||||
|
|
||||||
});
|
});
|
||||||
it("validateDUID invalid", () => {
|
it("validateDUID invalid", () => {
|
||||||
expect(validateDUID("gggggggg"))
|
expect(validateDUID("gggggggg")).not.toBe(undefined);
|
||||||
.not
|
expect(validateDUID("abcdefABa")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateDUID("abcdefABa"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("validateMAC valid", () => {
|
it("validateMAC valid", () => {
|
||||||
expect(validateMAC("00:D0:56:F2:B5:12"))
|
expect(validateMAC("00:D0:56:F2:B5:12")).toBe(undefined);
|
||||||
.toBe(undefined);
|
expect(validateMAC("00:26:DD:14:C4:EE")).toBe(undefined);
|
||||||
expect(validateMAC("00:26:DD:14:C4:EE"))
|
expect(validateMAC("06:00:00:00:00:00")).toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateMAC("06:00:00:00:00:00"))
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
it("validateMAC invalid", () => {
|
it("validateMAC invalid", () => {
|
||||||
expect(validateMAC("00:00:00:00:00:0G"))
|
expect(validateMAC("00:00:00:00:00:0G")).not.toBe(undefined);
|
||||||
.not
|
expect(validateMAC("06:00:00:00:00:00:00")).not.toBe(undefined);
|
||||||
.toBe(undefined);
|
|
||||||
expect(validateMAC("06:00:00:00:00:00:00"))
|
|
||||||
.not
|
|
||||||
.toBe(undefined);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user