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

Compare commits

..

395 Commits

Author SHA1 Message Date
c35a4a8236 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!164
2021-06-30 12:34:05 +00:00
67b8386cd0 Merge branch 'bump-5113' into 'dev'
Bump v5.1.13

See merge request turris/reforis/foris-js!163
2021-06-30 11:56:44 +00:00
f67edc39e1 Bump v5.1.13
* Add sentinelAgreement endpoint to forisUrls
* NPM audit fix
2021-06-30 10:51:03 +02:00
6f0f344eb4 NPM audit fix 2021-06-30 10:45:30 +02:00
3a39e44c34 Merge branch 'add-data-collection-endpoint' into 'dev'
Add sentinelAgreement endpoint to forisUrls

See merge request turris/reforis/foris-js!162
2021-06-30 08:41:09 +00:00
cff5f1e5e1 Add sentinelAgreement endpoint to forisUrls 2021-06-29 17:39:53 +02:00
b7bab92d5d Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!160
2021-05-14 11:55:44 +00:00
75dd0fec92 Merge branch 'fix-wifi' into 'dev'
Expend library with the ResetWifiSettings function

Closes #20

See merge request turris/reforis/foris-js!155
2021-05-14 11:46:20 +00:00
3619532124 Bump v5.1.12
* Add & update translations
* Add & fix obsolete links
* Expend library with the ResetWifiSettings function
* Fix switching Wi-Fi modes depending on bands in WiFiForm
* Fix translation sources in WiFiForm
* NPM audit fix
* Other small improvements
2021-05-14 13:38:01 +02:00
ce62fd1043 Update Snapshots 2021-05-14 13:38:00 +02:00
c5bac99d8e NPM audit fix 2021-05-14 13:38:00 +02:00
f7146e3b14 Fix obsolete rebootPage link in forisUrls 2021-05-14 13:37:59 +02:00
18ba90567c Fix fuzzy translation messages in English catalog 2021-05-14 13:37:59 +02:00
2e9da55df7 Fix ids in wifiSettings fixture 2021-05-14 13:37:59 +02:00
da10a34d64 Revert "Fix reForis infinity redirect loop when WS error occurs"
It turned out that this fix doesn't work as expected in some cases.

This reverts commit 7505302875.
2021-05-14 13:37:58 +02:00
764a6c86cd Expend library with the ResetWifiSettings function
Use named export instead of the default for ResetWifiSettings,
as we want to use it not only inside the WiFiSettings component.
2021-05-14 13:37:58 +02:00
6059ce9e7b Merge branch 'fix-wifi-modes' into 'dev'
Fix switching Wi-Fi modes depending on bands in WiFiForm

Closes reforis#292

See merge request turris/reforis/foris-js!159
2021-05-14 11:11:01 +00:00
4368bea2c2 Update tests 2021-05-14 13:06:48 +02:00
9dd6bbca90 Fix switching Wi-Fi modes depending on bands in WiFiForm 2021-05-14 13:06:48 +02:00
d5bb99570c Merge branch 'add-packages-url' into 'dev'
Add Packages URL

See merge request turris/reforis/foris-js!158
2021-04-29 15:48:13 +00:00
e1260a5ea1 Add Packages URL into forisUrls 2021-04-21 14:10:23 +02:00
02f2c5be4f Merge branch 'update-translations' into 'dev'
Add & update translations

See merge request turris/reforis/foris-js!156
2021-04-08 18:06:53 +00:00
ce04f6c27e Merge remote-tracking branch 'weblate/master' into update-translations 2021-04-08 15:57:34 +02:00
80d4dd914d Merge branch 'fix-ios-redirect-loop' into 'dev'
Fix iOS redirect loop

Closes #19

See merge request turris/reforis/foris-js!154
2021-03-26 10:31:58 +00:00
7f82b2e73c NPM audit fix 2021-03-26 11:11:13 +01:00
ac8646a4e7 Update package-lock.json by npm v7
The lockfile v2 is used by npm v7, which is backwards compatible
to v1 lockfiles.

For more information:
https://docs.npmjs.com/cli/v7/configuring-npm/package-lock-json#lockfileversion
2021-03-26 11:11:13 +01:00
7505302875 Fix reForis infinity redirect loop when WS error occurs 2021-03-26 11:11:12 +01:00
adc6bbca14 Merge branch 'fix-translation-sources' into 'dev'
Fix translation sources in WiFiForm

See merge request turris/reforis/foris-js!153
2021-03-24 10:25:19 +00:00
86f98148c6 Fix translation sources in WiFiForm 2021-03-03 13:18:09 +01:00
f623b98acc Translated using Weblate (Russian)
Currently translated at 100.0% (50 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/ru/
2021-02-19 06:50:27 +01:00
3be1213b3b Translated using Weblate (Czech)
Currently translated at 100.0% (50 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/cs/
2021-02-17 15:50:37 +01:00
09007b922e Translated using Weblate (Russian)
Currently translated at 98.0% (49 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/ru/
2021-02-14 16:50:25 +01:00
f6231370b9 Translated using Weblate (Czech)
Currently translated at 86.0% (43 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/cs/
2021-02-14 16:50:25 +01:00
449b93ce41 Translated using Weblate (French)
Currently translated at 56.0% (28 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/fr/
2021-02-09 17:50:37 +01:00
764c8dedd8 Translated using Weblate (Russian)
Currently translated at 96.0% (48 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/ru/
2021-02-09 17:50:37 +01:00
9bfd20ef0c Translated using Weblate (Greek)
Currently translated at 8.0% (4 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/el/
2021-02-09 17:50:37 +01:00
0289c5010f Translated using Weblate (Czech)
Currently translated at 80.0% (40 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/cs/
2021-02-09 17:50:37 +01:00
1733b8609b Translated using Weblate (Russian)
Currently translated at 88.0% (44 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/ru/
2021-02-06 00:41:58 +01:00
d5c3365fdb Translated using Weblate (Greek)
Currently translated at 8.0% (4 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/el/
2021-02-06 00:41:57 +01:00
0ba4814275 Translated using Weblate (Norwegian Bokmål)
Currently translated at 82.0% (41 of 50 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/nb_NO/
2021-02-06 00:41:57 +01:00
fca410ec82 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!152
2021-02-04 13:11:19 +01:00
4f09c2da9a Merge branch 'fix-translations' into 'dev'
Fix translations

See merge request turris/reforis/foris-js!151
2021-02-04 12:43:20 +01:00
57ef9c4ea0 Bump v5.1.11
* Remove duplicated file for Norwegian language
* Fix translations inconsistency
2021-02-04 12:14:29 +01:00
b7695cc854 Remove duplicated file for Norwegian language
I noticed thanks to Weblate that there are two files for the same
language and I found this site:
http://people.skolelinux.org/pere/blog/Spr_kkoder_for_POSIX_locale_i_Norge.html

We should use nb_NO and remove nb folder.
2021-02-04 12:12:39 +01:00
fd8b8b926a Merge remote-tracking branch 'weblate/master' into fix-translations 2021-02-03 18:09:37 +01:00
b91ec527d1 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!150
2021-02-03 14:41:59 +01:00
7369d906b5 Merge branch 'bump-5110' into 'dev'
Bump v5.1.10

See merge request turris/reforis/foris-js!149
2021-02-02 10:26:00 +01:00
45fee77426 Bump v5.1.10
* Add and update translations
2021-01-29 17:14:03 +01:00
b12cba893e Merge branch 'new-translations' into 'dev'
Add new translations

See merge request turris/reforis/foris-js!148
2021-01-29 13:49:51 +01:00
09d1698647 Update translation messages 2021-01-28 11:45:37 +01:00
83c05c6c89 Create translation messages 2021-01-28 11:44:40 +01:00
a08de54ca1 Makefile: update Python version 2021-01-28 11:43:36 +01:00
cb5fa4ce34 Translated using Weblate (Hungarian)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/hu/
2021-01-28 11:37:10 +01:00
fb32c84dc2 Translated using Weblate (Polish)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/pl/
2021-01-28 11:37:00 +01:00
4060b3c916 Translated using Weblate (Dutch)
Currently translated at 5.5% (1 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/nl/
2021-01-28 11:36:43 +01:00
7abfd627e4 Translated using Weblate (Spanish)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/es/
2021-01-28 11:36:14 +01:00
0fbc3df247 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!147
2021-01-21 10:57:46 +01:00
bc9c00d3a1 Merge branch 'bump-519' into 'dev'
Bump v5.1.9

See merge request turris/reforis/foris-js!146
2021-01-21 10:30:32 +01:00
8d75b5ec6e Bump v5.1.9
* Fix trailing space in Modal classes
* Change formFieldsSize of ResetWiFiSettings card
* Increase bottom margin of formFieldsSize
2021-01-20 11:42:24 +01:00
c1aa1948b4 Merge branch 'fix-wifi-layout' into 'dev'
Fix Wi-Fi layout

See merge request turris/reforis/foris-js!145
2021-01-19 16:42:17 +01:00
8c110ebf52 NPM audit fix 2021-01-18 23:31:43 +01:00
abb5be53aa Fix trailing space in Modal classes 2021-01-18 23:10:39 +01:00
af0fb80e45 Update Snapshots 2021-01-18 23:10:39 +01:00
688192504f Change formFieldsSize of ResetWiFiSettings card 2021-01-18 22:06:20 +01:00
b8e5dbec8d Increase bottom margin of formFieldsSize 2021-01-18 22:05:56 +01:00
bcb5365d08 Translated using Weblate (Hungarian)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/hu/
2021-01-07 02:26:22 +01:00
037d1993c8 Translated using Weblate (Polish)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/pl/
2020-12-23 13:29:13 +01:00
2287ddc420 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!144
2020-12-20 18:54:48 +01:00
fde751a25f Merge branch 'check-installed-plugins' into 'dev'
Add isPluginInstalled function

See merge request turris/reforis/foris-js!143
2020-12-20 18:47:06 +01:00
79006cfb99 Bump v5.1.8 2020-12-19 00:25:44 +01:00
de398901f3 Add isPluginInstalled function 2020-12-19 00:14:05 +01:00
bea429d6ac Translated using Weblate (Dutch)
Currently translated at 5.5% (1 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/nl/
2020-11-29 20:29:03 +01:00
e818120986 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!142
2020-11-27 17:55:01 +01:00
56173d4959 Merge branch 'add-storage-link' into 'dev'
Add storage link

See merge request turris/reforis/foris-js!141
2020-11-27 17:09:55 +01:00
7c837d041e Bump v5.1.7 2020-11-27 15:37:07 +01:00
473c81f9a4 Add storage link 2020-11-27 15:37:02 +01:00
ba9abca5cf Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!140
2020-11-27 13:03:14 +01:00
15567a7dde Merge branch 'release-516' into 'dev'
Bump v5.1.6

Closes #18

See merge request turris/reforis/foris-js!139
2020-11-27 12:30:39 +01:00
e2695d49a1 Bump v5.1.6
* NPM audit fix
* Add displayCard function to utils
* Add optional sizes to Modal
* Add information about optional sizes to docs
* Remove redundant merge.py
2020-11-25 23:29:42 +01:00
a87e6858bf Remove redundant merge.py 2020-11-25 23:29:31 +01:00
e864de5a24 Merge branch 'add-optional-sizes-modals' into 'dev'
Add optional sizes to Modals

See merge request turris/reforis/foris-js!138
2020-11-23 22:25:18 +01:00
5469e6ec80 Add displayCard function to utils 2020-11-22 23:45:27 +01:00
4898016388 Update Snapshots 2020-11-20 17:02:10 +01:00
e0fab75c69 NPM audit fix 2020-11-20 17:00:26 +01:00
6480a39cdb Add information about optional sizes to docs 2020-11-20 16:56:25 +01:00
6f05d5d136 Add optional sizes to Modal 2020-11-20 16:56:16 +01:00
96150fe230 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!137
2020-09-29 11:01:27 +02:00
0892a1534a Merge branch 'release-v5.1.5' into 'dev'
Release v5.1.5

See merge request turris/reforis/foris-js!136
2020-09-29 10:56:55 +02:00
1bac60e054 Bump v5.1.5 2020-09-25 19:27:58 +02:00
328e568ab3 NPM audit fix 2020-09-25 19:26:57 +02:00
c68389359e Update Snapshots 2020-09-25 18:52:25 +02:00
e03e0f44cc Fix extra empty space in Switch's classes 2020-09-25 18:50:04 +02:00
1e04d34645 Fix DateTime import 2020-09-25 18:50:04 +02:00
187ecc54e5 Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!135
2020-09-25 17:53:36 +02:00
ed7cf34e76 Merge branch 'release-v5.1.4' into 'dev'
Release v5.1.4

See merge request turris/reforis/foris-js!133
2020-09-25 17:43:10 +02:00
aaf4087c96 Update Snapshots 2020-09-25 17:32:04 +02:00
240db88661 Bump v5.1.4 2020-09-25 17:27:47 +02:00
913a7d7b75 Add closing bootstrap modal using ESC 2020-09-25 17:27:47 +02:00
bdc8726791 Change reboot modal's heading to "Warning!" 2020-09-25 17:27:46 +02:00
1c986519f6 Fix Alert's dismissible class condition 2020-09-25 17:27:46 +02:00
defc363f01 Add inline option to Wi-Fi's RadioSet 2020-09-14 18:48:30 +02:00
ef66fb43cc Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!131
2020-09-11 18:14:34 +02:00
69723f6b0b Merge branch 'new-bump' into 'dev'
Bump v5.1.3

See merge request turris/reforis/foris-js!130
2020-09-11 18:08:32 +02:00
c32137e29a Bump v5.1.3 2020-09-11 18:00:05 +02:00
03cf73be6e Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!129
2020-09-11 17:50:07 +02:00
be7349661f Merge branch 'ssid-validation' into 'dev'
Ssid validation

Closes reforis#218

See merge request turris/reforis/foris-js!128
2020-09-11 17:39:05 +02:00
5186385b9f Update snapshots 2020-09-11 17:32:46 +02:00
002786d073 Add test 2020-09-11 17:32:46 +02:00
4d246540c1 Add SSID validation for bytes count 2020-09-11 17:32:45 +02:00
35b97ec0fe Add validation for SSID with diacritic 2020-09-11 17:32:45 +02:00
d2688532af Merge branch 'dev' into 'master'
Bump v5.1.2

See merge request turris/reforis/foris-js!127
2020-09-08 18:40:57 +02:00
e1d75d8328 Merge branch 'release-v5.1.2' into 'dev'
Bump v5.1.2

See merge request turris/reforis/foris-js!126
2020-09-08 18:36:28 +02:00
0f85713483 Bump v5.1.2 2020-09-08 18:26:15 +02:00
c3cdafce13 Merge branch 'fix-ws-loop' into 'dev'
Fix infinity loop caused by WebSockets

Closes #17

See merge request turris/reforis/foris-js!125
2020-09-08 18:11:05 +02:00
b96b434a3e Update Snapshots 2020-09-02 17:55:53 +02:00
0ea5f7de84 Decrease Switch's margin-bottom with headings 2020-09-02 17:55:44 +02:00
0c7997f6c0 Fix Reboot page URL in respective dropdown 2020-09-02 17:55:44 +02:00
90ce866869 Fix infinity loop caused by WebSockets 2020-09-02 17:55:25 +02:00
ad99a2034d Merge branch 'dev' into 'master'
Add "inline" option to RadioSet

See merge request turris/reforis/foris-js!124
2020-08-31 18:24:42 +02:00
4ff814f0fd Merge branch 'small-fixes' into 'dev'
Add "inline" option to RadioSet

See merge request turris/reforis/foris-js!123
2020-08-31 18:19:12 +02:00
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
f1feffb4bb Merge branch 'dev' into 'master'
Release v5.1.0

See merge request turris/reforis/foris-js!122
2020-08-26 11:55:07 +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
074ddf8a8b Translated using Weblate (Spanish)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/es/
2020-05-25 15:41:39 +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
51ba380cf0 Merge branch 'dev' into 'master'
Release 2.1.0

See merge request turris/reforis/foris-js!62
2019-12-19 12:10:18 +01:00
4eae1ed8d2 Merge branch 'ws-logging' into 'dev'
Changed levels of WS logs

Closes reforis#162

See merge request turris/reforis/foris-js!61
2019-12-19 11:58:59 +01:00
3d290114fa Changed levels of WS logs 2019-12-17 17:45:55 +01:00
3f87e9e4b4 Merge branch 'export-radio' into 'dev'
Export <Radio />.

See merge request turris/reforis/foris-js!60
2019-12-17 14:07:14 +01:00
6d5cb6a951 Export <Radio />. 2019-12-17 14:04:06 +01:00
8d3be8df67 Merge branch 'click-outside-hook' into 'dev'
Detect clicks outside element with a hook

See merge request turris/reforis/foris-js!59
2019-12-16 16:21:18 +01:00
90509f2a23 Detect clicks outside element with a hook 2019-12-16 13:44:58 +01:00
73f84a2d81 Merge branch '8-fix-git-link' into 'dev'
Fixed link to git repository

Closes #8

See merge request turris/reforis/foris-js!58
2019-12-09 12:45:01 +01:00
cea7325427 Fixed link to git repository 2019-12-09 11:51:50 +01:00
a8d8c872f9 Merge branch 'dev' into 'master'
Publish 2.0.0.

See merge request turris/reforis/foris-js!57
2019-12-09 10:51:49 +01:00
cda7898a96 Merge branch 'fix-readme' into 'dev'
Fix README.md publishing.

See merge request turris/reforis/foris-js!56
2019-12-09 10:24:42 +01:00
26bea9c7c4 Fix README.md publishing. 2019-12-06 17:26:01 +01:00
fd1518265f Merge branch 'spinner-element-class-name' into 'dev'
Add className to SpinnerElement.

See merge request turris/reforis/foris-js!55
2019-12-06 15:07:16 +01:00
61d10e91e0 Merge branch 'ws-unsubscription' into 'dev'
Add WS unsubscribtion.

See merge request turris/reforis/foris-js!53
2019-12-06 15:06:59 +01:00
aac6c6bf2a Add className to SpinnerElement. 2019-12-06 12:13:29 +01:00
d55615abcc Grammar. 2019-12-06 12:09:54 +01:00
9d322811c3 Improve docs and propTypes of WS usage in ForisForm. 2019-12-06 12:07:42 +01:00
f30685d9c2 Add WS unsubscribtion.
Code review improvements.
2019-12-06 11:46:30 +01:00
5bb298270b Merge branch '15-api-url-suffix' into 'dev'
Set suffix for API URL

Closes #15

See merge request turris/reforis/foris-js!54
2019-12-06 10:27:48 +01:00
8d0c640994 Set suffix for API URL 2019-12-06 10:27:48 +01:00
25ddb5949c Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!52
2019-12-02 17:11:03 +01:00
7b739f55a0 Merge branch 'add-reboot-button' into 'dev'
Add reboot button

See merge request turris/reforis/foris-js!50
2019-11-29 16:37:44 +01:00
03a020f87c Bump version 1.4.0. 2019-11-29 16:29:32 +01:00
c6fd9bbadb NPM audit fix. 2019-11-29 16:29:32 +01:00
acaaab0654 Fix URL prefixes. 2019-11-29 16:29:31 +01:00
04a667eb6f Extract reboot button from reForis.
* Add RebootButton tests.
 * RebootButton code review.
 * Update translations.
2019-11-29 16:29:31 +01:00
d71f638bd5 Merge branch 'download-button-class' into 'dev'
Allow adding classes to DownloadButton

See merge request turris/reforis/foris-js!51
2019-11-29 16:01:53 +01:00
1064277cd9 Allow adding classes to DownloadButton 2019-11-29 16:01:53 +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
8d1d5b57fd Merge branch 'dev' 2019-11-25 13:07:20 +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
fd01bc6f56 Merge branch 'bump-1.3.3' into 'dev'
Bump version 1.3.3.

See merge request turris/reforis/foris-js!48
2019-11-22 15:35:41 +00:00
e27a23600f Bump version 1.3.3. 2019-11-22 16:30:25 +01:00
daf787e2df Merge branch 'translations' into 'master'
Translations

See merge request turris/reforis/foris-js!47
2019-11-22 15:19:01 +00:00
512c65c213 Translated using Weblate (Czech)
Currently translated at 100.0% (18 of 18 strings)

Translation: Turris/Foris JS
Translate-URL: https://hosted.weblate.org/projects/turris/foris-js/cs/
2019-11-21 18:04:38 +01:00
3925fb6439 Added translation using Weblate (Spanish) 2019-11-21 05:10:24 +01:00
21bbfb6d2e Merge branch 'dev' into 'master'
Dev

See merge request turris/reforis/foris-js!43
2019-11-20 10:22:05 +00:00
1dcba1dfa8 Merge branch 'api-polling-catch-error' into 'dev'
Catch error state in API polling.

See merge request turris/reforis/foris-js!44
2019-11-19 16:56:38 +00:00
fd8acd1ceb Catch error and sending state in API polling. 2019-11-19 16:56:38 +00:00
48d5cf0119 Merge branch 'clickable-checkbox-helptext' into 'dev'
Make checkBox help text clickabe.

See merge request turris/reforis/foris-js!45
2019-11-19 12:43:15 +00:00
1a82f8e225 Update checkbox snapshots. 2019-11-19 13:37:43 +01:00
638821d025 Make checkBox help text clickabe. 2019-11-19 13:36:49 +01:00
fbaa73e378 Merge branch 'global-alert-context' into 'dev'
Use global AlertContext

See merge request turris/reforis/foris-js!42
2019-11-18 12:51:43 +00:00
e54db2c577 Use global AlertContext 2019-11-18 12:51:43 +00:00
a6866a0673 Merge branch 'api-polling' into 'dev'
Add hook for API polling.

See merge request turris/reforis/foris-js!41
2019-11-15 15:59:44 +00:00
429814ebb5 Add until param to API polling hook. 2019-11-15 14:21:19 +01:00
73e213c467 Add default delay. 2019-11-15 14:20:14 +01:00
2e68e56e44 Add hook for API polling. 2019-11-15 14:20:07 +01:00
b3bb4de646 Merge branch 'with-either-props' into 'dev'
Fix for withEither

See merge request turris/reforis/foris-js!40
2019-11-15 08:55:24 +00:00
b30f9f59b4 Fix for withEither 2019-11-15 08:55:24 +00:00
158bd1bb24 Merge branch 'dev' into 'master'
Release 1.3.1

See merge request turris/reforis/foris-js!38
2019-11-14 12:58:31 +00:00
d935f78d6e Merge branch '13-packages-required-for-translations' into 'dev'
Added virtual environment and packages required for translations.

Closes #13

See merge request turris/reforis/foris-js!39
2019-11-14 12:51:58 +00:00
73f4ab48c3 Added virtual environment and packages required for translations. 2019-11-14 11:28:28 +01:00
7075592f24 Merge branch 'timeout' into 'dev'
Timeout handling

See merge request turris/reforis/foris-js!36
2019-11-13 14:45:24 +00:00
23029470b9 Improve error handling + small refactoring. 2019-11-13 15:28:26 +01:00
7e6e6f8c87 Use generic error message in the ForisForm. 2019-11-13 14:49:52 +01:00
b831d664a9 Add timout handling. 2019-11-13 14:49:52 +01:00
0f5b35a3ba Merge branch 'shared-lint-configs' into 'dev'
Shared lint configs

See merge request turris/reforis/foris-js!37
2019-11-13 10:11:11 +00:00
6e02f1d194 Shared lint configs 2019-11-13 10:11:11 +00:00
13ff8221ca Merge branch 'improve-alert' into 'dev'
Move alert to portal

See merge request turris/reforis/foris-js!35
2019-11-12 12:50:29 +00:00
a51ba0630d Move alert to portal 2019-11-12 12:50:29 +00:00
ee5cf07614 Merge branch 'loading-and-errors' into 'dev'
Loading and errors HOCs

See merge request turris/reforis/foris-js!34
2019-11-07 17:21:14 +00:00
8b39bf4193 Loading and errors HOCs 2019-11-07 17:21:14 +00:00
644726a0fc Merge branch '6-api-hooks-fix' into 'dev'
Added missing hook to index.js

Closes #6

See merge request turris/reforis/foris-js!33
2019-11-05 12:03:43 +00:00
654ae6914a Added missing hook to index.js 2019-11-05 13:00:44 +01:00
81dedf59cd Merge branch '6-api-hooks' into 'dev'
Resolve "Discuss and implement proper API methods."

Closes #6

See merge request turris/reforis/foris-js!32
2019-11-05 11:10:50 +00:00
7f8aaea7b8 Resolve "Discuss and implement proper API methods." 2019-11-05 11:10:50 +00:00
dfa80e64ec Merge branch 'publish-fix' into 'dev'
Fixed publish script

See merge request turris/reforis/foris-js!31
2019-11-01 11:08:05 +00:00
031b53f03c Fixed publish script 2019-11-01 10:49:45 +01:00
ca23b2d335 Merge branch 'alert-context-fix' into 'dev'
Flat structure of published package

See merge request turris/reforis/foris-js!30
2019-11-01 09:28:28 +00:00
0984c45161 Flat structure of published package 2019-11-01 09:28:28 +00:00
6835bc7a28 Merge branch 'global-alert' into 'dev'
Global alert

See merge request turris/reforis/foris-js!29
2019-10-30 16:06:53 +00:00
0915d477fe Global alert 2019-10-30 16:06:53 +00:00
c114579b7f Merge branch 'dev' into 'master'
Release 1.2.0

See merge request turris/reforis/foris-js!28
2019-10-24 13:52:35 +00:00
22b2bc9c09 Merge branch 'release-1.2.0' into 'dev'
Release 1.2.0

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

[skip ci]
2019-10-24 11:54:36 +00:00
cab2cfa068 Release 1.2.0 2019-10-24 13:47:25 +02:00
a137a0d4cf Merge branch 'dev' into 'master'
Release 1.1.1

See merge request turris/reforis/foris-js!26
2019-10-24 11:24:57 +00:00
54cf7e3c06 Merge branch 'master' into dev 2019-10-24 10:47:13 +02:00
18eb28f368 Merge branch 'radio-checkbox-whitespace' into 'dev'
Radio checkbox whitespace

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

[skip ci]
2019-10-24 08:12:39 +00:00
88f3836485 Radio checkbox whitespace 2019-10-24 08:12:39 +00:00
8f88b09e66 Merge branch 'dev' into 'master'
Release 1.1.0

See merge request turris/reforis/foris-js!24
2019-10-22 08:24:10 +00:00
f2aa28f172 Release 1.1.0 2019-10-22 08:24:10 +00:00
a88fbf63e9 Merge branch 'shell-quotes' into 'dev'
Added quotes to shell variables

See merge request turris/reforis/foris-js!23
2019-10-15 08:50:53 +00:00
ff9e8fdeb1 Added quotes to shell variables 2019-10-15 10:10:33 +02:00
8cd4ac8b44 Merge branch 'ws-connection-closed' into 'dev'
Download button

See merge request turris/reforis/foris-js!22
2019-10-11 14:11:14 +00:00
760e6d9243 Download button 2019-10-11 14:11:14 +00:00
2429f4662c Merge branch '5-versioning' into 'dev'
Changed beta versioning procedure

Closes #5

See merge request turris/reforis/foris-js!21
2019-10-11 08:25:06 +00:00
b320e6a860 Changed beta versioning procedure 2019-10-11 10:15:53 +02:00
1e3e9433ec Merge branch 'client-configuration' into 'dev'
Client configuration

See merge request turris/reforis/foris-js!20
2019-10-10 15:25:00 +00:00
e3a795e40d Client configuration 2019-10-10 15:25:00 +00:00
dccc9e5769 Merge branch 'dev' into 'master'
Release 1.0.0

See merge request turris/reforis/foris-js!19
2019-10-07 15:49:42 +00:00
30748fab12 Merge branch 'master' into dev
[skip ci]
2019-10-07 17:36:04 +02:00
a17ecc6060 Merge branch 'release-1.0.0' into 'dev'
Release 1.0.0

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

[skip ci]
2019-10-07 15:31:02 +00:00
75ce94d3ee Release 1.0.0 2019-10-07 17:24:03 +02:00
96263af618 Merge branch 'dev' into 'master'
Release 0.1.0

See merge request turris/reforis/foris-js!17
2019-10-07 15:16:27 +00:00
50a1bfd9b5 Release 0.1.0 2019-10-07 15:16:27 +00:00
b360431f38 Merge branch 'release-0.1.0' into 'dev'
Release 0.1.0

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

[skip ci]
2019-10-07 15:01:29 +00:00
9eebb35e65 Release 0.1.0 2019-10-07 16:53:54 +02:00
cf556e3518 Merge branch '1-automatic-publish' into 'dev'
Resolve "Automatic NPM publish."

Closes #1

See merge request turris/reforis/foris-js!15
2019-10-07 14:43:57 +00:00
5977e675cf Resolve "Automatic NPM publish." 2019-10-07 14:43:57 +00:00
ee5f3da093 Merge branch '4-increment-decrement' into 'dev'
Resolve "Increment/decrement value in NumberInput when +/- button is kept pushed."

Closes #4

See merge request turris/reforis/foris-js!14
2019-10-07 09:18:25 +00:00
afa8c160a3 Resolve "Increment/decrement value in NumberInput when +/- button is kept pushed." 2019-10-07 09:18:25 +00:00
0af56ec84c Merge branch 'non-json-payload' into 'dev'
Filter non-JSON payload

See merge request turris/reforis/foris-js!13
2019-10-01 09:38:18 +00:00
96eed02d32 Filter non-JSON payload 2019-10-01 09:38:18 +00:00
8479518fab Merge branch 'docs' into 'dev'
Fix docs, extract CSS to Foris JS.

See merge request turris/reforis/foris-js!10
2019-09-30 13:01:00 +00:00
800dedbcfd Merge branch 'reforis-125-ignore-non-json-errors' into 'dev'
Ignore non-JSON error payload

See merge request turris/reforis/foris-js!12
2019-09-30 12:58:41 +00:00
44e45499c6 Ignore non-JSON error payload 2019-09-30 12:58:41 +00:00
5457f68c70 Download docs css via NPM. 2019-09-30 11:27:13 +02:00
680871de62 Core review docs fixes. 2019-09-30 11:26:06 +02:00
9641fbcb50 Version bump 2019-09-30 10:09:52 +02:00
1708f026a4 Merge branch 'filter-keys-fix' into 'dev'
Added missing export

See merge request turris/reforis/foris-js!11
2019-09-30 08:04:05 +00:00
7516cfdbfe Added missing export 2019-09-30 09:58:11 +02:00
cbb1382c66 Merge branch 'filter-keys' into 'dev'
Added function to filter object by keys

See merge request turris/reforis/foris-js!9
2019-09-30 07:51:59 +00:00
e4e28dbce4 Move css to the library. 2019-09-26 16:10:52 +02:00
7a14ed1b60 Copyright. 2019-09-26 12:23:22 +02:00
497a1a0ad3 Added function to filter object keys 2019-09-26 09:39:07 +02:00
4a481ea642 Add styleguidist docs. 2019-09-25 16:14:29 +02:00
8296c6129e Merge branch '89-arrows-number-input' into 'dev'
Disable default styles for number input

See merge request turris/reforis/foris-js!5
2019-09-25 11:59:45 +00:00
7253319b61 Disable default styles for number input 2019-09-25 11:59:45 +00:00
7371fbcac0 Merge branch '3-handle-patch-request' into 'dev'
Resolve "Handle PATCH request"

Closes #3

See merge request turris/reforis/foris-js!8
2019-09-25 11:56:08 +00:00
d658f0b112 Resolve "Handle PATCH request" 2019-09-25 11:56:08 +00:00
edc5c92421 Merge branch '2-alert-context' into 'dev'
Resolve "Extract alert context from OpenVPN plugin"

Closes #2

See merge request turris/reforis/foris-js!7
2019-09-24 07:52:09 +00:00
d4bc5a6998 Resolve "Extract alert context from OpenVPN plugin" 2019-09-24 07:52:09 +00:00
b938dd85ff Merge branch 'api-delete-method' into 'dev'
DELETE method in API hooks

See merge request turris/reforis/foris-js!6
2019-09-10 08:30:42 +00:00
4ff3e33411 DELETE method in API hooks 2019-09-10 08:30:42 +00:00
143 changed files with 43124 additions and 12985 deletions

View File

@ -1,66 +1,8 @@
const path = require("path");
module.exports = {
"env": {
"browser": true,
"node": true,
"es6": true,
"jest": true
},
"extends": [
"airbnb",
"airbnb/hooks"
],
"globals": {
"_": "readonly",
"babel": "readonly",
"ForisTranslations": "readonly",
"ngettext": "readonly",
"ForisPlugins": "readonly"
},
"parser": "babel-eslint",
"rules": {
"quotes": ["error", "double"],
"indent": ["error", 4],
"react/jsx-indent": ["error", 4],
"react/jsx-indent-props": ["error", 4],
"react/prop-types": "warn",
"react/no-array-index-key": "warn",
"react/button-has-type": "warn",
extends: ["eslint-config-reforis", "prettier"],
plugins: ["prettier"],
rules: {
"prettier/prettier": ["error"],
"import/prefer-default-export": "off",
"import/no-unresolved": [
"error",
// Ignore imports used only in tests
{ ignore: ["customTestRender"] }
],
"import/no-cycle": "warn",
"no-console": "error",
"no-use-before-define": ["error", {
functions: false,
classes: true,
variables: true
}],
"no-restricted-syntax": "warn",
// Should be enabled in the future
"camelcase": "off",
"no-param-reassign": "off",
"react/jsx-props-no-spreading": "off",
"react/require-default-props": "off",
"react/default-props-match-prop-types": "off",
"react/forbid-prop-types": "off",
// Permanently disabled
"react/jsx-filename-extension": "off",
"no-plusplus": "off",
"consistent-return": "off",
"radix": "off",
"no-continue": "off",
"react/no-danger": "off",
},
"settings": {
"import/resolver": {
"node": {
"paths": ["src"]
}
}
}
};

6
.gitignore vendored
View File

@ -4,6 +4,9 @@
logs
*.log
# Python
venv/
# NodeJS
## Logs
npm-debug.log*
@ -43,8 +46,9 @@ coverage.xml
## Translations
*.mo
/js/styleguide/
.gitignore
dist/
foris-*.tgz
styleguide/
testUtils

View File

@ -1,26 +1,44 @@
image: node:8-alpine
image: node:10-alpine
stages:
- test
- build
- test
- build
- publish
before_script:
- npm install
- apk add make
- npm install
test:
stage: test
script:
- npm test
stage: test
script:
- make test
lint:
stage: test
script:
- npm run lint
stage: test
script:
- make lint
build:
stage: build
script:
- npm pack
artifacts:
paths:
- foris-*.tgz
stage: build
script:
- make pack
artifacts:
paths:
- dist/foris-*.tgz
publish_beta:
stage: publish
only:
refs:
- dev
script:
- make publish-beta
publish_latest:
stage: publish
only:
refs:
- master
script:
- 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

@ -1,17 +1,68 @@
.PHONY: all create-messages update-messages clean
.PHONY: all install-js watch-js build-js collect-files pack publish-beta publish-latest lint test test-js-update-snapshots create-messages update-messages docs docs-watch clean
DEV_PYTHON=python3
VENV_NAME?=venv
VENV_BIN=$(shell pwd)/$(VENV_NAME)/bin
all:
@echo "make install-js"
@echo " Install dependencies"
@echo "make watch-js"
@echo " Compile JS in watch mode."
@echo "make build-js"
@echo " Compile JS."
@echo "make lint-js"
@echo " Run linter"
@echo "make test-js"
@echo " Run tests"
@echo "make create-messages"
@echo " Create locale messages (.pot)."
@echo "make update-messages"
@echo " Update locale messages from .pot file."
@echo "make docs"
@echo " Build project documentation."
@echo "make docs-watch"
@echo " Start styleguidist server."
@echo "make clean"
@echo " Remove python artifacts and virtualenv."
create-messages:
pybabel extract -F babel.cfg -o ./translations/forisjs.pot .
update-messages:
pybabel update -i translations/forisjs.pot -d translations
venv: $(VENV_NAME)/bin/activate
$(VENV_NAME)/bin/activate:
test -d $(VENV_NAME) || $(DEV_PYTHON) -m virtualenv -p $(DEV_PYTHON) $(VENV_NAME)
$(VENV_BIN)/$(DEV_PYTHON) -m pip install -r requirements.txt
touch $(VENV_NAME)/bin/activate
install-js: package.json
npm install --save-dev
collect-files:
sh scripts/collect_files.sh
pack: collect-files
cd dist && npm pack
publish-beta: collect-files
sh scripts/publish.sh beta
publish-latest: collect-files
sh scripts/publish.sh latest
lint:
npm run lint
lint-js-fix:
npm run lint:fix
test:
npm test
test-js-update-snapshots:
npm test -- -u
create-messages: venv
$(VENV_BIN)/pybabel extract -F babel.cfg -o ./translations/forisjs.pot .
update-messages: venv
$(VENV_BIN)/pybabel update -i ./translations/forisjs.pot -d ./translations -D forisjs
docs:
npm run-script docs
docs-watch:
npm run-script docs:watch
clean:
rm -rf node_modules dist

52
README.md Normal file
View File

@ -0,0 +1,52 @@
# foris-js
Set of utils and common React elements for reForis.
## Publishing package
### Beta versions
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.
`foris@0.1.0-beta.d9073aa4`.
### Preparing a release
1. Crete a merge request to `dev` branch with version bumped
2. When merging add `[skip ci]` to commit message to prevent publishing
unnecessary version
3. Create a merge request from `dev` to `master` branch
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,17 +1,4 @@
module.exports = {
presets: [
"@babel/preset-env",
"@babel/preset-react",
],
plugins: [
"@babel/plugin-transform-runtime",
"@babel/plugin-syntax-export-default-from",
["module-resolver", {
root: ["./src"],
alias: {
test: "./test",
underscore: "lodash",
},
}],
],
presets: ["@babel/preset-env", "@babel/preset-react"],
plugins: ["@babel/plugin-transform-runtime"],
};

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

6
docs/intro.md Normal file
View File

@ -0,0 +1,6 @@
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/",
],
moduleNameMapper: {
"\\.(css|less)$": "<rootDir>/src/__mocks__/styleMock.js",
},
clearMocks: true,
collectCoverageFrom: ["src/**/*.{js,jsx}"],
coverageDirectory: "coverage",
testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/"],
testPathIgnorePatterns: ["/node_modules/", "/__fixtures__/", "/dist/"],
verbose: false,
setupFilesAfterEnv: [
"@testing-library/react/cleanup-after-each",
@ -24,4 +27,5 @@ module.exports = {
globals: {
TZ: "utc",
},
transformIgnorePatterns: ["node_modules/(?!(react-datetime)/)"],
};

43620
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,71 +1,70 @@
{
"name": "foris",
"version": "0.0.7",
"description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.",
"repository": {
"type": "git",
"url": "https://gitlab.labs.nic.cz/turris/reforis/forisjs.git"
},
"keywords": [
"foris",
"reforis"
],
"license": "GPL-3.0",
"main": "./dist/index.js",
"dependencies": {
"axios": "^0.19.0",
"immutability-helper": "^3.0.1",
"prop-types": "^15.7.2",
"react-datetime": "^2.16.3",
"react-router": "^5.0.1",
"react-uid": "^2.2.0",
"moment": "^2.24.0",
"moment-timezone": "^0.5.25"
},
"peerDependencies": {
"react": "^16.9.0",
"react-dom": "^16.9.0"
},
"devDependencies": {
"@babel/cli": "^7.5.5",
"@babel/core": "^7.5.5",
"@babel/plugin-syntax-export-default-from": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"@testing-library/react": "^8.0.1",
"babel-eslint": "^9.0.0",
"babel-jest": "^24.8.0",
"babel-loader": "^8.0.6",
"babel-plugin-module-resolver": "^3.2.0",
"babel-plugin-react-transform": "^3.0.0",
"babel-polyfill": "^6.26.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
"eslint-plugin-react-hooks": "^1.6.0",
"jest": "^24.8.0",
"jest-mock-axios": "^3.0.0",
"moment": "^2.24.0",
"moment-timezone": "^0.5.25",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-styleguidist": "^9.1.11",
"snapshot-diff": "^0.5.1"
},
"scripts": {
"build": "rm -rf dist; babel src --out-dir dist --ignore '**/__tests__' --source-maps inline",
"prepare": "rm -rf ./dist && npm run build",
"lint": "eslint src",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --coverage --colors"
},
"files": [
"dist/**",
"translations"
]
"name": "foris",
"version": "5.1.13",
"description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.",
"repository": {
"type": "git",
"url": "https://gitlab.nic.cz/turris/reforis/foris-js.git"
},
"keywords": [
"foris",
"reforis"
],
"license": "GPL-3.0",
"main": "./src/index.js",
"dependencies": {
"axios": "^0.21.1",
"immutability-helper": "3.0.1",
"moment": "^2.24.0",
"qrcode.react": "^0.9.3",
"react-datetime": "^3.0.4",
"react-uid": "^2.2.0"
},
"peerDependencies": {
"bootstrap": "4.4.1",
"prop-types": "15.7.2",
"react": "16.9.0",
"react-dom": "16.9.0",
"react-router-dom": "^5.1.2"
},
"devDependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.9.0",
"@babel/plugin-transform-runtime": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@fortawesome/fontawesome-free": "^5.13.0",
"@testing-library/react": "^8.0.9",
"babel-loader": "^8.1.0",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.5.0",
"css-loader": "^5.2.4",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-reforis": "^1.0.0",
"eslint-plugin-prettier": "^3.1.4",
"file-loader": "^6.0.0",
"jest": "^25.2.0",
"jest-mock-axios": "^3.2.0",
"moment-timezone": "^0.5.28",
"prettier": "2.0.5",
"prop-types": "15.7.2",
"react": "16.9.0",
"react-dom": "16.9.0",
"react-router-dom": "^5.1.2",
"react-styleguidist": "^11.1.7",
"snapshot-diff": "^0.7.0",
"style-loader": "^1.2.1",
"webpack": "^5.15.0"
},
"scripts": {
"lint": "eslint src",
"lint:fix": "eslint --fix src",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "jest --coverage --colors",
"docs": "npx styleguidist build ",
"docs:watch": "styleguidist server"
}
}

1
requirements.txt Normal file
View File

@ -0,0 +1 @@
Babel

13
scripts/collect_files.sh Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
# Collect files
mkdir -p 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
# Remove unwanted files
find dist -type d -name __tests__ -exec rm -r {} +
rm -rf dist/__mocks__

24
scripts/publish.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/sh
if test -z "$NPM_TOKEN"
then
echo "\$NPM_TOKEN is not set"
exit 1
else
cd dist
# Need to replace "_" with "-" as GitLab CI won't accept secret vars with "-"
echo "//registry.npmjs.org/:_authToken=$(echo "$NPM_TOKEN" | tr _ -)" > .npmrc
echo "unsafe-perm = true" >> ~/.npmrc
if test "$1" = "beta"
then
BETA_VERSION=$(npx -c 'echo "$npm_package_version"')-beta.$CI_COMMIT_SHORT_SHA
npm version "$BETA_VERSION" --git-tag-version false
npm publish --tag beta
elif test "$1" = "latest"
then
npm publish
else
echo "Usage: publish.sh [ beta | latest ]"
exit 1
fi
fi

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

@ -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, { useState, useContext, useCallback } from "react";
import PropTypes from "prop-types";
import { Alert, ALERT_TYPES } from "../bootstrap/Alert";
import { Portal } from "../utils/Portal";
AlertContextProvider.propTypes = {
children: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.node),
PropTypes.node,
]),
};
function AlertContextProvider({ children }) {
const { AlertContext } = window;
const [alert, setAlert] = useState(null);
const setAlertWrapper = useCallback(
(message, type = ALERT_TYPES.DANGER) => {
setAlert({ message, type });
},
[setAlert]
);
const dismissAlert = useCallback(() => setAlert(null), [setAlert]);
return (
<>
{alert && (
<Portal containerId="alert-container">
<Alert type={alert.type} onDismiss={dismissAlert}>
{alert.message}
</Alert>
</Portal>
)}
<AlertContext.Provider value={[setAlertWrapper, dismissAlert]}>
{children}
</AlertContext.Provider>
</>
);
}
function useAlert() {
const { AlertContext } = window;
return useContext(AlertContext);
}
export { AlertContextProvider, useAlert };

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

@ -0,0 +1,65 @@
/*
* 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, getByText, queryByText, fireEvent } from "customTestRender";
import { useAlert, AlertContextProvider } from "../AlertContext";
function AlertTest() {
const [setAlert, dismissAlert] = useAlert();
// alert-container serves as an output for Portal which renders Alert
return (
<>
<div id="alert-container" />
<button onClick={() => setAlert("Alert content")}>Set alert</button>
<button onClick={dismissAlert}>Dismiss alert</button>
</>
);
}
describe("AlertContext", () => {
let componentContainer;
beforeEach(() => {
const { container } = render(
<AlertContextProvider>
<AlertTest />
</AlertContextProvider>
);
componentContainer = container;
});
it("should render component without alert", () => {
expect(componentContainer).toMatchSnapshot();
});
it("should render alert", () => {
fireEvent.click(getByText(componentContainer, "Set alert"));
expect(componentContainer).toMatchSnapshot();
});
it("should dismiss alert with alert button", () => {
fireEvent.click(getByText(componentContainer, "Set alert"));
// Alert is present
expect(getByText(componentContainer, "Alert content")).toBeDefined();
fireEvent.click(componentContainer.querySelector(".close"));
// Alert is gone
expect(queryByText(componentContainer, "Alert content")).toBeNull();
});
it("should dismiss alert with external button", () => {
fireEvent.click(getByText(componentContainer, "Set alert"));
// Alert is present
expect(getByText(componentContainer, "Alert content")).toBeDefined();
fireEvent.click(getByText(componentContainer, "Dismiss alert"));
// Alert is gone
expect(queryByText(componentContainer, "Alert content")).toBeNull();
});
});

View File

@ -0,0 +1,41 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`AlertContext should render alert 1`] = `
<div>
<div
id="alert-container"
>
<div
class="alert alert-dismissible alert-danger"
>
<button
class="close"
type="button"
>
×
</button>
Alert content
</div>
</div>
<button>
Set alert
</button>
<button>
Dismiss alert
</button>
</div>
`;
exports[`AlertContext should render component without alert 1`] = `
<div>
<div
id="alert-container"
/>
<button>
Set alert
</button>
<button>
Dismiss alert
</button>
</div>
`;

View File

@ -5,149 +5,132 @@
* See /LICENSE for more information.
*/
import axios from "axios";
import { useCallback, useReducer } from "react";
import { useCallback, useEffect, useReducer, useState } from "react";
import { ForisURLs } from "forisUrls";
import { ForisURLs } from "../utils/forisUrls";
import {
API_ACTIONS,
API_METHODS,
API_STATE,
getErrorPayload,
HEADERS,
TIMEOUT,
} from "./utils";
const DATA_METHODS = ["POST", "PATCH", "PUT"];
const POST_HEADERS = {
Accept: "application/json",
"Content-Type": "application/json",
"X-CSRFToken": getCookie("_csrf_token"),
};
function createAPIHook(method) {
return (urlRoot, contentType) => {
const [state, dispatch] = useReducer(APIReducer, {
state: API_STATE.INIT,
data: null,
});
function getCookie(name) {
let cookieValue = null;
if (document.cookie && document.cookie !== "") {
const cookies = document.cookie.split(";");
for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i].trim();
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) === (`${name}=`)) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}
const sendRequest = useCallback(
async ({ data, suffix } = {}) => {
const headers = { ...HEADERS };
if (contentType) {
headers["Content-Type"] = contentType;
}
export const TIMEOUT = 5000;
dispatch({ type: API_ACTIONS.INIT });
try {
// Prepare request
const request = API_METHODS[method];
const config = {
timeout: TIMEOUT,
headers,
};
const url = suffix ? `${urlRoot}/${suffix}` : urlRoot;
const API_ACTIONS = {
INIT: 1,
SUCCESS: 2,
FAILURE: 3,
};
// Make request
let result;
if (DATA_METHODS.includes(method)) {
result = await request(url, data, config);
} else {
result = await request(url, config);
}
const APIGetReducer = (state, action) => {
switch (action.type) {
case API_ACTIONS.INIT:
return {
...state,
isLoading: true,
isError: false,
};
case API_ACTIONS.SUCCESS:
return {
...state,
isLoading: false,
isError: false,
data: action.payload,
};
case API_ACTIONS.FAILURE:
if (action.status === 403) window.location.assign(ForisURLs.login);
return {
...state,
isLoading: false,
isError: true,
data: action.payload,
};
default:
throw new Error();
}
};
export function useAPIGet(url) {
const [state, dispatch] = useReducer(APIGetReducer, {
isLoading: false,
isError: false,
data: null,
});
const get = useCallback(async () => {
dispatch({ type: API_ACTIONS.INIT });
try {
const result = await axios.get(url, {
timeout: TIMEOUT,
});
dispatch({ type: API_ACTIONS.SUCCESS, payload: result.data });
} catch (error) {
dispatch({
type: API_ACTIONS.FAILURE,
payload: error.response.data,
status: error.response.status,
});
}
}, [url]);
return [state, get];
}
const APIPostReducer = (state, action) => {
switch (action.type) {
case API_ACTIONS.INIT:
return {
...state,
isSending: true,
isError: false,
isSuccess: false,
};
case API_ACTIONS.SUCCESS:
return {
...state,
isSending: false,
isError: false,
isSuccess: true,
data: action.payload,
};
case API_ACTIONS.FAILURE:
if (action.status === 403) window.location.assign(ForisURLs.login);
return {
...state,
isSending: false,
isError: true,
isSuccess: false,
data: action.payload,
};
default:
throw new Error();
}
};
export function useAPIPost(url) {
const [state, dispatch] = useReducer(APIPostReducer, {
isSending: false,
isError: false,
isSuccess: false,
data: null,
});
const post = async (data) => {
dispatch({ type: API_ACTIONS.INIT });
try {
const result = await axios.post(url, data, {
timeout: TIMEOUT,
headers: POST_HEADERS,
});
dispatch({ type: API_ACTIONS.SUCCESS, payload: result.data });
} catch (error) {
dispatch({
type: API_ACTIONS.FAILURE,
payload: error.response.data,
status: error.response.status,
});
}
// 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, post];
}
function APIReducer(state, action) {
switch (action.type) {
case API_ACTIONS.INIT:
return {
...state,
state: API_STATE.SENDING,
};
case API_ACTIONS.SUCCESS:
return {
state: API_STATE.SUCCESS,
data: action.payload,
};
case API_ACTIONS.FAILURE:
if (action.status === 403) {
window.location.assign(ForisURLs.login);
}
// Not an API error - should be rethrown.
if (
action.payload &&
action.payload.stack &&
action.payload.message
) {
throw action.payload;
}
return {
state: API_STATE.ERROR,
data: action.payload,
};
default:
throw new Error();
}
}
const useAPIGet = createAPIHook("GET");
const useAPIPost = createAPIHook("POST");
const useAPIPatch = createAPIHook("PATCH");
const useAPIPut = createAPIHook("PUT");
const useAPIDelete = createAPIHook("DELETE");
export { useAPIGet, useAPIPost, useAPIPatch, useAPIPut, useAPIDelete };
export function useAPIPolling(endpoint, delay = 1000, until) {
// delay ms
const [state, setState] = useState({ state: API_STATE.INIT });
const [getResponse, get] = useAPIGet(endpoint);
useEffect(() => {
if (getResponse.state !== API_STATE.INIT) {
setState(getResponse);
}
}, [getResponse]);
useEffect(() => {
if (until) {
const interval = setInterval(get, delay);
return () => clearInterval(interval);
}
}, [until, delay, get]);
return [state];
}

79
src/api/utils.js Normal file
View File

@ -0,0 +1,79 @@
/*
* 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 axios from "axios";
export const HEADERS = {
Accept: "application/json",
"Content-Type": "application/json",
"X-CSRFToken": getCookie("_csrf_token"),
};
export const TIMEOUT = 30500;
export const API_ACTIONS = {
INIT: 1,
SUCCESS: 2,
FAILURE: 3,
};
export const API_STATE = {
INIT: "init",
SENDING: "sending",
SUCCESS: "success",
ERROR: "error",
};
export const API_METHODS = {
GET: axios.get,
POST: axios.post,
PATCH: axios.patch,
PUT: axios.put,
DELETE: axios.delete,
};
function getCookie(name) {
let cookieValue = null;
if (document.cookie && document.cookie !== "") {
const cookies = document.cookie.split(";");
for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i].trim();
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) === `${name}=`) {
cookieValue = decodeURIComponent(
cookie.substring(name.length + 1)
);
break;
}
}
}
return cookieValue;
}
export function getErrorPayload(error) {
if (error.response) {
if (error.response.status === 403) {
return _("The session is expired. Please log in again.");
}
return getJSONErrorMessage(error);
}
if (error.code === "ECONNABORTED") {
return _("Timeout error occurred.");
}
if (error.request) {
return _("No response received.");
}
// Return original error because it's not directly related to API request/response.
return error;
}
export function getJSONErrorMessage(error) {
if (error.response.headers["content-type"] === "application/json") {
return error.response.data;
}
return _("An unknown API error occurred.");
}

View File

@ -8,11 +8,20 @@
import React from "react";
import PropTypes from "prop-types";
export const ALERT_TYPES = Object.freeze({
PRIMARY: "primary",
SECONDARY: "secondary",
SUCCESS: "success",
DANGER: "danger",
WARNING: "warning",
INFO: "info",
LIGHT: "light",
DARK: "dark",
});
Alert.propTypes = {
/** Type of the alert it adds as `alert-${type}` class. */
type: PropTypes.string.isRequired,
/** Alert message. */
message: PropTypes.string,
type: PropTypes.oneOf(Object.values(ALERT_TYPES)),
/** Alert content. */
children: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.node),
@ -22,13 +31,24 @@ Alert.propTypes = {
onDismiss: PropTypes.func,
};
export function Alert({
type, message, onDismiss, children,
}) {
Alert.defaultProps = {
type: ALERT_TYPES.DANGER,
};
export function Alert({ type, onDismiss, children }) {
return (
<div className={`alert alert-dismissible alert-${type}`}>
{onDismiss ? <button type="button" className="close" onClick={onDismiss}>&times;</button> : false}
{message}
<div
className={`alert ${
onDismiss ? "alert-dismissible" : ""
} alert-${type}`}
>
{onDismiss ? (
<button type="button" className="close" onClick={onDismiss}>
&times;
</button>
) : (
false
)}
{children}
</div>
);

View File

@ -1,20 +1,21 @@
Bootstrap alert component.
```jsx
import {useState} from 'react';
function AlertExample(){
```jsx
import { useState } from "react";
function AlertExample() {
const [alert, setAlert] = useState(true);
if (alert)
return <Alert
type='warning'
message='Some warning out there!'
onDismiss={()=>setAlert(false)}
/>;
return <button
className='btn btn-secondary'
onClick={()=>setAlert(true)}
>Show alert again</button>;
};
<AlertExample/>
return (
<Alert type="warning" onDismiss={() => setAlert(false)}>
Some warning out there!
</Alert>
);
return (
<button className="btn btn-secondary" onClick={() => setAlert(true)}>
Show alert again
</button>
);
}
<AlertExample />;
```

View File

@ -8,11 +8,6 @@
import React from "react";
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 = {
/** Additional class name. */
className: PropTypes.string,
@ -30,20 +25,29 @@ Button.propTypes = {
};
export function Button({
className, loading, forisFormSize, children, ...props
className,
loading,
forisFormSize,
children,
...props
}) {
className = className ? `btn ${className}` : "btn btn-primary ";
if (forisFormSize) className += SIZE_CLASS + SIZE_CLASS_SM;
let buttonClass = className ? `btn ${className}` : "btn btn-primary ";
if (forisFormSize) {
buttonClass = `${buttonClass} col-sm-12 col-md-3 col-lg-2`;
}
const span = loading
? <span className="spinner-border spinner-border-sm" role="status" aria-hidden="true" /> : null;
const span = loading ? (
<span
className="spinner-border spinner-border-sm"
role="status"
aria-hidden="true"
/>
) : null;
return (
<button type="button" className={className} {...props}>
<button type="button" className={buttonClass} {...props}>
{span}
{" "}
{span ? " " : null}
{" "}
{children}
</button>
);

View File

@ -11,5 +11,7 @@ Can be used without parameters:
Using loading spinner:
```jsx
<Button loading disabled>Loading...</Button>
<Button loading disabled>
Loading...
</Button>
```

View File

@ -7,44 +7,42 @@
import React from "react";
import PropTypes from "prop-types";
import { useUID } from "react-uid/dist/es5/index";
import { formFieldsSize } from "./constants";
import { useUID } from "react-uid";
CheckBox.propTypes = {
/** Label message */
label: PropTypes.string.isRequired,
/** Help text message */
helpText: PropTypes.string,
/** Apply default size (full-width) */
useDefaultSize: PropTypes.bool,
/** Control if checkbox is clickable */
disabled: PropTypes.bool,
};
CheckBox.defaultProps = {
useDefaultSize: true,
disabled: false,
};
export function CheckBox({
label, helpText, useDefaultSize, disabled, ...props
}) {
export function CheckBox({ label, helpText, disabled, ...props }) {
const uid = useUID();
return (
<div className={useDefaultSize ? formFieldsSize : ""} style={{ marginBottom: "1rem" }}>
<div className="custom-control custom-checkbox" style={{ marginBottom: "0" }}>
<div className="form-group">
<div className="custom-control custom-checkbox ">
<input
className="custom-control-input"
type="checkbox"
id={uid}
disabled={disabled}
{...props}
/>
<label className="custom-control-label" htmlFor={uid} style={helpText ? { marginBottom: "0" } : null}>{label}</label>
<label className="custom-control-label" htmlFor={uid}>
{label}
{helpText && (
<small className="form-text text-muted">
{helpText}
</small>
)}
</label>
</div>
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
</div>
);
}

View File

@ -1,16 +1,17 @@
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.
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.
```js
import {useState} from 'react';
import { useState } from "react";
const [value, setValue] = useState(false);
<CheckBox
value={value}
label="Some label"
label="Some label"
helpText="Read the small text!"
onChange={value => setValue(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

@ -7,8 +7,10 @@
import React from "react";
import PropTypes from "prop-types";
import Datetime from "react-datetime/DateTime";
import Datetime from "react-datetime";
import moment from "moment/moment";
import "react-datetime/css/react-datetime.css";
import "./DataTimeInput.css";
import { Input } from "./Input";
@ -36,14 +38,17 @@ const DEFAULT_DATE_FORMAT = "YYYY-MM-DD";
const DEFAULT_TIME_FORMAT = "HH:mm:ss";
export function DataTimeInput({
value, onChange, isValidDate, dateFormat, timeFormat, children, ...props
value,
onChange,
isValidDate,
dateFormat,
timeFormat,
children,
...props
}) {
function renderInput(datetimeProps) {
return (
<Input
{...props}
{...datetimeProps}
>
<Input {...props} {...datetimeProps}>
{children}
</Input>
);
@ -52,8 +57,12 @@ export function DataTimeInput({
return (
<Datetime
locale={ForisTranslations.locale}
dateFormat={dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT}
timeFormat={timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT}
dateFormat={
dateFormat !== undefined ? dateFormat : DEFAULT_DATE_FORMAT
}
timeFormat={
timeFormat !== undefined ? timeFormat : DEFAULT_TIME_FORMAT
}
value={value}
onChange={onChange}
isValidDate={isValidDate}

View File

@ -1,25 +1,26 @@
Adopted from `react-datetime/DateTime` datatime picker component.
It uses `momentjs` see example.
Adopted from `react-datetime/DateTime` datatime picker component. It uses
`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
ForisTranslations={locale:'en'};
ForisTranslations = { locale: "en" };
import {useState, useEffect} from 'react';
import moment from 'moment/moment';
import { useState, useEffect } from "react";
import moment from "moment/moment";
const [dataTime, setDataTime] = useState(moment());
const [error, setError] = useState();
useEffect(()=>{
dataTime.isValid() ? setError(null) : setError('Invalid value!');
},[dataTime]);
useEffect(() => {
dataTime.isValid() ? setError(null) : setError("Invalid value!");
}, [dataTime]);
<DataTimeInput
label='Time to sleep'
label="Time to sleep"
value={dataTime}
error={error}
helpText='Example helptext...'
onChange={value => setDataTime(value)}
/>
helpText="Example helptext..."
onChange={(value) => setDataTime(value)}
/>;
```

View File

@ -0,0 +1,30 @@
/*
* 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";
DownloadButton.propTypes = {
href: PropTypes.string.isRequired,
className: PropTypes.string,
children: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.node),
PropTypes.node,
]),
};
DownloadButton.defaultProps = {
className: "btn-primary",
};
export function DownloadButton({ href, className, children }) {
return (
<a href={href} className={`btn ${className}`.trim()} download>
{children}
</a>
);
}

View File

@ -0,0 +1,10 @@
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.
```js
<DownloadButton href="example.zip">Download</DownloadButton>
```

View File

@ -6,13 +6,12 @@
*/
import React from "react";
import PropTypes from "prop-types";
import { Input } from "./Input";
export const EmailInput = ({ ...props }) => <Input type="email" {...props} />;
EmailInput.propTypes = {
/** Field label. */
label: PropTypes.string.isRequired,

View File

@ -1,18 +1,19 @@
Bootstrap component of email input with label with predefined sizes and structure for using in foris forms.
It use built-in browser email address checking. It's only meaningful using inside `<form>`.
Bootstrap component of email input with label with predefined sizes and
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.
```js
import {useState} from 'react';
const [email, setEmail] = useState('Wrong email');
<form onSubmit={e=>e.preventDefault()}>
import { useState } from "react";
const [email, setEmail] = useState("Wrong email");
<form onSubmit={(e) => e.preventDefault()}>
<EmailInput
value={email}
label="Some label"
label="Some label"
helpText="Read the small text!"
onChange={target => setEmail(target.value)}
onChange={(event) => setEmail(event.target.value)}
/>
<button type="submit">Try to submit</button>
</form>
</form>;
```

View File

@ -0,0 +1,36 @@
/*
* 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 { Input } from "./Input";
FileInput.propTypes = {
/** Field label. */
label: PropTypes.string.isRequired,
/** Error message. */
error: PropTypes.string,
/** Help text message. */
helpText: PropTypes.string,
/** Email value. */
value: PropTypes.string,
/** Allow selecting multiple files. */
multiple: PropTypes.bool,
};
export function FileInput({ ...props }) {
return (
<Input
type="file"
className="custom-file-input"
labelClassName="custom-file-label"
groupClassName="custom-file"
{...props}
/>
);
}

View File

@ -0,0 +1,48 @@
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.
```js
import { useState } from "react";
const [files, setFiles] = useState([]);
// Note that files is not an array but FileList.
const label = files.length === 1 ? files[0].name : "Choose file";
<form className="col">
<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

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

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

@ -1,20 +1,24 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React, { useEffect, useRef } from "react";
import React, { useRef, useEffect } from "react";
import PropTypes from "prop-types";
import { Portal } from "utils/Portal";
import { Portal } from "../utils/Portal";
import { useClickOutside } from "../utils/hooks";
import "./Modal.css";
Modal.propTypes = {
/** Is modal shown value */
shown: PropTypes.bool.isRequired,
/** Callback to manage modal visibility */
setShown: PropTypes.func.isRequired,
scrollable: PropTypes.bool,
size: PropTypes.string,
/** Modal content use following: `ModalHeader`, `ModalBody`, `ModalFooter` */
children: PropTypes.oneOfType([
@ -23,28 +27,54 @@ Modal.propTypes = {
]).isRequired,
};
export function Modal({ shown, setShown, children }) {
export function Modal({ shown, setShown, scrollable, size, children }) {
const dialogRef = useRef();
let modalSize = "modal-";
useClickOutside(dialogRef, () => setShown(false));
useEffect(() => {
function handleClickOutsideDialog(e) {
if (!dialogRef.current.contains(e.target)) setShown(false);
}
const handleEsc = (event) => {
if (event.keyCode === 27) {
setShown(false);
}
};
window.addEventListener("keydown", handleEsc);
document.addEventListener("mousedown", handleClickOutsideDialog);
return () => {
document.removeEventListener("mousedown", handleClickOutsideDialog);
window.removeEventListener("keydown", handleEsc);
};
}, [setShown]);
switch (size) {
case "sm":
modalSize += "sm";
break;
case "lg":
modalSize += "lg";
break;
case "xl":
modalSize += "xl";
break;
default:
modalSize = "";
break;
}
return (
<Portal containerId="modal-container">
<div className={`modal fade ${shown ? "show" : ""}`} role="dialog">
<div ref={dialogRef} className="modal-dialog" role="document">
<div className="modal-content">
{children}
</div>
<div
className={`modal fade ${shown ? "show" : ""}`.trim()}
role="dialog"
>
<div
ref={dialogRef}
className={`${modalSize.trim()} modal-dialog modal-dialog-centered ${
scrollable ? "modal-dialog-scrollable" : ""
}`.trim()}
role="document"
>
<div className="modal-content">{children}</div>
</div>
</div>
</Portal>
@ -60,7 +90,11 @@ export function ModalHeader({ setShown, title }) {
return (
<div className="modal-header">
<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>
</button>
</div>
@ -86,9 +120,5 @@ ModalFooter.propTypes = {
};
export function ModalFooter({ children }) {
return (
<div className="modal-footer">
{children}
</div>
);
return <div className="modal-footer">{children}</div>;
}

View File

@ -1,27 +1,47 @@
Bootstrap modal component.
I have no idea why example doesn't work here but you can investigate HTML code...
```js
import {ModalHeader, ModalBody, ModalFooter} from './Modal';
It's required to have an element `<div id={"modal-container"}/>` somewhere on
the page since modals are rendered in portals.
import {useState} from 'react';
Modals also have three optional sizes, which can be defined through the `size`
prop:
- small - `sm`
- large - `lg`
- extra-large - `xl`
For more details please visit Bootstrap
<a href="https://getbootstrap.com/docs/4.5/components/modal/#optional-sizes" target="_blank">
documentation</a>.
```js
<div id="modal-container" />
```
```js
import { ModalHeader, ModalBody, ModalFooter } from "./Modal";
import { useState } from "react";
const [shown, setShown] = useState(false);
<>
<Modal shown={shown}>
<ModalHeader setShown={setShown} title='Warning!'/>
<ModalBody><p>Bla bla bla...</p></ModalBody>
<Modal setShown={setShown} shown={shown} size="sm">
<ModalHeader setShown={setShown} title="Warning!" />
<ModalBody>
<p>Bla bla bla...</p>
</ModalBody>
<ModalFooter>
<button
className='btn btn-secondary'
<button
className="btn btn-secondary"
onClick={() => setShown(false)}
>Skip it</button>
>
Skip it
</button>
</ModalFooter>
</Modal>
<button
className='btn btn-secondary'
onClick={()=>setShown(true)}
>Show modal</button>
</>
<button className="btn btn-secondary" onClick={() => setShown(true)}>
Show modal
</button>
</>;
```

View File

@ -0,0 +1,10 @@
input[type="number"] {
-webkit-appearance: textfield;
-moz-appearance: textfield;
appearance: textfield;
}
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none;
}

View File

@ -6,11 +6,11 @@
*/
import React from "react";
import PropTypes from "prop-types";
import { Input } from "./Input";
export const NumberInput = ({ ...props }) => <Input type="number" {...props} />;
import { useConditionalTimeout } from "../utils/hooks";
import { Input } from "./Input";
import "./NumberInput.css";
NumberInput.propTypes = {
/** Field label. */
@ -20,8 +20,56 @@ NumberInput.propTypes = {
/** Help text message. */
helpText: PropTypes.string,
/** Number value. */
value: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]),
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
/** Function called when value changes. */
onChange: PropTypes.func.isRequired,
/** Additional description dispaled to the right of input value. */
inlineText: PropTypes.string,
};
NumberInput.defaultProps = {
value: 0,
};
export function NumberInput({ onChange, inlineText, value, ...props }) {
function updateValue(initialValue, difference) {
onChange({ target: { value: initialValue + difference } });
}
const enableIncrease = useConditionalTimeout(
{ callback: updateValue },
value,
1
);
const enableDecrease = useConditionalTimeout(
{ callback: updateValue },
value,
-1
);
return (
<Input type="number" onChange={onChange} value={value} {...props}>
<div className="input-group-append">
{inlineText && <p className="input-group-text">{inlineText}</p>}
<button
type="button"
className="btn btn-outline-secondary"
onMouseDown={() => enableIncrease(true)}
onMouseUp={() => enableIncrease(false)}
aria-label="Increase"
>
<i className="fas fa-plus" />
</button>
<button
type="button"
className="btn btn-outline-secondary"
onMouseDown={() => enableDecrease(true)}
onMouseUp={() => enableDecrease(false)}
aria-label="Decrease"
>
<i className="fas fa-minus" />
</button>
</div>
</Input>
);
}

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.
```js
import {useState} from 'react';
import { useState } from "react";
const [value, setValue] = useState(42);
<NumberInput
value={value}
label="Some number"
label="Some number"
helpText="Read the small text!"
min='33'
max='54'
onChange={target => setValue(target.value)}
/>
min="33"
max="54"
onChange={(event) => setValue(event.target.value)}
/>;
```

View File

@ -31,22 +31,24 @@ export function PasswordInput({ withEye, ...props }) {
autoComplete={isHidden ? "new-password" : null}
{...props}
>
{withEye
? (
<div className="input-group-append">
<button
type="button"
className="input-group-text"
onClick={(e) => {
e.preventDefault();
setHidden((shouldBeHidden) => !shouldBeHidden);
}}
>
<i className={`fa ${isHidden ? "fa-eye" : "fa-eye-slash"}`} />
</button>
</div>
)
: null}
{withEye ? (
<div className="input-group-append">
<button
type="button"
className="input-group-text"
onClick={(e) => {
e.preventDefault();
setHidden((shouldBeHidden) => !shouldBeHidden);
}}
>
<i
className={`fa ${
isHidden ? "fa-eye" : "fa-eye-slash"
}`}
/>
</button>
</div>
) : null}
</Input>
);
}

View File

@ -1,17 +1,18 @@
Password Bootstrap component input with label and predefined sizes and structure for using in foris forms.
Can be used with "eye" button, see example.
Password Bootstrap component input with label and predefined sizes and structure
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
import {useState} from 'react';
const [value, setValue] = useState('secret');
import { useState } from "react";
const [value, setValue] = useState("secret");
<PasswordInput
withEye
value={value}
label="Some password"
label="Some password"
helpText="Read the small text!"
onChange={target => setValue(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.
* See /LICENSE for more information.
@ -7,10 +7,7 @@
import React from "react";
import PropTypes from "prop-types";
import { useUID } from "react-uid/dist/es5/index";
import { formFieldsSize } from "./constants";
import { useUID } from "react-uid";
RadioSet.propTypes = {
/** Name attribute of the input HTML tag. */
@ -18,20 +15,35 @@ RadioSet.propTypes = {
/** RadioSet label . */
label: PropTypes.string,
/** Choices . */
choices: PropTypes.arrayOf(PropTypes.shape({
/** Choice lable . */
label: PropTypes.string.isRequired,
/** Choice value . */
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
})).isRequired,
choices: PropTypes.arrayOf(
PropTypes.shape({
/** Choice lable . */
label: PropTypes.oneOfType([
PropTypes.string,
PropTypes.element,
PropTypes.node,
PropTypes.arrayOf(PropTypes.node),
]).isRequired,
/** Choice value . */
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
.isRequired,
})
).isRequired,
/** Initial value . */
value: PropTypes.string,
/** Help text message . */
helpText: PropTypes.string,
inline: PropTypes.bool,
};
export function RadioSet({
name, label, choices, value, helpText, ...props
name,
label,
choices,
value,
helpText,
inline,
...props
}) {
const uid = useUID();
const radios = choices.map((choice, key) => {
@ -45,49 +57,62 @@ export function RadioSet({
value={choice.value}
helpText={choice.helpText}
checked={choice.value === value}
inline={inline}
{...props}
/>
);
});
return (
<div className={`form-group ${formFieldsSize}`} style={{ marginBottom: "1rem" }}>
{label
? (
<label className="col-12" htmlFor={uid} style={{ paddingLeft: "0" }}>
{label}
</label>
)
: null}
<div className="form-group">
{label && (
<label htmlFor={uid} className="d-block">
{label}
</label>
)}
{radios}
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
{helpText && (
<small className="form-text text-muted">{helpText}</small>
)}
</div>
);
}
Radio.propTypes = {
label: PropTypes.string.isRequired,
label: PropTypes.oneOfType([
PropTypes.string,
PropTypes.element,
PropTypes.node,
PropTypes.arrayOf(PropTypes.node),
]).isRequired,
id: PropTypes.string.isRequired,
inline: PropTypes.bool,
helpText: PropTypes.string,
};
function Radio({
label, id, helpText, ...props
}) {
export function Radio({ label, id, helpText, inline, ...props }) {
return (
<>
<div className="custom-control custom-radio custom-control-inline">
<div
className={`custom-control custom-radio ${
inline ? "custom-control-inline" : ""
}`.trim()}
>
<input
id={id}
className="custom-control-input"
type="radio"
{...props}
/>
<label className="custom-control-label" htmlFor={id}>{label}</label>
<label className="custom-control-label" htmlFor={id}>
{label}
</label>
{helpText && (
<small className="form-text text-muted mt-0 mb-3">
{helpText}
</small>
)}
</div>
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
</>
);
}

View File

@ -1,13 +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.
Unless `helpText` is set for one of the options they are displayed inline.
```js
import {useState} from 'react';
const CHOICES=[
{value:'one',label:'1'},
{value:'two',label:'2'},
{value:'three',label:'3'},
import { useState } from "react";
const CHOICES = [
{ value: "one", label: "1" },
{ value: "two", label: "2" },
{ value: "three", label: "3" },
];
const [value, setValue] = useState(CHOICES[0].value);
@ -15,10 +18,10 @@ const [value, setValue] = useState(CHOICES[0].value);
{/*Yeah, it gets event, not value!*/}
<RadioSet
value={value}
name='some-radio'
name="some-radio"
choices={CHOICES}
onChange={event=>setValue(event.target.value)}
onChange={(event) => setValue(event.target.value)}
/>
<p>Selected value: {value}</p>
</>
</>;
```

View File

@ -7,8 +7,7 @@
import React from "react";
import PropTypes from "prop-types";
import { useUID } from "react-uid/dist/es5/index";
import { useUID } from "react-uid";
Select.propTypes = {
/** Select field Label. */
@ -16,34 +15,30 @@ Select.propTypes = {
/** Choices if form of {value : "Label",...}. */
choices: PropTypes.object.isRequired,
/** Current value. */
value: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]).isRequired,
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
/** Help text message. */
helpText: PropTypes.string,
};
export function Select({
label, choices, helpText, ...props
}) {
export function Select({ label, choices, helpText, ...props }) {
const uid = useUID();
const options = Object.keys(choices).map(
(key) => <option key={key} value={key}>{choices[key]}</option>,
);
const options = Object.keys(choices)
.sort((a, b) => a - b || a.toString().localeCompare(b.toString()))
.map((key) => (
<option key={key} value={key}>
{choices[key]}
</option>
));
return (
<div className="form-group col-sm-12 offset-lg-1 col-lg-10">
<div className="form-group">
<label htmlFor={uid}>{label}</label>
<select
className="custom-select"
id={uid}
{...props}
>
<select className="custom-select" id={uid} {...props}>
{options}
</select>
{helpText ? <small className="form-text text-muted">{helpText}</small> : null}
{helpText ? (
<small className="form-text text-muted">{helpText}</small>
) : null}
</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.
```js
import {useState} from 'react';
const CHOICES={
apple:'Apple',
banana:'Banana',
peach:'Peach',
import { useState } from "react";
const CHOICES = {
apple: "Apple",
banana: "Banana",
peach: "Peach",
};
const [value, setValue] = useState(Object.keys(CHOICES)[0]);
@ -17,9 +18,9 @@ const [value, setValue] = useState(Object.keys(CHOICES)[0]);
label="Fruit"
value={value}
choices={CHOICES}
onChange={event=>setValue(event.target.value)}
onChange={(event) => setValue(event.target.value)}
/>
<p>Selected choice label: {CHOICES[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 PropTypes from "prop-types";
import "./Spinner.css";
Spinner.propTypes = {
/** Children components put into `div` with "spinner-text" class. */
children: PropTypes.oneOfType([
@ -23,19 +25,19 @@ Spinner.defaultProps = {
fullScreen: false,
};
export function Spinner({
fullScreen, children, className, ...props
}) {
export function Spinner({ fullScreen, children, className }) {
if (!fullScreen) {
return (
<div className={`spinner-wrapper ${className || ""}`} {...props}>
<div
className={`spinner-wrapper ${className || "my-3 text-center"}`}
>
<SpinnerElement>{children}</SpinnerElement>
</div>
);
}
return (
<div className="spinner-fs-wrapper" {...props}>
<div className="spinner-fs-wrapper">
<div className="spinner-fs-background">
<SpinnerElement>{children}</SpinnerElement>
</div>
@ -46,6 +48,8 @@ export function Spinner({
SpinnerElement.propTypes = {
/** Spinner's size */
small: PropTypes.bool,
/** Additional className */
className: PropTypes.string,
/** Children components */
children: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.node),
@ -53,13 +57,18 @@ SpinnerElement.propTypes = {
]),
};
export function SpinnerElement({ small, children }) {
export function SpinnerElement({ small, className, children }) {
return (
<>
<div className={`spinner-border ${small ? "spinner-border-sm" : ""}`} role="status">
<div
className={`spinner-border ${
small ? "spinner-border-sm" : ""
} ${className || ""}`.trim()}
role="status"
>
<span className="sr-only" />
</div>
<div className="spinner-text">{children}</div>
{children && <div className="spinner-text">{children}</div>}
</>
);
}

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 ${switchHeading ? "switch" : ""}`.trim()}>
<div
className={`custom-control custom-switch ${
!helpText ? "custom-control-inline" : ""
} ${switchHeading ? "switch-heading" : ""}`.trim()}
>
<input
type="checkbox"
className="custom-control-input"
id={uid}
{...props}
/>
<label className="custom-control-label" htmlFor={uid}>
{label}
</label>
{helpText && (
<small className="form-text text-muted mt-0 mb-3">
{helpText}
</small>
)}
</div>
</div>
);
}

View File

@ -10,10 +10,8 @@ import PropTypes from "prop-types";
import { Input } from "./Input";
export const TextInput = ({ ...props }) => <Input type="text" {...props} />;
TextInput.propTypes = {
/** Field label. */
label: PropTypes.string.isRequired,

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.
```js
import {useState} from 'react';
const [value, setValue] = useState('Bla bla');
import { useState } from "react";
const [value, setValue] = useState("Bla bla");
<TextInput
value={value}
label="Some text"
label="Some 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 />", () => {
it("Render button correctly", () => {
const { container } = render(<Button>Test Button</Button>);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
it("Render button with custom classes", () => {
const { container } = render(<Button className="one two three">Test Button</Button>);
expect(container.firstChild)
.toMatchSnapshot();
const { container } = render(
<Button className="one two three">Test Button</Button>
);
expect(container.firstChild).toMatchSnapshot();
});
it("Render button with spinner", () => {
const { container } = render(<Button loading={true}>Test Button</Button>);
expect(container.firstChild)
.toMatchSnapshot();
const { container } = render(<Button loading>Test Button</Button>);
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -18,22 +18,16 @@ describe("<Checkbox/>", () => {
label="Test label"
checked
helpText="Some help text"
onChange={() => {
}}
onChange={() => {}}
/>
);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
it("Render uncheked checkbox", () => {
const { container } = render(
<CheckBox
label="Test label"
helpText="Some help text"
/>
<CheckBox label="Test label" helpText="Some help text" />
);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -0,0 +1,23 @@
/*
* 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 } from "customTestRender";
import { DownloadButton } from "../DownloadButton";
describe("<DownloadButton />", () => {
it("should have download attribute", () => {
const { container } = render(
<DownloadButton href="http://example.com">
Test Button
</DownloadButton>
);
expect(container.firstChild.getAttribute("download")).not.toBeNull();
});
});

View File

@ -7,23 +7,43 @@
import React from "react";
import { render } from "customTestRender";
import { render, fireEvent, getByLabelText, wait } from "customTestRender";
import { NumberInput } from "../NumberInput";
describe("<NumberInput/>", () => {
it("Render number input", () => {
const onChangeMock = jest.fn();
let componentContainer;
beforeEach(() => {
const { container } = render(
<NumberInput
label="Test label"
helpText="Some help text"
value={1123}
onChange={() => {
}}
value={1}
onChange={onChangeMock}
/>
);
expect(container.firstChild)
.toMatchSnapshot();
componentContainer = container;
});
it("Render number input", () => {
expect(componentContainer.firstChild).toMatchSnapshot();
});
it("Increase number with button", async () => {
const increaseButton = getByLabelText(componentContainer, "Increase");
fireEvent.mouseDown(increaseButton);
await wait(() =>
expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 2 } })
);
});
it("Decrease number with button", async () => {
const decreaseButton = getByLabelText(componentContainer, "Decrease");
fireEvent.mouseDown(decreaseButton);
await wait(() =>
expect(onChangeMock).toHaveBeenCalledWith({ target: { value: 0 } })
);
});
});

View File

@ -18,11 +18,9 @@ describe("<PasswordInput/>", () => {
label="Test label"
helpText="Some help text"
value="Some password"
onChange={() => {
}}
onChange={() => {}}
/>
);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -14,32 +14,30 @@ import { RadioSet } from "../RadioSet";
const TEST_CHOICES = [
{
label: "label",
value: "value"
value: "value",
},
{
label: "another label",
value: "another value"
value: "another value",
},
{
label: "another one label",
value: "another on value"
}
value: "another on value",
},
];
describe("<RadioSet/>", () => {
it("Render radio set", () => {
const { container } = render(
<RadioSet
name={"test_name"}
label='Radios set label'
value='value'
name="test_name"
label="Radios set label"
value="value"
choices={TEST_CHOICES}
helpText={"Some help text"}
onChange={() => {
}}
helpText="Some help text"
onChange={() => {}}
/>
);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -7,27 +7,31 @@
import React from "react";
import { fireEvent, getByDisplayValue, getByText, render } from "customTestRender";
import {
fireEvent,
getByDisplayValue,
getByText,
render,
} from "customTestRender";
import { Select } from "../Select";
const TEST_CHOICES = {
"1": "one",
"2": "two",
"3": "three",
1: "one",
2: "two",
3: "three",
};
describe("<Select/>", () => {
var selectContainer;
let selectContainer;
const onChangeHandler = jest.fn();
beforeEach(() => {
const { container } = render(
<Select
label='Test label'
value='1'
label="Test label"
value="1"
choices={TEST_CHOICES}
helpText='Help text'
helpText="Help text"
onChange={onChangeHandler}
/>
);
@ -35,21 +39,17 @@ describe("<Select/>", () => {
});
it("Test with snapshot.", () => {
expect(selectContainer)
.toMatchSnapshot();
expect(selectContainer).toMatchSnapshot();
});
it("Test onChange handling.", () => {
const select = getByDisplayValue(selectContainer, "one");
expect(select.value)
.toBe("1");
expect(select.value).toBe("1");
fireEvent.change(select, { target: { value: "2" } });
const option = getByText(selectContainer, "two");
expect(onChangeHandler)
.toBeCalled();
expect(onChangeHandler).toBeCalled();
expect(option.value)
.toBe("2");
expect(option.value).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"
helpText="Some help text"
value="Some text"
onChange={() => {
}}
onChange={() => {}}
/>
);
expect(container.firstChild)
.toMatchSnapshot();
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -5,8 +5,6 @@ exports[`<Button /> Render button correctly 1`] = `
class="btn btn-primary "
type="button"
>
Test Button
</button>
`;
@ -16,8 +14,6 @@ exports[`<Button /> Render button with custom classes 1`] = `
class="btn one two three"
type="button"
>
Test Button
</button>
`;
@ -33,8 +29,6 @@ exports[`<Button /> Render button with spinner 1`] = `
role="status"
/>
Test Button
</button>
`;

View File

@ -2,12 +2,10 @@
exports[`<Checkbox/> Render checkbox 1`] = `
<div
class="col-sm-12 offset-lg-1 col-lg-10"
style="margin-bottom: 1rem;"
class="form-group"
>
<div
class="custom-control custom-checkbox"
style="margin-bottom: 0px;"
class="custom-control custom-checkbox "
>
<input
checked=""
@ -18,27 +16,24 @@ exports[`<Checkbox/> Render checkbox 1`] = `
<label
class="custom-control-label"
for="1"
style="margin-bottom: 0px;"
>
Test label
<small
class="form-text text-muted"
>
Some help text
</small>
</label>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
`;
exports[`<Checkbox/> Render uncheked checkbox 1`] = `
<div
class="col-sm-12 offset-lg-1 col-lg-10"
style="margin-bottom: 1rem;"
class="form-group"
>
<div
class="custom-control custom-checkbox"
style="margin-bottom: 0px;"
class="custom-control custom-checkbox "
>
<input
class="custom-control-input"
@ -48,15 +43,14 @@ exports[`<Checkbox/> Render uncheked checkbox 1`] = `
<label
class="custom-control-label"
for="1"
style="margin-bottom: 0px;"
>
Test label
<small
class="form-text text-muted"
>
Some help text
</small>
</label>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
`;

View File

@ -2,31 +2,49 @@
exports[`<NumberInput/> Render number input 1`] = `
<div
class="col-sm-12 offset-lg-1 col-lg-10"
class="form-group"
>
<div
class="form-group"
<label
for="1"
>
<label
for="1"
>
Test label
</label>
Test label
</label>
<div
class="input-group"
>
<input
class="form-control"
id="1"
type="number"
value="1"
/>
<div
class="input-group"
class="input-group-append"
>
<input
class="form-control"
id="1"
type="number"
value="1123"
/>
<button
aria-label="Increase"
class="btn btn-outline-secondary"
type="button"
>
<i
class="fas fa-plus"
/>
</button>
<button
aria-label="Decrease"
class="btn btn-outline-secondary"
type="button"
>
<i
class="fas fa-minus"
/>
</button>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
`;

View File

@ -2,32 +2,28 @@
exports[`<PasswordInput/> Render password input 1`] = `
<div
class="col-sm-12 offset-lg-1 col-lg-10"
class="form-group"
>
<div
class="form-group"
<label
for="1"
>
<label
for="1"
>
Test label
</label>
<div
class="input-group"
>
<input
autocomplete="new-password"
class="form-control"
id="1"
type="password"
value="Some password"
/>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
Test label
</label>
<div
class="input-group"
>
<input
autocomplete="new-password"
class="form-control"
id="1"
type="password"
value="Some password"
/>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
`;

View File

@ -2,18 +2,16 @@
exports[`<RadioSet/> Render radio set 1`] = `
<div
class="form-group col-sm-12 offset-lg-1 col-lg-10"
style="margin-bottom: 1rem;"
class="form-group"
>
<label
class="col-12"
class="d-block"
for="1"
style="padding-left: 0px;"
>
Radios set label
</label>
<div
class="custom-control custom-radio custom-control-inline"
class="custom-control custom-radio"
>
<input
checked=""
@ -31,7 +29,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
</label>
</div>
<div
class="custom-control custom-radio custom-control-inline"
class="custom-control custom-radio"
>
<input
class="custom-control-input"
@ -48,7 +46,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
</label>
</div>
<div
class="custom-control custom-radio custom-control-inline"
class="custom-control custom-radio"
>
<input
class="custom-control-input"

View File

@ -3,7 +3,7 @@
exports[`<Select/> Test with snapshot. 1`] = `
<div>
<div
class="form-group col-sm-12 offset-lg-1 col-lg-10"
class="form-group"
>
<label
for="1"

View File

@ -0,0 +1,56 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<Switch/> Render switch 1`] = `
<div
class="form-group"
>
<div
class="custom-control custom-switch"
>
<input
checked=""
class="custom-control-input"
id="1"
type="checkbox"
/>
<label
class="custom-control-label"
for="1"
>
Test label
</label>
<small
class="form-text text-muted mt-0 mb-3"
>
Some help text
</small>
</div>
</div>
`;
exports[`<Switch/> Render uncheked switch 1`] = `
<div
class="form-group"
>
<div
class="custom-control custom-switch"
>
<input
class="custom-control-input"
id="1"
type="checkbox"
/>
<label
class="custom-control-label"
for="1"
>
Test label
</label>
<small
class="form-text text-muted mt-0 mb-3"
>
Some help text
</small>
</div>
</div>
`;

View File

@ -2,31 +2,27 @@
exports[`<TextInput/> Render text input 1`] = `
<div
class="col-sm-12 offset-lg-1 col-lg-10"
class="form-group"
>
<div
class="form-group"
<label
for="1"
>
<label
for="1"
>
Test label
</label>
<div
class="input-group"
>
<input
class="form-control"
id="1"
type="text"
value="Some text"
/>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
Test label
</label>
<div
class="input-group"
>
<input
class="form-control"
id="1"
type="text"
value="Some text"
/>
</div>
<small
class="form-text text-muted"
>
Some help text
</small>
</div>
`;

View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
@ -7,4 +7,5 @@
/** Bootstrap column size for form fields */
// eslint-disable-next-line import/prefer-default-export
export const formFieldsSize = "col-sm-12 offset-lg-1 col-lg-10";
export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4";
export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3";

View File

@ -0,0 +1,78 @@
/*
* 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, useEffect } from "react";
import PropTypes from "prop-types";
import { useAPIPost } from "../api/hooks";
import { API_STATE } from "../api/utils";
import { ForisURLs } from "../utils/forisUrls";
import { Button } from "../bootstrap/Button";
import { Modal, ModalHeader, ModalBody, ModalFooter } from "../bootstrap/Modal";
import { useAlert } from "../alertContext/AlertContext";
export function RebootButton(props) {
const [triggered, setTriggered] = useState(false);
const [modalShown, setModalShown] = useState(false);
const [triggerRebootStatus, triggerReboot] = useAPIPost(ForisURLs.reboot);
const [setAlert] = useAlert();
useEffect(() => {
if (triggerRebootStatus.state === API_STATE.ERROR) {
setAlert(_("Reboot request failed."));
}
});
function rebootHandler() {
setTriggered(true);
triggerReboot();
setModalShown(false);
}
return (
<>
<RebootModal
shown={modalShown}
setShown={setModalShown}
onReboot={rebootHandler}
/>
<Button
className="btn-danger"
loading={triggered}
disabled={triggered}
onClick={() => setModalShown(true)}
{...props}
>
{_("Reboot")}
</Button>
</>
);
}
RebootModal.propTypes = {
shown: PropTypes.bool.isRequired,
setShown: PropTypes.func.isRequired,
onReboot: PropTypes.func.isRequired,
};
function RebootModal({ shown, setShown, onReboot }) {
return (
<Modal shown={shown} setShown={setShown}>
<ModalHeader setShown={setShown} title={_("Warning!")} />
<ModalBody>
<p>{_("Are you sure you want to restart the router?")}</p>
</ModalBody>
<ModalFooter>
<Button onClick={() => setShown(false)}>{_("Cancel")}</Button>
<Button className="btn-danger" onClick={onReboot}>
{_("Confirm reboot")}
</Button>
</ModalFooter>
</Modal>
);
}

View File

@ -0,0 +1,74 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React, { useEffect, useState } from "react";
import PropTypes from "prop-types";
import { Button } from "../../bootstrap/Button";
import { useAlert } from "../../alertContext/AlertContext";
import { ALERT_TYPES } from "../../bootstrap/Alert";
import { useAPIPost } from "../../api/hooks";
import { API_STATE } from "../../api/utils";
import { formFieldsSize } from "../../bootstrap/constants";
ResetWiFiSettings.propTypes = {
ws: PropTypes.object.isRequired,
endpoint: PropTypes.string.isRequired,
};
export function ResetWiFiSettings({ ws, endpoint }) {
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const module = "wifi";
ws.subscribe(module).bind(module, "reset", () => {
// eslint-disable-next-line no-restricted-globals
setTimeout(() => location.reload(), 1000);
});
}, [ws]);
const [postResetResponse, postReset] = useAPIPost(endpoint);
const [setAlert, dismissAlert] = useAlert();
useEffect(() => {
if (postResetResponse.state === API_STATE.ERROR) {
setAlert(_("An error occurred during resetting Wi-Fi settings."));
} else if (postResetResponse.state === API_STATE.SUCCESS) {
setAlert(
_("Wi-Fi settings are set to defaults."),
ALERT_TYPES.SUCCESS
);
}
}, [postResetResponse, setAlert]);
function onReset() {
dismissAlert();
setIsLoading(true);
postReset();
}
return (
<div className={formFieldsSize}>
<h2>{_("Reset Wi-Fi Settings")}</h2>
<p>
{_(`If a number of wireless cards doesn't match, you may try \
to reset the Wi-Fi settings. Note that this will remove the current Wi-Fi \
configuration and restore the default values.`)}
</p>
<div className="text-right">
<Button
className="btn-primary"
forisFormSize
loading={isLoading}
disabled={isLoading}
onClick={onReset}
>
{_("Reset Wi-Fi Settings")}
</Button>
</div>
</div>
);
}

View File

@ -0,0 +1,258 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import PropTypes from "prop-types";
import { 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}
helpText={HELP_TEXTS.ssid}
required
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: {
SSID: { $set: value },
},
},
}))}
{...props}
>
<div className="input-group-append">
<WiFiQRCode
SSID={formData.SSID}
password={formData.password}
/>
</div>
</TextInput>
<PasswordInput
withEye
label={_("Password")}
value={formData.password}
error={formErrors.password}
helpText={HELP_TEXTS.password}
required
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: { password: { $set: value } },
},
}))}
{...props}
/>
<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}
inline
onChange={setFormValue((value) => ({
devices: {
[deviceIndex]: {
hwmode: { $set: value },
channel: { $set: "0" },
htmode: {
$set:
value === "11a" ? "VHT80" : "HT20",
},
},
},
}))}
{...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,98 @@
/*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import PropTypes from "prop-types";
import { TextInput } from "../../bootstrap/TextInput";
import { Switch } from "../../bootstrap/Switch";
import { PasswordInput } from "../../bootstrap/PasswordInput";
import WiFiQRCode from "./WiFiQRCode";
import { HELP_TEXTS } from "./constants";
WifiGuestForm.propTypes = {
formData: PropTypes.shape({
id: PropTypes.number.isRequired,
SSID: PropTypes.string.isRequired,
password: PropTypes.string.isRequired,
enabled: PropTypes.bool.isRequired,
}),
formErrors: PropTypes.shape({
SSID: PropTypes.string,
password: PropTypes.string,
}),
setFormValue: PropTypes.func.isRequired,
deviceIndex: PropTypes.string,
};
export default function WifiGuestForm({
formData,
formErrors,
setFormValue,
deviceIndex,
...props
}) {
return (
<>
<Switch
label={_("Enable Guest Wi-Fi")}
checked={formData.enabled}
helpText={HELP_TEXTS.guest_wifi_enabled}
onChange={setFormValue((value) => ({
devices: {
[formData.id]: {
guest_wifi: { enabled: { $set: value } },
},
},
}))}
{...props}
/>
{formData.enabled ? (
<>
<TextInput
label="SSID"
value={formData.SSID}
error={formErrors.SSID}
helpText={HELP_TEXTS.ssid}
onChange={setFormValue((value) => ({
devices: {
[formData.id]: {
guest_wifi: { SSID: { $set: value } },
},
},
}))}
{...props}
>
<div className="input-group-append">
<WiFiQRCode
SSID={formData.SSID}
password={formData.password}
/>
</div>
</TextInput>
<PasswordInput
withEye
label={_("Password")}
value={formData.password}
helpText={HELP_TEXTS.password}
error={formErrors.password}
required
onChange={setFormValue((value) => ({
devices: {
[formData.id]: {
guest_wifi: { password: { $set: value } },
},
},
}))}
{...props}
/>
</>
) : null}
</>
);
}

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,107 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import PropTypes from "prop-types";
import { ForisForm } from "../../form/components/ForisForm";
import WiFiForm from "./WiFiForm";
import { ResetWiFiSettings } from "./ResetWiFiSettings";
WiFiSettings.propTypes = {
ws: PropTypes.object.isRequired,
endpoint: PropTypes.string.isRequired,
resetEndpoint: PropTypes.string.isRequired,
hasGuestNetwork: PropTypes.bool,
};
export function WiFiSettings({ ws, endpoint, resetEndpoint, hasGuestNetwork }) {
return (
<>
<ForisForm
ws={ws}
forisConfig={{
endpoint,
wsModule: "wifi",
}}
prepData={prepData}
prepDataToSubmit={prepDataToSubmit}
validator={validator}
>
<WiFiForm hasGuestNetwork={hasGuestNetwork} />
</ForisForm>
<ResetWiFiSettings ws={ws} endpoint={resetEndpoint} />
</>
);
}
function prepData(formData) {
formData.devices.forEach((device, idx) => {
formData.devices[idx].channel = device.channel.toString();
});
return formData;
}
function prepDataToSubmit(formData) {
formData.devices.forEach((device, idx) => {
delete device.available_bands;
formData.devices[idx].channel = parseInt(device.channel);
if (!device.enabled) {
formData.devices[idx] = { id: device.id, enabled: false };
return;
}
if (!device.guest_wifi.enabled)
formData.devices[idx].guest_wifi = { enabled: false };
});
return formData;
}
export function byteCount(string) {
const buffer = Buffer.from(string, "utf-8");
const count = buffer.byteLength;
return count;
}
export function validator(formData) {
const formErrors = formData.devices.map((device) => {
if (!device.enabled) return {};
const errors = {};
if (device.SSID.length > 32)
errors.SSID = _("SSID can't be longer than 32 symbols");
if (device.SSID.length === 0) errors.SSID = _("SSID can't be empty");
if (byteCount(device.SSID) > 32)
errors.SSID = _("SSID can't be longer than 32 bytes");
if (device.password.length < 8)
errors.password = _("Password must contain at least 8 symbols");
if (!device.guest_wifi.enabled) return errors;
const guest_wifi_errors = {};
if (device.guest_wifi.SSID.length > 32)
guest_wifi_errors.SSID = _("SSID can't be longer than 32 symbols");
if (device.guest_wifi.SSID.length === 0)
guest_wifi_errors.SSID = _("SSID can't be empty");
if (byteCount(device.guest_wifi.SSID) > 32)
guest_wifi_errors.SSID = _("SSID can't be longer than 32 bytes");
if (device.guest_wifi.password.length < 8)
guest_wifi_errors.password = _(
"Password must contain at least 8 symbols"
);
if (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-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import { render, fireEvent, wait } from "customTestRender";
import mockAxios from "jest-mock-axios";
import { WebSockets } from "webSockets/WebSockets";
import { mockJSONError } from "testUtils/network";
import { mockSetAlert } from "testUtils/alertContextMock";
import { ALERT_TYPES } from "../../../bootstrap/Alert";
import { ResetWiFiSettings } from "../ResetWiFiSettings";
describe("<ResetWiFiSettings/>", () => {
const webSockets = new WebSockets();
const endpoint = "/reforis/api/wifi-reset";
let getAllByText;
beforeEach(() => {
({ getAllByText } = render(
<ResetWiFiSettings ws={webSockets} endpoint={endpoint} />
));
});
it("should display alert on open ports - success", async () => {
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
expect(mockAxios.post).toBeCalledWith(
endpoint,
undefined,
expect.anything()
);
mockAxios.mockResponse({ data: { foo: "bar" } });
await wait(() =>
expect(mockSetAlert).toBeCalledWith(
"Wi-Fi settings are set to defaults.",
ALERT_TYPES.SUCCESS
)
);
});
it("should display alert on open ports - failure", async () => {
fireEvent.click(getAllByText("Reset Wi-Fi Settings")[1]);
mockJSONError();
await wait(() =>
expect(mockSetAlert).toBeCalledWith(
"An error occurred during resetting Wi-Fi settings."
)
);
});
});

View File

@ -0,0 +1,220 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
import React from "react";
import diffSnapshot from "snapshot-diff";
import mockAxios from "jest-mock-axios";
import { fireEvent, render, wait } from "customTestRender";
import { WebSockets } from "webSockets/WebSockets";
import { mockJSONError } from "testUtils/network";
import {
wifiSettingsFixture,
oneDevice,
twoDevices,
threeDevices,
} from "./__fixtures__/wifiSettings";
import { WiFiSettings, validator, byteCount } from "../WiFiSettings";
describe("<WiFiSettings/>", () => {
let firstRender;
let getAllByText;
let getAllByLabelText;
let getByText;
let 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: "HT80",
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: "HT20",
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: "HT80",
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);
});
it("ByteCount function", () => {
expect(byteCount("abc")).toEqual(3);
});
});

View File

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

View File

@ -0,0 +1,922 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -250,207 +250,95 @@
value=\\"0\\"
>
auto
</option>
<option
- value=\\"36\\"
+ value=\\"1\\"
>
- 36
- (5180 MHz )
+ 1
+ (2412 MHz )
</option>
<option
- value=\\"40\\"
+ value=\\"2\\"
>
- 40
- (5200 MHz )
+ 2
+ (2417 MHz )
</option>
<option
- value=\\"44\\"
+ value=\\"3\\"
>
- 44
- (5220 MHz )
+ 3
+ (2422 MHz )
</option>
<option
- value=\\"48\\"
- >
-
- 48
- (5240 MHz )
-
- </option>
- <option
- value=\\"52\\"
- >
-
- 52
- (5260 MHz ,DFS)
-
- </option>
- <option
- value=\\"56\\"
- >
-
- 56
- (5280 MHz ,DFS)
-
- </option>
- <option
- value=\\"60\\"
+ value=\\"4\\"
>
- 60
- (5300 MHz ,DFS)
+ 4
+ (2427 MHz )
</option>
<option
- value=\\"64\\"
+ value=\\"5\\"
>
- 64
- (5320 MHz ,DFS)
+ 5
+ (2432 MHz )
</option>
<option
- value=\\"100\\"
+ value=\\"6\\"
>
- 100
- (5500 MHz ,DFS)
+ 6
+ (2437 MHz )
</option>
<option
- value=\\"104\\"
+ value=\\"7\\"
>
- 104
- (5520 MHz ,DFS)
+ 7
+ (2442 MHz )
</option>
<option
- value=\\"108\\"
+ value=\\"8\\"
>
- 108
- (5540 MHz ,DFS)
+ 8
+ (2447 MHz )
</option>
<option
- value=\\"112\\"
+ value=\\"9\\"
>
- 112
- (5560 MHz ,DFS)
+ 9
+ (2452 MHz )
</option>
<option
- value=\\"116\\"
+ value=\\"10\\"
>
- 116
- (5580 MHz ,DFS)
+ 10
+ (2457 MHz )
</option>
<option
- value=\\"120\\"
+ value=\\"11\\"
>
- 120
- (5600 MHz ,DFS)
-
- </option>
- <option
- value=\\"124\\"
- >
-
- 124
- (5620 MHz ,DFS)
-
- </option>
- <option
- value=\\"128\\"
- >
-
- 128
- (5640 MHz ,DFS)
-
- </option>
- <option
- value=\\"132\\"
- >
-
- 132
- (5660 MHz ,DFS)
-
- </option>
- <option
- value=\\"136\\"
- >
-
- 136
- (5680 MHz ,DFS)
-
- </option>
- <option
- value=\\"140\\"
- >
-
- 140
- (5700 MHz ,DFS)
-
- </option>
- <option
- value=\\"144\\"
- >
-
- 144
- (5720 MHz ,DFS)
-
- </option>
- <option
- value=\\"149\\"
- >
-
- 149
- (5745 MHz )
-
- </option>
- <option
- value=\\"153\\"
- >
-
- 153
- (5765 MHz )
-
- </option>
- <option
- value=\\"157\\"
- >
-
- 157
- (5785 MHz )
-
- </option>
- <option
- value=\\"161\\"
- >
-
- 161
- (5805 MHz )
-
- </option>
- <option
- value=\\"165\\"
- >
-
- 165
- (5825 MHz )
+ 11
+ (2462 MHz )
</option>
</select>
</div>
<div"
`;
exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
<DocumentFragment>
<div
class="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
>
<form>
<div
class="form-group switch"
>
<div
class="custom-control custom-switch custom-control-inline switch-heading"
>
<input
class="custom-control-input"
id="1"
type="checkbox"
/>
<label
class="custom-control-label"
for="1"
>
<h2>
Wi-Fi 1
</h2>
</label>
</div>
</div>
<hr />
<div
class="form-group switch"
>
<div
class="custom-control custom-switch custom-control-inline switch-heading"
>
<input
class="custom-control-input"
id="2"
type="checkbox"
/>
<label
class="custom-control-label"
for="2"
>
<h2>
Wi-Fi 2
</h2>
</label>
</div>
</div>
<div
class="text-right"
>
<button
class="btn btn-primary col-sm-12 col-md-3 col-lg-2"
type="submit"
>
Save
</button>
</div>
</form>
</div>
<div
class="card p-4 col-sm-12 col-lg-12 p-0 mb-4"
>
<h2>
Reset Wi-Fi Settings
</h2>
<p>
If a number of wireless cards doesn't match, you may try to reset the Wi-Fi settings. Note that this will remove the current Wi-Fi configuration and restore the default values.
</p>
<div
class="text-right"
>
<button
class="btn btn-primary col-sm-12 col-md-3 col-lg-2"
type="button"
>
Reset Wi-Fi Settings
</button>
</div>
</div>
</DocumentFragment>
`;
exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
"Snapshot Diff:
- First value
+ Second value
@@ -479,10 +479,94 @@
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>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+ SSID which contains non-standard characters could cause problems on some devices.
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"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
@@ -506,10 +590,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,467 @@
Wi-Fi 1
</h2>
</label>
</div>
</div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"4\\"
+ >
+ SSID
+ </label>
+ <div
+ class=\\"input-group\\"
+ >
+ <input
+ class=\\"form-control\\"
+ id=\\"4\\"
+ required=\\"\\"
+ type=\\"text\\"
+ value=\\"TestSSID1\\"
+ />
+ <div
+ class=\\"input-group-append\\"
+ >
+ <button
+ class=\\"input-group-text\\"
+ type=\\"button\\"
+ >
+ <img
+ alt=\\"QR\\"
+ src=\\"/reforis/static/reforis/imgs/QR_icon.svg\\"
+ style=\\"opacity: 0.67;\\"
+ width=\\"20\\"
+ />
+ </button>
+ </div>
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+ SSID which contains non-standard characters could cause problems on some devices.
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"5\\"
+ >
+ Password
+ </label>
+ <div
+ class=\\"input-group\\"
+ >
+ <input
+ autocomplete=\\"new-password\\"
+ class=\\"form-control\\"
+ id=\\"5\\"
+ required=\\"\\"
+ type=\\"password\\"
+ value=\\"TestPass\\"
+ />
+ <div
+ class=\\"input-group-append\\"
+ >
+ <button
+ class=\\"input-group-text\\"
+ type=\\"button\\"
+ >
+ <i
+ class=\\"fa fa-eye\\"
+ />
+ </button>
+ </div>
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ WPA2 pre-shared key, that is required to connect to the network.
+
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <div
+ class=\\"custom-control custom-checkbox \\"
+ >
+ <input
+ class=\\"custom-control-input\\"
+ id=\\"6\\"
+ type=\\"checkbox\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"6\\"
+ >
+ Hide SSID
+ <small
+ class=\\"form-text text-muted\\"
+ >
+ If set, network is not visible when scanning for available networks.
+ </small>
+ </label>
+ </div>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ class=\\"d-block\\"
+ for=\\"7\\"
+ >
+ GHz
+ </label>
+ <div
+ class=\\"custom-control custom-radio custom-control-inline\\"
+ >
+ <input
+ class=\\"custom-control-input\\"
+ id=\\"hwmode-0-0\\"
+ name=\\"hwmode-0\\"
+ type=\\"radio\\"
+ value=\\"11g\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"hwmode-0-0\\"
+ >
+ 2.4
+ </label>
+ </div>
+ <div
+ class=\\"custom-control custom-radio custom-control-inline\\"
+ >
+ <input
+ checked=\\"\\"
+ class=\\"custom-control-input\\"
+ id=\\"hwmode-0-1\\"
+ name=\\"hwmode-0\\"
+ type=\\"radio\\"
+ value=\\"11a\\"
+ />
+ <label
+ class=\\"custom-control-label\\"
+ for=\\"hwmode-0-1\\"
+ >
+ 5
+ </label>
+ </div>
+ <small
+ class=\\"form-text text-muted\\"
+ >
+
+ The 2.4 GHz band is more widely supported by clients, but tends to have more interference. The 5 GHz band is a
+ newer standard and may not be supported by all your devices. It usually has less interference, but the signal
+ does not carry so well indoors.
+ </small>
+ </div>
+ <div
+ class=\\"form-group\\"
+ >
+ <label
+ for=\\"8\\"
+ >
+ 802.11n/ac mode
+ </label>
+ <select
+ class=\\"custom-select\\"
+ id=\\"8\\"
+ >
+ <option
+ value=\\"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\\"
+ >
+ <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,45 @@
/*
* 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 = {
ssid: _(
`SSID which contains non-standard characters could cause problems on some devices.`
),
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

@ -0,0 +1,63 @@
/*
* 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 {
fireEvent,
getByText,
queryByText,
render,
wait,
} from "customTestRender";
import mockAxios from "jest-mock-axios";
import { mockJSONError } from "testUtils/network";
import { mockSetAlert } from "testUtils/alertContextMock";
import { RebootButton } from "../RebootButton";
describe("<RebootButton/>", () => {
let componentContainer;
beforeEach(() => {
const { container } = render(
<>
<div id="modal-container" />
<RebootButton />
</>
);
componentContainer = container;
});
it("Render.", () => {
expect(componentContainer).toMatchSnapshot();
});
it("Render modal.", () => {
expect(queryByText(componentContainer, "Confirm reboot")).toBeNull();
fireEvent.click(getByText(componentContainer, "Reboot"));
expect(componentContainer).toMatchSnapshot();
});
it("Confirm reboot.", () => {
fireEvent.click(getByText(componentContainer, "Reboot"));
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
expect(mockAxios.post).toHaveBeenCalledWith(
"/reforis/api/reboot",
undefined,
expect.anything()
);
});
it("Hold error.", async () => {
fireEvent.click(getByText(componentContainer, "Reboot"));
fireEvent.click(getByText(componentContainer, "Confirm reboot"));
mockJSONError();
await wait(() =>
expect(mockSetAlert).toBeCalledWith("Reboot request failed.")
);
});
});

View File

@ -0,0 +1,86 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<RebootButton/> Render modal. 1`] = `
<div>
<div
id="modal-container"
>
<div
class="modal fade show"
role="dialog"
>
<div
class="modal-dialog modal-dialog-centered"
role="document"
>
<div
class="modal-content"
>
<div
class="modal-header"
>
<h5
class="modal-title"
>
Warning!
</h5>
<button
class="close"
type="button"
>
<span
aria-hidden="true"
>
×
</span>
</button>
</div>
<div
class="modal-body"
>
<p>
Are you sure you want to restart the router?
</p>
</div>
<div
class="modal-footer"
>
<button
class="btn btn-primary "
type="button"
>
Cancel
</button>
<button
class="btn btn-danger"
type="button"
>
Confirm reboot
</button>
</div>
</div>
</div>
</div>
</div>
<button
class="btn btn-danger"
type="button"
>
Reboot
</button>
</div>
`;
exports[`<RebootButton/> Render. 1`] = `
<div>
<div
id="modal-container"
/>
<button
class="btn btn-danger"
type="button"
>
Reboot
</button>
</div>
`;

View File

@ -1,17 +0,0 @@
export const REFORIS_URL_PREFIX = process.env.LIGHTTPD ? "/reforis" : "";
export const ForisURLs = {
login: `${REFORIS_URL_PREFIX}/login`,
static: `${REFORIS_URL_PREFIX}/static/reforis`,
wifi: `${REFORIS_URL_PREFIX}/network-settings/wifi`,
packageManagement: {
updateSettings: `${REFORIS_URL_PREFIX}/package-management/update-settings`,
updates: `${REFORIS_URL_PREFIX}/package-management/updates`,
},
// Notifications links are used with <Link/> inside Router, thus url subdir is not required.
notifications: "/notifications",
notificationsSettings: "/administration/notifications-settings",
luci: "/cgi-bin/luci",
};

View File

@ -12,18 +12,15 @@ import { STATES, SubmitButton } from "../components/SubmitButton";
describe("<SubmitButton/>", () => {
it("Render ready", () => {
const { container } = render(<SubmitButton state={STATES.READY}/>);
expect(container)
.toMatchSnapshot();
const { container } = render(<SubmitButton state={STATES.READY} />);
expect(container).toMatchSnapshot();
});
it("Render saving", () => {
const { container } = render(<SubmitButton state={STATES.SAVING}/>);
expect(container)
.toMatchSnapshot();
const { container } = render(<SubmitButton state={STATES.SAVING} />);
expect(container).toMatchSnapshot();
});
it("Render load", () => {
const { container } = render(<SubmitButton state={STATES.LOAD}/>);
expect(container)
.toMatchSnapshot();
const { container } = render(<SubmitButton state={STATES.LOAD} />);
expect(container).toMatchSnapshot();
});
});

View File

@ -3,7 +3,7 @@
exports[`<SubmitButton/> Render load 1`] = `
<div>
<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=""
type="submit"
>
@ -13,8 +13,6 @@ exports[`<SubmitButton/> Render load 1`] = `
role="status"
/>
Load settings
</button>
</div>
@ -23,11 +21,9 @@ exports[`<SubmitButton/> Render load 1`] = `
exports[`<SubmitButton/> Render ready 1`] = `
<div>
<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"
>
Save
</button>
</div>
@ -36,7 +32,7 @@ exports[`<SubmitButton/> Render ready 1`] = `
exports[`<SubmitButton/> Render saving 1`] = `
<div>
<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=""
type="submit"
>
@ -46,8 +42,6 @@ exports[`<SubmitButton/> Render saving 1`] = `
role="status"
/>
Updating
</button>
</div>

View File

@ -5,99 +5,113 @@
* See /LICENSE for more information.
*/
import React from 'react';
import React from "react";
import { act, fireEvent, render, waitForElement } from 'customTestRender';
import mockAxios from 'jest-mock-axios';
import { act, fireEvent, render, waitForElement } from "customTestRender";
import mockAxios from "jest-mock-axios";
import { WebSockets } from "webSockets/WebSockets";
import { ForisForm } from "../components/ForisForm";
// 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.
const TestForm = ({formData, formErrors, setFormValue}) => {
return <>
const TestForm = ({ formData, formErrors, setFormValue }) => (
<>
<input
data-testid='test-input'
data-testid="test-input"
value={formData.field}
onChange={setFormValue(value => ({field: {$set: value}}))}
onChange={setFormValue((value) => ({ field: { $set: value } }))}
/>
<p>{formErrors.field}</p>
</>
};
);
describe('useForm hook.', () => {
describe("useForm hook.", () => {
let mockValidator;
let mockPrepData;
let mockPrepDataToSubmit;
let mockWebSockets;
let input;
let form;
const Child = jest.fn(props => <TestForm {...props}/>);
const Child = jest.fn((props) => <TestForm {...props} />);
beforeEach(async () => {
mockPrepData = jest.fn(() => ({field: 'preparedData'}));
mockPrepDataToSubmit = jest.fn(() => ({field: 'preparedDataToSubmit'}));
mockValidator = jest.fn(data => data.field === 'invalidValue' ? {field: 'Error'} : {});
const {getByTestId, container} = render(
mockPrepData = jest.fn(() => ({ field: "preparedData" }));
mockPrepDataToSubmit = jest.fn(() => ({
field: "preparedDataToSubmit",
}));
mockValidator = jest.fn((data) =>
data.field === "invalidValue" ? { field: "Error" } : {}
);
const { getByTestId, container } = render(
<ForisForm
ws={mockWebSockets}
ws={new WebSockets()}
// Just some module which exists...
forisConfig={{
endpoint: 'testEndpoint',
wsModule: 'testWSModule'
endpoint: "testEndpoint",
wsModule: "testWSModule",
}}
prepData={mockPrepData}
prepDataToSubmit={mockPrepDataToSubmit}
validator={mockValidator}
>
<Child/>
<Child />
</ForisForm>
);
mockAxios.mockResponse({field: 'fetchedData'});
mockAxios.mockResponse({ field: "fetchedData" });
input = await waitForElement(() =>
getByTestId('test-input')
);
form = container.firstChild
input = await waitForElement(() => getByTestId("test-input"));
form = container.firstChild.firstChild;
});
it('Validation on changing.', () => {
it("Validation on changing.", () => {
expect(mockValidator).toHaveBeenCalledTimes(1);
expect(Child).toHaveBeenCalledTimes(1);
expect(Child.mock.calls[0][0].formErrors).toMatchObject({});
act(() => {
fireEvent.change(input, {target: {value: 'invalidValue', type: 'text'}});
fireEvent.change(input, {
target: { value: "invalidValue", type: "text" },
});
});
expect(Child).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.', () => {
fireEvent.change(input, {target: {value: 'newValue', type: 'text'}})
expect(input.value).toBe('newValue');
it("Update text value.", () => {
fireEvent.change(input, {
target: { value: "newValue", type: "text" },
});
expect(input.value).toBe("newValue");
});
it('Update text value.', () => {
fireEvent.change(input, {target: {value: 123, type: 'number'}})
expect(input.value).toBe('123');
it("Update text value.", () => {
fireEvent.change(input, { target: { value: 123, type: "number" } });
expect(input.value).toBe("123");
});
it('Update checkbox value.', () => {
fireEvent.change(input, {target: {checked: true, type: 'checkbox'}})
it("Update checkbox value.", () => {
fireEvent.change(input, {
target: { checked: true, type: "checkbox" },
});
expect(input.checked).toBe(true);
});
it('Fetch data.', () => {
expect(mockAxios.get).toHaveBeenCalledWith('testEndpoint', expect.anything());
it("Fetch data.", () => {
expect(mockAxios.get).toHaveBeenCalledWith(
"testEndpoint",
expect.anything()
);
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(mockPrepDataToSubmit).toHaveBeenCalledTimes(0);
@ -106,9 +120,9 @@ describe('useForm hook.', () => {
expect(mockPrepDataToSubmit).toHaveBeenCalledTimes(1);
expect(mockAxios.post).toHaveBeenCalledTimes(1);
expect(mockAxios.post).toHaveBeenCalledWith(
'testEndpoint',
{'field': 'preparedDataToSubmit'},
expect.anything(),
"testEndpoint",
{ field: "preparedDataToSubmit" },
expect.anything()
);
});
});

View File

@ -11,128 +11,80 @@ import {
validateIPv4Address,
validateIPv6Address,
validateIPv6Prefix,
validateMAC
} from "validations";
validateMAC,
} from "utils/validations";
describe("Validation functions", () => {
it("validateIPv4Address valid", () => {
expect(validateIPv4Address("192.168.1.1"))
.toBe(undefined);
expect(validateIPv4Address("1.1.1.1"))
.toBe(undefined);
expect(validateIPv4Address("0.0.0.0"))
.toBe(undefined);
expect(validateIPv4Address("192.168.1.1")).toBe(undefined);
expect(validateIPv4Address("1.1.1.1")).toBe(undefined);
expect(validateIPv4Address("0.0.0.0")).toBe(undefined);
});
it("validateIPv4Address invalid", () => {
expect(validateIPv4Address("invalid"))
.not
.toBe(undefined);
expect(validateIPv4Address("192.256.1.1"))
.not
.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);
expect(validateIPv4Address("invalid")).not.toBe(undefined);
expect(validateIPv4Address("192.256.1.1")).not.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", () => {
expect(validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
.toBe(undefined);
expect(validateIPv6Address("0:0:0:0:0:0:0:1"))
.toBe(undefined);
expect(validateIPv6Address("::1"))
.toBe(undefined);
expect(validateIPv6Address("::"))
.toBe(undefined);
expect(
validateIPv6Address("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
).toBe(undefined);
expect(validateIPv6Address("0:0:0:0:0:0:0:1")).toBe(undefined);
expect(validateIPv6Address("::1")).toBe(undefined);
expect(validateIPv6Address("::")).toBe(undefined);
});
it("validateIPv6Address invalid", () => {
expect(validateIPv6Address("invalid"))
.not
.toBe(undefined);
expect(validateIPv6Address("1.1.1.1"))
.not
.toBe(undefined);
expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313"))
.not
.toBe(undefined);
expect(validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313"))
.not
.toBe(undefined);
expect(validateIPv6Address("invalid")).not.toBe(undefined);
expect(validateIPv6Address("1.1.1.1")).not.toBe(undefined);
expect(validateIPv6Address("1200::AB00:1234::2552:7777:1313")).not.toBe(
undefined
);
expect(
validateIPv6Address("1200:0000:AB00:1234:O000:2552:7777:1313")
).not.toBe(undefined);
});
it("validateIPv6Prefix valid", () => {
expect(validateIPv6Prefix("2002:0000::/16"))
.toBe(undefined);
expect(validateIPv6Prefix("0::/0"))
.toBe(undefined);
expect(validateIPv6Prefix("2002:0000::/16")).toBe(undefined);
expect(validateIPv6Prefix("0::/0")).toBe(undefined);
});
it("validateIPv6Prefix invalid", () => {
expect(validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334"))
.not
.toBe(undefined);
expect(validateIPv6Prefix("::1"))
.not
.toBe(undefined);
expect(validateIPv6Prefix("2002:0000::/999"))
.not
.toBe(undefined);
expect(
validateIPv6Prefix("2001:0db8:85a3:0000:0000:8a2e:0370:7334")
).not.toBe(undefined);
expect(validateIPv6Prefix("::1")).not.toBe(undefined);
expect(validateIPv6Prefix("2002:0000::/999")).not.toBe(undefined);
});
it("validateDomain valid", () => {
expect(validateDomain("example.com"))
.toBe(undefined);
expect(validateDomain("one.two.three"))
.toBe(undefined);
expect(validateDomain("example.com")).toBe(undefined);
expect(validateDomain("one.two.three")).toBe(undefined);
});
it("validateDomain invalid", () => {
expect(validateDomain("test/"))
.not
.toBe(undefined);
expect(validateDomain("."))
.not
.toBe(undefined);
expect(validateDomain("test/")).not.toBe(undefined);
expect(validateDomain(".")).not.toBe(undefined);
});
it("validateDUID valid", () => {
expect(validateDUID("abcdefAB"))
.toBe(undefined);
expect(validateDUID("ABCDEF12"))
.toBe(undefined);
expect(validateDUID("ABCDEF12AB"))
.toBe(undefined);
expect(validateDUID("abcdefAB")).toBe(undefined);
expect(validateDUID("ABCDEF12")).toBe(undefined);
expect(validateDUID("ABCDEF12AB")).toBe(undefined);
});
it("validateDUID invalid", () => {
expect(validateDUID("gggggggg"))
.not
.toBe(undefined);
expect(validateDUID("abcdefABa"))
.not
.toBe(undefined);
expect(validateDUID("gggggggg")).not.toBe(undefined);
expect(validateDUID("abcdefABa")).not.toBe(undefined);
});
it("validateMAC valid", () => {
expect(validateMAC("00:D0:56:F2:B5:12"))
.toBe(undefined);
expect(validateMAC("00:26:DD:14:C4:EE"))
.toBe(undefined);
expect(validateMAC("06:00:00:00:00:00"))
.toBe(undefined);
expect(validateMAC("00:D0:56:F2:B5:12")).toBe(undefined);
expect(validateMAC("00:26:DD:14:C4:EE")).toBe(undefined);
expect(validateMAC("06:00:00:00:00:00")).toBe(undefined);
});
it("validateMAC invalid", () => {
expect(validateMAC("00:00:00:00:00:0G"))
.not
.toBe(undefined);
expect(validateMAC("06:00:00:00:00:00:00"))
.not
.toBe(undefined);
expect(validateMAC("00:00:00:00:00:0G")).not.toBe(undefined);
expect(validateMAC("06:00:00:00:00:00:00")).not.toBe(undefined);
});
});

View File

@ -5,26 +5,32 @@
* See /LICENSE for more information.
*/
import React, { useEffect, useState } from "react";
import React, { useEffect } from "react";
import PropTypes from "prop-types";
import { Prompt } from "react-router-dom";
import { Spinner } from "bootstrap/Spinner";
import { useAPIPost } from "api/hooks";
import { ALERT_TYPES } from "../../bootstrap/Alert";
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 { useForisModule, useForm } from "../hooks";
import { STATES as SUBMIT_BUTTON_STATES, SubmitButton } from "./SubmitButton";
import { FailAlert, SuccessAlert } from "./alerts";
import { ErrorMessage } from "../../utils/ErrorMessage";
ForisForm.propTypes = {
/** WebSocket object see `scr/common/WebSockets.js`. */
/** Optional WebSocket object. See `scr/common/WebSockets.js`.
* `forisConfig.wsModule` should be specified when it's passed.
* */
ws: PropTypes.object,
/** Foris configuration object. See usage in main components. */
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,
/** `foris-controller` module name to be used via WebSockets.
* If it's not passed then WebSockets aren't used
* It can be use only with `ws` prop.
* */
wsModule: PropTypes.string,
/** `foris-controller` action name to be used via WebSockets.
@ -32,20 +38,41 @@ ForisForm.propTypes = {
* */
wsAction: PropTypes.string,
}).isRequired,
/** Function to prepare data recived from the API before using in forms. */
prepData: PropTypes.func.isRequired,
/** Function to prepare data received from the API before using in forms. */
prepData: PropTypes.func,
/** Function to prepare data from form before submitting. */
prepDataToSubmit: PropTypes.func.isRequired,
prepDataToSubmit: PropTypes.func,
/** 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. */
validator: PropTypes.func.isRequired,
validator: PropTypes.func,
/** Disables form */
disabled: PropTypes.bool,
/** reForis form components. */
children: PropTypes.node.isRequired,
/** Optional override of form submit callback */
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
customWSProp(props) {
const wsModuleIsSpecified = !!(
props.forisConfig && props.forisConfig.wsModule
);
if (props.ws && !wsModuleIsSpecified) {
return new Error(
"forisConfig.wsModule should be specified when ws object is passed."
);
}
if (!props.ws && wsModuleIsSpecified) {
return new Error(
"forisConfig.wsModule is specified without passing ws object."
);
}
},
};
ForisForm.defaultProps = {
@ -56,7 +83,12 @@ ForisForm.defaultProps = {
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({
ws,
forisConfig,
@ -66,83 +98,105 @@ export function ForisForm({
validator,
disabled,
onSubmitOverridden,
formReference,
children,
}) {
const [formState, onFormChangeHandler, resetFormData] = useForm(validator, prepData);
const [formState, onFormChangeHandler, resetFormData] = useForm(
validator,
prepData
);
const [setAlert, dismissAlert] = useAlert();
const [forisModuleState] = useForisModule(ws, forisConfig);
useEffect(() => {
if (forisModuleState.data) {
if (forisModuleState.state === API_STATE.SUCCESS) {
resetFormData(forisModuleState.data);
}
}, [forisModuleState.data, resetFormData, prepData]);
}, [forisModuleState, resetFormData, prepData]);
const [postState, post] = useAPIPost(forisConfig.endpoint);
useEffect(() => {
if (postState.isSuccess) postCallback();
}, [postCallback, postState.isSuccess]);
if (postState.state === API_STATE.SUCCESS) {
postCallback();
setAlert(_("Settings saved successfully"), ALERT_TYPES.SUCCESS);
} else if (postState.state === API_STATE.ERROR) {
setAlert(postState.data);
}
}, [postCallback, postState.state, postState.data, setAlert]);
if (forisModuleState.state === API_STATE.ERROR) {
return <ErrorMessage message={forisModuleState.data} />;
}
if (!formState.data) {
return <Spinner />;
}
function onSubmitHandler(e) {
e.preventDefault();
function onSubmitHandler(event) {
event.preventDefault();
resetFormData();
dismissAlert();
const copiedFormData = JSON.parse(JSON.stringify(formState.data));
const preparedData = prepDataToSubmit(copiedFormData);
post(preparedData);
post({ data: preparedData });
}
function getSubmitButtonState() {
if (postState.isSending) return SUBMIT_BUTTON_STATES.SAVING;
if (forisModuleState.isLoading) return SUBMIT_BUTTON_STATES.LOAD;
if (postState.state === API_STATE.SENDING) {
return SUBMIT_BUTTON_STATES.SAVING;
}
if (forisModuleState.state === API_STATE.SENDING) {
return SUBMIT_BUTTON_STATES.LOAD;
}
return SUBMIT_BUTTON_STATES.READY;
}
const [alertIsDismissed, setAlertIsDismissed] = useState(false);
if (!formState.data) return <Spinner className="row justify-content-center" />;
const formIsDisabled = disabled || forisModuleState.isLoading || postState.isSending;
const formIsDisabled =
disabled ||
forisModuleState.state === API_STATE.SENDING ||
postState.state === API_STATE.SENDING;
const submitButtonIsDisabled = disabled || !!formState.errors;
const childrenWithFormProps = React.Children.map(
children,
(child) => React.cloneElement(child, {
const childrenWithFormProps = React.Children.map(children, (child) =>
React.cloneElement(child, {
initialData: formState.initialData,
formData: formState.data,
formErrors: formState.errors,
setFormValue: onFormChangeHandler,
disabled: formIsDisabled,
}),
})
);
const onSubmit = onSubmitOverridden
? onSubmitOverridden(formState.data, onFormChangeHandler, onSubmitHandler)
? onSubmitOverridden(
formState.data,
onFormChangeHandler,
onSubmitHandler
)
: onSubmitHandler;
function getMessageOnLeavingPage() {
if (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?");
}
let alert = null;
if (!alertIsDismissed) {
if (postState.isSuccess) {
alert = <SuccessAlert onDismiss={() => setAlertIsDismissed(true)} />;
} else if (postState.isError) {
alert = <FailAlert onDismiss={() => setAlertIsDismissed(true)} />;
}
if (
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 (
<>
<div className={formFieldsSize}>
<Prompt message={getMessageOnLeavingPage} />
{alert}
<form onSubmit={onSubmit}>
<form onSubmit={onSubmit} ref={formReference}>
{childrenWithFormProps}
<SubmitButton
state={getSubmitButtonState()}
disabled={submitButtonIsDisabled}
/>
<div className="text-right">
<SubmitButton
state={getSubmitButtonState()}
disabled={submitButtonIsDisabled}
/>
</div>
</form>
</>
</div>
);
}

View File

@ -0,0 +1,74 @@
`<ForisForm/>` is Higher-Order Component which encapsulates entire form logic
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/>`
You can pass more forms as children.
```js
<ForisForm
ws={ws}
forisConfig={{
endpoint: API_URLs.wan,
wsModule: "wan",
}}
prepData={prepData}
prepDataToSubmit={prepDataToSubmit}
validator={validator}
>
<WANForm />
<WAN6Form />
<MACForm />
</ForisForm>
```
### Example of children forms `props` usage
```js
export default function MACForm({
formData,
formErrors,
setFormValue,
...props
}) {
const macSettings = formData.mac_settings;
const errors = (formErrors || {}).mac_settings || {};
return (
<>
<h3>{_("MAC")}</h3>
<CheckBox
label={_("Custom MAC address")}
checked={macSettings.custom_mac_enabled}
helpText={HELP_TEXTS.custom_mac_enabled}
onChange={setFormValue((value) => ({
mac_settings: { custom_mac_enabled: { $set: value } },
}))}
{...props}
/>
{macSettings.custom_mac_enabled ? (
<TextInput
label={_("MAC address")}
value={macSettings.custom_mac || ""}
helpText={HELP_TEXTS.custom_mac}
error={errors.custom_mac}
required
onChange={setFormValue((value) => ({
mac_settings: { custom_mac: { $set: value } },
}))}
{...props}
/>
) : null}
</>
);
}
```
The <ForisForm/> passes subsequent `props` to the child components.
| Prop | Type | Description |
| -------------- | ------ | -------------------------------------------------------------------------- |
| `formData` | object | Data returned from API. |
| `formErrors` | object | Errors returned after validation via validator. |
| `setFormValue` | func | Function for data update. It takes update rule as arg (see example above). |
| `disabled` | bool | Flag to disable form elements (during updates or loadings e.t.c.). |

View File

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

View File

@ -1,46 +0,0 @@
/*
* 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 { Alert } from "bootstrap/Alert";
import { Portal } from "utils/Portal";
SuccessAlert.propTypes = {
onDismiss: PropTypes.func.isRequired,
};
const ALERT_CONTAINER_ID = "alert-container";
export function SuccessAlert({ onDismiss }) {
return (
<Portal containerId={ALERT_CONTAINER_ID}>
<Alert
type="success"
message={_("Settings were successfully saved.")}
onDismiss={onDismiss}
/>
</Portal>
);
}
FailAlert.propTypes = {
onDismiss: PropTypes.func.isRequired,
};
export function FailAlert({ onDismiss }) {
return (
<Portal containerId={ALERT_CONTAINER_ID}>
<Alert
type="danger"
message={_("Settings update was failed.")}
onDismiss={onDismiss}
/>
</Portal>
);
}

View File

@ -8,70 +8,76 @@
import { useCallback, useEffect, useReducer } from "react";
import update from "immutability-helper";
import { useAPIGet } from "api/hooks";
import { useWSForisModule } from "webSockets/hooks";
import { useAPIGet } from "../api/hooks";
import { useWSForisModule } from "../webSockets/hooks";
const FORM_ACTIONS = {
updateValue: 1,
resetData: 2,
};
export function useForm(validator, prepData) {
export function useForm(validator, dataPreprocessor) {
const [state, dispatch] = useReducer(formReducer, {
data: null,
initialData: null,
errors: {},
});
const onFormReload = useCallback((data) => {
dispatch({
type: FORM_ACTIONS.resetData,
data,
prepData,
validator,
});
}, [prepData, validator]);
const onFormReload = useCallback(
(data) => {
dispatch({
type: FORM_ACTIONS.resetData,
data,
dataPreprocessor,
validator,
});
},
[dataPreprocessor, validator]
);
const onFormChangeHandler = useCallback((updateRule) => (event) => {
dispatch({
type: FORM_ACTIONS.updateValue,
value: getChangedValue(event.target),
updateRule,
validator,
});
}, [validator]);
return [
state,
onFormChangeHandler,
onFormReload,
];
const onFormChangeHandler = useCallback(
(updateRule) => (event) => {
dispatch({
type: FORM_ACTIONS.updateValue,
value: getChangedValue(event.target),
updateRule,
validator,
});
},
[validator]
);
return [state, onFormChangeHandler, onFormReload];
}
function formReducer(state, action) {
switch (action.type) {
case FORM_ACTIONS.updateValue: {
const newData = update(state.data, action.updateRule(action.value));
const errors = action.validator(newData);
return {
...state,
data: newData,
errors,
};
}
case FORM_ACTIONS.resetData: {
if (!action.data) return { ...state, initialData: state.data };
const prepData = action.prepData ? action.prepData(action.data) : action.data;
return {
data: prepData,
initialData: prepData,
errors: action.data ? action.validator(prepData) : undefined,
};
}
default: {
throw new Error();
}
case FORM_ACTIONS.updateValue: {
const newData = update(state.data, action.updateRule(action.value));
const errors = action.validator(newData);
return {
...state,
data: newData,
errors,
};
}
case FORM_ACTIONS.resetData: {
if (!action.data) {
return { ...state, initialData: state.data };
}
const data = action.dataPreprocessor
? action.dataPreprocessor(action.data)
: action.data;
return {
data,
initialData: data,
errors: action.data ? action.validator(data) : undefined,
};
}
default: {
throw new Error();
}
}
}
@ -82,6 +88,9 @@ function getChangedValue(target) {
} else if (target.type === "number") {
const parsedValue = parseInt(value);
value = Number.isNaN(parsedValue) ? value : parsedValue;
} else if (target.type === "file") {
// Return first file (we don't need multiple yet)
[value] = target.files;
}
return value;
}

View File

@ -1,45 +1,80 @@
/*
* Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
*
* This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information.
*/
// API
export { useAPIGet, useAPIPost } from "./api/hooks";
export {
useAPIGet,
useAPIPost,
useAPIPatch,
useAPIPut,
useAPIDelete,
useAPIPolling,
} from "./api/hooks";
export { API_STATE } from "./api/utils";
// Bootstrap
export { Alert } from "bootstrap/Alert";
export { Button } from "bootstrap/Button";
export { CheckBox } from "bootstrap/CheckBox";
export { formFieldsSize } from "bootstrap/constants";
export { DataTimeInput } from "bootstrap/DataTimeInput";
export { EmailInput } from "bootstrap/EmailInput";
export { Input } from "bootstrap/Input";
export { NumberInput } from "bootstrap/NumberInput";
export { PasswordInput } from "bootstrap/PasswordInput";
export { RadioSet } from "bootstrap/RadioSet";
export { Select } from "bootstrap/Select";
export { TextInput } from "bootstrap/TextInput";
export { Alert, ALERT_TYPES } from "./bootstrap/Alert";
export { Button } from "./bootstrap/Button";
export { CheckBox } from "./bootstrap/CheckBox";
export { DownloadButton } from "./bootstrap/DownloadButton";
export { DataTimeInput } from "./bootstrap/DataTimeInput";
export { EmailInput } from "./bootstrap/EmailInput";
export { FileInput } from "./bootstrap/FileInput";
export { Input } from "./bootstrap/Input";
export { NumberInput } from "./bootstrap/NumberInput";
export { PasswordInput } from "./bootstrap/PasswordInput";
export { Radio, RadioSet } from "./bootstrap/RadioSet";
export { Select } from "./bootstrap/Select";
export { TextInput } from "./bootstrap/TextInput";
export { formFieldsSize, buttonFormFieldsSize } from "./bootstrap/constants";
export { Switch } from "./bootstrap/Switch";
export {
Spinner,
SpinnerElement,
} from "bootstrap/Spinner";
export {
Modal,
ModalBody,
ModalFooter,
ModalHeader,
} from "bootstrap/Modal";
export { Spinner, SpinnerElement } from "./bootstrap/Spinner";
export { Modal, ModalBody, ModalFooter, ModalHeader } from "./bootstrap/Modal";
// Common
export { RebootButton } from "./common/RebootButton";
export { WiFiSettings } from "./common/WiFiSettings/WiFiSettings";
export { ResetWiFiSettings } from "./common/WiFiSettings/ResetWiFiSettings";
// Form
export { ForisForm } from "form/components/ForisForm";
export { SubmitButton, STATES as SUBMIT_BUTTON_STATES } from "form/components/SubmitButton";
export { useForisModule, useForm } from "form/hooks";
export { ForisForm } from "./form/components/ForisForm";
export {
SubmitButton,
STATES as SUBMIT_BUTTON_STATES,
} from "./form/components/SubmitButton";
export { useForisModule, useForm } from "./form/hooks";
// WebSockets
export { useWSForisModule } from "webSockets/hooks";
export { WebSockets } from "webSockets/WebSockets";
export { useWSForisModule } from "./webSockets/hooks";
export { WebSockets } from "./webSockets/WebSockets";
// Utils
export { Portal } from "utils/Portal";
export { Portal } from "./utils/Portal";
export {
undefinedIfEmpty,
withoutUndefinedKeys,
onlySpecifiedKeys,
} 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";
export { displayCard } from "./utils/displayCard";
export { isPluginInstalled } from "./utils/isPluginInstalled";
// Foris URL
export { ForisURLs, REFORIS_URL_PREFIX } from "forisUrls";
export { ForisURLs, REFORIS_URL_PREFIX } from "./utils/forisUrls";
// Validation
export {
@ -50,4 +85,7 @@ export {
validateDUID,
validateMAC,
validateMultipleEmails,
} from "validations";
} from "./utils/validations";
// Alert context
export { AlertContextProvider, useAlert } from "./alertContext/AlertContext";

View File

@ -0,0 +1,23 @@
/*
* 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";
const mockSetAlert = jest.fn();
const mockDismissAlert = jest.fn();
window.AlertContext = React.createContext();
function AlertContextMock({ children }) {
return (
<AlertContext.Provider value={[mockSetAlert, mockDismissAlert]}>
{children}
</AlertContext.Provider>
);
}
export { AlertContextMock, mockSetAlert, mockDismissAlert };

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