@eeacms/volto-eea-website-theme 4.1.1 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -26
- package/package.json +1 -1
- package/src/actions/header-settings.js +9 -0
- package/src/actions/index.js +1 -1
- package/src/constants/ActionTypes.js +1 -1
- package/src/customizations/volto/components/theme/Header/Header.jsx +5 -2
- package/src/customizations/volto/server.jsx +0 -2
- package/src/helpers/headerSettingsExtender.js +20 -0
- package/src/index.js +7 -2
- package/src/reducers/index.js +1 -2
- package/src/actions/eea-settings.js +0 -9
- package/src/reducers/eea-settings.js +0 -33
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
+
### [4.2.0](https://github.com/eea/volto-eea-website-theme/compare/4.1.1...4.2.0) - 21 April 2026
|
|
8
|
+
|
|
9
|
+
#### :nail_care: Enhancements
|
|
10
|
+
|
|
11
|
+
- refactor: replace eea-settings controlpanel with header-settings via asyncPropsExtenders [Miu Razvan - [`f7d169b`](https://github.com/eea/volto-eea-website-theme/commit/f7d169b1bd12446cef74b78969cca1ddb19a7531)]
|
|
12
|
+
|
|
13
|
+
#### :hammer_and_wrench: Others
|
|
14
|
+
|
|
15
|
+
- Release 4.2.0 [Alin Voinea - [`8f7d6d0`](https://github.com/eea/volto-eea-website-theme/commit/8f7d6d0d0547dbe384c835375b56ccdb87c5dd44)]
|
|
7
16
|
### [4.1.1](https://github.com/eea/volto-eea-website-theme/compare/4.1.0...4.1.1) - 17 April 2026
|
|
8
17
|
|
|
9
18
|
#### :bug: Bug Fixes
|
|
@@ -63,8 +72,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
63
72
|
|
|
64
73
|
#### :house: Internal changes
|
|
65
74
|
|
|
66
|
-
- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`b15b302`](https://github.com/eea/volto-eea-website-theme/commit/b15b302ff88ec6afa6901ee7e1726cc4e04a8739)]
|
|
67
|
-
- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`36f2e1e`](https://github.com/eea/volto-eea-website-theme/commit/36f2e1e176471b3753d77ab8aaf0cba577b43b36)]
|
|
68
75
|
|
|
69
76
|
### [3.19.0](https://github.com/eea/volto-eea-website-theme/compare/3.18.1...3.19.0) - 11 February 2026
|
|
70
77
|
|
|
@@ -127,7 +134,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
127
134
|
#### :hammer_and_wrench: Others
|
|
128
135
|
|
|
129
136
|
- Release 3.12.0 [Alin Voinea - [`ea1e961`](https://github.com/eea/volto-eea-website-theme/commit/ea1e96144684b2a8238ae476fd8d47de82ff42b4)]
|
|
130
|
-
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`2cac56e`](https://github.com/eea/volto-eea-website-theme/commit/2cac56e22e580e042d368b69254172539ed33b65)]
|
|
131
137
|
### [3.11.0](https://github.com/eea/volto-eea-website-theme/compare/3.10.1...3.11.0) - 29 September 2025
|
|
132
138
|
|
|
133
139
|
#### :bug: Bug Fixes
|
|
@@ -221,8 +227,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
221
227
|
|
|
222
228
|
#### :hammer_and_wrench: Others
|
|
223
229
|
|
|
224
|
-
- Add Sonarqube tag using fise-frontend addons list [EEA Jenkins - [`3d50874`](https://github.com/eea/volto-eea-website-theme/commit/3d50874281ebcb91a1ae3727248f656a6f26c603)]
|
|
225
|
-
- Add Sonarqube tag using ied-frontend addons list [EEA Jenkins - [`a3f7676`](https://github.com/eea/volto-eea-website-theme/commit/a3f76767d99cb6dd93cc7fa0eafdea57e9000b2c)]
|
|
226
230
|
### [3.5.4](https://github.com/eea/volto-eea-website-theme/compare/3.5.3...3.5.4) - 30 January 2025
|
|
227
231
|
|
|
228
232
|
#### :bug: Bug Fixes
|
|
@@ -323,7 +327,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
323
327
|
|
|
324
328
|
#### :hammer_and_wrench: Others
|
|
325
329
|
|
|
326
|
-
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`e417f83`](https://github.com/eea/volto-eea-website-theme/commit/e417f839312045c56b67ab8134fe5b0622b3e2c3)]
|
|
327
330
|
## [3.0.0](https://github.com/eea/volto-eea-website-theme/compare/2.4.0...3.0.0) - 21 October 2024
|
|
328
331
|
|
|
329
332
|
#### :nail_care: Enhancements
|
|
@@ -409,7 +412,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
409
412
|
- Refs #269520 - other_organisation test [Tripon Eugen - [`7558b27`](https://github.com/eea/volto-eea-website-theme/commit/7558b27a9d1cd6d3480a32b296c7325c796006c9)]
|
|
410
413
|
- Refs #269520 - other_organisation token widget edit mode [Tripon Eugen - [`b6df127`](https://github.com/eea/volto-eea-website-theme/commit/b6df127bd91b6f55dda8f468e1107037d43752ff)]
|
|
411
414
|
- Refs #269520 - other_organisation token widget [Tripon Eugen - [`6fd7543`](https://github.com/eea/volto-eea-website-theme/commit/6fd7543894bd2c593a1729116befd95c82ea3c8f)]
|
|
412
|
-
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`cbc36c7`](https://github.com/eea/volto-eea-website-theme/commit/cbc36c74dfcd5f7cb1013a4c673d9c02e0023766)]
|
|
413
415
|
### [2.1.1](https://github.com/eea/volto-eea-website-theme/compare/2.1.0...2.1.1) - 28 May 2024
|
|
414
416
|
|
|
415
417
|
#### :bug: Bug Fixes
|
|
@@ -494,7 +496,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
494
496
|
|
|
495
497
|
#### :hammer_and_wrench: Others
|
|
496
498
|
|
|
497
|
-
- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`adc6730`](https://github.com/eea/volto-eea-website-theme/commit/adc6730e21a37afb865b842182624401de6a29f5)]
|
|
498
499
|
### [1.33.1](https://github.com/eea/volto-eea-website-theme/compare/1.33.0...1.33.1) - 4 April 2024
|
|
499
500
|
|
|
500
501
|
#### :bug: Bug Fixes
|
|
@@ -628,8 +629,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
628
629
|
|
|
629
630
|
- bump version [Razvan - [`721e939`](https://github.com/eea/volto-eea-website-theme/commit/721e939d12e324b459ebfa78a2e656ee7142a3d6)]
|
|
630
631
|
- merge master into this branch [Razvan - [`586c8f9`](https://github.com/eea/volto-eea-website-theme/commit/586c8f910bac55a043bd8dda60e9444bd2ae1663)]
|
|
631
|
-
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`fd90044`](https://github.com/eea/volto-eea-website-theme/commit/fd9004442a9d1d465f7601ecdefe3e23c61e6a9c)]
|
|
632
|
-
- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`4bc3dd3`](https://github.com/eea/volto-eea-website-theme/commit/4bc3dd3ae412a66befd04b5b80fab3716c929240)]
|
|
633
632
|
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c4dbd28`](https://github.com/eea/volto-eea-website-theme/commit/c4dbd289358205bc2d849aab7edb11ccf3b89cee)]
|
|
634
633
|
- fix tests [Razvan - [`042330b`](https://github.com/eea/volto-eea-website-theme/commit/042330bc97d32ffe7ba769b4f2453f71cffed706)]
|
|
635
634
|
- remove RemoveSchema logic [Razvan - [`08d10f8`](https://github.com/eea/volto-eea-website-theme/commit/08d10f8bf6f75478260e4e4c66d7316ba87b907a)]
|
|
@@ -724,11 +723,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
724
723
|
- test: Add real image to cypress test [Alin Voinea - [`4ff591a`](https://github.com/eea/volto-eea-website-theme/commit/4ff591ae3318c9588b4e2114582c0fa6cfdf31ae)]
|
|
725
724
|
- test: Add cypress tests for Image block styling position and align [Alin Voinea - [`7341ef7`](https://github.com/eea/volto-eea-website-theme/commit/7341ef7b92714fc0cc3ab0c31c39033e7b3e19e7)]
|
|
726
725
|
- Revert "change(tests): commented out rss test since title block config is missing" [Alin Voinea - [`fb61191`](https://github.com/eea/volto-eea-website-theme/commit/fb611918d6ca380b89b594f283dcf9f685a4b294)]
|
|
727
|
-
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`6a3be30`](https://github.com/eea/volto-eea-website-theme/commit/6a3be3092589411af7808a235f76de5222fd3868)]
|
|
728
|
-
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`c3978f2`](https://github.com/eea/volto-eea-website-theme/commit/c3978f23375ef066e9fd6f6c2e34ba6c1c058f69)]
|
|
729
|
-
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`f672779`](https://github.com/eea/volto-eea-website-theme/commit/f672779e845bec9240ccc901e9f53ec80c5a1819)]
|
|
730
|
-
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`ae5d8e3`](https://github.com/eea/volto-eea-website-theme/commit/ae5d8e3f4e04dc2808d47ce2ee886e1b23b528da)]
|
|
731
|
-
- test: [JENKINS] Improve cypress time [valentinab25 - [`170ff0c`](https://github.com/eea/volto-eea-website-theme/commit/170ff0c8e3b30e69479bdf1117e811fea94f1027)]
|
|
732
726
|
### [1.23.0](https://github.com/eea/volto-eea-website-theme/compare/1.22.1...1.23.0) - 2 November 2023
|
|
733
727
|
|
|
734
728
|
#### :rocket: New Features
|
|
@@ -741,7 +735,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
741
735
|
|
|
742
736
|
#### :house: Internal changes
|
|
743
737
|
|
|
744
|
-
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f28fce3`](https://github.com/eea/volto-eea-website-theme/commit/f28fce3d1eb815f95fb9aa40de42b10b7e8e30c5)]
|
|
745
738
|
- chore: husky, lint-staged use fixed versions [valentinab25 - [`6d15088`](https://github.com/eea/volto-eea-website-theme/commit/6d150886c5aeb2ca0b569270486e60f7cc274e2c)]
|
|
746
739
|
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`20c0323`](https://github.com/eea/volto-eea-website-theme/commit/20c032380b33c0077c869a05136f93e2fb68e5d4)]
|
|
747
740
|
|
|
@@ -927,7 +920,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
927
920
|
|
|
928
921
|
#### :house: Internal changes
|
|
929
922
|
|
|
930
|
-
- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`370dcbf`](https://github.com/eea/volto-eea-website-theme/commit/370dcbfbf1a8135ce7b1b3b271b004552a631837)]
|
|
931
923
|
|
|
932
924
|
#### :hammer_and_wrench: Others
|
|
933
925
|
|
|
@@ -1083,7 +1075,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1083
1075
|
|
|
1084
1076
|
#### :hammer_and_wrench: Others
|
|
1085
1077
|
|
|
1086
|
-
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`6c5e2f8`](https://github.com/eea/volto-eea-website-theme/commit/6c5e2f80456e2061d9e9c15fd0a0b91b9ac70568)]
|
|
1087
1078
|
### [1.9.1](https://github.com/eea/volto-eea-website-theme/compare/1.9.0...1.9.1) - 28 February 2023
|
|
1088
1079
|
|
|
1089
1080
|
#### :bug: Bug Fixes
|
|
@@ -1230,7 +1221,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1230
1221
|
|
|
1231
1222
|
- For some reasons types is a string [Alin Voinea - [`3769a09`](https://github.com/eea/volto-eea-website-theme/commit/3769a0981181d5b633f3498daebbe96be8b4b833)]
|
|
1232
1223
|
- Fix(redirect): o.filter - refs #157627 [Alin Voinea - [`deb23da`](https://github.com/eea/volto-eea-website-theme/commit/deb23da846444cc96539697fd798429ae0abe89e)]
|
|
1233
|
-
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`f1fffc5`](https://github.com/eea/volto-eea-website-theme/commit/f1fffc5db96725440863d545580b4e76cce4b796)]
|
|
1234
1224
|
### [1.5.0](https://github.com/eea/volto-eea-website-theme/compare/1.4.2...1.5.0) - 9 January 2023
|
|
1235
1225
|
|
|
1236
1226
|
#### :hammer_and_wrench: Others
|
|
@@ -1264,7 +1254,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1264
1254
|
|
|
1265
1255
|
- Release 1.4.0 [Alin Voinea - [`bd42a0d`](https://github.com/eea/volto-eea-website-theme/commit/bd42a0d26e928cac5d99933194755da3db06b341)]
|
|
1266
1256
|
- bump version to use as volto-eea-design-system [David Ichim - [`f4be047`](https://github.com/eea/volto-eea-website-theme/commit/f4be047328b46399b03b612d378b18aaf82e7dc1)]
|
|
1267
|
-
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`9b7cfef`](https://github.com/eea/volto-eea-website-theme/commit/9b7cfefb4d34fc1c948015e491feb370f9795bd8)]
|
|
1268
1257
|
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`df252a9`](https://github.com/eea/volto-eea-website-theme/commit/df252a9bfed0bb86cadf53c59dd1603b1e2cd822)]
|
|
1269
1258
|
### [1.3.2](https://github.com/eea/volto-eea-website-theme/compare/1.3.1...1.3.2) - 16 December 2022
|
|
1270
1259
|
|
|
@@ -1274,7 +1263,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1274
1263
|
|
|
1275
1264
|
#### :hammer_and_wrench: Others
|
|
1276
1265
|
|
|
1277
|
-
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`a43c658`](https://github.com/eea/volto-eea-website-theme/commit/a43c658a7920c8df95e763b9a637f38ce77eba2c)]
|
|
1278
1266
|
- Better razzle.config [Tiberiu Ichim - [`81dbf48`](https://github.com/eea/volto-eea-website-theme/commit/81dbf48815fb27facb4f82c9b764540fdf188b2e)]
|
|
1279
1267
|
- Better razzle.config [Tiberiu Ichim - [`7bc9da2`](https://github.com/eea/volto-eea-website-theme/commit/7bc9da2cd837ab62a95cd29979cdd9b0055b7d67)]
|
|
1280
1268
|
### [1.3.1](https://github.com/eea/volto-eea-website-theme/compare/1.3.0...1.3.1) - 28 November 2022
|
|
@@ -1285,7 +1273,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1285
1273
|
|
|
1286
1274
|
#### :hammer_and_wrench: Others
|
|
1287
1275
|
|
|
1288
|
-
- yarn 3 [Alin Voinea - [`ea7a709`](https://github.com/eea/volto-eea-website-theme/commit/ea7a7094945312776e9b6f44e371178603e92139)]
|
|
1289
1276
|
### [1.3.0](https://github.com/eea/volto-eea-website-theme/compare/1.2.0...1.3.0) - 22 November 2022
|
|
1290
1277
|
|
|
1291
1278
|
#### :rocket: New Features
|
|
@@ -1326,7 +1313,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1326
1313
|
- Add subsite class to body [Tiberiu Ichim - [`74d700f`](https://github.com/eea/volto-eea-website-theme/commit/74d700fbfd6249a8604762a7e4e49cce857db0f3)]
|
|
1327
1314
|
- Add subsite info to header [Tiberiu Ichim - [`47daf8b`](https://github.com/eea/volto-eea-website-theme/commit/47daf8bb6374a1222040626b19d4154df7ba1b83)]
|
|
1328
1315
|
- fix eslint [Miu Razvan - [`eb8d0a7`](https://github.com/eea/volto-eea-website-theme/commit/eb8d0a790bc70c0aae256c6ff35f63c4885f338e)]
|
|
1329
|
-
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`cc578a4`](https://github.com/eea/volto-eea-website-theme/commit/cc578a413b205a8e61e091fab3a88f94cedefc89)]
|
|
1330
1316
|
### [1.1.0](https://github.com/eea/volto-eea-website-theme/compare/1.0.0...1.1.0) - 28 October 2022
|
|
1331
1317
|
|
|
1332
1318
|
#### :nail_care: Enhancements
|
|
@@ -1374,7 +1360,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1374
1360
|
|
|
1375
1361
|
#### :hammer_and_wrench: Others
|
|
1376
1362
|
|
|
1377
|
-
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
|
|
1378
1363
|
### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
|
|
1379
1364
|
|
|
1380
1365
|
#### :hammer_and_wrench: Others
|
|
@@ -1642,7 +1627,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1642
1627
|
- Header refactor, add custom logo #5 [ichim-david - [`4950235`](https://github.com/eea/volto-eea-website-theme/commit/49502358105437cfeac3b144e6d301cb59aa2346)]
|
|
1643
1628
|
- Update footer.config with new publication card component [ichim-david - [`2e38e9a`](https://github.com/eea/volto-eea-website-theme/commit/2e38e9a417f835009d60c80d4eb4b30229f55e45)]
|
|
1644
1629
|
- feature(breadcrumbs): implement eea-design-system breadcrumb as Volto component #32 #7 [ichim-david - [`181af41`](https://github.com/eea/volto-eea-website-theme/commit/181af4125ce2b9ddac56dab4723cb11c26633221)]
|
|
1645
|
-
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`da8ceb6`](https://github.com/eea/volto-eea-website-theme/commit/da8ceb68ea68bfbc9504e48ccd4d68277f11ab9a)]
|
|
1646
1630
|
- use breadcrumbs from eea-design-system [nileshgulia1 - [`db2f9e9`](https://github.com/eea/volto-eea-website-theme/commit/db2f9e9a4327420a3cce9a9903cd88549b129eab)]
|
|
1647
1631
|
- Update theme.config [ichim-david - [`8eca4f4`](https://github.com/eea/volto-eea-website-theme/commit/8eca4f40397a4aeca6d39029c92db78968d37064)]
|
|
1648
1632
|
- Added keyContent component to theme.config [ichim-david - [`d86f202`](https://github.com/eea/volto-eea-website-theme/commit/d86f202d0274d839487a88b51cae9a0e899beb23)]
|
|
@@ -1684,5 +1668,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1684
1668
|
|
|
1685
1669
|
#### :hammer_and_wrench: Others
|
|
1686
1670
|
|
|
1687
|
-
- yarn bootstrap [Alin Voinea - [`6995e9e`](https://github.com/eea/volto-eea-website-theme/commit/6995e9e091f21fdbbdffa8a44fc0e2c626f6d46a)]
|
|
1688
1671
|
- Initial commit [Alin Voinea - [`6a9c03a`](https://github.com/eea/volto-eea-website-theme/commit/6a9c03a7cebe71ca87e82cf58c42904063e9d8d3)]
|
package/package.json
CHANGED
package/src/actions/index.js
CHANGED
|
@@ -6,4 +6,4 @@
|
|
|
6
6
|
export const SET_ISPRINT = 'SET_ISPRINT';
|
|
7
7
|
export const SET_PRINT_LOADING = 'SET_PRINT_LOADING';
|
|
8
8
|
export const GET_NAVIGATION_SETTINGS = 'GET_NAVIGATION_SETTINGS';
|
|
9
|
-
export const
|
|
9
|
+
export const GET_HEADER_SETTINGS = 'GET_HEADER_SETTINGS';
|
|
@@ -61,9 +61,12 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
|
|
|
61
61
|
const width = useSelector((state) => state.screen?.width);
|
|
62
62
|
const dispatch = useDispatch();
|
|
63
63
|
|
|
64
|
-
const
|
|
64
|
+
const headerSettings = useSelector(
|
|
65
|
+
(state) => state.reduxAsyncConnect?.headerSettings,
|
|
66
|
+
);
|
|
67
|
+
|
|
65
68
|
const headerSearchBox =
|
|
66
|
-
|
|
69
|
+
headerSettings?.searchBox || eea.headerSearchBox || [];
|
|
67
70
|
const previousToken = usePrevious(token);
|
|
68
71
|
const navigationSettings =
|
|
69
72
|
useSelector((state) => state.navigationSettings?.settings) ||
|
|
@@ -33,7 +33,6 @@ import {
|
|
|
33
33
|
import { changeLanguage } from '@plone/volto/actions/language/language';
|
|
34
34
|
|
|
35
35
|
import userSession from '@plone/volto/reducers/userSession/userSession';
|
|
36
|
-
import { getEEASettings } from '@eeacms/volto-eea-website-theme/actions';
|
|
37
36
|
|
|
38
37
|
import configureStore from '@plone/volto/store';
|
|
39
38
|
import ErrorPage from '@plone/volto/error';
|
|
@@ -264,7 +263,6 @@ server.get('/*', (req, res) => {
|
|
|
264
263
|
const location = parseUrl(url);
|
|
265
264
|
|
|
266
265
|
loadOnServer({ store, location, routes, api })
|
|
267
|
-
.then(() => Promise.all([store.dispatch(getEEASettings())]).catch(() => {}))
|
|
268
266
|
.then(() => {
|
|
269
267
|
const initialLang =
|
|
270
268
|
req.universalCookies.get('I18N_LANGUAGE') ||
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { getHeaderSettings } from '@eeacms/volto-eea-website-theme/actions';
|
|
2
|
+
|
|
3
|
+
// asyncPropsExtenders entry. Loads header settings during SSR so they're
|
|
4
|
+
// available to the Header component on the first render. Result lands in
|
|
5
|
+
// state.reduxAsyncConnect.headerSettings.
|
|
6
|
+
export const headerSettingsExtender = {
|
|
7
|
+
path: '/',
|
|
8
|
+
extend: (dispatchActions) => {
|
|
9
|
+
if (
|
|
10
|
+
dispatchActions.filter((a) => a.key === 'headerSettings').length === 0
|
|
11
|
+
) {
|
|
12
|
+
dispatchActions.push({
|
|
13
|
+
key: 'headerSettings',
|
|
14
|
+
promise: ({ store: { dispatch } }) =>
|
|
15
|
+
__SERVER__ && dispatch(getHeaderSettings()),
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
return dispatchActions;
|
|
19
|
+
},
|
|
20
|
+
};
|
package/src/index.js
CHANGED
|
@@ -49,7 +49,8 @@ import okMiddleware from './middleware/ok';
|
|
|
49
49
|
import voltoCustomCSSMiddleware from './middleware/voltoCustom';
|
|
50
50
|
import { voltoCustomJsMiddleware } from './middleware/voltoCustom';
|
|
51
51
|
import installSlate from './slate';
|
|
52
|
-
import { print, navigationSettings
|
|
52
|
+
import { print, navigationSettings } from './reducers';
|
|
53
|
+
import { headerSettingsExtender } from './helpers/headerSettingsExtender';
|
|
53
54
|
|
|
54
55
|
import * as eea from './config';
|
|
55
56
|
|
|
@@ -676,9 +677,13 @@ const applyConfig = (config) => {
|
|
|
676
677
|
...(config.addonReducers || {}),
|
|
677
678
|
print,
|
|
678
679
|
navigationSettings,
|
|
679
|
-
eeaSettings,
|
|
680
680
|
};
|
|
681
681
|
|
|
682
|
+
config.settings.asyncPropsExtenders = [
|
|
683
|
+
...(config.settings.asyncPropsExtenders || []),
|
|
684
|
+
headerSettingsExtender,
|
|
685
|
+
];
|
|
686
|
+
|
|
682
687
|
// Mega menu object
|
|
683
688
|
if (!config.settings.menuItemsLayouts) {
|
|
684
689
|
config.settings.menuItemsLayouts = {};
|
package/src/reducers/index.js
CHANGED
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { GET_EEA_SETTINGS } from '../constants/ActionTypes';
|
|
2
|
-
|
|
3
|
-
const initialState = {
|
|
4
|
-
error: null,
|
|
5
|
-
loaded: false,
|
|
6
|
-
loading: false,
|
|
7
|
-
data: {},
|
|
8
|
-
};
|
|
9
|
-
|
|
10
|
-
export default function eeaSettings(state = initialState, action = {}) {
|
|
11
|
-
switch (action.type) {
|
|
12
|
-
case `${GET_EEA_SETTINGS}_PENDING`:
|
|
13
|
-
return { ...state, error: null, loaded: false, loading: true };
|
|
14
|
-
case `${GET_EEA_SETTINGS}_SUCCESS`:
|
|
15
|
-
return {
|
|
16
|
-
...state,
|
|
17
|
-
error: null,
|
|
18
|
-
loaded: true,
|
|
19
|
-
loading: false,
|
|
20
|
-
data: action.result || {},
|
|
21
|
-
};
|
|
22
|
-
case `${GET_EEA_SETTINGS}_FAIL`:
|
|
23
|
-
return {
|
|
24
|
-
...state,
|
|
25
|
-
error: action.error,
|
|
26
|
-
loaded: false,
|
|
27
|
-
loading: false,
|
|
28
|
-
data: {},
|
|
29
|
-
};
|
|
30
|
-
default:
|
|
31
|
-
return state;
|
|
32
|
-
}
|
|
33
|
-
}
|