1
0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-06-15 13:36:35 +02:00

Compare commits

...

150 Commits

Author SHA1 Message Date
896277b62a Bump v5.1.1 2020-08-31 16:04:03 +02:00
b0365e3b06 NPM audit fix 2020-08-31 15:56:01 +02:00
8bd71a08af Update Snapshots 2020-08-31 15:56:01 +02:00
1903016f13 Add "inline" option to RadioSet 2020-08-31 15:56:00 +02:00
443f14d26c Add ability to select switch's form-group 2020-08-31 15:56:00 +02:00
61b349c6cc Merge branch 'fluid-aid' into 'dev'
Add auxiliary features in order to support Fluid Layout

See merge request turris/reforis/foris-js!121
2020-08-25 17:35:28 +02:00
7a98ab0c2d Bump v5.1.0 2020-08-25 17:32:24 +02:00
5de05fe4eb NPM audit fix 2020-08-25 17:32:24 +02:00
50943e0b11 fixup! Fix buttons size outside of form's card layout 2020-08-25 17:32:23 +02:00
f64419c643 Add tests for Switch 2020-08-18 17:37:08 +02:00
a0f7a312e5 .gitlab.ci: update to node 10 2020-08-18 16:17:00 +02:00
f8726e6012 Format all files with Prettier 2020-08-18 16:17:00 +02:00
e41da48b1a Integrate Prettier + ESLint + reForis Style Guide 2020-08-18 16:17:00 +02:00
a434ecac18 Update Snapshots 2020-08-18 15:41:05 +02:00
5ae129b0f5 Fix tests 2020-08-18 15:41:05 +02:00
a2acac255d Swap checkboxes for switches on Wi-Fi page 2020-08-18 15:41:04 +02:00
c1b1d8c079 Add Switch component 2020-08-18 15:41:03 +02:00
e422acc92f Add testUtils to .gitignore 2020-08-10 15:57:06 +02:00
705ed5ac80 Update Snapshots 2020-08-06 17:25:49 +02:00
1dd1805ae0 Fix buttons size outside of form's card layout 2020-08-06 17:25:38 +02:00
e858b30994 Add appropriate links to dropdown headers 2020-08-05 14:37:14 +02:00
8a56d71c51 Add semantic & accessibility structure for headings 2020-08-05 14:36:54 +02:00
d34c465787 Update Snapshots 2020-07-30 11:57:50 +02:00
cbf37dd747 Fix overview & notifications URLs 2020-07-30 11:40:11 +02:00
f9cfb248d3 Decrease button width on different breakpoints 2020-07-22 16:07:41 +02:00
9be880aeaa Remove form's offset & extend it on 12 columns 2020-07-22 15:59:49 +02:00
a4bb41d585 Merge branch 'dev' into 'master'
Release v5.0.1

See merge request turris/reforis/foris-js!120
2020-07-21 12:52:29 +02:00
c3b09b01e5 Merge branch 'release-v5.0.1' into 'dev'
Release v5.0.1

See merge request turris/reforis/foris-js!119
2020-07-21 12:20:53 +02:00
12b862c568 Bump v5.0.1 2020-07-21 11:59:13 +02:00
54f9f984f1 NPM audit fix & update of packages 2020-07-21 11:59:12 +02:00
5dbc58d44b Merge branch 'new-channel-bandwidth' into 'dev'
New channel bandwidth & Natural Sort of options

Closes reforis#200

See merge request turris/reforis/foris-js!118
2020-07-17 16:27:27 +02:00
e7f9fbca96 Merge branch 'dev' into 'new-channel-bandwidth'
# Conflicts:
#   src/common/WiFiSettings/WiFiForm.js
2020-07-17 16:24:43 +02:00
8d40dbb841 Merge branch 'additional-wifi-module-fix' into 'dev'
Fix Wi-Fi Form bug with additional Wi-Fi modules

Closes reforis#204

See merge request turris/reforis/foris-js!117
2020-07-17 14:38:24 +02:00
cea8aa0c12 Fix a Wi-Fi Form bug with additional Wi-Fi modules 2020-07-17 14:33:35 +02:00
16a7a6c52d Update Snapshots 2020-07-17 14:19:56 +02:00
597b6fcf4c Add Natural sort order for list of options 2020-07-17 14:19:56 +02:00
5eb6b90ed4 Add 802.11ac 160 MHz wide channel to constants 2020-07-17 13:38:30 +02:00
48c323c1a1 Fix Wi-Fi Form bug with additional Wi-Fi modules 2020-07-17 12:26:46 +02:00
3d57b38808 Merge branch 'dev' into 'master'
Merging Dev into Master

See merge request turris/reforis/foris-js!116
2020-07-16 16:07:04 +02:00
ae8baddbdd Merge branch 'one-wifi-module-fix' into 'dev'
Fix form submission button with one Wi-Fi module.

Closes reforis#192

See merge request turris/reforis/foris-js!115
2020-07-13 19:38:44 +02:00
67e4abe4d1 Add test suites for a Wi-Fi form submission 2020-07-07 11:35:58 +02:00
57f1ccced8 Fix form submission button for one or more Wi-Fi modules. 2020-06-29 13:24:42 +02:00
1e95bff7ff Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!114
2020-06-04 22:56:37 +02:00
0f253ecc19 Merge branch 'docs-update' into 'dev'
Docs update

See merge request turris/reforis/foris-js!113
2020-06-04 22:52:24 +02:00
a5e096dc00 Fix and update docs. 2020-06-04 22:52:24 +02:00
182cbe698f Merge branch 'dev' into 'master'
Bump v5.0.0.

See merge request turris/reforis/foris-js!111
2020-05-07 17:17:47 +02:00
982eb371ad Bump v5.0.0.
I've realized that it should be major update due to broken API.
2020-05-07 16:55:55 +02:00
2786f856f7 Merge branch 'dev' into 'master'
Release v4.5.1.

See merge request turris/reforis/foris-js!110
2020-05-07 16:47:30 +02:00
48b080dc26 Merge branch 'release-4.5.1' into 'dev'
Release v4.5.1.

See merge request turris/reforis/foris-js!109
2020-05-07 16:40:27 +02:00
71beeb46f1 Bump v4.5.1.
* Add initial data to ForisForm children.
 * Update .pot file.
2020-05-07 16:34:33 +02:00
060a0489e1 Merge branch 'translations' into 'dev'
Update translations (.pot).

See merge request turris/reforis/foris-js!108
2020-05-07 16:31:44 +02:00
ae49b246cd Update translations (.pot). 2020-05-07 16:13:03 +02:00
27c37eb74b Merge branch 'add-inital-form-data-to-children-of-foris-form' into 'dev'
Add initial form data to children of the ForisForm.

See merge request turris/reforis/foris-js!107
2020-05-07 16:03:51 +02:00
cd708fa294 Add initial form data to children of the ForisForm. 2020-05-07 16:00:02 +02:00
8ec0392852 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!106
2020-03-26 16:29:27 +01:00
27a5e62d9a Merge branch 'fix-pdfmake' into 'dev'
Fix pdfmake.

See merge request turris/reforis/foris-js!105
2020-03-25 21:34:38 +01:00
aeaad4aa72 Bump v4.5.0. 2020-03-25 21:26:59 +01:00
256a000d61 NPM update. 2020-03-25 21:17:12 +01:00
c78ed9a5d0 NPM audit fix. 2020-03-25 21:17:12 +01:00
bded10211a Use pdfmake from globals. 2020-03-25 21:17:12 +01:00
25ac6cf1e9 Remove pdfmake. 2020-03-25 21:17:12 +01:00
9a2547a6c2 Merge branch 'dev' into 'master'
Release v4.4.0.

See merge request turris/reforis/foris-js!104
2020-03-13 22:16:42 +01:00
7968c7af4a Merge branch 'fix-hostname-validation-regex' into 'dev'
Fix hostname validation regex

See merge request turris/reforis/foris-js!103
2020-03-13 21:41:49 +01:00
4b94c470c3 Bump v4.4.0. 2020-03-13 21:37:21 +01:00
e1b5a25ddd Update domain vadlidation. 2020-03-13 21:37:21 +01:00
95af86c776 NPM audit fix. 2020-03-13 21:37:21 +01:00
02b5583712 Move vadliadtions and forisUrls to utils. 2020-03-13 21:37:21 +01:00
2f4d757a1a Merge branch 'dev' into 'master'
Release v4.3.1.

See merge request turris/reforis/foris-js!102
2020-03-06 14:10:21 +01:00
3c7a67783f Merge branch 'add-logout-url' into 'dev'
Add logout URL.

See merge request turris/reforis/foris-js!101
2020-03-06 14:06:34 +01:00
4500e85a40 Bump v4.3.1. 2020-03-06 14:01:40 +01:00
ce955095fd Add logout link. 2020-03-06 14:00:18 +01:00
00b861531e Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!100
2020-02-26 17:02:47 +01:00
fad5b97a2e Merge branch 'release-4.3.0' into 'dev'
Release 4.3.0

See merge request turris/reforis/foris-js!99
2020-02-26 16:57:26 +01:00
aa639596d4 Bump v4.3.0. 2020-02-26 16:52:53 +01:00
1ee41f4f14 Merge branch 'radioset-element-children' into 'dev'
Allow RadioSet accept elements as children.

See merge request turris/reforis/foris-js!98
2020-02-26 15:24:28 +01:00
bf8c2d28bf Allow RadioSet accept elements as children. 2020-02-26 15:21:43 +01:00
dbb840d51c Merge branch 'scrollable-modal' into 'dev'
Add option to make modal scrollable.

See merge request turris/reforis/foris-js!97
2020-02-26 11:47:50 +01:00
ba772be869 Add option to make modal scrollable. 2020-02-26 11:44:52 +01:00
70da1c3c00 Merge branch 'dev' into 'master'
Release 4.2.0.

See merge request turris/reforis/foris-js!96
2020-02-26 11:37:23 +01:00
8e68bbc91f Merge branch 'release-v4.2.0' into 'dev'
Bump v4.2.0.

See merge request turris/reforis/foris-js!95
2020-02-21 16:33:31 +01:00
0af8c4aa28 Bump v4.2.0. 2020-02-21 16:06:21 +01:00
a9114caf9e Merge branch 'translations' into 'dev'
Translations

See merge request turris/reforis/foris-js!94
2020-02-21 11:07:13 +01:00
3c81264024 Create and update translation messages. 2020-02-20 17:29:11 +01:00
0330b39f2e Merge remote-tracking branch 'weblate/master' into translations 2020-02-20 17:26:34 +01:00
a7dcced08b Add weblate config file. 2020-02-20 17:19:07 +01:00
c453a35763 Merge branch 'dev' into 'master'
Release 4.1.0

See merge request turris/reforis/foris-js!93
2020-02-20 16:07:50 +01:00
d97248c6ec Merge branch 'datetime-utils' into 'dev'
Added date and time utilities.

See merge request turris/reforis/foris-js!92
2020-02-20 14:30:28 +01:00
9fbc4e8383 Added date and time utilities. 2020-02-20 14:30:28 +01:00
57bebc92c7 Merge branch 'dev' into 'master'
Release 4.0.0

See merge request turris/reforis/foris-js!91
2020-02-20 11:53:43 +01:00
5939e9dd0e Merge branch 'version-4.0.0' into 'dev'
Changed version to 4.0.0.

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

[skip ci]
2020-02-20 10:40:24 +01:00
0665869c30 Changed version to 4.0.0. 2020-02-19 10:34:47 +01:00
199b27d63a Merge branch '12-api-error' into 'dev'
Rethrow unhandled error from API hooks.

Closes #12

See merge request turris/reforis/foris-js!89
2020-02-18 17:37:34 +01:00
2b28434712 Rethrow unhandled error from API hooks. 2020-02-18 14:32:59 +01:00
388860d51e Merge branch 'dev' into 'master'
Release 3.4.0

See merge request turris/reforis/foris-js!88
2020-02-17 10:55:59 +01:00
8b7c459855 Merge branch 'css-refactoring' into 'dev'
Added styles extracted from reForis.

See merge request turris/reforis/foris-js!85
2020-02-14 17:26:24 +01:00
83409b0118 Merge branch 'foris-form-docs' into 'dev'
Fixed ForisForm docstring.

See merge request turris/reforis/foris-js!87
2020-02-14 13:55:23 +01:00
c1cd90dff6 Fixed ForisForm docstring. 2020-02-14 12:40:23 +01:00
01fb897180 Merge branch 'form-reference' into 'dev'
Added reference to form element.

See merge request turris/reforis/foris-js!86
2020-02-13 15:55:01 +01:00
716c323b28 Added reference to form element. 2020-02-10 12:06:16 +01:00
55dbf8f8bb Translated using Weblate (German)
Currently translated at 66.7% (12 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/de/
2020-02-04 19:50:20 +01:00
85e42980ec Added styles extracted from reForis. 2020-01-22 13:21:46 +01:00
3dee532ea2 Translated using Weblate (Norwegian Bokmål)
Currently translated at 77.8% (14 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/nb_NO/
2020-01-21 14:52:31 +01:00
3aac48d2bf Merge branch 'foris-form-error' into 'dev'
Display actual error within the form.

See merge request turris/reforis/foris-js!84
2020-01-20 16:54:42 +01:00
ee33d33738 Display actual error within the form. 2020-01-20 16:54:42 +01:00
605f682356 Merge branch 'dev' into 'master'
Release 3.2.0

See merge request turris/reforis/foris-js!81
2020-01-17 15:14:23 +01:00
a0a775996e Merge branch 'use-react-router-dom' into 'dev'
Use react-router-dom instead of react-router.

See merge request turris/reforis/foris-js!80
2020-01-17 14:35:20 +01:00
532acf9d86 Add warning about using <ForisForm /> component in plugins. 2020-01-17 13:15:46 +01:00
cbc3c2f3e7 Merge branch 'revert-disable-prompt' into 'dev'
Revert "Prompt as an optional element of ForisForm."

See merge request turris/reforis/foris-js!83
2020-01-17 12:44:12 +01:00
556e12c964 Revert "Prompt as an optional element of ForisForm."
This reverts commit 75bfbb88ae.
2020-01-17 12:44:11 +01:00
813a865f62 Merge branch 'conection-timeout' into 'dev'
Increased network timeout.

See merge request turris/reforis/foris-js!82
2020-01-17 12:10:56 +01:00
c495aa97ac Increased network timeout. 2020-01-16 18:40:57 +01:00
2d375b1690 Merge branch 'disable-form-prompt' into 'dev'
Prompt as an optional element of ForisForm.

See merge request turris/reforis/foris-js!77
2020-01-16 16:12:44 +01:00
e7e389e843 Add react-router-dom to peer dep. 2020-01-16 12:23:02 +01:00
8679749e0f Merge branch 'controller-id-in-hook' into 'dev'
Added controller ID filter to WebSocket hook.

See merge request turris/reforis/foris-js!79
2020-01-16 10:27:30 +01:00
6d8e0cec70 Added controller ID filter to WebSocket hook. 2020-01-16 10:27:30 +01:00
5091eecedf Use react-router-dom instead of react-router. 2020-01-15 18:19:04 +01:00
75bfbb88ae Prompt as an optional element of ForisForm. 2020-01-14 15:00:17 +01:00
e5cbbc9019 Merge branch 'wifi-messages' into 'dev'
Updated translation messages after moving WiFi form.

See merge request turris/reforis/foris-js!76
2020-01-13 16:10:19 +01:00
7ab1d2aaa4 Updated translation messages after moving WiFi form. 2020-01-13 16:10:19 +01:00
e62accc4b3 Translated using Weblate (French)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/fr/
2020-01-11 22:21:24 +01:00
03e071d5ee Merge branch 'dev' into 'master'
Release 3.1.1

See merge request turris/reforis/foris-js!75
2020-01-10 10:44:40 +01:00
d83ba3bfd3 Merge branch 'moment-timezone' into 'dev'
Moved moment-timezone to devDependencies.

See merge request turris/reforis/foris-js!74
2020-01-10 09:53:50 +01:00
3e2c89cac7 Moved moment-timezone to devDependencies. 2020-01-09 17:46:15 +01:00
e3d159d6a3 Merge branch 'expose-fix' into 'dev'
Fix for exposed libraries.

See merge request turris/reforis/foris-js!73
2020-01-09 16:39:59 +01:00
afa9b5a402 Fix for exposed libraries. 2020-01-09 16:33:25 +01:00
b8555247f2 Merge branch 'dev' into 'master'
Release 3.1.0

See merge request turris/reforis/foris-js!72
2020-01-09 11:57:45 +01:00
de8462429b Merge branch 'wifi-settings' into 'dev'
Wi-Fi settings form

See merge request turris/reforis/foris-js!71
2020-01-09 11:25:29 +01:00
5fd0d3626a Wi-Fi settings form 2020-01-09 11:25:29 +01:00
9dcc689491 Merge branch 'fix-main-js-path' into 'dev'
Fix main js file path in unpacked library.

See merge request turris/reforis/foris-js!70
2020-01-09 07:20:48 +01:00
35f307200d Bump version to 3.0.1. 2020-01-08 11:59:33 +01:00
afb5366dd7 Fix main js path in unpacked library. 2020-01-08 09:38:02 +01:00
1e6278abdf Merge branch 'dev' into 'master'
Release 3.0.0

See merge request turris/reforis/foris-js!68
2020-01-07 16:10:16 +01:00
6769e84e62 Merge branch 'version-3.0.0' into 'dev'
Version 3.0.0

See merge request turris/reforis/foris-js!69
2020-01-07 15:57:28 +01:00
71b0a9a5fa Version 3.0.0 [skip ci] 2020-01-07 15:37:07 +01:00
418e38de31 Merge branch 'form-widgets-size' into 'dev'
Form widgets size

See merge request turris/reforis/foris-js!66
2020-01-07 13:27:50 +01:00
56a4c47948 Form widgets size 2020-01-07 13:27:49 +01:00
c67ad164ce Merge branch 'pack-without-src' into 'dev'
Make packing without src.

See merge request turris/reforis/foris-js!67
2020-01-07 13:07:44 +01:00
6374fd5adf Make packing without src. 2020-01-07 13:03:55 +01:00
cc13e9c164 Merge branch 'no-babel' into 'dev'
No babel

See merge request turris/reforis/foris-js!64
2020-01-07 11:12:17 +01:00
bb90800945 Merge branch 'dev' into 'master'
Release 2.1.1

See merge request turris/reforis/foris-js!65
2020-01-06 09:56:29 +01:00
6d4bff2b4f Merge branch 'datepicker' into 'dev'
Display datepicker above input

Closes reforis#153

See merge request turris/reforis/foris-js!63
2020-01-06 09:45:16 +01:00
92f560b69f Display datepicker above input 2020-01-06 09:45:16 +01:00
a318f12352 Translated using Weblate (French)
Currently translated at 38.9% (7 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/fr/
2019-12-28 15:55:00 +01:00
32e3a57bd7 Fix source files path. 2019-12-27 12:10:19 +01:00
dd27802056 Fix relative imports. 2019-12-27 12:10:19 +01:00
bd4e1953e3 Don't use babel. 2019-12-27 12:10:19 +01:00
68e4368ae3 npm audit fix. 2019-12-27 12:10:19 +01:00
cffa0a2b80 Translated using Weblate (French)
Currently translated at 38.9% (7 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/fr/
2019-11-25 17:04:59 +01:00
7579fc3b8c Translated using Weblate (Swedish)
Currently translated at 11.1% (2 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/sv/
2019-11-23 18:04:52 +01:00
6601cd55e0 Translated using Weblate (Russian)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/ru/
2019-11-23 18:04:51 +01:00
135 changed files with 26069 additions and 14443 deletions

View File

@ -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
.gitignore vendored
View File

@ -51,3 +51,4 @@ coverage.xml
dist/ dist/
foris-*.tgz foris-*.tgz
styleguide/ styleguide/
testUtils

View File

@ -1,44 +1,44 @@
image: node:8-alpine image: node:10-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
View 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
View File

@ -0,0 +1,3 @@
[weblate]
url = https://hosted.weblate.org/api/
translation = turris/foris-js

View File

@ -35,11 +35,6 @@ $(VENV_NAME)/bin/activate:
install-js: package.json install-js: package.json
npm install --save-dev npm install --save-dev
watch-js:
npm run build:watch
build-js:
npm run build
collect-files: collect-files:
sh scripts/collect_files.sh sh scripts/collect_files.sh
pack: collect-files pack: collect-files
@ -51,6 +46,8 @@ publish-latest: collect-files
lint: lint:
npm run lint npm run lint
lint-js-fix:
npm run lint:fix
test: test:
npm test npm test

View File

@ -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
```

View File

@ -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: [],
},
},
}; };

25
docs/development.md Normal file
View 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
[`npm link`](https://docs.npmjs.com/cli/link).
Please, notice that it will not work if you link library just from root of the
repo. It happens due to location of sources `./src`. You need to pack library
first `make pack` and then link it from `./dist` directory.
Yeah it's not such comfortable solution for development. But it can fixed by
writing small script similar as `make pack` but with linking every file and
directory from `./src` to the some directory and linking then from it. Notice
that you need to link `package.json` and `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 ;)

View File

@ -1 +1,6 @@
Foris JS library is set of componets and utils for Foris JS application and plugins. Foris JS library is set of components and utils for Foris JS application and
plugins.
Please notice that all of these components or utils are used in reForis and
plugins. If you like to study by example I would recommend to full-text search
these repos.

View File

@ -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",
},
}; };

31269
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,74 +1,70 @@
{ {
"name": "foris", "name": "foris",
"version": "2.1.0", "version": "5.1.1",
"description": "Set of components and utils for Foris and its plugins.", "description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.", "author": "CZ.NIC, z.s.p.o.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://gitlab.labs.nic.cz/turris/reforis/foris-js.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.19.2",
"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": "^0.9.3",
"prop-types": "^15.7.2", "react-datetime": "^2.16.3",
"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.7.2",
"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.8.4",
"@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": "^3.5.3",
"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.28",
"file-loader": "^4.2.0", "prettier": "2.0.5",
"immutability-helper": "3.0.1", "prop-types": "15.7.2",
"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": "^10.6.2",
"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": "^4.43.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"
}
} }

View File

@ -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__

View 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 = {};

View File

@ -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>
</> </>
); );

View 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).

View File

@ -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;

View File

@ -5,13 +5,16 @@
* 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 { ForisURLs } from "../utils/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 +26,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 === 403) {
window.location.assign(ForisURLs.login); window.location.assign(ForisURLs.login);
} }
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 +112,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);

View File

@ -13,7 +13,7 @@ export const HEADERS = {
"X-CSRFToken": getCookie("_csrf_token"), "X-CSRFToken": getCookie("_csrf_token"),
}; };
export const TIMEOUT = 5000; export const TIMEOUT = 30500;
export const API_ACTIONS = { export const API_ACTIONS = {
INIT: 1, INIT: 1,
@ -43,8 +43,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;
} }
} }
@ -65,9 +67,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) {

View File

@ -35,12 +35,16 @@ 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 className={`alert alert-dismissible alert-${type}`}>
{onDismiss ? <button type="button" className="close" onClick={onDismiss}>&times;</button> : false} {onDismiss ? (
<button type="button" className="close" onClick={onDismiss}>
&times;
</button>
) : (
false
)}
{children} {children}
</div> </div>
); );

View File

@ -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 />;
``` ```

View File

@ -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>
); );

View File

@ -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>
``` ```

View File

@ -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>

View File

@ -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)}
/> />;
``` ```

View File

@ -0,0 +1,4 @@
/* Override defaults from "react-datetime" - display picker above input */
.rdtPicker {
bottom: 0;
}

View File

@ -10,6 +10,7 @@ import PropTypes from "prop-types";
import Datetime from "react-datetime/DateTime"; import Datetime from "react-datetime/DateTime";
import moment from "moment/moment"; import moment from "moment/moment";
import "react-datetime/css/react-datetime.css"; import "react-datetime/css/react-datetime.css";
import "./DataTimeInput.css";
import { Input } from "./Input"; import { Input } from "./Input";
@ -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}

View File

@ -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)}
/> />;
``` ```

View File

@ -23,11 +23,7 @@ DownloadButton.defaultProps = {
export function DownloadButton({ href, className, children }) { export function DownloadButton({ href, className, children }) {
return ( return (
<a <a href={href} className={`btn ${className}`.trim()} download>
href={href}
className={`btn ${className}`.trim()}
download
>
{children} {children}
</a> </a>
); );

View File

@ -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>

View File

@ -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} />;

View File

@ -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>;
``` ```

View File

@ -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 }) {

View File

@ -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>;
``` ```

View File

@ -9,8 +9,6 @@ import React from "react";
import { useUID } from "react-uid"; import { useUID } from "react-uid";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { formFieldsSize } from "./constants";
Input.propTypes = { Input.propTypes = {
type: PropTypes.string.isRequired, type: PropTypes.string.isRequired,
label: PropTypes.string.isRequired, label: PropTypes.string.isRequired,
@ -27,25 +25,38 @@ Input.propTypes = {
/** Base bootstrap input component. */ /** Base bootstrap input component. */
export function Input({ export function Input({
type, label, helpText, error, className, children, labelClassName, groupClassName, ...props type,
label,
helpText,
error,
className,
children,
labelClassName,
groupClassName,
...props
}) { }) {
const uid = useUID(); const uid = useUID();
const inputClassName = `form-control ${className || ""} ${(error ? "is-invalid" : "")}`.trim(); const inputClassName = `form-control ${className || ""} ${
error ? "is-invalid" : ""
}`.trim();
return ( return (
<div className={`form-group ${formFieldsSize}`}> <div className="form-group">
<label className={labelClassName} htmlFor={uid}>{label}</label> <label className={labelClassName} htmlFor={uid}>
{label}
</label>
<div className={`input-group ${groupClassName || ""}`.trim()}> <div className={`input-group ${groupClassName || ""}`.trim()}>
<input <input
className={inputClassName} className={inputClassName}
type={type} type={type}
id={uid} id={uid}
{...props} {...props}
/> />
{children} {children}
</div> </div>
{error ? <div className="invalid-feedback">{error}</div> : null} {error ? <div className="invalid-feedback">{error}</div> : null}
{helpText ? <small className="form-text text-muted">{helpText}</small> : null} {helpText ? (
<small className="form-text text-muted">{helpText}</small>
) : null}
</div> </div>
); );
} }

15
src/bootstrap/Modal.css Normal file
View 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);
}

View File

@ -8,14 +8,16 @@
import React, { useRef } from "react"; import React, { useRef } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Portal } from "utils/Portal"; import { Portal } from "../utils/Portal";
import { useClickOutside } from "utils/hooks"; 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,
/** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */ /** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */
children: PropTypes.oneOfType([ children: PropTypes.oneOfType([
@ -24,7 +26,7 @@ Modal.propTypes = {
]).isRequired, ]).isRequired,
}; };
export function Modal({ shown, setShown, children }) { export function Modal({ shown, setShown, scrollable, children }) {
const dialogRef = useRef(); const dialogRef = useRef();
useClickOutside(dialogRef, () => setShown(false)); useClickOutside(dialogRef, () => setShown(false));
@ -32,10 +34,14 @@ export function Modal({ shown, setShown, children }) {
return ( return (
<Portal containerId="modal-container"> <Portal containerId="modal-container">
<div className={`modal fade ${shown ? "show" : ""}`} role="dialog"> <div className={`modal fade ${shown ? "show" : ""}`} role="dialog">
<div ref={dialogRef} className="modal-dialog modal-dialog-centered" role="document"> <div
<div className="modal-content"> ref={dialogRef}
{children} className={`modal-dialog modal-dialog-centered${
</div> scrollable ? " modal-dialog-scrollable" : ""
}`}
role="document"
>
<div className="modal-content">{children}</div>
</div> </div>
</div> </div>
</Portal> </Portal>
@ -51,7 +57,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">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
@ -77,9 +87,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>
);
} }

View File

@ -1,33 +1,36 @@
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.
```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}>
<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>
</> </>;
``` ```

View File

@ -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;
} }

View File

@ -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}>

View File

@ -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)}
/> />;
``` ```

View File

@ -31,22 +31,24 @@ export function PasswordInput({ withEye, ...props }) {
autoComplete={isHidden ? "new-password" : null} autoComplete={isHidden ? "new-password" : null}
{...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>
); );
} }

View File

@ -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)}
/> />;
``` ```

View File

@ -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,
}; };
export 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>
</> </>
); );

View File

@ -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>
</> </>;
``` ```

View File

@ -15,34 +15,30 @@ 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)
(key) => <option key={key} value={key}>{choices[key]}</option>, .sort((a, b) => a - b || a.toString().localeCompare(b.toString()))
); .map((key) => (
<option key={key} value={key}>
{choices[key]}
</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>
); );
} }

View File

@ -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
View 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;
}

View File

@ -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
View 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 switch">
<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>
);
}

View File

@ -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)}
/> />;
``` ```

View File

@ -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();
}); });
}); });

View File

@ -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();
}); });
}); });

View File

@ -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();
}); });
}); });

View File

@ -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 } })
);
}); });
}); });

View File

@ -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();
}); });
}); });

View File

@ -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();
}); });
}); });

View File

@ -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");
}); });
}); });

View 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();
});
});

View File

@ -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();
}); });
}); });

View File

@ -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>
`; `;

View File

@ -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 "

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -0,0 +1,56 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<Switch/> Render switch 1`] = `
<div
class="form-group switch"
>
<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 switch"
>
<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>
`;

View File

@ -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"

View File

@ -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-3";
export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";

View File

@ -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 "../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")}
@ -67,10 +64,14 @@ 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={_("Reboot confirmation")} />
<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>
); );

View File

@ -0,0 +1,75 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React, { useEffect, useState } from "react";
import PropTypes from "prop-types";
import { Button } from "../../bootstrap/Button";
import { useAlert } from "../../alertContext/AlertContext";
import { ALERT_TYPES } from "../../bootstrap/Alert";
import { useAPIPost } from "../../api/hooks";
import { API_STATE } from "../../api/utils";
import { buttonFormFieldsSize } from "../../bootstrap/constants";
ResetWiFiSettings.propTypes = {
ws: PropTypes.object.isRequired,
endpoint: PropTypes.string.isRequired,
};
export default function ResetWiFiSettings({ ws, endpoint }) {
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const module = "wifi";
ws.subscribe(module).bind(module, "reset", () => {
// 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 (
<>
<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={`${buttonFormFieldsSize} text-right`}>
<Button
className="btn-warning"
forisFormSize
loading={isLoading}
disabled={isLoading}
onClick={onReset}
>
{_("Reset Wi-Fi Settings")}
</Button>
</div>
</>
);
}

View File

@ -0,0 +1,252 @@
/*
* 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 { Switch } from "../../bootstrap/Switch";
import { CheckBox } from "../../bootstrap/CheckBox";
import { PasswordInput } from "../../bootstrap/PasswordInput";
import { RadioSet } from "../../bootstrap/RadioSet";
import { Select } from "../../bootstrap/Select";
import { TextInput } from "../../bootstrap/TextInput";
import WiFiQRCode from "./WiFiQRCode";
import WifiGuestForm from "./WiFiGuestForm";
import { HELP_TEXTS, HTMODES, HWMODES } from "./constants";
WiFiForm.propTypes = {
formData: PropTypes.shape({ devices: PropTypes.arrayOf(PropTypes.object) })
.isRequired,
formErrors: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
setFormValue: PropTypes.func.isRequired,
hasGuestNetwork: PropTypes.bool,
};
WiFiForm.defaultProps = {
formData: { devices: [] },
setFormValue: () => {},
hasGuestNetwork: true,
};
export default function WiFiForm({
formData,
formErrors,
setFormValue,
hasGuestNetwork,
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,
}),
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;
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}
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}
/>
<CheckBox
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}
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: {
hwmode: { $set: value },
channel: { $set: "0" },
},
},
}))}
{...props}
/>
<Select
label="802.11n/ac mode"
choices={getHtmodeChoices(formData)}
value={formData.htmode}
helpText={HELP_TEXTS.htmode}
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: { htmode: { $set: value } },
},
}))}
{...props}
/>
<Select
label="Channel"
choices={getChannelChoices(formData)}
value={formData.channel}
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: { channel: { $set: value } },
},
}))}
{...props}
/>
{hasGuestNetwork && (
<WifiGuestForm
formData={{
id: deviceIndex,
...formData.guest_wifi,
}}
formErrors={formErrors.guest_wifi || {}}
setFormValue={setFormValue}
{...props}
/>
)}
</>
) : null}
{divider ? <hr /> : null}
</>
);
}
function getChannelChoices(device) {
const channelChoices = {
0: _("auto"),
};
device.available_bands.forEach((availableBand) => {
if (availableBand.hwmode !== device.hwmode) return;
availableBand.available_channels.forEach((availableChannel) => {
channelChoices[availableChannel.number.toString()] = `
${availableChannel.number}
(${availableChannel.frequency} MHz ${
availableChannel.radar ? " ,DFS" : ""
})
`;
});
});
return channelChoices;
}
function getHtmodeChoices(device) {
const htmodeChoices = {};
device.available_bands.forEach((availableBand) => {
if (availableBand.hwmode !== device.hwmode) return;
availableBand.available_htmodes.forEach((availableHtmod) => {
htmodeChoices[availableHtmod] = HTMODES[availableHtmod];
});
});
return htmodeChoices;
}
function getHwmodeChoices(device) {
return device.available_bands.map((availableBand) => ({
label: HWMODES[availableBand.hwmode],
value: availableBand.hwmode,
}));
}

View File

@ -0,0 +1,97 @@
/*
* 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}
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}
</>
);
}

View 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>
);
}

View File

@ -0,0 +1,97 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import PropTypes from "prop-types";
import { ForisForm } from "../../form/components/ForisForm";
import WiFiForm from "./WiFiForm";
import ResetWiFiSettings from "./ResetWiFiSettings";
WiFiSettings.propTypes = {
ws: PropTypes.object.isRequired,
endpoint: PropTypes.string.isRequired,
resetEndpoint: PropTypes.string.isRequired,
hasGuestNetwork: PropTypes.bool,
};
export function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
return (
<>
<ForisForm
ws={ws}
forisConfig={{
endpoint,
wsModule: "wifi",
}}
prepData={prepData}
prepDataToSubmit={prepDataToSubmit}
validator={validator}
>
<WiFiForm hasGuestNetwork={hasGuestNetwork} />
</ForisForm>
<ResetWiFiSettings ws={ws} endpoint={resetEndpoint} />
</>
);
}
function prepData(formData) {
formData.devices.forEach((device, idx) => {
formData.devices[idx].channel = device.channel.toString();
});
return formData;
}
function prepDataToSubmit(formData) {
formData.devices.forEach((device, idx) => {
delete device.available_bands;
formData.devices[idx].channel = parseInt(device.channel);
if (!device.enabled) {
formData.devices[idx] = { id: device.id, enabled: false };
return;
}
if (!device.guest_wifi.enabled)
formData.devices[idx].guest_wifi = { enabled: false };
});
return formData;
}
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 (device.password.length < 8)
errors.password = _("Password must contain at least 8 symbols");
if (!device.guest_wifi.enabled) return errors;
const guest_wifi_errors = {};
if (device.guest_wifi.SSID.length > 32)
guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
if (device.guest_wifi.SSID.length === 0)
guest_wifi_errors.SSID = _("SSID can't be empty");
if (device.guest_wifi.password.length < 8)
guest_wifi_errors.password = _(
"Password must contain at least 8 symbols"
);
if (guest_wifi_errors.SSID || guest_wifi_errors.password) {
errors.guest_wifi = guest_wifi_errors;
}
return errors;
});
return JSON.stringify(formErrors).match(/\[[{},?]+\]/) ? null : formErrors;
}

View File

@ -0,0 +1,55 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import { render, fireEvent, wait } from "customTestRender";
import mockAxios from "jest-mock-axios";
import { WebSockets } from "webSockets/WebSockets";
import { mockJSONError } from "testUtils/network";
import { mockSetAlert } from "testUtils/alertContextMock";
import { ALERT_TYPES } from "../../../bootstrap/Alert";
import ResetWiFiSettings from "../ResetWiFiSettings";
describe("<ResetWiFiSettings/>", () => {
const webSockets = new WebSockets();
const endpoint = "/reforis/api/wifi-reset";
let getAllByText;
beforeEach(() => {
({ getAllByText } = render(
<ResetWiFiSettings ws={webSockets} endpoint={endpoint} />
));
});
it("should display alert on open ports - success", async () => {
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
expect(mockAxios.post).toBeCalledWith(
endpoint,
undefined,
expect.anything()
);
mockAxios.mockResponse({ data: { foo: "bar" } });
await wait(() =>
expect(mockSetAlert).toBeCalledWith(
"Wi-Fi settings are set to defaults.",
ALERT_TYPES.SUCCESS
)
);
});
it("should display alert on open ports - failure", async () => {
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
mockJSONError();
await wait(() =>
expect(mockSetAlert).toBeCalledWith(
"An error occurred during resetting Wi-Fi settings."
)
);
});
});

View File

@ -0,0 +1,216 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import diffSnapshot from "snapshot-diff";
import mockAxios from "jest-mock-axios";
import { fireEvent, render, wait } from "customTestRender";
import { WebSockets } from "webSockets/WebSockets";
import { mockJSONError } from "testUtils/network";
import {
wifiSettingsFixture,
oneDevice,
twoDevices,
threeDevices,
} from "./__fixtures__/wifiSettings";
import { WiFiSettings, validator } from "../WiFiSettings";
describe("<WiFiSettings/>", () => {
let firstRender;
let getAllByText;
let getAllByLabelText;
let getByText;
let asFragment;
const endpoint = "/reforis/api/wifi";
beforeEach(async () => {
const webSockets = new WebSockets();
const renderRes = render(
<WiFiSettings
ws={webSockets}
endpoint={endpoint}
resetEndpoint="foo"
/>
);
asFragment = renderRes.asFragment;
getAllByText = renderRes.getAllByText;
getAllByLabelText = renderRes.getAllByLabelText;
getByText = renderRes.getByText;
mockAxios.mockResponse({ data: wifiSettingsFixture() });
await wait(() => renderRes.getByText("Wi-Fi 1"));
firstRender = renderRes.asFragment();
});
it("should handle error", async () => {
const webSockets = new WebSockets();
const { getByText } = render(
<WiFiSettings
ws={webSockets}
ws={webSockets}
endpoint={endpoint}
resetEndpoint="foo"
/>
);
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: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{ enabled: false, id: 1 },
],
};
expect(mockAxios.post).toHaveBeenCalledWith(
endpoint,
data,
expect.anything()
);
});
it("Post form: 2.4 GHz", () => {
fireEvent.click(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: "HT40",
hwmode: "11g",
id: 0,
password: "TestPass",
},
{ enabled: false, id: 1 },
],
};
expect(mockAxios.post).toHaveBeenCalledWith(
endpoint,
data,
expect.anything()
);
});
it("Post form: guest network.", () => {
fireEvent.click(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: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{ 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);
});
});

View File

@ -0,0 +1,396 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
export function wifiSettingsFixture() {
return {
devices: [
{
SSID: "TestSSID1",
available_bands: [
{
available_channels: [
{
frequency: 2412,
number: 1,
radar: false,
},
{
frequency: 2417,
number: 2,
radar: false,
},
{
frequency: 2422,
number: 3,
radar: false,
},
{
frequency: 2427,
number: 4,
radar: false,
},
{
frequency: 2432,
number: 5,
radar: false,
},
{
frequency: 2437,
number: 6,
radar: false,
},
{
frequency: 2442,
number: 7,
radar: false,
},
{
frequency: 2447,
number: 8,
radar: false,
},
{
frequency: 2452,
number: 9,
radar: false,
},
{
frequency: 2457,
number: 10,
radar: false,
},
{
frequency: 2462,
number: 11,
radar: false,
},
],
available_htmodes: [
"NOHT",
"HT20",
"HT40",
"VHT20",
"VHT40",
"VHT80",
],
hwmode: "11g",
},
{
available_channels: [
{
frequency: 5180,
number: 36,
radar: false,
},
{
frequency: 5200,
number: 40,
radar: false,
},
{
frequency: 5220,
number: 44,
radar: false,
},
{
frequency: 5240,
number: 48,
radar: false,
},
{
frequency: 5260,
number: 52,
radar: true,
},
{
frequency: 5280,
number: 56,
radar: true,
},
{
frequency: 5300,
number: 60,
radar: true,
},
{
frequency: 5320,
number: 64,
radar: true,
},
{
frequency: 5500,
number: 100,
radar: true,
},
{
frequency: 5520,
number: 104,
radar: true,
},
{
frequency: 5540,
number: 108,
radar: true,
},
{
frequency: 5560,
number: 112,
radar: true,
},
{
frequency: 5580,
number: 116,
radar: true,
},
{
frequency: 5600,
number: 120,
radar: true,
},
{
frequency: 5620,
number: 124,
radar: true,
},
{
frequency: 5640,
number: 128,
radar: true,
},
{
frequency: 5660,
number: 132,
radar: true,
},
{
frequency: 5680,
number: 136,
radar: true,
},
{
frequency: 5700,
number: 140,
radar: true,
},
{
frequency: 5720,
number: 144,
radar: true,
},
{
frequency: 5745,
number: 149,
radar: false,
},
{
frequency: 5765,
number: 153,
radar: false,
},
{
frequency: 5785,
number: 157,
radar: false,
},
{
frequency: 5805,
number: 161,
radar: false,
},
{
frequency: 5825,
number: 165,
radar: false,
},
],
available_htmodes: [
"NOHT",
"HT20",
"HT40",
"VHT20",
"VHT40",
"VHT80",
],
hwmode: "11a",
},
],
channel: 60,
enabled: false,
guest_wifi: {
SSID: "TestGuestSSID",
enabled: false,
password: "",
},
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{
SSID: "Turris",
available_bands: [
{
available_channels: [
{
frequency: 2412,
number: 1,
radar: false,
},
{
frequency: 2417,
number: 2,
radar: false,
},
{
frequency: 2422,
number: 3,
radar: false,
},
{
frequency: 2427,
number: 4,
radar: false,
},
{
frequency: 2432,
number: 5,
radar: false,
},
{
frequency: 2437,
number: 6,
radar: false,
},
{
frequency: 2442,
number: 7,
radar: false,
},
{
frequency: 2447,
number: 8,
radar: false,
},
{
frequency: 2452,
number: 9,
radar: false,
},
{
frequency: 2457,
number: 10,
radar: false,
},
{
frequency: 2462,
number: 11,
radar: false,
},
],
available_htmodes: ["NOHT", "HT20", "HT40"],
hwmode: "11g",
},
],
channel: 11,
enabled: false,
guest_wifi: {
SSID: "TestSSID",
enabled: false,
password: "",
},
hidden: false,
htmode: "HT40",
hwmode: "11g",
id: 1,
password: "TestPass",
},
],
};
}
const oneDevice = {
devices: [
{
SSID: "Turris1",
channel: 60,
enabled: true,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
],
};
const twoDevices = {
devices: [
{
SSID: "",
channel: 60,
enabled: true,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{
SSID: "Turris2",
channel: 60,
enabled: true,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
],
};
const threeDevices = {
devices: [
{
SSID: "Turris1",
channel: 60,
enabled: true,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{
SSID: "Turris2",
channel: 60,
enabled: false,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "TestPass",
},
{
SSID: "Turris3",
channel: 60,
enabled: true,
guest_wifi: { enabled: false },
hidden: false,
htmode: "HT40",
hwmode: "11a",
id: 0,
password: "",
},
],
};
export { oneDevice, twoDevices, threeDevices };

View File

@ -0,0 +1,911 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -245,207 +245,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-3"
>
<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>
<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="col-sm-12 col-lg-12 p-0 mb-3 text-right"
>
<button
class="btn btn-warning col-sm-12 col-md-3 col-lg-2"
type="button"
>
Reset Wi-Fi Settings
</button>
</div>
</DocumentFragment>
`;
exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -474,10 +474,89 @@
Parameters of the guest network can be set in the Guest network tab.
</small>
</div>
</div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"20\\"
+ >
+ SSID
+ </label>
+ <div
+ class=\\"input-group\\"
+ >
+ <input
+ class=\\"form-control\\"
+ id=\\"20\\"
+ type=\\"text\\"
+ value=\\"TestGuestSSID\\"
+ />
+ <div
+ class=\\"input-group-append\\"
+ >
+ <button
+ class=\\"input-group-text\\"
+ type=\\"button\\"
+ >
+ <img
+ alt=\\"QR\\"
+ src=\\"/reforis/static/reforis/imgs/QR_icon.svg\\"
+ style=\\"opacity: 0.67;\\"
+ width=\\"20\\"
+ />
+ </button>
+ </div>
+ </div>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"21\\"
+ >
+ Password
+ </label>
+ <div
+ class=\\"input-group\\"
+ >
+ <input
+ autocomplete=\\"new-password\\"
+ class=\\"form-control is-invalid\\"
+ id=\\"21\\"
+ required=\\"\\"
+ type=\\"password\\"
+ value=\\"\\"
+ />
+ <div
+ class=\\"input-group-append\\"
+ >
+ <button
+ class=\\"input-group-text\\"
+ type=\\"button\\"
+ >
+ <i
+ class=\\"fa fa-eye\\"
+ />
+ </button>
+ </div>
+ </div>
+ <div
+ class=\\"invalid-feedback\\"
+ >
+ Password must contain at least 8 symbols
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ WPA2 pre-shared key, that is required to connect to the network.
+
+ </small>
+ </div>
<hr />
<div
class=\\"form-group switch\\"
>
<div
@@ -501,10 +580,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,462 @@
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>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"5\\"
+ >
+ Password
+ </label>
+ <div
+ class=\\"input-group\\"
+ >
+ <input
+ autocomplete=\\"new-password\\"
+ class=\\"form-control\\"
+ id=\\"5\\"
+ required=\\"\\"
+ type=\\"password\\"
+ value=\\"TestPass\\"
+ />
+ <div
+ class=\\"input-group-append\\"
+ >
+ <button
+ class=\\"input-group-text\\"
+ type=\\"button\\"
+ >
+ <i
+ class=\\"fa fa-eye\\"
+ />
+ </button>
+ </div>
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ WPA2 pre-shared key, that is required to connect to the network.
+
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <div
+ class=\\"custom-control custom-checkbox \\"
+ >
+ <input
+ class=\\"custom-control-input\\"
+ id=\\"6\\"
+ type=\\"checkbox\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"6\\"
+ >
+ Hide SSID
+ <small
+ class=\\"form-text text-muted\\"
+ >
+ If set, network is not visible when scanning for available networks.
+ </small>
+ </label>
+ </div>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ class=\\"d-block\\"
+ for=\\"7\\"
+ >
+ GHz
+ </label>
+ <div
+ class=\\"custom-control custom-radio\\"
+ >
+ <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\\"
+ >
+ <input
+ checked=\\"\\"
+ class=\\"custom-control-input\\"
+ id=\\"hwmode-0-1\\"
+ name=\\"hwmode-0\\"
+ type=\\"radio\\"
+ value=\\"11a\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"hwmode-0-1\\"
+ >
+ 5
+ </label>
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
+ newer standard and may not be supported by all your devices. It usually has less interference, but the signal
+ does not carry so well indoors.
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"8\\"
+ >
+ 802.11n/ac mode
+ </label>
+ <select
+ class=\\"custom-select\\"
+ id=\\"8\\"
+ >
+ <option
+ value=\\"HT20\\"
+ >
+ 802.11n - 20 MHz wide channel
+ </option>
+ <option
+ value=\\"HT40\\"
+ >
+ 802.11n - 40 MHz wide channel
+ </option>
+ <option
+ value=\\"NOHT\\"
+ >
+ Disabled
+ </option>
+ <option
+ value=\\"VHT20\\"
+ >
+ 802.11ac - 20 MHz wide channel
+ </option>
+ <option
+ value=\\"VHT40\\"
+ >
+ 802.11ac - 40 MHz wide channel
+ </option>
+ <option
+ value=\\"VHT80\\"
+ >
+ 802.11ac - 80 MHz wide channel
+ </option>
+ </select>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
+ throughput but can cause more interference in the network. If you don't know what to choose, use the default
+ option with 20 MHz wide channel.
+
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"9\\"
+ >
+ Channel
+ </label>
+ <select
+ class=\\"custom-select\\"
+ id=\\"9\\"
+ >
+ <option
+ value=\\"0\\"
+ >
+ auto
+ </option>
+ <option
+ value=\\"36\\"
+ >
+
+ 36
+ (5180 MHz )
+
+ </option>
+ <option
+ value=\\"40\\"
+ >
+
+ 40
+ (5200 MHz )
+
+ </option>
+ <option
+ value=\\"44\\"
+ >
+
+ 44
+ (5220 MHz )
+
+ </option>
+ <option
+ value=\\"48\\"
+ >
+
+ 48
+ (5240 MHz )
+
+ </option>
+ <option
+ value=\\"52\\"
+ >
+
+ 52
+ (5260 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"56\\"
+ >
+
+ 56
+ (5280 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"60\\"
+ >
+
+ 60
+ (5300 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"64\\"
+ >
+
+ 64
+ (5320 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"100\\"
+ >
+
+ 100
+ (5500 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"104\\"
+ >
+
+ 104
+ (5520 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"108\\"
+ >
+
+ 108
+ (5540 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"112\\"
+ >
+
+ 112
+ (5560 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"116\\"
+ >
+
+ 116
+ (5580 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"120\\"
+ >
+
+ 120
+ (5600 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"124\\"
+ >
+
+ 124
+ (5620 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"128\\"
+ >
+
+ 128
+ (5640 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"132\\"
+ >
+
+ 132
+ (5660 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"136\\"
+ >
+
+ 136
+ (5680 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"140\\"
+ >
+
+ 140
+ (5700 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"144\\"
+ >
+
+ 144
+ (5720 MHz ,DFS)
+
+ </option>
+ <option
+ value=\\"149\\"
+ >
+
+ 149
+ (5745 MHz )
+
+ </option>
+ <option
+ value=\\"153\\"
+ >
+
+ 153
+ (5765 MHz )
+
+ </option>
+ <option
+ value=\\"157\\"
+ >
+
+ 157
+ (5785 MHz )
+
+ </option>
+ <option
+ value=\\"161\\"
+ >
+
+ 161
+ (5805 MHz )
+
+ </option>
+ <option
+ value=\\"165\\"
+ >
+
+ 165
+ (5825 MHz )
+
+ </option>
+ </select>
+ </div>
+ <div
+ class=\\"form-group switch\\"
+ >
+ <div
+ class=\\"custom-control custom-switch\\"
+ >
+ <input
+ class=\\"custom-control-input\\"
+ id=\\"10\\"
+ type=\\"checkbox\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"10\\"
+ >
+ 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"
`;

View 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 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"),
};
export const HWMODES = {
"11g": "2.4",
"11a": "5",
};
export const HELP_TEXTS = {
password: _(`
WPA2 pre-shared key, that is required to connect to the network.
`),
hidden: _(
"If set, network is not visible when scanning for available networks."
),
hwmode: _(`
The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
newer standard and may not be supported by all your devices. It usually has less interference, but the signal
does not carry so well indoors.`),
htmode: _(`
Change this to adjust 802.11n/ac mode of operation. 802.11n with 40 MHz wide channels can yield higher
throughput but can cause more interference in the network. If you don't know what to choose, use the default
option with 20 MHz wide channel.
`),
guest_wifi_enabled: _(`
Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to
access the internet, but aren't allowed to access other devices and the configuration interface of the router.
Parameters of the guest network can be set in the Guest network tab.
`),
};

View 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};;`;
}

View File

@ -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.")
);
}); });
}); });

View File

@ -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>

View File

@ -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();
}); });
}); });

View File

@ -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>

View File

@ -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 { ForisForm } from "../components/ForisForm";
import { WebSockets } from "webSockets/WebSockets"; import { WebSockets } from "webSockets/WebSockets";
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 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={new WebSockets()} 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()
); );
}); });
}); });

View File

@ -11,128 +11,80 @@ import {
validateIPv4Address, validateIPv4Address,
validateIPv6Address, validateIPv6Address,
validateIPv6Prefix, validateIPv6Prefix,
validateMAC validateMAC,
} from "validations"; } 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
.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);
}); });
}); });

View File

@ -7,17 +7,18 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Prompt } from "react-router-dom";
import { Spinner } from "bootstrap/Spinner"; import { ALERT_TYPES } from "../../bootstrap/Alert";
import { useAPIPost } from "api/hooks"; import { API_STATE } from "../../api/utils";
import { formFieldsSize } from "../../bootstrap/constants";
import { Spinner } from "../../bootstrap/Spinner";
import { useAlert } from "../../alertContext/AlertContext";
import { useAPIPost } from "../../api/hooks";
import { Prompt } from "react-router";
import { API_STATE } from "api/utils";
import { ErrorMessage } from "utils/ErrorMessage";
import { useAlert } from "alertContext/AlertContext";
import { ALERT_TYPES } from "bootstrap/Alert";
import { useForisModule, useForm } from "../hooks"; import { useForisModule, useForm } from "../hooks";
import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton"; import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
import { ErrorMessage } from "../../utils/ErrorMessage";
ForisForm.propTypes = { ForisForm.propTypes = {
/** Optional WebSocket object. See `scr/common/WebSockets.js`. /** Optional WebSocket object. See `scr/common/WebSockets.js`.
@ -26,7 +27,7 @@ ForisForm.propTypes = {
ws: PropTypes.object, ws: PropTypes.object,
/** Foris configuration object. See usage in main components. */ /** Foris configuration object. See usage in main components. */
forisConfig: PropTypes.shape({ forisConfig: PropTypes.shape({
/** reForis Flask aplication API endpoint from `src/common/API.js`. */ /** reForis Flask application API endpoint from `src/common/API.js`. */
endpoint: PropTypes.string.isRequired, endpoint: PropTypes.string.isRequired,
/** `foris-controller` module name to be used via WebSockets. /** `foris-controller` module name to be used via WebSockets.
* It can be use only with `ws` prop. * It can be use only with `ws` prop.
@ -37,29 +38,39 @@ ForisForm.propTypes = {
* */ * */
wsAction: PropTypes.string, wsAction: PropTypes.string,
}).isRequired, }).isRequired,
/** Function to prepare data recived from the API before using in forms. */ /** Function to prepare data received from the API before using in forms. */
prepData: PropTypes.func.isRequired, prepData: PropTypes.func,
/** Function to prepare data from form before submitting. */ /** Function to prepare data from form before submitting. */
prepDataToSubmit: PropTypes.func.isRequired, prepDataToSubmit: PropTypes.func,
/** Function to handle response to POST request. */ /** Function to handle response to POST request. */
postCallback: PropTypes.func.isRequired, postCallback: PropTypes.func,
/** Validate data and provide validation object. Then validation errors passed to children. */ /** Validate data and provide validation object. Then validation errors passed to children. */
validator: PropTypes.func.isRequired, validator: PropTypes.func,
/** Disables form */ /** Disables form */
disabled: PropTypes.bool, disabled: PropTypes.bool,
/** reForis form components. */
children: PropTypes.node.isRequired,
/** Optional override of form submit callback */ /** Optional override of form submit callback */
onSubmitOverridden: PropTypes.func, onSubmitOverridden: PropTypes.func,
/** Reference to actual form element (useful for programmatically submitting it).
* Pass the output of useRef hook to this prop.
*/
formReference: PropTypes.object,
/** reForis form components. */
children: PropTypes.node.isRequired,
// eslint-disable-next-line react/no-unused-prop-types // eslint-disable-next-line react/no-unused-prop-types
customWSProp(props) { customWSProp(props) {
const wsModuleIsSpecified = !!(props.forisConfig && props.forisConfig.wsModule); const wsModuleIsSpecified = !!(
props.forisConfig && props.forisConfig.wsModule
);
if (props.ws && !wsModuleIsSpecified) { if (props.ws && !wsModuleIsSpecified) {
return new Error("forisConfig.wsModule should be specified when ws object is passed."); return new Error(
"forisConfig.wsModule should be specified when ws object is passed."
);
} }
if (!props.ws && wsModuleIsSpecified) { if (!props.ws && wsModuleIsSpecified) {
return new Error("forisConfig.wsModule is specified without passing ws object."); return new Error(
"forisConfig.wsModule is specified without passing ws object."
);
} }
}, },
}; };
@ -72,7 +83,12 @@ ForisForm.defaultProps = {
disabled: false, disabled: false,
}; };
/** Serves as HOC for all foris forms components. */ /** Serves as HOC for all foris forms components.
*
* As `<Prompt />` from `react-router-dom` is used in this component then it required to
* use exposed `ReactRouterDOM` object from `react-router-dom` library which is exposed by reForis.
* See README for more information.
* */
export function ForisForm({ export function ForisForm({
ws, ws,
forisConfig, forisConfig,
@ -82,10 +98,14 @@ export function ForisForm({
validator, validator,
disabled, disabled,
onSubmitOverridden, onSubmitOverridden,
formReference,
children, children,
}) { }) {
const [formState, onFormChangeHandler, resetFormData] = useForm(validator, prepData); const [formState, onFormChangeHandler, resetFormData] = useForm(
const [setAlert] = useAlert(); validator,
prepData
);
const [setAlert, dismissAlert] = useAlert();
const [forisModuleState] = useForisModule(ws, forisConfig); const [forisModuleState] = useForisModule(ws, forisConfig);
useEffect(() => { useEffect(() => {
@ -105,7 +125,7 @@ export function ForisForm({
}, [postCallback, postState.state, postState.data, setAlert]); }, [postCallback, postState.state, postState.data, setAlert]);
if (forisModuleState.state === API_STATE.ERROR) { if (forisModuleState.state === API_STATE.ERROR) {
return <ErrorMessage />; return <ErrorMessage message={forisModuleState.data} />;
} }
if (!formState.data) { if (!formState.data) {
return <Spinner />; return <Spinner />;
@ -114,6 +134,7 @@ export function ForisForm({
function onSubmitHandler(event) { function onSubmitHandler(event) {
event.preventDefault(); event.preventDefault();
resetFormData(); resetFormData();
dismissAlert();
const copiedFormData = JSON.parse(JSON.stringify(formState.data)); const copiedFormData = JSON.parse(JSON.stringify(formState.data));
const preparedData = prepDataToSubmit(copiedFormData); const preparedData = prepDataToSubmit(copiedFormData);
post({ data: preparedData }); post({ data: preparedData });
@ -129,40 +150,53 @@ export function ForisForm({
return SUBMIT_BUTTON_STATES.READY; return SUBMIT_BUTTON_STATES.READY;
} }
const formIsDisabled = (disabled const formIsDisabled =
|| forisModuleState.state === API_STATE.SENDING disabled ||
|| postState.state === API_STATE.SENDING); forisModuleState.state === API_STATE.SENDING ||
postState.state === API_STATE.SENDING;
const submitButtonIsDisabled = disabled || !!formState.errors; const submitButtonIsDisabled = disabled || !!formState.errors;
const childrenWithFormProps = React.Children.map( const childrenWithFormProps = React.Children.map(children, (child) =>
children, React.cloneElement(child, {
(child) => React.cloneElement(child, { initialData: formState.initialData,
formData: formState.data, formData: formState.data,
formErrors: formState.errors, formErrors: formState.errors,
setFormValue: onFormChangeHandler, setFormValue: onFormChangeHandler,
disabled: formIsDisabled, disabled: formIsDisabled,
}), })
); );
const onSubmit = onSubmitOverridden const onSubmit = onSubmitOverridden
? onSubmitOverridden(formState.data, onFormChangeHandler, onSubmitHandler) ? onSubmitOverridden(
formState.data,
onFormChangeHandler,
onSubmitHandler
)
: onSubmitHandler; : onSubmitHandler;
function getMessageOnLeavingPage() { function getMessageOnLeavingPage() {
if (JSON.stringify(formState.data) === JSON.stringify(formState.initialData)) return true; if (
return _("Changes you made may not be saved. Are you sure you want to leave?"); JSON.stringify(formState.data) ===
JSON.stringify(formState.initialData)
)
return true;
return _(
"Changes you made may not be saved. Are you sure you want to leave?"
);
} }
return ( return (
<> <div className={formFieldsSize}>
<Prompt message={getMessageOnLeavingPage} /> <Prompt message={getMessageOnLeavingPage} />
<form onSubmit={onSubmit}> <form onSubmit={onSubmit} ref={formReference}>
{childrenWithFormProps} {childrenWithFormProps}
<SubmitButton <div className="text-right">
state={getSubmitButtonState()} <SubmitButton
disabled={submitButtonIsDisabled} state={getSubmitButtonState()}
/> disabled={submitButtonIsDisabled}
/>
</div>
</form> </form>
</> </div>
); );
} }

View File

@ -1,8 +1,11 @@
`<ForisForm/>` is Higher-Order Component which encapsulates entire form logic and provides with children required props. `<ForisForm/>` is Higher-Order Component which encapsulates entire form logic
This component structure provides comfort API and allows to create typical Foris module forms easily. and provides with children required props. This component structure provides
comfort API and allows to create typical Foris module forms easily.
## Example of usage of `<ForisForm/>` ## Example of usage of `<ForisForm/>`
You can pass more forms as children. You can pass more forms as children.
```js ```js
<ForisForm <ForisForm
ws={ws} ws={ws}
@ -24,7 +27,10 @@ You can pass more forms as children.
```js ```js
export default function MACForm({ export default function MACForm({
formData, formErrors, setFormValue, ...props formData,
formErrors,
setFormValue,
...props
}) { }) {
const macSettings = formData.mac_settings; const macSettings = formData.mac_settings;
const errors = (formErrors || {}).mac_settings || {}; const errors = (formErrors || {}).mac_settings || {};
@ -35,38 +41,33 @@ export default function MACForm({
label={_("Custom MAC address")} label={_("Custom MAC address")}
checked={macSettings.custom_mac_enabled} checked={macSettings.custom_mac_enabled}
helpText={HELP_TEXTS.custom_mac_enabled} helpText={HELP_TEXTS.custom_mac_enabled}
onChange={setFormValue((value) => ({
onChange={setFormValue( mac_settings: { custom_mac_enabled: { $set: value } },
(value) => ({ mac_settings: { custom_mac_enabled: { $set: value } } }), }))}
)}
{...props} {...props}
/> />
{macSettings.custom_mac_enabled {macSettings.custom_mac_enabled ? (
? ( <TextInput
<TextInput label={_("MAC address")}
label={_("MAC address")} value={macSettings.custom_mac || ""}
value={macSettings.custom_mac || ""} helpText={HELP_TEXTS.custom_mac}
helpText={HELP_TEXTS.custom_mac} error={errors.custom_mac}
error={errors.custom_mac} required
required onChange={setFormValue((value) => ({
mac_settings: { custom_mac: { $set: value } },
onChange={setFormValue( }))}
(value) => ({ mac_settings: { custom_mac: { $set: value } } }), {...props}
)} />
) : null}
{...props}
/>
)
: null}
</> </>
); );
} }
``` ```
The <ForisForm/> passes subsequent `props` to the child components. The <ForisForm/> passes subsequent `props` to the child components.
| Prop | Type | Description | | Prop | Type | Description |
|----------------|--------|----------------------------------------------------------------------------| | -------------- | ------ | -------------------------------------------------------------------------- |
| `formData` | object | Data returned from API. | | `formData` | object | Data returned from API. |
| `formErrors` | object | Errors returned after validation via validator. | | `formErrors` | object | Errors returned after validation via validator. |
| `setFormValue` | func | Function for data update. It takes update rule as arg (see example above). | | `setFormValue` | func | Function for data update. It takes update rule as arg (see example above). |

View File

@ -8,7 +8,7 @@
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { Button } from "bootstrap/Button"; import { Button } from "../../bootstrap/Button";
export const STATES = { export const STATES = {
READY: 1, READY: 1,
@ -18,8 +18,7 @@ export const STATES = {
SubmitButton.propTypes = { SubmitButton.propTypes = {
disabled: PropTypes.bool, disabled: PropTypes.bool,
state: PropTypes.oneOf(Object.keys(STATES) state: PropTypes.oneOf(Object.keys(STATES).map((key) => STATES[key])),
.map((key) => STATES[key])),
}; };
export function SubmitButton({ disabled, state, ...props }) { export function SubmitButton({ disabled, state, ...props }) {
@ -28,14 +27,14 @@ export function SubmitButton({ disabled, state, ...props }) {
let labelSubmitButton; let labelSubmitButton;
switch (state) { switch (state) {
case STATES.SAVING: case STATES.SAVING:
labelSubmitButton = _("Updating"); labelSubmitButton = _("Updating");
break; break;
case STATES.LOAD: case STATES.LOAD:
labelSubmitButton = _("Load settings"); labelSubmitButton = _("Load settings");
break; break;
default: default:
labelSubmitButton = _("Save"); labelSubmitButton = _("Save");
} }
return ( return (
@ -44,7 +43,6 @@ export function SubmitButton({ disabled, state, ...props }) {
loading={loadingSubmitButton} loading={loadingSubmitButton}
disabled={disableSubmitButton} disabled={disableSubmitButton}
forisFormSize forisFormSize
{...props} {...props}
> >
{labelSubmitButton} {labelSubmitButton}

View File

@ -8,8 +8,8 @@
import { useCallback, useEffect, useReducer } from "react"; import { useCallback, useEffect, useReducer } from "react";
import update from "immutability-helper"; import update from "immutability-helper";
import { useAPIGet } from "api/hooks"; import { useAPIGet } from "../api/hooks";
import { useWSForisModule } from "webSockets/hooks"; import { useWSForisModule } from "../webSockets/hooks";
const FORM_ACTIONS = { const FORM_ACTIONS = {
updateValue: 1, updateValue: 1,
@ -23,57 +23,61 @@ export function useForm(validator, dataPreprocessor) {
errors: {}, errors: {},
}); });
const onFormReload = useCallback((data) => { const onFormReload = useCallback(
dispatch({ (data) => {
type: FORM_ACTIONS.resetData, dispatch({
data, type: FORM_ACTIONS.resetData,
dataPreprocessor, data,
validator, dataPreprocessor,
}); validator,
}, [dataPreprocessor, validator]); });
},
[dataPreprocessor, validator]
);
const onFormChangeHandler = useCallback((updateRule) => (event) => { const onFormChangeHandler = useCallback(
dispatch({ (updateRule) => (event) => {
type: FORM_ACTIONS.updateValue, dispatch({
value: getChangedValue(event.target), type: FORM_ACTIONS.updateValue,
updateRule, value: getChangedValue(event.target),
validator, updateRule,
}); validator,
}, [validator]); });
},
[validator]
);
return [ return [state, onFormChangeHandler, onFormReload];
state,
onFormChangeHandler,
onFormReload,
];
} }
function formReducer(state, action) { function formReducer(state, action) {
switch (action.type) { switch (action.type) {
case FORM_ACTIONS.updateValue: { case FORM_ACTIONS.updateValue: {
const newData = update(state.data, action.updateRule(action.value)); const newData = update(state.data, action.updateRule(action.value));
const errors = action.validator(newData); const errors = action.validator(newData);
return { return {
...state, ...state,
data: newData, data: newData,
errors, errors,
}; };
}
case FORM_ACTIONS.resetData: {
if (!action.data) {
return { ...state, initialData: state.data };
} }
case FORM_ACTIONS.resetData: {
if (!action.data) {
return { ...state, initialData: state.data };
}
const data = action.dataPreprocessor ? action.dataPreprocessor(action.data) : action.data; const data = action.dataPreprocessor
return { ? action.dataPreprocessor(action.data)
data, : action.data;
initialData: data, return {
errors: action.data ? action.validator(data) : undefined, data,
}; initialData: data,
} errors: action.data ? action.validator(data) : undefined,
default: { };
throw new Error(); }
} default: {
throw new Error();
}
} }
} }

View File

@ -13,59 +13,66 @@ export {
useAPIPut, useAPIPut,
useAPIDelete, useAPIDelete,
useAPIPolling, useAPIPolling,
} from "api/hooks"; } from "./api/hooks";
export { API_STATE } from "api/utils"; export { API_STATE } from "./api/utils";
// Bootstrap // Bootstrap
export { Alert, ALERT_TYPES } from "bootstrap/Alert"; export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
export { Button } from "bootstrap/Button"; export { Button } from "./bootstrap/Button";
export { CheckBox } from "bootstrap/CheckBox"; export { CheckBox } from "./bootstrap/CheckBox";
export { DownloadButton } from "bootstrap/DownloadButton"; export { DownloadButton } from "./bootstrap/DownloadButton";
export { DataTimeInput } from "bootstrap/DataTimeInput"; export { DataTimeInput } from "./bootstrap/DataTimeInput";
export { EmailInput } from "bootstrap/EmailInput"; export { EmailInput } from "./bootstrap/EmailInput";
export { FileInput } from "bootstrap/FileInput"; export { FileInput } from "./bootstrap/FileInput";
export { Input } from "bootstrap/Input"; export { Input } from "./bootstrap/Input";
export { NumberInput } from "bootstrap/NumberInput"; export { NumberInput } from "./bootstrap/NumberInput";
export { PasswordInput } from "bootstrap/PasswordInput"; export { PasswordInput } from "./bootstrap/PasswordInput";
export { Radio, RadioSet } from "bootstrap/RadioSet"; export { Radio, RadioSet } from "./bootstrap/RadioSet";
export { Select } from "bootstrap/Select"; export { Select } from "./bootstrap/Select";
export { TextInput } from "bootstrap/TextInput"; export { TextInput } from "./bootstrap/TextInput";
export { formFieldsSize } from "bootstrap/constants"; export { formFieldsSize, buttonFormFieldsSize } from "./bootstrap/constants";
export { Switch } from "./bootstrap/Switch";
export { export { Spinner, SpinnerElement } from "./bootstrap/Spinner";
Spinner, export { Modal, ModalBody, ModalFooter, ModalHeader } from "./bootstrap/Modal";
SpinnerElement,
} from "bootstrap/Spinner";
export {
Modal,
ModalBody,
ModalFooter,
ModalHeader,
} from "bootstrap/Modal";
// Common // Common
export { RebootButton } from "common/RebootButton"; export { RebootButton } from "./common/RebootButton";
export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
// Form // Form
export { ForisForm } from "form/components/ForisForm"; export { ForisForm } from "./form/components/ForisForm";
export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "form/components/SubmitButton"; export {
export { useForisModule, useForm } from "form/hooks"; SubmitButton,
STATES as SUBMIT_BUTTON_STATES,
} from "./form/components/SubmitButton";
export { useForisModule, useForm } from "./form/hooks";
// WebSockets // WebSockets
export { useWSForisModule } from "webSockets/hooks"; export { useWSForisModule } from "./webSockets/hooks";
export { WebSockets } from "webSockets/WebSockets"; export { WebSockets } from "./webSockets/WebSockets";
// Utils // Utils
export { Portal } from "utils/Portal"; export { Portal } from "./utils/Portal";
export { undefinedIfEmpty, withoutUndefinedKeys, onlySpecifiedKeys } from "utils/objectHelpers";
export { export {
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage, undefinedIfEmpty,
} from "utils/conditionalHOCs"; withoutUndefinedKeys,
export { ErrorMessage } from "utils/ErrorMessage"; onlySpecifiedKeys,
export { useClickOutside } from "utils/hooks"; } from "./utils/objectHelpers";
export {
withEither,
withSpinner,
withSending,
withSpinnerOnSending,
withError,
withErrorMessage,
} from "./utils/conditionalHOCs";
export { ErrorMessage } from "./utils/ErrorMessage";
export { useClickOutside } from "./utils/hooks";
export { toLocaleDateString } from "./utils/datetime";
// Foris URL // Foris URL
export { ForisURLs, REFORIS_URL_PREFIX } from "forisUrls"; export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
// Validation // Validation
export { export {
@ -76,7 +83,7 @@ export {
validateDUID, validateDUID,
validateMAC, validateMAC,
validateMultipleEmails, validateMultipleEmails,
} from "validations"; } from "./utils/validations";
// Alert context // Alert context
export { AlertContextProvider, useAlert } from "alertContext/AlertContext"; export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";

View File

@ -15,7 +15,7 @@ window.AlertContext = React.createContext();
function AlertContextMock({ children }) { function AlertContextMock({ children }) {
return ( return (
<AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}> <AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}>
{ children } {children}
</AlertContext.Provider> </AlertContext.Provider>
); );
} }

View File

@ -9,7 +9,7 @@
import React from "react"; import React from "react";
import { UIDReset } from "react-uid"; import { UIDReset } from "react-uid";
import { StaticRouter } from "react-router"; import { StaticRouter } from "react-router-dom";
import { render } from "@testing-library/react"; import { render } from "@testing-library/react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
@ -26,15 +26,14 @@ function Wrapper({ children }) {
return ( return (
<AlertContextMock> <AlertContextMock>
<StaticRouter> <StaticRouter>
<UIDReset> <UIDReset>{children}</UIDReset>
{children}
</UIDReset>
</StaticRouter> </StaticRouter>
</AlertContextMock> </AlertContextMock>
); );
} }
const customTestRender = (ui, options) => render(ui, { wrapper: Wrapper, ...options }); const customTestRender = (ui, options) =>
render(ui, { wrapper: Wrapper, ...options });
// re-export everything // re-export everything
export * from "@testing-library/react"; export * from "@testing-library/react";

View File

@ -0,0 +1,12 @@
/*
* 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.
*/
// Mock babel (gettext)
global._ = (str) => str;
global.ngettext = (str) => str;
global.babel = { format: (str) => str };
global.ForisTranslations = { locale: "en" };

View File

@ -5,8 +5,10 @@
* See /LICENSE for more information. * See /LICENSE for more information.
*/ */
import mockAxios from 'jest-mock-axios'; import mockAxios from "jest-mock-axios";
export function mockJSONError(data) { export function mockJSONError(data) {
mockAxios.mockError({ response: { data, headers: { "content-type": "application/json" } } }); mockAxios.mockError({
response: { data, headers: { "content-type": "application/json" } },
});
} }

View File

@ -5,29 +5,24 @@
* See /LICENSE for more information. * See /LICENSE for more information.
*/ */
import mockAxios from 'jest-mock-axios'; import mockAxios from "jest-mock-axios";
import moment from 'moment-timezone'; import moment from "moment-timezone";
import "./mockGlobals";
// Setup axios cleanup // Setup axios cleanup
global.afterEach(() => { global.afterEach(() => {
mockAxios.reset(); mockAxios.reset();
}); });
// Mock babel (gettext)
global._ = str => str;
global.ngettext = str => str;
global.babel = {format: (str) => str};
global.ForisTranslations = {};
// Mock web sockets // Mock web sockets
window.WebSocket = jest.fn(); window.WebSocket = jest.fn();
// Mock scrollIntoView // Mock scrollIntoView
global.HTMLElement.prototype.scrollIntoView = () => {}; global.HTMLElement.prototype.scrollIntoView = () => {};
jest.doMock('moment', () => { // Mock timezone utilities
moment.tz.setDefault('UTC'); jest.doMock("moment", () => {
moment.tz.setDefault("UTC");
return moment; return moment;
}); });
Date.now = jest.fn(() => new Date(Date.UTC(2019, 1, 1, 12, 13, 14)).valueOf()); Date.now = jest.fn(() => new Date(Date.UTC(2019, 1, 1, 12, 13, 14)).valueOf());

View File

@ -6,11 +6,16 @@
*/ */
import React from "react"; import React from "react";
import PropTypes from "prop-types";
export function ErrorMessage() { ErrorMessage.propTypes = {
return ( message: PropTypes.string,
<p className="text-center text-danger"> };
{_("An error occurred while fetching data.")}
</p> ErrorMessage.defaultProps = {
); message: _("An error occurred while fetching data."),
};
export function ErrorMessage({ message }) {
return <p className="text-center text-danger">{message}</p>;
} }

View File

@ -7,10 +7,15 @@
import React from "react"; import React from "react";
import { render } from "customTestRender"; import { render } from "customTestRender";
import {
withEither, withSpinner, withSending, withSpinnerOnSending, withError, withErrorMessage,
} from "../conditionalHOCs";
import { API_STATE } from "api/utils"; import { API_STATE } from "api/utils";
import {
withEither,
withSpinner,
withSending,
withSpinnerOnSending,
withError,
withErrorMessage,
} from "../conditionalHOCs";
describe("conditional HOCs", () => { describe("conditional HOCs", () => {
const First = () => <p>First</p>; const First = () => <p>First</p>;
@ -52,14 +57,18 @@ describe("conditional HOCs", () => {
it("should render First component", () => { it("should render First component", () => {
const withAlternative = withSending(Alternative); const withAlternative = withSending(Alternative);
const FirstWithConditional = withAlternative(First); const FirstWithConditional = withAlternative(First);
const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />); const { getByText } = render(
<FirstWithConditional apiState={API_STATE.SUCCESS} />
);
expect(getByText("First")).toBeDefined(); expect(getByText("First")).toBeDefined();
}); });
it("should render Alternative component", () => { it("should render Alternative component", () => {
const withAlternative = withSending(Alternative); const withAlternative = withSending(Alternative);
const FirstWithConditional = withAlternative(First); const FirstWithConditional = withAlternative(First);
const { getByText } = render(<FirstWithConditional apiState={API_STATE.SENDING} />); const { getByText } = render(
<FirstWithConditional apiState={API_STATE.SENDING} />
);
expect(getByText("Alternative")).toBeDefined(); expect(getByText("Alternative")).toBeDefined();
}); });
}); });
@ -67,13 +76,17 @@ describe("conditional HOCs", () => {
describe("withSpinnerOnSending", () => { describe("withSpinnerOnSending", () => {
it("should render First component", () => { it("should render First component", () => {
const FirstWithConditional = withSpinnerOnSending(First); const FirstWithConditional = withSpinnerOnSending(First);
const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />); const { getByText } = render(
<FirstWithConditional apiState={API_STATE.SUCCESS} />
);
expect(getByText("First")).toBeDefined(); expect(getByText("First")).toBeDefined();
}); });
it("should render spinner", () => { it("should render spinner", () => {
const FirstWithConditional = withSpinnerOnSending(First); const FirstWithConditional = withSpinnerOnSending(First);
const { container } = render(<FirstWithConditional apiState={API_STATE.SENDING} />); const { container } = render(
<FirstWithConditional apiState={API_STATE.SENDING} />
);
expect(container).toMatchSnapshot(); expect(container).toMatchSnapshot();
}); });
}); });
@ -97,13 +110,17 @@ describe("conditional HOCs", () => {
describe("withErrorMessage", () => { describe("withErrorMessage", () => {
it("should render First component", () => { it("should render First component", () => {
const FirstWithConditional = withErrorMessage(First); const FirstWithConditional = withErrorMessage(First);
const { getByText } = render(<FirstWithConditional apiState={API_STATE.SUCCESS} />); const { getByText } = render(
<FirstWithConditional apiState={API_STATE.SUCCESS} />
);
expect(getByText("First")).toBeDefined(); expect(getByText("First")).toBeDefined();
}); });
it("should render error message", () => { it("should render error message", () => {
const FirstWithConditional = withErrorMessage(First); const FirstWithConditional = withErrorMessage(First);
const { container } = render(<FirstWithConditional apiState={API_STATE.ERROR} />); const { container } = render(
<FirstWithConditional apiState={API_STATE.ERROR} />
);
expect(container).toMatchSnapshot(); expect(container).toMatchSnapshot();
}); });
}); });

Some files were not shown because too many files have changed in this diff Show More