Skip to content

Commit 3beb5c0

Browse files
rpnykanenrpnykanen
authored
Merge pull request #574 from City-of-Helsinki/dev
Dev to main
2 parents c297c83 + 1f503b2 commit 3beb5c0

File tree

29 files changed

+431
-95
lines changed

29 files changed

+431
-95
lines changed

‎.github/workflows/auto-release-pr.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
on:
2+
push:
3+
branches:
4+
- dev
5+
name: Automatic release PR
6+
jobs:
7+
release-pr:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v3
11+
with:
12+
fetch-depth: 1
13+
- name: Create pull request
14+
run: |
15+
gh pr create \
16+
--base main \
17+
--head dev \
18+
--title "Dev to main" \
19+
--body "Dev to main" || true
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎composer.lock‎

Lines changed: 76 additions & 75 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: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
uuid: e478d84e-0e63-4c35-ba22-4db0f1f2fe54
1+
uuid: d9392c10-4e45-4691-812b-15b061778348
22
langcode: en
33
status: true
44
dependencies:
55
config:
66
- field.field.paragraph.event_list.field_api_url
7+
- field.field.paragraph.event_list.field_event_count
78
- field.field.paragraph.event_list.field_event_list_description
89
- field.field.paragraph.event_list.field_event_list_title
10+
- field.field.paragraph.event_list.field_event_location
11+
- field.field.paragraph.event_list.field_event_time
12+
- field.field.paragraph.event_list.field_free_events
913
- field.field.paragraph.event_list.field_load_more
14+
- field.field.paragraph.event_list.field_remote_events
1015
- paragraphs.paragraphs_type.event_list
1116
module:
1217
- link
1318
- text
1419
_core:
15-
default_config_hash: Tyi9wGAv2OWtaU056U3LSPa3HhdiWSFnd1nZqhZNC8k
20+
default_config_hash: bGb0ZQ38-NxHtZ1rrdqclYHeStlwA5q3ucy5Wpnb0ng
1621
id: paragraph.event_list.default
1722
targetEntityType: paragraph
1823
bundle: event_list
@@ -26,6 +31,12 @@ content:
2631
placeholder_url: ''
2732
placeholder_title: ''
2833
third_party_settings: { }
34+
field_event_count:
35+
type: options_select
36+
weight: 4
37+
region: content
38+
settings: { }
39+
third_party_settings: { }
2940
field_event_list_description:
3041
type: text_textarea
3142
weight: 1
@@ -42,13 +53,35 @@ content:
4253
size: 60
4354
placeholder: ''
4455
third_party_settings: { }
45-
field_load_more:
56+
field_event_location:
57+
type: boolean_checkbox
58+
weight: 4
59+
region: content
60+
settings:
61+
display_label: true
62+
third_party_settings: { }
63+
field_event_time:
64+
type: boolean_checkbox
65+
weight: 5
66+
region: content
67+
settings:
68+
display_label: true
69+
third_party_settings: { }
70+
field_free_events:
71+
type: boolean_checkbox
72+
weight: 7
73+
region: content
74+
settings:
75+
display_label: true
76+
third_party_settings: { }
77+
field_remote_events:
4678
type: boolean_checkbox
47-
weight: 3
79+
weight: 6
4880
region: content
4981
settings:
5082
display_label: true
5183
third_party_settings: { }
5284
hidden:
5385
created: true
86+
field_load_more: true
5487
status: true

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

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
1-
uuid: f4d6607c-e8dd-4c31-b4c7-1309356cdbf2
1+
uuid: a6ab85c9-cf27-49a6-88e9-5c889ea6ec57
22
langcode: en
33
status: true
44
dependencies:
55
config:
66
- field.field.paragraph.event_list.field_api_url
7+
- field.field.paragraph.event_list.field_event_count
78
- field.field.paragraph.event_list.field_event_list_description
89
- field.field.paragraph.event_list.field_event_list_title
10+
- field.field.paragraph.event_list.field_event_location
11+
- field.field.paragraph.event_list.field_event_time
12+
- field.field.paragraph.event_list.field_free_events
913
- field.field.paragraph.event_list.field_load_more
14+
- field.field.paragraph.event_list.field_remote_events
1015
- paragraphs.paragraphs_type.event_list
1116
module:
17+
- options
1218
- text
1319
_core:
14-
default_config_hash: 9xAT4OL9SGihyabuUdNlviQpCUdo09jo96OyzIZe-v8
20+
default_config_hash: dMZ_8jKpOaA7CkuxlB2baa1apQcQ_vFlXM04jq4bqQY
1521
id: paragraph.event_list.default
1622
targetEntityType: paragraph
1723
bundle: event_list
1824
mode: default
1925
content:
26+
field_event_count:
27+
type: list_default
28+
label: above
29+
settings: { }
30+
third_party_settings: { }
31+
weight: 2
32+
region: content
2033
field_event_list_description:
2134
type: text_default
2235
label: hidden
@@ -32,6 +45,46 @@ content:
3245
third_party_settings: { }
3346
weight: 0
3447
region: content
48+
field_event_location:
49+
type: boolean
50+
label: above
51+
settings:
52+
format: default
53+
format_custom_false: ''
54+
format_custom_true: ''
55+
third_party_settings: { }
56+
weight: 2
57+
region: content
58+
field_event_time:
59+
type: boolean
60+
label: above
61+
settings:
62+
format: default
63+
format_custom_false: ''
64+
format_custom_true: ''
65+
third_party_settings: { }
66+
weight: 3
67+
region: content
68+
field_free_events:
69+
type: boolean
70+
label: above
71+
settings:
72+
format: default
73+
format_custom_false: ''
74+
format_custom_true: ''
75+
third_party_settings: { }
76+
weight: 5
77+
region: content
78+
field_remote_events:
79+
type: boolean
80+
label: above
81+
settings:
82+
format: default
83+
format_custom_false: ''
84+
format_custom_true: ''
85+
third_party_settings: { }
86+
weight: 4
87+
region: content
3588
hidden:
3689
field_api_url: true
3790
field_load_more: true

‎conf/cmi/core.extension.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ module:
5555
helfi_charts: 0
5656
helfi_contact_cards: 0
5757
helfi_content: 0
58-
helfi_events: 0
5958
helfi_gdpr_compliance: 0
6059
helfi_kymp_content: 0
6160
helfi_kymp_district_project_search: 0
@@ -69,6 +68,7 @@ module:
6968
helfi_news_feed: 0
7069
helfi_platform_config: 0
7170
helfi_proxy: 0
71+
helfi_react_search: 0
7272
helfi_siteimprove_config: 0
7373
helfi_toc: 0
7474
helfi_tpr: 0

‎conf/cmi/field.field.paragraph.event_list.field_api_url.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ dependencies:
88
module:
99
- link
1010
_core:
11-
default_config_hash: nkKsGw0gRWVU1GwZugGKaiSe3OoNrBjDpoUXkkt457Y
11+
default_config_hash: lGeClo15Zf7kvOo9oZobBROAy8-TnAFRtIwnSvDIArY
1212
id: paragraph.event_list.field_api_url
1313
field_name: field_api_url
1414
entity_type: paragraph
1515
bundle: event_list
1616
label: 'Api URL'
17-
description: 'Add URL from tapahtumat.hel.fi to form a list of events'
17+
description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum'
1818
required: false
1919
translatable: false
2020
default_value: { }

‎conf/cmi/field.field.paragraph.event_list.field_event_count.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
uuid: a2f0e8b4-5f8e-4a94-869a-8faa26a4ba97
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.paragraph.field_event_count
7+
- paragraphs.paragraphs_type.event_list
8+
module:
9+
- options
10+
_core:
11+
default_config_hash: 6AMaHxUxptC9tDiCGTiCpFWXBHfR4tUUSdMY9Q5BD6Q
12+
id: paragraph.event_list.field_event_count
13+
field_name: field_event_count
14+
entity_type: paragraph
15+
bundle: event_list
16+
label: 'Event count'
17+
description: ''
18+
required: false
19+
translatable: false
20+
default_value:
21+
-
22+
value: 3
23+
default_value_callback: ''
24+
settings: { }
25+
field_type: list_integer

‎conf/cmi/field.field.paragraph.event_list.field_event_location.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
uuid: 7d0d179d-39a9-4c68-a0bf-59bc54eb2ede
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.paragraph.field_event_location
7+
- paragraphs.paragraphs_type.event_list
8+
_core:
9+
default_config_hash: qn_ofDevCfu_ZKP8n6kRAQFTmy0cRAXNJUvxS6mU-6Q
10+
id: paragraph.event_list.field_event_location
11+
field_name: field_event_location
12+
entity_type: paragraph
13+
bundle: event_list
14+
label: 'Event location'
15+
description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter.'
16+
required: false
17+
translatable: false
18+
default_value:
19+
-
20+
value: 0
21+
default_value_callback: ''
22+
settings:
23+
on_label: 'Yes'
24+
off_label: 'No'
25+
field_type: boolean

‎conf/cmi/field.field.paragraph.event_list.field_event_time.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
uuid: 188c96ce-6c82-4691-9602-3991edc63549
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.paragraph.field_event_time
7+
- paragraphs.paragraphs_type.event_list
8+
_core:
9+
default_config_hash: w4dBFRcLBALwVLbGirmkj4Hjs08twZZqv8I9E7aVBtc
10+
id: paragraph.event_list.field_event_time
11+
field_name: field_event_time
12+
entity_type: paragraph
13+
bundle: event_list
14+
label: 'Event time'
15+
description: 'Show "event time" filter.'
16+
required: false
17+
translatable: false
18+
default_value:
19+
-
20+
value: 0
21+
default_value_callback: ''
22+
settings:
23+
on_label: 'Yes'
24+
off_label: 'No'
25+
field_type: boolean

‎conf/cmi/field.field.paragraph.event_list.field_free_events.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
uuid: 6e35d5de-9645-4331-ac17-bc4c9c6f2efd
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- field.storage.paragraph.field_free_events
7+
- paragraphs.paragraphs_type.event_list
8+
_core:
9+
default_config_hash: 43RWM8pRAJy3tpuEGjFEy4ghMhQoCznir0O2015s_hc
10+
id: paragraph.event_list.field_free_events
11+
field_name: field_free_events
12+
entity_type: paragraph
13+
bundle: event_list
14+
label: 'Free events'
15+
description: 'Show "list only free events" filter.'
16+
required: false
17+
translatable: false
18+
default_value:
19+
-
20+
value: 0
21+
default_value_callback: ''
22+
settings:
23+
on_label: 'Yes'
24+
off_label: 'No'
25+
field_type: boolean

0 commit comments

Comments
 (0)