Skip to content

Commit fb4136f

Browse files
authored
Merge pull request #1269 from City-of-Helsinki/dev
Dev to main
2 parents e7951fd + 9dded8a commit fb4136f

File tree

41 files changed

+1004
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1004
-579
lines changed

composer.lock

Lines changed: 598 additions & 407 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.linkedevents_event.linkedevents_event.default.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ content:
3636
size: 60
3737
placeholder: ''
3838
third_party_settings: { }
39+
translation:
40+
weight: 10
41+
settings: { }
42+
third_party_settings: { }
43+
region: content
3944
hidden:
4045
end_time: true
4146
start_time: true

conf/cmi/core.entity_form_display.media.remote_video.default.yml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,76 @@ status: true
44
dependencies:
55
config:
66
- field.field.media.remote_video.field_media_oembed_video
7+
- field.field.media.remote_video.field_remote_video_videographer
78
- media.type.remote_video
89
module:
910
- media
1011
- path
1112
_core:
12-
default_config_hash: QZM7c0oisNmohFKNSqp_g5gzx8yzeSjVdgn6wpDg_vM
13+
default_config_hash: oMwxSUn6hUxk3rUpuYI-Ztzm2IROX0FEunUgzGcnfgs
1314
id: media.remote_video.default
1415
targetEntityType: media
1516
bundle: remote_video
1617
mode: default
1718
content:
1819
created:
1920
type: datetime_timestamp
20-
weight: 10
21+
weight: 5
2122
region: content
2223
settings: { }
2324
third_party_settings: { }
2425
field_media_oembed_video:
2526
type: oembed_textfield
26-
weight: 0
27+
weight: 1
28+
region: content
29+
settings:
30+
size: 60
31+
placeholder: ''
32+
third_party_settings: { }
33+
field_remote_video_videographer:
34+
type: string_textfield
35+
weight: 2
2736
region: content
2837
settings:
2938
size: 60
3039
placeholder: ''
3140
third_party_settings: { }
3241
langcode:
3342
type: language_select
34-
weight: 2
43+
weight: 3
3544
region: content
3645
settings:
3746
include_locked: true
3847
third_party_settings: { }
48+
name:
49+
type: string_textfield
50+
weight: 0
51+
region: content
52+
settings:
53+
size: 60
54+
placeholder: ''
55+
third_party_settings: { }
3956
path:
4057
type: path
41-
weight: 30
58+
weight: 7
4259
region: content
4360
settings: { }
4461
third_party_settings: { }
4562
status:
4663
type: boolean_checkbox
47-
weight: 100
64+
weight: 8
4865
region: content
4966
settings:
5067
display_label: true
5168
third_party_settings: { }
5269
translation:
53-
weight: 10
70+
weight: 6
5471
region: content
5572
settings: { }
5673
third_party_settings: { }
5774
uid:
5875
type: entity_reference_autocomplete
59-
weight: 5
76+
weight: 4
6077
region: content
6178
settings:
6279
match_operator: CONTAINS
@@ -65,6 +82,5 @@ content:
6582
placeholder: ''
6683
third_party_settings: { }
6784
hidden:
68-
name: true
6985
publish_on: true
7086
unpublish_on: true

conf/cmi/core.entity_form_display.media.remote_video.media_library.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,23 @@ dependencies:
55
config:
66
- core.entity_form_mode.media.media_library
77
- field.field.media.remote_video.field_media_oembed_video
8+
- field.field.media.remote_video.field_remote_video_videographer
89
- media.type.remote_video
910
_core:
10-
default_config_hash: mJfTw0zr7khgf6MfSZkJp32tuNhpOrjQuRDQN7ggVBE
11+
default_config_hash: ICmLjt5WIfXzvtJX_YkRGdyKasNtsRCLGIjhuqkbCvw
1112
id: media.remote_video.media_library
1213
targetEntityType: media
1314
bundle: remote_video
1415
mode: media_library
1516
content:
17+
field_remote_video_videographer:
18+
type: string_textfield
19+
weight: 1
20+
region: content
21+
settings:
22+
size: 60
23+
placeholder: ''
24+
third_party_settings: { }
1625
name:
1726
type: string_textfield
1827
weight: 0
@@ -22,7 +31,7 @@ content:
2231
placeholder: ''
2332
third_party_settings: { }
2433
translation:
25-
weight: 10
34+
weight: 2
2635
region: content
2736
settings: { }
2837
third_party_settings: { }

conf/cmi/core.entity_view_display.media.remote_video.default.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ status: true
44
dependencies:
55
config:
66
- field.field.media.remote_video.field_media_oembed_video
7+
- field.field.media.remote_video.field_remote_video_videographer
78
- media.type.remote_video
89
module:
910
- media
1011
_core:
11-
default_config_hash: ywWEZZCy12l3zdRvU4FRTAPVuRpImwJVixaPwpHD3PY
12+
default_config_hash: H3mLykk8aP5nXkPwNqQgexVrxo6JKFVnnU1ZFoKchBs
1213
id: media.remote_video.default
1314
targetEntityType: media
1415
bundle: remote_video
@@ -27,6 +28,7 @@ content:
2728
region: content
2829
hidden:
2930
created: true
31+
field_remote_video_videographer: true
3032
langcode: true
3133
name: true
3234
search_api_excerpt: true

conf/cmi/core.entity_view_display.media.remote_video.media_library.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ dependencies:
55
config:
66
- core.entity_view_mode.media.media_library
77
- field.field.media.remote_video.field_media_oembed_video
8+
- field.field.media.remote_video.field_remote_video_videographer
89
- image.style.medium
910
- media.type.remote_video
1011
module:
1112
- image
1213
_core:
13-
default_config_hash: EJiV7oe8qtC1lgLmRWpjmZXXoDo_0oqTZwr59PZz41Q
14+
default_config_hash: '-OYhRJ3MUtZvvq8kso4SneprcI1fHAFW9QVpdL4L2hk'
1415
id: media.remote_video.media_library
1516
targetEntityType: media
1617
bundle: remote_video
@@ -30,6 +31,7 @@ content:
3031
hidden:
3132
created: true
3233
field_media_oembed_video: true
34+
field_remote_video_videographer: true
3335
langcode: true
3436
name: true
3537
search_api_excerpt: true

conf/cmi/editoria11y.settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ content_root: ''
44
assertiveness: smart
55
no_load: ''
66
ignore_all_if_absent: ''
7-
ignore_elements: '.card img, .picture--computed img, .content-card__image img, .card-teaser__img img, .list-of-links__item__image img, .components--computed *, .announcement__content-body p'
7+
ignore_elements: '.card img, .picture--computed img, .content-card__image img, .card-teaser__img img, .list-of-links__item__image img, .components--computed *, .announcement__content-body p, .social-media-sharing *, .node--type-map-page *, .leaflet-container *, .historia-search *'
88
panel_no_cover: ''
99
embedded_content_warning: ''
1010
download_links: ''

conf/cmi/external_entities.external_entity_type.linkedevents_event.yml

Lines changed: 59 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
module:
66
- helfi_paragraphs_curated_event_list
77
_core:
8-
default_config_hash: 2zKdeRcO2ycvpjuAJQM15t8LEk8Eai78fvP6uY4XEyk
8+
default_config_hash: t_KlyetAjzSj4gLKAKoLdgVdxHPL-GdJ05XCp2UyJ0g
99
id: linkedevents_event
1010
label: 'LinkedEvents: Event'
1111
label_plural: 'LinkedEvents: Events'
@@ -28,7 +28,9 @@ field_mappers:
2828
data_processors:
2929
-
3030
id: default
31-
config: { }
31+
config:
32+
datatype: ''
33+
default: null
3234
description: ''
3335
debug_level: 0
3436
uuid:
@@ -44,7 +46,9 @@ field_mappers:
4446
data_processors:
4547
-
4648
id: default
47-
config: { }
49+
config:
50+
datatype: ''
51+
default: null
4852
description: ''
4953
debug_level: 0
5054
title:
@@ -60,7 +64,21 @@ field_mappers:
6064
data_processors:
6165
-
6266
id: default
63-
config: { }
67+
config:
68+
datatype: ''
69+
default: null
70+
description: ''
71+
debug_level: 0
72+
content_translation_source:
73+
id: generic
74+
config:
75+
property_mappings:
76+
value:
77+
id: constant
78+
config:
79+
mapping: en
80+
required_field: false
81+
main_property: true
6482
description: ''
6583
debug_level: 0
6684
main_image:
@@ -76,7 +94,9 @@ field_mappers:
7694
data_processors:
7795
-
7896
id: default
79-
config: { }
97+
config:
98+
datatype: ''
99+
default: null
80100
description: ''
81101
title:
82102
id: jsonpath
@@ -87,7 +107,9 @@ field_mappers:
87107
data_processors:
88108
-
89109
id: default
90-
config: { }
110+
config:
111+
datatype: ''
112+
default: null
91113
description: ''
92114
debug_level: 0
93115
start_time:
@@ -103,7 +125,9 @@ field_mappers:
103125
data_processors:
104126
-
105127
id: default
106-
config: { }
128+
config:
129+
datatype: ''
130+
default: null
107131
description: ''
108132
debug_level: 0
109133
end_time:
@@ -119,7 +143,9 @@ field_mappers:
119143
data_processors:
120144
-
121145
id: default
122-
config: { }
146+
config:
147+
datatype: ''
148+
default: null
123149
description: ''
124150
debug_level: 0
125151
external_link:
@@ -135,18 +161,22 @@ field_mappers:
135161
data_processors:
136162
-
137163
id: default
138-
config: { }
164+
config:
165+
datatype: ''
166+
default: null
139167
description: ''
140168
title:
141169
id: jsonpath
142170
config:
143-
mapping: $.clean_title
171+
mapping: $.name
144172
required_field: false
145173
main_property: false
146174
data_processors:
147175
-
148176
id: default
149-
config: { }
177+
config:
178+
datatype: ''
179+
default: null
150180
description: ''
151181
debug_level: 0
152182
field_save_order: null
@@ -159,7 +189,24 @@ data_aggregator:
159189
id: linkedevents_events
160190
config: { }
161191
data_aggregator_notes: ''
162-
language_settings: { }
192+
language_settings:
193+
overrides:
194+
fi:
195+
data_aggregator:
196+
id: single
197+
config:
198+
storage_clients:
199+
-
200+
id: linkedevents_events
201+
config: { }
202+
sv:
203+
data_aggregator:
204+
id: single
205+
config:
206+
storage_clients:
207+
-
208+
id: linkedevents_events
209+
config: { }
163210
persistent_cache_max_age: 1800
164211
annotation_entity_type_id: null
165212
annotation_bundle_id: null
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
uuid: e19d3762-7f22-4b57-b7a8-3fb8afaa59a0
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.media.field_remote_video_videographer
7+
- media.type.remote_video
8+
_core:
9+
default_config_hash: QTqlZAIz5OG9Ht7sMbe0f6ypWg0c9QFYB1uoEY4bA94
10+
id: media.remote_video.field_remote_video_videographer
11+
field_name: field_remote_video_videographer
12+
entity_type: media
13+
bundle: remote_video
14+
label: Videographer
15+
description: 'Write the name of the videographer here.'
16+
required: false
17+
translatable: false
18+
default_value: { }
19+
default_value_callback: ''
20+
settings: { }
21+
field_type: string
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
uuid: 18fe792d-18e5-44ad-b7c1-2e0d38f033a6
2+
langcode: en
3+
status: true
4+
dependencies:
5+
module:
6+
- media
7+
_core:
8+
default_config_hash: rWbT8RmSPIxL03vVkJjq07vi7zsDt1fI5W7U-lDcXc0
9+
id: media.field_remote_video_videographer
10+
field_name: field_remote_video_videographer
11+
entity_type: media
12+
type: string
13+
settings:
14+
max_length: 255
15+
case_sensitive: false
16+
is_ascii: false
17+
module: core
18+
locked: false
19+
cardinality: 1
20+
translatable: true
21+
indexes: { }
22+
persist_with_no_fields: false
23+
custom_storage: false

0 commit comments

Comments
 (0)