@eeacms/volto-clms-theme 1.1.73 → 1.1.75
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 +26 -12
- package/Jenkinsfile +1 -1
- package/package.json +1 -1
- package/src/components/Blocks/CclHomeBgImageBlock/CclHomeBgImageBlockEdit.jsx +1 -0
- package/src/components/Blocks/CclHomeBgImageBlock/CclHomeBgImageSchema.js +71 -1
- package/src/components/Blocks/CclHomeBgImageBlock/CclWhiteBgView.jsx +35 -0
- package/src/components/Blocks/CclRelatedListingBlock/CclRelatedListingView.jsx +6 -4
- package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/rewriteOptions.js +2 -0
- package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclCarouselView.jsx +3 -3
- package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/custom.less +1 -0
- package/src/components/CclUtils/helmetTitle.js +1 -1
- package/src/index.js +7 -1
- package/theme/site/extras/home.less +45 -1
package/CHANGELOG.md
CHANGED
|
@@ -4,16 +4,39 @@ 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
|
-
### [1.1.
|
|
7
|
+
### [1.1.75](https://github.com/eea/volto-clms-theme/compare/1.1.74...1.1.75) - 8 November 2023
|
|
8
|
+
|
|
9
|
+
#### :rocket: New Features
|
|
10
|
+
|
|
11
|
+
- feat: allow Files in Global search [Mikel Larreategi - [`fd202e9`](https://github.com/eea/volto-clms-theme/commit/fd202e95810fbcfa369fda1e493265ac01e5c439)]
|
|
12
|
+
|
|
13
|
+
#### :bug: Bug Fixes
|
|
14
|
+
|
|
15
|
+
- fix: re-request relatedListings navigating between datasets [Ion Lizarazu - [`8f2c617`](https://github.com/eea/volto-clms-theme/commit/8f2c6177da3bfa4583d4292dcbad2edf49a128fe)]
|
|
16
|
+
- fix:CLMS-2805 addition of two new boxes [Unai - [`31c3285`](https://github.com/eea/volto-clms-theme/commit/31c3285e8f06313919b8bb7492111c35633b0cde)]
|
|
17
|
+
- fix: CLMS-2803 removed < and > buttons from main page's carousel [Unai - [`2b539f4`](https://github.com/eea/volto-clms-theme/commit/2b539f4e26a556bb55d0cf09b92d489786ae7ed3)]
|
|
18
|
+
|
|
19
|
+
#### :house: Internal changes
|
|
20
|
+
|
|
21
|
+
- style: Automated code fix [eea-jenkins - [`95b48d1`](https://github.com/eea/volto-clms-theme/commit/95b48d109d48a633c614a9f26072b989ad7e6466)]
|
|
22
|
+
|
|
23
|
+
### [1.1.74](https://github.com/eea/volto-clms-theme/compare/1.1.73...1.1.74) - 7 November 2023
|
|
24
|
+
|
|
25
|
+
#### :rocket: New Features
|
|
26
|
+
|
|
27
|
+
- feat: change the source of navroot title to rely on the newly released p.restapi [Mikel Larreategi - [`3f4f96e`](https://github.com/eea/volto-clms-theme/commit/3f4f96edadad29f4762b1d7a59f0801d63834605)]
|
|
28
|
+
- feat: expand the navroot [Mikel Larreategi - [`3ee730c`](https://github.com/eea/volto-clms-theme/commit/3ee730c88942469688c781068b39bb4971ee4972)]
|
|
29
|
+
|
|
30
|
+
#### :hammer_and_wrench: Others
|
|
31
|
+
|
|
32
|
+
### [1.1.73](https://github.com/eea/volto-clms-theme/compare/1.1.72...1.1.73) - 6 November 2023
|
|
8
33
|
|
|
9
34
|
#### :hammer_and_wrench: Others
|
|
10
35
|
|
|
11
|
-
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`3a543b9`](https://github.com/eea/volto-clms-theme/commit/3a543b9000c1168d54edfb8003eb08dfa7c85031)]
|
|
12
36
|
- comment Integration tests [Ion Lizarazu - [`74713f8`](https://github.com/eea/volto-clms-theme/commit/74713f8f78d77ba193d8c27462cc8787d698ab81)]
|
|
13
37
|
- uncomment cypress tests [Ion Lizarazu - [`3526a5c`](https://github.com/eea/volto-clms-theme/commit/3526a5c46481667b0518c6cce0927e67726c6f6c)]
|
|
14
38
|
- use chrome instead of chromium to run cypress tests [Ion Lizarazu - [`6ae3a06`](https://github.com/eea/volto-clms-theme/commit/6ae3a06dbec1914c06a55c0dcb826c49b75f9739)]
|
|
15
39
|
- ccltabs activeTab condition having first child [Ion Lizarazu - [`3cf9376`](https://github.com/eea/volto-clms-theme/commit/3cf9376d55f5f41b7e42c25e5925cd871ec71d81)]
|
|
16
|
-
- test: [JENKINS] Improve cypress time [valentinab25 - [`f41ecfe`](https://github.com/eea/volto-clms-theme/commit/f41ecfea8b5a1e409303ffcc7befe7f51316d652)]
|
|
17
40
|
### [1.1.72](https://github.com/eea/volto-clms-theme/compare/1.1.71...1.1.72) - 2 November 2023
|
|
18
41
|
|
|
19
42
|
### [1.1.71](https://github.com/eea/volto-clms-theme/compare/1.1.70...1.1.71) - 31 October 2023
|
|
@@ -24,7 +47,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
24
47
|
|
|
25
48
|
#### :house: Internal changes
|
|
26
49
|
|
|
27
|
-
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`67ca3bb`](https://github.com/eea/volto-clms-theme/commit/67ca3bb111f34842569c12b9c87a2a91bd14b09e)]
|
|
28
50
|
|
|
29
51
|
#### :hammer_and_wrench: Others
|
|
30
52
|
|
|
@@ -121,7 +143,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
121
143
|
|
|
122
144
|
- readme [Mikel Larreategi - [`3c0ab05`](https://github.com/eea/volto-clms-theme/commit/3c0ab051981a4efad7712bc46182eed9d79fd10f)]
|
|
123
145
|
- remove from addons [Mikel Larreategi - [`89c2e7d`](https://github.com/eea/volto-clms-theme/commit/89c2e7d793193e6bb64642f0b06a01cd3c81108a)]
|
|
124
|
-
- yarn.lock added after running yarn [Unai - [`ad307be`](https://github.com/eea/volto-clms-theme/commit/ad307be72bbfe753f7571ea4d784a09978e0f7f2)]
|
|
125
146
|
- prettier issue fix [Unai - [`8bc0650`](https://github.com/eea/volto-clms-theme/commit/8bc0650918f9fa1065d19d2c15ce153a5fc5abbb)]
|
|
126
147
|
- set a limit of 5 items in the download queue [Mikel Larreategi - [`b81cc83`](https://github.com/eea/volto-clms-theme/commit/b81cc8383165bafbbff52fbeeb365d413051802e)]
|
|
127
148
|
- adjust logo size [Mikel Larreategi - [`b90a72c`](https://github.com/eea/volto-clms-theme/commit/b90a72c07102025a7e90607b25d34611ddd4f4f6)]
|
|
@@ -263,7 +284,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
263
284
|
|
|
264
285
|
- fix cart items concat function [Ion Lizarazu - [`4b72249`](https://github.com/eea/volto-clms-theme/commit/4b72249ef17a0cda22661809fce5be7c2d1f6649)]
|
|
265
286
|
- revert Jenkinsfile [Ion Lizarazu - [`64f6cd0`](https://github.com/eea/volto-clms-theme/commit/64f6cd08100357843b507c00d3286d7debe0ef04)]
|
|
266
|
-
- yarn.lock file [Ion Lizarazu - [`8444ad1`](https://github.com/eea/volto-clms-theme/commit/8444ad1606b3939e4609bdd186e5ace2252588a8)]
|
|
267
287
|
- packages.json versions order [Ion Lizarazu - [`4fd7a86`](https://github.com/eea/volto-clms-theme/commit/4fd7a86ab43238841b421e1ed10ebd52ab420a15)]
|
|
268
288
|
- downloadablefilestablewidget param modification [Ion Lizarazu - [`5dd794a`](https://github.com/eea/volto-clms-theme/commit/5dd794a33a8eddd042a753b7ab47e7d2a323b011)]
|
|
269
289
|
- add technical_documents_accordion_text field to the dataset view [Ion Lizarazu - [`96ed1e5`](https://github.com/eea/volto-clms-theme/commit/96ed1e5e2c2b501bd303bc76b333a70ad1614c16)]
|
|
@@ -388,7 +408,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
388
408
|
|
|
389
409
|
- remove NUTS text for area naming in the cart [ionlizarazu - [`062e0a3`](https://github.com/eea/volto-clms-theme/commit/062e0a375f5352bc13c18ff7ec33fad4bcc59f2f)]
|
|
390
410
|
- dependencies [ionlizarazu - [`405ef96`](https://github.com/eea/volto-clms-theme/commit/405ef96090fe7bd4af73a49d3285a92fad712e3b)]
|
|
391
|
-
- yarn.lock [ionlizarazu - [`7132119`](https://github.com/eea/volto-clms-theme/commit/71321195c4dd4fceed67f2f0872f3e24bba61c17)]
|
|
392
411
|
- volto-blocks-grid module mapping [ionlizarazu - [`4fec3ca`](https://github.com/eea/volto-clms-theme/commit/4fec3cabc437322ad92ed90d682250bd123ccaaf)]
|
|
393
412
|
- volto-blocks-grid v7.0.2 [ionlizarazu - [`2557e60`](https://github.com/eea/volto-clms-theme/commit/2557e6039d3cea33ca0bd11a0a3ef4764c611f78)]
|
|
394
413
|
- remove styling from teaser block [ionlizarazu - [`879e684`](https://github.com/eea/volto-clms-theme/commit/879e684057c88f52f60f0fa54cbaa155c7d14688)]
|
|
@@ -476,7 +495,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
476
495
|
|
|
477
496
|
#### :house: Internal changes
|
|
478
497
|
|
|
479
|
-
- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`b4cbf65`](https://github.com/eea/volto-clms-theme/commit/b4cbf6557fbc67f7fc4cea5aa2cb19804f3d7e3c)]
|
|
480
498
|
|
|
481
499
|
#### :hammer_and_wrench: Others
|
|
482
500
|
|
|
@@ -1675,7 +1693,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1675
1693
|
#### :hammer_and_wrench: Others
|
|
1676
1694
|
|
|
1677
1695
|
- related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
|
|
1678
|
-
- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
|
|
1679
1696
|
- sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
|
|
1680
1697
|
- lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
|
|
1681
1698
|
- footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
|
|
@@ -1826,7 +1843,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
1826
1843
|
- search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
|
|
1827
1844
|
- language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
|
|
1828
1845
|
- toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
|
|
1829
|
-
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
|
|
1830
1846
|
### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
|
|
1831
1847
|
|
|
1832
1848
|
#### :hammer_and_wrench: Others
|
|
@@ -2731,13 +2747,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
2731
2747
|
#### :hammer_and_wrench: Others
|
|
2732
2748
|
|
|
2733
2749
|
- replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
|
|
2734
|
-
- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
|
|
2735
2750
|
- add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
|
|
2736
2751
|
- upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
|
|
2737
2752
|
- HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
|
|
2738
2753
|
- babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
|
|
2739
2754
|
- prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
|
|
2740
|
-
- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
|
|
2741
2755
|
- Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
|
|
2742
2756
|
- cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
|
|
2743
2757
|
- some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]
|
package/Jenkinsfile
CHANGED
|
@@ -159,7 +159,7 @@ pipeline {
|
|
|
159
159
|
// script {
|
|
160
160
|
// try {
|
|
161
161
|
// sh '''docker run --pull always --rm -d --name="$IMAGE_NAME-plone" -e SITE="Plone" -e PROFILES="$BACKEND_PROFILES" -e ADDONS="$BACKEND_ADDONS" eeacms/plone-backend'''
|
|
162
|
-
// sh '''timeout 3600 docker run --shm-size=2g --link $IMAGE_NAME-plone:plone --entrypoint=make --name="$IMAGE_NAME-cypress" --workdir=/app/src/addons/${GIT_NAME} -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" $IMAGE_NAME-frontend cypress-ci'''
|
|
162
|
+
// sh '''timeout -s 9 3600 docker run --shm-size=2g --cpu-quota=150000 --link $IMAGE_NAME-plone:plone --entrypoint=make --name="$IMAGE_NAME-cypress" --workdir=/app/src/addons/${GIT_NAME} -e "RAZZLE_INTERNAL_API_PATH=http://plone:8080/Plone" $IMAGE_NAME-frontend cypress-ci'''
|
|
163
163
|
// } finally {
|
|
164
164
|
// try {
|
|
165
165
|
// sh '''rm -rf cypress-videos cypress-results cypress-coverage cypress-screenshots'''
|
package/package.json
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
export const HomeBgImageSchema = (
|
|
1
|
+
export const HomeBgImageSchema = (
|
|
2
|
+
config,
|
|
3
|
+
hasButton,
|
|
4
|
+
hasLocationInfo,
|
|
5
|
+
hasDatasetButton,
|
|
6
|
+
) => {
|
|
2
7
|
const variationsConfig = config.blocks.blocksConfig['homeBgImage'].variations;
|
|
3
8
|
const variations = Object.keys(variationsConfig).map((variation) => [
|
|
4
9
|
variationsConfig[variation].id,
|
|
@@ -13,6 +18,20 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
|
|
|
13
18
|
},
|
|
14
19
|
]
|
|
15
20
|
: [];
|
|
21
|
+
const hasDatasetButtonFieldset = hasDatasetButton
|
|
22
|
+
? [
|
|
23
|
+
{
|
|
24
|
+
id: 'datasetButtonStyle',
|
|
25
|
+
title: 'Dataset button style',
|
|
26
|
+
fields: [
|
|
27
|
+
'dataset_buttonTitle',
|
|
28
|
+
'dataset_href',
|
|
29
|
+
'dataset_style',
|
|
30
|
+
'dataset_disabled',
|
|
31
|
+
],
|
|
32
|
+
},
|
|
33
|
+
]
|
|
34
|
+
: [];
|
|
16
35
|
const hasLocationFieldset = hasLocationInfo
|
|
17
36
|
? [
|
|
18
37
|
{
|
|
@@ -36,10 +55,15 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
|
|
|
36
55
|
'location',
|
|
37
56
|
'hasLocationInfo',
|
|
38
57
|
'hasButton',
|
|
58
|
+
'dataset_title',
|
|
59
|
+
'dataset_subtitle',
|
|
60
|
+
'dataset_description',
|
|
61
|
+
'hasDatasetButton',
|
|
39
62
|
],
|
|
40
63
|
},
|
|
41
64
|
...hasLocationFieldset,
|
|
42
65
|
...hasButtonFieldset,
|
|
66
|
+
...hasDatasetButtonFieldset,
|
|
43
67
|
],
|
|
44
68
|
properties: {
|
|
45
69
|
title: {
|
|
@@ -122,6 +146,52 @@ export const HomeBgImageSchema = (config, hasButton, hasLocationInfo) => {
|
|
|
122
146
|
type: 'boolean',
|
|
123
147
|
default: false,
|
|
124
148
|
},
|
|
149
|
+
dataset_title: {
|
|
150
|
+
title: 'Dataset title',
|
|
151
|
+
description: 'Dataset div title',
|
|
152
|
+
type: 'string',
|
|
153
|
+
},
|
|
154
|
+
dataset_subtitle: {
|
|
155
|
+
title: 'Dataset subTitle',
|
|
156
|
+
description: 'Dataset div Subtitle',
|
|
157
|
+
type: 'string',
|
|
158
|
+
},
|
|
159
|
+
dataset_description: {
|
|
160
|
+
title: 'Dataset description',
|
|
161
|
+
description: 'Dataset div description',
|
|
162
|
+
type: 'string',
|
|
163
|
+
},
|
|
164
|
+
hasDatasetButton: {
|
|
165
|
+
title: 'Dataset button',
|
|
166
|
+
type: 'boolean',
|
|
167
|
+
default: false,
|
|
168
|
+
},
|
|
169
|
+
dataset_buttonTitle: {
|
|
170
|
+
title: 'Title',
|
|
171
|
+
description: 'Add button text',
|
|
172
|
+
type: 'string',
|
|
173
|
+
},
|
|
174
|
+
dataset_href: {
|
|
175
|
+
title: 'URL',
|
|
176
|
+
description: 'Select site content or paste external url',
|
|
177
|
+
widget: 'object_browser',
|
|
178
|
+
mode: 'link',
|
|
179
|
+
selectedItemAttrs: ['Title', 'Description', '@type', '@id'],
|
|
180
|
+
allowExternals: true,
|
|
181
|
+
},
|
|
182
|
+
dataset_style: {
|
|
183
|
+
title: 'Button style',
|
|
184
|
+
choices: [
|
|
185
|
+
['default', 'Default'],
|
|
186
|
+
['filled', 'Filled'],
|
|
187
|
+
],
|
|
188
|
+
default: 'default',
|
|
189
|
+
},
|
|
190
|
+
dataset_disabled: {
|
|
191
|
+
title: 'Disabled',
|
|
192
|
+
type: 'boolean',
|
|
193
|
+
default: false,
|
|
194
|
+
},
|
|
125
195
|
},
|
|
126
196
|
required: [],
|
|
127
197
|
};
|
|
@@ -38,6 +38,41 @@ const CclWhiteBgView = (props) => {
|
|
|
38
38
|
</CclButton>
|
|
39
39
|
)}
|
|
40
40
|
</div>
|
|
41
|
+
{data?.dataset_title ||
|
|
42
|
+
data?.dataset_subtitle ||
|
|
43
|
+
(data?.dataset_description && (
|
|
44
|
+
<div className="home-dataset-banner">
|
|
45
|
+
{data.dataset_title && <h1>{data?.dataset_title}</h1>}
|
|
46
|
+
{data.dataset_subtitle && <h2>{data?.dataset_subtitle}</h2>}
|
|
47
|
+
{data.dataset_description && (
|
|
48
|
+
<h3>{data?.dataset_description} </h3>
|
|
49
|
+
)}
|
|
50
|
+
{data?.hasDatasetButton === true && (
|
|
51
|
+
<CclButton
|
|
52
|
+
url={
|
|
53
|
+
data?.download &&
|
|
54
|
+
data?.dataset_href?.[0]?.['@type'] === 'File'
|
|
55
|
+
? data?.dataset_href?.[0]?.['@id'] + '/@@download/file'
|
|
56
|
+
: data?.dataset_href?.[0]?.['@id']
|
|
57
|
+
}
|
|
58
|
+
disabled={data?.dataset_disabled}
|
|
59
|
+
download={
|
|
60
|
+
data?.download ||
|
|
61
|
+
data?.dataset_href?.[0]?.['@type'] === 'File'
|
|
62
|
+
}
|
|
63
|
+
target={
|
|
64
|
+
data?.target ||
|
|
65
|
+
(data?.download &&
|
|
66
|
+
data?.dataset_href[0]['@type'] === 'File' &&
|
|
67
|
+
'_blank')
|
|
68
|
+
}
|
|
69
|
+
mode={data?.dataset_style}
|
|
70
|
+
>
|
|
71
|
+
{data?.dataset_buttonTitle}
|
|
72
|
+
</CclButton>
|
|
73
|
+
)}
|
|
74
|
+
</div>
|
|
75
|
+
))}
|
|
41
76
|
</div>
|
|
42
77
|
</div>
|
|
43
78
|
);
|
|
@@ -32,10 +32,10 @@ const CclRelatedListingView = (props) => {
|
|
|
32
32
|
const { pagination, currentPage, paginationSize, dataList } = p_data;
|
|
33
33
|
|
|
34
34
|
const dispatch = useDispatch();
|
|
35
|
+
const uid = metadata ? metadata['UID'] : properties['UID'];
|
|
35
36
|
const searchSubrequests = useSelector(
|
|
36
|
-
(state) => state.search.subrequests?.[id],
|
|
37
|
+
(state) => state.search.subrequests?.[`${id}-${uid}`],
|
|
37
38
|
);
|
|
38
|
-
const uid = metadata ? metadata['UID'] : properties['UID'];
|
|
39
39
|
|
|
40
40
|
const associated = directRelation
|
|
41
41
|
? directQuery
|
|
@@ -96,6 +96,7 @@ const CclRelatedListingView = (props) => {
|
|
|
96
96
|
}
|
|
97
97
|
|
|
98
98
|
uid &&
|
|
99
|
+
id &&
|
|
99
100
|
!searchSubrequests?.loading &&
|
|
100
101
|
!searchSubrequests?.loaded &&
|
|
101
102
|
!searchSubrequests?.error &&
|
|
@@ -110,11 +111,12 @@ const CclRelatedListingView = (props) => {
|
|
|
110
111
|
sort_order: sort_order,
|
|
111
112
|
b_size: 99999,
|
|
112
113
|
},
|
|
113
|
-
id
|
|
114
|
+
`${id}-${uid}`,
|
|
114
115
|
),
|
|
115
116
|
);
|
|
117
|
+
return () => {};
|
|
116
118
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
117
|
-
}, [data, id, uid, dispatch
|
|
119
|
+
}, [data, id, uid, dispatch]);
|
|
118
120
|
|
|
119
121
|
return (
|
|
120
122
|
<>
|
|
@@ -9,6 +9,7 @@ export const portal_types_labels = {
|
|
|
9
9
|
TechnicalLibrary: 'Product documentation',
|
|
10
10
|
Document: 'Other content',
|
|
11
11
|
FAQ: 'FAQ',
|
|
12
|
+
File: 'Files',
|
|
12
13
|
};
|
|
13
14
|
|
|
14
15
|
export const category_labels = {
|
|
@@ -52,6 +53,7 @@ const rewriteOptions = (name, choices) => {
|
|
|
52
53
|
'Tender',
|
|
53
54
|
'WorkOpportunity',
|
|
54
55
|
'Document',
|
|
56
|
+
'File',
|
|
55
57
|
];
|
|
56
58
|
|
|
57
59
|
const dataset_geographical_classification = [
|
|
@@ -63,7 +63,7 @@ const View = (props) => {
|
|
|
63
63
|
);
|
|
64
64
|
};
|
|
65
65
|
|
|
66
|
-
const ArrowsGroup = (arrowProps) => {
|
|
66
|
+
/* const ArrowsGroup = (arrowProps) => {
|
|
67
67
|
return (
|
|
68
68
|
<div className={'slick-arrows'}>
|
|
69
69
|
<button
|
|
@@ -87,7 +87,7 @@ const View = (props) => {
|
|
|
87
87
|
></button>
|
|
88
88
|
</div>
|
|
89
89
|
);
|
|
90
|
-
};
|
|
90
|
+
}; */
|
|
91
91
|
|
|
92
92
|
const [showInfo, setShowInfo] = React.useState(false);
|
|
93
93
|
const panes = tabsList.map((tab, index) => {
|
|
@@ -113,7 +113,7 @@ const View = (props) => {
|
|
|
113
113
|
<Slider {...settings} ref={slider} className="home-carousel">
|
|
114
114
|
{panes.length ? panes.map((pane) => pane.renderItem) : ''}
|
|
115
115
|
</Slider>
|
|
116
|
-
<ArrowsGroup activeTab={activeTab} tabsList={tabsList} slider={slider} />
|
|
116
|
+
{/* <ArrowsGroup activeTab={activeTab} tabsList={tabsList} slider={slider} /> */}
|
|
117
117
|
<Dots
|
|
118
118
|
dotActiveTab={activeTab}
|
|
119
119
|
dotTabsList={tabsList}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export const helmetTitle = (title_tag_content, content) => {
|
|
2
|
-
let nav_root_title = content?.['@components']?.navroot?.title;
|
|
2
|
+
let nav_root_title = content?.['@components']?.navroot?.navroot?.title;
|
|
3
3
|
const result_title =
|
|
4
4
|
nav_root_title === title_tag_content
|
|
5
5
|
? title_tag_content ?? ''
|
package/src/index.js
CHANGED
|
@@ -186,7 +186,13 @@ const applyConfig = (config) => {
|
|
|
186
186
|
...config.settings.apiExpanders,
|
|
187
187
|
{
|
|
188
188
|
match: '',
|
|
189
|
-
GET_CONTENT: [
|
|
189
|
+
GET_CONTENT: [
|
|
190
|
+
'breadcrumbs',
|
|
191
|
+
'actions',
|
|
192
|
+
'types',
|
|
193
|
+
'translations',
|
|
194
|
+
'navroot',
|
|
195
|
+
],
|
|
190
196
|
},
|
|
191
197
|
{
|
|
192
198
|
match: '',
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
padding: 0 2rem;
|
|
150
150
|
}
|
|
151
151
|
|
|
152
|
-
@media (max-width:770px) {
|
|
152
|
+
@media (max-width: 770px) {
|
|
153
153
|
.ccl-banner-top-main img {
|
|
154
154
|
min-height: 550px;
|
|
155
155
|
max-height: 550px;
|
|
@@ -174,6 +174,12 @@
|
|
|
174
174
|
}
|
|
175
175
|
}
|
|
176
176
|
|
|
177
|
+
@media (max-width: 1200px) {
|
|
178
|
+
.home-carousel {
|
|
179
|
+
margin-bottom: -4rem;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
177
183
|
.home-carousel .slick-dots {
|
|
178
184
|
position: absolute;
|
|
179
185
|
bottom: 3.75rem;
|
|
@@ -396,9 +402,32 @@
|
|
|
396
402
|
.home-map-container > .ccl-container {
|
|
397
403
|
position: absolute;
|
|
398
404
|
bottom: 4rem;
|
|
405
|
+
display: flex;
|
|
399
406
|
width: 100%;
|
|
400
407
|
max-width: 1400px;
|
|
408
|
+
flex-wrap: wrap;
|
|
409
|
+
justify-content: center;
|
|
401
410
|
padding: 0 2rem;
|
|
411
|
+
gap: 1rem;
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
@media (max-width: 990px) {
|
|
415
|
+
.home-map-container img {
|
|
416
|
+
min-height: 320px;
|
|
417
|
+
}
|
|
418
|
+
}
|
|
419
|
+
|
|
420
|
+
@media (max-width: 700px) {
|
|
421
|
+
.home-dataset-banner,
|
|
422
|
+
.home-map-banner {
|
|
423
|
+
min-width: 320px;
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
.home-map-container > .ccl-container {
|
|
427
|
+
bottom: 0;
|
|
428
|
+
height: 100%;
|
|
429
|
+
padding: 1rem 0;
|
|
430
|
+
}
|
|
402
431
|
}
|
|
403
432
|
|
|
404
433
|
@media (max-width: 480px) {
|
|
@@ -407,6 +436,8 @@
|
|
|
407
436
|
}
|
|
408
437
|
|
|
409
438
|
.home-map-container > .ccl-container {
|
|
439
|
+
bottom: 4rem;
|
|
440
|
+
height: auto;
|
|
410
441
|
padding: 0;
|
|
411
442
|
}
|
|
412
443
|
}
|
|
@@ -424,8 +455,21 @@
|
|
|
424
455
|
.home-map-banner {
|
|
425
456
|
width: 40%;
|
|
426
457
|
}
|
|
458
|
+
|
|
459
|
+
.home-dataset-banner {
|
|
460
|
+
width: 40%;
|
|
461
|
+
}
|
|
427
462
|
}
|
|
428
463
|
|
|
464
|
+
.home-dataset-banner {
|
|
465
|
+
max-width: 100%;
|
|
466
|
+
padding: 1.5rem;
|
|
467
|
+
background-color: fade(@white, 70%);
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
.home-dataset-banner h4 {
|
|
471
|
+
margin-bottom: 1rem;
|
|
472
|
+
}
|
|
429
473
|
/* Meet band */
|
|
430
474
|
.home-meet-container {
|
|
431
475
|
padding: 3rem 1rem;
|