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

Dev to main

Author: khalima

composer.lock

@@ -10,7 +10,7 @@ dependencies:
     - media
     - path
 _core:
-  default_config_hash: oMwxSUn6hUxk3rUpuYI-Ztzm2IROX0FEunUgzGcnfgs
+  default_config_hash: FiPfivewZveR0h3FgHeOYe-NLP8I1cDx01sBqeRiMl4
 id: media.remote_video.default
 targetEntityType: media
 bundle: remote_video
@@ -32,15 +32,15 @@ content:
     third_party_settings: {  }
   field_remote_video_videographer:
     type: string_textfield
-    weight: 2
+    weight: 3
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   langcode:
     type: language_select
-    weight: 3
+    weight: 2
     region: content
     settings:
       include_locked: true

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

@@ -4,28 +4,47 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.curated_event_list.field_all_events_link
+    - field.field.paragraph.curated_event_list.field_curated_events_description
+    - field.field.paragraph.curated_event_list.field_curated_events_title
     - field.field.paragraph.curated_event_list.field_events
     - paragraphs.paragraphs_type.curated_event_list
   module:
     - link
+    - text
 _core:
-  default_config_hash: xbLWsjGFnK8aSW5O_r3mVF5bAlCp8J6wP5mGihlXLfU
+  default_config_hash: DTch1ah5ggskOX4k7HRe3J3ozun_6oybvntYEOx7tUw
 id: paragraph.curated_event_list.default
 targetEntityType: paragraph
 bundle: curated_event_list
 mode: default
 content:
   field_all_events_link:
     type: link_default
-    weight: 1
+    weight: 5
     region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
+  field_curated_events_description:
+    type: text_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_curated_events_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_events:
     type: entity_reference_autocomplete
-    weight: 0
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS

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

@@ -14,7 +14,7 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: VflHWgcqxxjyQ5dI9XiXzqbtlh7Pl2_qqR3bz8Zj1jg
+  default_config_hash: 1x2FyksFlVde-Zc2xHxsXEqlr5LgOFjVKsgJX0O4pG4
 id: paragraph.remote_video.default
 targetEntityType: paragraph
 bundle: remote_video
@@ -30,7 +30,7 @@ content:
     third_party_settings: {  }
   field_remote_video:
     type: media_library_widget
-    weight: 2
+    weight: 4
     region: content
     settings:
       media_types: {  }
@@ -53,21 +53,20 @@ content:
     third_party_settings: {  }
   field_remote_video_video_desc:
     type: text_textarea
-    weight: 4
+    weight: 5
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   field_remote_video_video_title:
     type: string_textfield
-    weight: 3
+    weight: 2
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
 hidden:
   created: true
-  field_iframe_title: true
   status: true

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

@@ -4,12 +4,15 @@ status: true
 dependencies:
   config:
     - field.field.paragraph.curated_event_list.field_all_events_link
+    - field.field.paragraph.curated_event_list.field_curated_events_description
+    - field.field.paragraph.curated_event_list.field_curated_events_title
     - field.field.paragraph.curated_event_list.field_events
     - paragraphs.paragraphs_type.curated_event_list
   module:
     - link
+    - text
 _core:
-  default_config_hash: kSyBcsfddKV9vQJsToglwPaZvKFQSf3GDFPLqkzIfTQ
+  default_config_hash: nbkj5te2jsGtAn_qoUnLcVpJDu8TB3YmT0kZjx3ja7c
 id: paragraph.curated_event_list.default
 targetEntityType: paragraph
 bundle: curated_event_list
@@ -25,16 +28,31 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
+    weight: 3
+    region: content
+  field_curated_events_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
     weight: 1
     region: content
+  field_curated_events_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
   field_events:
     type: entity_reference_entity_view
     label: hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
-    weight: 0
+    weight: 2
     region: content
 hidden:
   search_api_excerpt: true

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

@@ -6,13 +6,13 @@ dependencies:
     - field.storage.media.field_remote_video_videographer
     - media.type.remote_video
 _core:
-  default_config_hash: QTqlZAIz5OG9Ht7sMbe0f6ypWg0c9QFYB1uoEY4bA94
+  default_config_hash: N8pM_U0isK3rTWVjfoUbkg5-9YNAtJry4kdqLpVVps0
 id: media.remote_video.field_remote_video_videographer
 field_name: field_remote_video_videographer
 entity_type: media
 bundle: remote_video
 label: Videographer
-description: 'Write the name of the videographer here.'
+description: 'Write the name of the videographer of the video.'
 required: false
 translatable: false
 default_value: {  }

conf/cmi/field.field.media.remote_video.field_remote_video_videographer.yml

@@ -8,13 +8,13 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: FfVydFQYnAcPJkSaTbBQoyzqe8k11WrSJ5tSxAt8b1k
+  default_config_hash: s13jjI9JHrzC_tfNgWIZEl3nA4M264dIr44J7rMCF5g
 id: paragraph.curated_event_list.field_all_events_link
 field_name: field_all_events_link
 entity_type: paragraph
 bundle: curated_event_list
 label: 'All events link'
-description: "Add a link to the tapahtumat.hel.fi website. You may also filter the events in the event calendar as desired and copy the page's URL.\r\n<br><br>\r\nAlso provide a text for the link, eg. <i>View all events.</i>"
+description: "Add a link to the tapahtumat.hel.fi or harrastukset.hel.fi website. You may also filter the events in the event calendar as desired and copy the page's URL.\r\n<br><br>\r\nAlso provide a text for the link, eg. <i>View all events.</i>"
 required: false
 translatable: false
 default_value:

conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml

@@ -0,0 +1,26 @@
+uuid: 84ea0e24-b08b-48e3-b384-41c4a8bc084d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_curated_events_description
+    - filter.format.minimal
+    - paragraphs.paragraphs_type.curated_event_list
+  module:
+    - text
+_core:
+  default_config_hash: 4MLIZ82SgoH1kDxA_8wb-teNT7tH6zcTr2oIVprrWm4
+id: paragraph.curated_event_list.field_curated_events_description
+field_name: field_curated_events_description
+entity_type: paragraph
+bundle: curated_event_list
+label: Description
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  allowed_formats:
+    - minimal
+field_type: text_long

conf/cmi/field.field.paragraph.curated_event_list.field_curated_events_description.yml

@@ -0,0 +1,23 @@
+uuid: 869d2b32-02a8-4a5f-a3e1-8a0a9711f8e3
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_curated_events_title
+    - paragraphs.paragraphs_type.curated_event_list
+_core:
+  default_config_hash: TFSD0dgfY9GK3X7Aq1TSCjXT6j5IJaJ-L3mtXTS1XNk
+id: paragraph.curated_event_list.field_curated_events_title
+field_name: field_curated_events_title
+entity_type: paragraph
+bundle: curated_event_list
+label: Title
+description: ''
+required: true
+translatable: false
+default_value:
+  -
+    value: 'Recommended events'
+default_value_callback: ''
+settings: {  }
+field_type: string

conf/cmi/field.field.paragraph.curated_event_list.field_curated_events_title.yml

@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_events
     - paragraphs.paragraphs_type.curated_event_list
 _core:
-  default_config_hash: XaOHQv-1E_t55GwYhhyvtA03_7mWbdEbmXA3YhGrHiA
+  default_config_hash: 6WTIxuF6Rzjshbq5srcg8o-e0vIRMdJH46q0JkpJaXQ
 id: paragraph.curated_event_list.field_events
 field_name: field_events
 entity_type: paragraph
 bundle: curated_event_list
-label: Events
-description: "Pick events to display in the list. You may either search event by their name <i>or</i> enter their ID. \r\n <br><br>\r\nYou can find the ID of an event on tapahtumat.hel.fi site from the URL of the page. For example, in the url <a>https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida</a> the <b>helsinki:agiy4m4ida</b> part is the ID of the event.\r\n <br><br>\r\nThe page will display the top three events. You can arrange the events by dragging. Expired events will be automatically removed from the page."
+label: 'Events and hobbies'
+description: "Pick events to display in the list. You may either search event by their name <i>or</i> enter their ID. \r\n <br><br>\r\nYou can find the ID of an event on tapahtumat.hel.fi or harrastukset.hel.fi from the URL of the page. For example, in the url <a>https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida</a> the <b>helsinki:agiy4m4ida</b> part is the ID of the event.\r\n <br><br>\r\nThe page will display the top three events. You can arrange the events by dragging. Expired events will be automatically removed from the page."
 required: false
 translatable: false
 default_value: {  }