Skip to content

Commit b80542d

Browse files
authored
Merge pull request #1082 from City-of-Helsinki/dev
Dev to main
2 parents ade3817 + 688788a commit b80542d

35 files changed

Lines changed: 583 additions & 334 deletions

File tree

composer.lock

Lines changed: 217 additions & 323 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conf/cmi/core.entity_form_display.paragraph.event_list.default.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ dependencies:
1111
- field.field.paragraph.event_list.field_event_time
1212
- field.field.paragraph.event_list.field_filter_keywords
1313
- field.field.paragraph.event_list.field_free_events
14+
- field.field.paragraph.event_list.field_language
1415
- field.field.paragraph.event_list.field_remote_events
1516
- paragraphs.paragraphs_type.event_list
1617
module:
1718
- link
1819
- select2
1920
- text
2021
_core:
21-
default_config_hash: pnw2o1LfSEYf_VAVfl_hQcc74gjXVo8kA5bkJd94LrI
22+
default_config_hash: x62qatKOWxt46tUtGnQqFy8_ZvwyXfJ6l0N5d-MEVhY
2223
id: paragraph.event_list.default
2324
targetEntityType: paragraph
2425
bundle: event_list
@@ -34,7 +35,7 @@ content:
3435
third_party_settings: { }
3536
field_event_count:
3637
type: options_select
37-
weight: 4
38+
weight: 3
3839
region: content
3940
settings: { }
4041
third_party_settings: { }
@@ -70,7 +71,7 @@ content:
7071
third_party_settings: { }
7172
field_filter_keywords:
7273
type: select2_entity_reference
73-
weight: 8
74+
weight: 9
7475
region: content
7576
settings:
7677
width: 100%
@@ -80,18 +81,25 @@ content:
8081
third_party_settings: { }
8182
field_free_events:
8283
type: boolean_checkbox
83-
weight: 7
84+
weight: 8
8485
region: content
8586
settings:
8687
display_label: true
8788
third_party_settings: { }
88-
field_remote_events:
89+
field_language:
8990
type: boolean_checkbox
9091
weight: 6
9192
region: content
9293
settings:
9394
display_label: true
9495
third_party_settings: { }
96+
field_remote_events:
97+
type: boolean_checkbox
98+
weight: 7
99+
region: content
100+
settings:
101+
display_label: true
102+
third_party_settings: { }
95103
hidden:
96104
created: true
97105
status: true
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
uuid: a26e6166-ba30-43ab-814e-4b7270bb3345
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.field.paragraph.number_highlights.field_number_highlight
7+
- field.field.paragraph.number_highlights.field_number_highlights_desc
8+
- field.field.paragraph.number_highlights.field_number_highlights_title
9+
- paragraphs.paragraphs_type.number_highlights
10+
module:
11+
- helfi_paragraphs_number_highlights
12+
- text
13+
_core:
14+
default_config_hash: TcSPoKoUjX5LGix7YJDs5aslM7BqnzqJ4PADOuoR92E
15+
id: paragraph.number_highlights.default
16+
targetEntityType: paragraph
17+
bundle: number_highlights
18+
mode: default
19+
content:
20+
field_number_highlight:
21+
type: numbers_item_widget
22+
weight: 2
23+
region: content
24+
settings:
25+
placeholder_number: ''
26+
placeholder_text: ''
27+
third_party_settings: { }
28+
field_number_highlights_desc:
29+
type: text_textarea
30+
weight: 1
31+
region: content
32+
settings:
33+
rows: 5
34+
placeholder: ''
35+
third_party_settings: { }
36+
field_number_highlights_title:
37+
type: string_textfield
38+
weight: 0
39+
region: content
40+
settings:
41+
size: 60
42+
placeholder: ''
43+
third_party_settings: { }
44+
hidden:
45+
created: true
46+
status: true

conf/cmi/core.entity_view_display.paragraph.event_list.default.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ dependencies:
1111
- field.field.paragraph.event_list.field_event_time
1212
- field.field.paragraph.event_list.field_filter_keywords
1313
- field.field.paragraph.event_list.field_free_events
14+
- field.field.paragraph.event_list.field_language
1415
- field.field.paragraph.event_list.field_remote_events
1516
- paragraphs.paragraphs_type.event_list
1617
module:
1718
- options
1819
- text
1920
_core:
20-
default_config_hash: YnAuXvpkTYS5kEYQPdVPJ3400B-7iL51-1nhoLiTy8s
21+
default_config_hash: hC0amz1ks1fL449mWbdWpFj5tb6pGEEjzEVaMhYiMIc
2122
id: paragraph.event_list.default
2223
targetEntityType: paragraph
2324
bundle: event_list
@@ -83,6 +84,16 @@ content:
8384
third_party_settings: { }
8485
weight: 5
8586
region: content
87+
field_language:
88+
type: boolean
89+
label: above
90+
settings:
91+
format: default
92+
format_custom_false: ''
93+
format_custom_true: ''
94+
third_party_settings: { }
95+
weight: 7
96+
region: content
8697
field_remote_events:
8798
type: boolean
8899
label: above
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
uuid: 94a2177c-d24a-448d-a3cb-3c78a42fa4d7
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.field.paragraph.number_highlights.field_number_highlight
7+
- field.field.paragraph.number_highlights.field_number_highlights_desc
8+
- field.field.paragraph.number_highlights.field_number_highlights_title
9+
- paragraphs.paragraphs_type.number_highlights
10+
module:
11+
- helfi_paragraphs_number_highlights
12+
- text
13+
_core:
14+
default_config_hash: 0z3hTsW4PJ2b1amH3TaI4AHpqCbve5aUPlUrxC4EX7o
15+
id: paragraph.number_highlights.default
16+
targetEntityType: paragraph
17+
bundle: number_highlights
18+
mode: default
19+
content:
20+
field_number_highlight:
21+
type: numbers_item_formatter
22+
label: hidden
23+
settings: { }
24+
third_party_settings: { }
25+
weight: 2
26+
region: content
27+
field_number_highlights_desc:
28+
type: text_default
29+
label: hidden
30+
settings: { }
31+
third_party_settings: { }
32+
weight: 1
33+
region: content
34+
field_number_highlights_title:
35+
type: string
36+
label: hidden
37+
settings:
38+
link_to_entity: false
39+
third_party_settings: { }
40+
weight: 0
41+
region: content
42+
hidden:
43+
search_api_excerpt: true

conf/cmi/core.extension.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ module:
7575
helfi_paragraphs_list_of_links: 0
7676
helfi_paragraphs_map: 0
7777
helfi_paragraphs_news_list: 0
78+
helfi_paragraphs_number_highlights: 0
7879
helfi_paragraphs_phasing: 0
7980
helfi_paragraphs_popular_services: 0
8081
helfi_paragraphs_remote_video: 0

conf/cmi/field.field.node.district.field_content.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies:
1616
- paragraphs.paragraphs_type.list_of_links
1717
- paragraphs.paragraphs_type.map
1818
- paragraphs.paragraphs_type.news_list
19+
- paragraphs.paragraphs_type.number_highlights
1920
- paragraphs.paragraphs_type.project_listing
2021
- paragraphs.paragraphs_type.remote_video
2122
- paragraphs.paragraphs_type.text
@@ -49,6 +50,7 @@ settings:
4950
map: map
5051
project_listing: project_listing
5152
image_gallery: image_gallery
53+
number_highlights: number_highlights
5254
negate: 0
5355
target_bundles_drag_drop:
5456
accordion:
@@ -84,6 +86,9 @@ settings:
8486
news_list:
8587
weight: 15
8688
enabled: true
89+
number_highlights:
90+
weight: 18
91+
enabled: true
8792
project_listing:
8893
weight: 16
8994
enabled: true

conf/cmi/field.field.node.district.field_lower_content.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- field.storage.node.field_lower_content
77
- node.type.district
88
- paragraphs.paragraphs_type.list_of_links
9+
- paragraphs.paragraphs_type.number_highlights
910
module:
1011
- entity_reference_revisions
1112
id: node.district.field_lower_content
@@ -23,6 +24,7 @@ settings:
2324
handler_settings:
2425
target_bundles:
2526
list_of_links: list_of_links
27+
number_highlights: number_highlights
2628
negate: 0
2729
target_bundles_drag_drop:
2830
accordion:
@@ -91,6 +93,9 @@ settings:
9193
news_list:
9294
weight: -54
9395
enabled: false
96+
number_highlights:
97+
weight: 17
98+
enabled: true
9499
phasing:
95100
weight: -43
96101
enabled: false

conf/cmi/field.field.node.landing_page.field_content.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies:
2020
- paragraphs.paragraphs_type.list_of_plans
2121
- paragraphs.paragraphs_type.map
2222
- paragraphs.paragraphs_type.news_list
23+
- paragraphs.paragraphs_type.number_highlights
2324
- paragraphs.paragraphs_type.phasing
2425
- paragraphs.paragraphs_type.popular_services
2526
- paragraphs.paragraphs_type.remote_video
@@ -63,6 +64,7 @@ settings:
6364
event_list: event_list
6465
news_list: news_list
6566
image_gallery: image_gallery
67+
number_highlights: number_highlights
6668
curated_event_list: curated_event_list
6769
hearings: hearings
6870
service_list: service_list
@@ -116,6 +118,9 @@ settings:
116118
news_list:
117119
weight: 14
118120
enabled: true
121+
number_highlights:
122+
weight: 16
123+
enabled: true
119124
phasing:
120125
weight: 7
121126
enabled: true

conf/cmi/field.field.node.page.field_content.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies:
2121
- paragraphs.paragraphs_type.list_of_plans
2222
- paragraphs.paragraphs_type.map
2323
- paragraphs.paragraphs_type.news_list
24+
- paragraphs.paragraphs_type.number_highlights
2425
- paragraphs.paragraphs_type.phasing
2526
- paragraphs.paragraphs_type.ploughing_schedule
2627
- paragraphs.paragraphs_type.remote_video
@@ -66,6 +67,7 @@ settings:
6667
contact_card_listing: contact_card_listing
6768
news_list: news_list
6869
image_gallery: image_gallery
70+
number_highlights: number_highlights
6971
service_list_search: service_list_search
7072
unit_search: unit_search
7173
unit_contact_card: unit_contact_card
@@ -119,6 +121,9 @@ settings:
119121
news_list:
120122
weight: 15
121123
enabled: true
124+
number_highlights:
125+
weight: 17
126+
enabled: true
122127
phasing:
123128
weight: 7
124129
enabled: true

0 commit comments

Comments
 (0)