Merge pull request #398 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Feb 9, 2023 · 64519a0 · 64519a0
2 parents 9f8d09b + 9c74f48
commit 64519a0
Show file tree

Hide file tree

Showing 25 changed files with 431 additions and 91 deletions.
diff --git a/.github/workflows/auto-release-pr.yml b/.github/workflows/auto-release-pr.yml
@@ -0,0 +1,21 @@
+on:
+  push:
+    branches:
+      - dev
+name: Automatic release PR
+jobs:
+  release-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - name: Create pull request
+        run: |
+          gh pr create \
+            --base main \
+            --head dev \
+            --title "Dev to main" \
+            --body "Dev to main" || true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
@@ -1,18 +1,23 @@
-uuid: e478d84e-0e63-4c35-ba22-4db0f1f2fe54
+uuid: a5c8253a-0306-4011-849d-c683d35b082c
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.paragraph.event_list.field_api_url
+    - field.field.paragraph.event_list.field_event_count
     - field.field.paragraph.event_list.field_event_list_description
     - field.field.paragraph.event_list.field_event_list_title
+    - field.field.paragraph.event_list.field_event_location
+    - field.field.paragraph.event_list.field_event_time
+    - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_load_more
+    - field.field.paragraph.event_list.field_remote_events
     - paragraphs.paragraphs_type.event_list
   module:
     - link
     - text
 _core:
-  default_config_hash: Tyi9wGAv2OWtaU056U3LSPa3HhdiWSFnd1nZqhZNC8k
+  default_config_hash: bGb0ZQ38-NxHtZ1rrdqclYHeStlwA5q3ucy5Wpnb0ng
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list
@@ -26,6 +31,12 @@ content:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
+  field_event_count:
+    type: options_select
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_event_list_description:
     type: text_textarea
     weight: 1
@@ -42,13 +53,35 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_load_more:
+  field_event_location:
+    type: boolean_checkbox
+    weight: 4
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  field_event_time:
+    type: boolean_checkbox
+    weight: 5
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  field_free_events:
+    type: boolean_checkbox
+    weight: 7
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  field_remote_events:
     type: boolean_checkbox
-    weight: 3
+    weight: 6
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
 hidden:
   created: true
+  field_load_more: true
   status: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
@@ -1,22 +1,35 @@
-uuid: f4d6607c-e8dd-4c31-b4c7-1309356cdbf2
+uuid: eb2af14b-70cb-4024-ab10-50231754d71b
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.paragraph.event_list.field_api_url
+    - field.field.paragraph.event_list.field_event_count
     - field.field.paragraph.event_list.field_event_list_description
     - field.field.paragraph.event_list.field_event_list_title
+    - field.field.paragraph.event_list.field_event_location
+    - field.field.paragraph.event_list.field_event_time
+    - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_load_more
+    - field.field.paragraph.event_list.field_remote_events
     - paragraphs.paragraphs_type.event_list
   module:
+    - options
     - text
 _core:
-  default_config_hash: 9xAT4OL9SGihyabuUdNlviQpCUdo09jo96OyzIZe-v8
+  default_config_hash: dMZ_8jKpOaA7CkuxlB2baa1apQcQ_vFlXM04jq4bqQY
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list
 mode: default
 content:
+  field_event_count:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
   field_event_list_description:
     type: text_default
     label: hidden
@@ -32,6 +45,46 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
+  field_event_location:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_event_time:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 3
+    region: content
+  field_free_events:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 5
+    region: content
+  field_remote_events:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 4
+    region: content
 hidden:
   field_api_url: true
   field_load_more: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -53,7 +53,6 @@ module:
   helfi_charts: 0
   helfi_contact_cards: 0
   helfi_content: 0
-  helfi_events: 0
   helfi_gdpr_compliance: 0
   helfi_languages: 0
   helfi_media: 0
@@ -64,6 +63,7 @@ module:
   helfi_news_item: 0
   helfi_platform_config: 0
   helfi_proxy: 0
+  helfi_react_search: 0
   helfi_siteimprove_config: 0
   helfi_toc: 0
   helfi_tpr: 0

diff --git a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
@@ -8,13 +8,13 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: nkKsGw0gRWVU1GwZugGKaiSe3OoNrBjDpoUXkkt457Y
+  default_config_hash: lGeClo15Zf7kvOo9oZobBROAy8-TnAFRtIwnSvDIArY
 id: paragraph.event_list.field_api_url
 field_name: field_api_url
 entity_type: paragraph
 bundle: event_list
 label: 'Api URL'
-description: 'Add URL from tapahtumat.hel.fi to form a list of events'
+description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum'
 required: false
 translatable: false
 default_value: {  }

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_count.yml b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml
@@ -0,0 +1,25 @@
+uuid: 60d52669-4c63-4494-a723-e3bbec54aeb6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_event_count
+    - paragraphs.paragraphs_type.event_list
+  module:
+    - options
+_core:
+  default_config_hash: 6AMaHxUxptC9tDiCGTiCpFWXBHfR4tUUSdMY9Q5BD6Q
+id: paragraph.event_list.field_event_count
+field_name: field_event_count
+entity_type: paragraph
+bundle: event_list
+label: 'Event count'
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    value: 3
+default_value_callback: ''
+settings: {  }
+field_type: list_integer
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml
@@ -0,0 +1,25 @@
+uuid: 6f999d19-e896-4e2a-8ede-fe4741172e5d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_event_location
+    - paragraphs.paragraphs_type.event_list
+_core:
+  default_config_hash: qn_ofDevCfu_ZKP8n6kRAQFTmy0cRAXNJUvxS6mU-6Q
+id: paragraph.event_list.field_event_location
+field_name: field_event_location
+entity_type: paragraph
+bundle: event_list
+label: 'Event location'
+description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_time.yml b/conf/cmi/field.field.paragraph.event_list.field_event_time.yml
@@ -0,0 +1,25 @@
+uuid: d7b6f6d4-4efa-462b-a024-2cad97ef9661
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_event_time
+    - paragraphs.paragraphs_type.event_list
+_core:
+  default_config_hash: w4dBFRcLBALwVLbGirmkj4Hjs08twZZqv8I9E7aVBtc
+id: paragraph.event_list.field_event_time
+field_name: field_event_time
+entity_type: paragraph
+bundle: event_list
+label: 'Event time'
+description: 'Show "event time" filter.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/conf/cmi/field.field.paragraph.event_list.field_free_events.yml b/conf/cmi/field.field.paragraph.event_list.field_free_events.yml
@@ -0,0 +1,25 @@
+uuid: d119de57-4367-44af-bfb1-b2ed5815cf27
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_free_events
+    - paragraphs.paragraphs_type.event_list
+_core:
+  default_config_hash: 43RWM8pRAJy3tpuEGjFEy4ghMhQoCznir0O2015s_hc
+id: paragraph.event_list.field_free_events
+field_name: field_free_events
+entity_type: paragraph
+bundle: event_list
+label: 'Free events'
+description: 'Show "list only free events" filter.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml
@@ -0,0 +1,25 @@
+uuid: a1db611f-3756-4abb-9c44-231046ed94c7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_remote_events
+    - paragraphs.paragraphs_type.event_list
+_core:
+  default_config_hash: FDxBxbAJWFx6CgcYVHtJc0CDYvMvy04Xqib_pWDlUhA
+id: paragraph.event_list.field_remote_events
+field_name: field_remote_events
+entity_type: paragraph
+bundle: event_list
+label: 'Remote events'
+description: 'Show "list only remote events" filter. Do not use at the same time with the "Event location" filter.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/conf/cmi/field.storage.paragraph.field_event_count.yml b/conf/cmi/field.storage.paragraph.field_event_count.yml
@@ -0,0 +1,23 @@
+uuid: 85f5a1f7-0415-44c7-9e03-1ccca65b2a2c
+langcode: en
+status: true
+dependencies:
+  module:
+    - options
+    - paragraphs
+_core:
+  default_config_hash: hBBiCFVuAo4fqyN3hPC1a3bTN4NTlur6kQQWxerTJWo
+id: paragraph.field_event_count
+field_name: field_event_count
+entity_type: paragraph
+type: list_integer
+settings:
+  allowed_values: {  }
+  allowed_values_function: helfi_react_search_event_list_allowed_values_function
+module: options
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/field.storage.paragraph.field_event_location.yml b/conf/cmi/field.storage.paragraph.field_event_location.yml
@@ -0,0 +1,20 @@
+uuid: 72335eda-cd9b-4473-a1fc-cb50deb7603f
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+_core:
+  default_config_hash: 9QFvQBbGdxgnHfEbMcWzk_rKsyyO1Ru3Z-rbibJxXyc
+id: paragraph.field_event_location
+field_name: field_event_location
+entity_type: paragraph
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false