UHF-11676: Linked courses preparation

composer.json

@@ -66,6 +66,7 @@
         "drupal/views_bulk_operations": "^4.1",
         "drupal/stage_file_proxy": "^3.1",
         "ruflin/elastica": "^8.0",
+        "symfony/property-access": "^7.3",
         "league/uri": "^6.0",
         "php": "^8.1"
     },

helfi_platform_config.info.yml

@@ -4,6 +4,7 @@ package: Custom
 core_version_requirement: ^9 || ^10
 dependencies:
   - drupal:language
+  - drupal:serialization
   - drupal:views
   - helfi_api_base:helfi_api_base
   - config_rewrite:config_rewrite

helfi_platform_config.services.yml

@@ -82,3 +82,9 @@ services:
       - { name: helfi_platform_config.og_image_builder, priority: -100 }
 
   Drupal\helfi_platform_config\RedirectCleaner: ~
+
+  helfi_platform_config.normalizer.object:
+    class: Symfony\Component\Serializer\Normalizer\ObjectNormalizer
+    public: false
+    tags:
+      - { name: normalizer }

modules/helfi_react_search/config/install/core.entity_form_display.paragraph.event_list.default.yml

@@ -3,18 +3,24 @@ 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_category_event
+    - field.field.paragraph.event_list.field_event_list_category_hobby
     - 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_free_text
+    - field.field.paragraph.event_list.field_event_list_keywords
+    - field.field.paragraph.event_list.field_event_list_place
     - field.field.paragraph.event_list.field_event_list_title
+    - field.field.paragraph.event_list.field_event_list_type
     - field.field.paragraph.event_list.field_event_location
     - field.field.paragraph.event_list.field_event_time
-    - field.field.paragraph.event_list.field_filter_keywords
     - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_language
     - field.field.paragraph.event_list.field_remote_events
     - paragraphs.paragraphs_type.event_list
   module:
+    - helfi_react_search
     - link
     - select2
     - text
@@ -23,19 +29,13 @@ targetEntityType: paragraph
 bundle: event_list
 mode: default
 content:
-  field_api_url:
-    type: link_default
-    weight: 2
+  field_event_list_title:
+    type: string_textfield
+    weight: 0
     region: content
     settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_event_count:
-    type: options_select
-    weight: 3
-    region: content
-    settings: {  }
+      size: 60
+      placeholder: ''
     third_party_settings: {  }
   field_event_list_description:
     type: text_textarea
@@ -45,58 +45,98 @@ content:
       rows: 3
       placeholder: ''
     third_party_settings: {  }
-  field_event_list_title:
+  field_event_list_type:
+    type: options_buttons
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_event_count:
+    type: options_select
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_event_list_free_text:
     type: string_textfield
-    weight: 0
+    weight: 4
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_event_list_category_event:
+    type: select2
+    weight: 5
+    region: content
+    settings:
+      width: 100%
+    third_party_settings: {  }
+  field_event_list_category_hobby:
+    type: select2
+    weight: 6
+    region: content
+    settings:
+      width: 100%
+    third_party_settings: {  }
+  field_event_list_keywords:
+    type: linked_events_select2
+    weight: 7
+    region: content
+    settings:
+      endpoint: keyword
+      query: data_source=yso&has_upcoming_events=True&sort=name
+    third_party_settings: {  }
+  field_event_list_place:
+    type: linked_events_select2
+    weight: 8
+    region: content
+    settings:
+      endpoint: place
+      query: sort=name
+    third_party_settings: {  }
   field_event_location:
     type: boolean_checkbox
-    weight: 4
+    weight: 9
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_event_time:
     type: boolean_checkbox
-    weight: 5
+    weight: 10
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
-  field_filter_keywords:
-    type: select2_entity_reference
-    weight: 9
+  field_language:
+    type: boolean_checkbox
+    weight: 11
     region: content
     settings:
-      width: 100%
-      autocomplete: true
-      match_operator: CONTAINS
-      match_limit: 10
+      display_label: true
     third_party_settings: {  }
-  field_free_events:
+  field_remote_events:
     type: boolean_checkbox
-    weight: 8
+    weight: 12
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
-  field_language:
+  field_free_events:
     type: boolean_checkbox
-    weight: 6
+    weight: 13
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
-  field_remote_events:
-    type: boolean_checkbox
-    weight: 7
+  field_event_list_keywords_filter:
+    type: linked_events_select2
+    weight: 14
     region: content
     settings:
-      display_label: true
+      endpoint: keyword
+      query: data_source=yso&has_upcoming_events=True&sort=name
     third_party_settings: {  }
 hidden:
   created: true

modules/helfi_react_search/config/install/core.entity_view_display.paragraph.event_list.default.yml

@@ -3,13 +3,11 @@ 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_filter_keywords
     - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_language
     - field.field.paragraph.event_list.field_remote_events
@@ -64,14 +62,6 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_filter_keywords:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 6
-    region: content
   field_free_events:
     type: boolean
     label: above
@@ -103,5 +93,4 @@ content:
     weight: 4
     region: content
 hidden:
-  field_api_url: true
   search_api_excerpt: true

modules/helfi_react_search/config/install/field.field.paragraph.event_list.field_event_count.yml

@@ -11,8 +11,8 @@ id: paragraph.event_list.field_event_count
 field_name: field_event_count
 entity_type: paragraph
 bundle: event_list
-label: 'Event count'
-description: ''
+label: 'Count'
+description: 'Select the number of items to display on the site.'
 required: false
 translatable: false
 default_value:

modules/helfi_react_search/config/install/field.field.paragraph.event_list.field_event_list_category_event.yml

@@ -0,0 +1,23 @@
+uuid: 2428bfce-c575-4662-afdd-7889c5c219c6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_event_list_category_event
+    - paragraphs.paragraphs_type.event_list
+  module:
+    - options
+id: paragraph.event_list.field_event_list_category_event
+field_name: field_event_list_category_event
+entity_type: paragraph
+bundle: event_list
+label: 'Event categories'
+description: 'Filter events by category.'
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings:
+  allowed_values: {  }
+  allowed_values_function: helfi_react_search_event_list_allowed_event_categories
+field_type: list_string