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

Dev to main

.github/workflows/artifact.yml

@@ -18,7 +18,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.7
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.9
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal

.github/workflows/update-config.yml

@@ -15,7 +15,7 @@ jobs:
 
     services:
       db:
-        image: mariadb:10.7
+        image: mariadb
         env:
           MYSQL_USER: drupal
           MYSQL_PASSWORD: drupal

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

@@ -0,0 +1,53 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.service_list_search.field_service_list_description
+    - field.field.paragraph.service_list_search.field_service_list_service_ids
+    - field.field.paragraph.service_list_search.field_service_list_services
+    - field.field.paragraph.service_list_search.field_service_list_title
+    - paragraphs.paragraphs_type.service_list_search
+  module:
+    - select2
+    - text
+id: paragraph.service_list_search.default
+targetEntityType: paragraph
+bundle: service_list_search
+mode: default
+content:
+  field_service_list_description:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_service_list_service_ids:
+    type: number
+    weight: 2
+    region: content
+    settings:
+      placeholder: ''
+    third_party_settings: {  }
+  field_service_list_services:
+    type: select2_entity_reference
+    weight: 3
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
+  field_service_list_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true

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

@@ -0,0 +1,34 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.service_list_search.field_service_list_description
+    - field.field.paragraph.service_list_search.field_service_list_service_ids
+    - field.field.paragraph.service_list_search.field_service_list_services
+    - field.field.paragraph.service_list_search.field_service_list_title
+    - paragraphs.paragraphs_type.service_list_search
+  module:
+    - text
+id: paragraph.service_list_search.default
+targetEntityType: paragraph
+bundle: service_list_search
+mode: default
+content:
+  field_service_list_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_service_list_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  field_service_list_service_ids: true
+  field_service_list_services: true

conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml

@@ -0,0 +1,101 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.tpr_service.teaser_search_result
+    - field.field.tpr_service.tpr_service.field_content
+    - field.field.tpr_service.tpr_service.field_lower_content
+    - field.field.tpr_service.tpr_service.field_metatags
+    - field.field.tpr_service.tpr_service.field_sidebar_content
+  module:
+    - helfi_tpr
+    - text
+_core:
+  default_config_hash: xI-QgKUvsjLc0SRc8bpDE336uJXT5rVP6K8TirZUzw8
+id: tpr_service.tpr_service.teaser_search_result
+targetEntityType: tpr_service
+bundle: tpr_service
+mode: teaser_search_result
+content:
+  description:
+    type: text_summary_or_trimmed
+    label: hidden
+    settings:
+      trim_length: 600
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  errand_services:
+    type: tpr_service_err_channel_list
+    label: hidden
+    settings:
+      view_mode: default
+      sort_order:
+        ESERVICE:
+          label: E-service
+          weight: '0'
+          show: 0
+        CHAT:
+          label: Chat
+          show: '1'
+          weight: '1'
+        EMAIL:
+          label: Email
+          show: '1'
+          weight: '2'
+        TELEPHONE:
+          label: Telephone
+          show: '1'
+          weight: '3'
+        PRINTABLE_FORM:
+          label: Form
+          show: '1'
+          weight: '4'
+        LOCAL:
+          label: 'Local service'
+          weight: '5'
+          show: 0
+        SMS:
+          label: SMS
+          weight: '6'
+          show: 0
+        WEBPAGE:
+          label: Webpage
+          weight: '7'
+          show: 0
+        MAIL:
+          label: 'Postal mail'
+          weight: '8'
+          show: 0
+        TELEFAX:
+          label: Telefax
+          weight: '9'
+          show: 0
+        OFFICE:
+          label: 'Service point'
+          weight: '99'
+          show: 0
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  field_content: true
+  field_lower_content: true
+  field_metatags: true
+  field_sidebar_content: true
+  has_unit: true
+  langcode: true
+  links: true
+  name_override: true
+  name_synonyms: true
+  service_id: true
+  toc_enabled: true

conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml

@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+id: tpr_service.teaser_search_result
+label: 'Teaser search result'
+targetEntityType: tpr_service
+cache: true

conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml

@@ -0,0 +1,24 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_service_list_description
+    - paragraphs.paragraphs_type.service_list_search
+  module:
+    - allowed_formats
+    - text
+third_party_settings:
+  allowed_formats:
+    allowed_formats: {  }
+id: paragraph.service_list_search.field_service_list_description
+field_name: field_service_list_description
+entity_type: paragraph
+bundle: service_list_search
+label: Description
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long

conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml

@@ -0,0 +1,23 @@
+uuid: 721b3a78-57b6-4625-8ba2-1f6723f88620
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_service_list_service_ids
+    - paragraphs.paragraphs_type.service_list_search
+id: paragraph.service_list_search.field_service_list_service_ids
+field_name: field_service_list_service_ids
+entity_type: paragraph
+bundle: service_list_search
+label: 'Service group ID'
+description: 'You’ll find the service group ID by opening a service you want to list for editing, and scrolling to the bottom of the form.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: null
+  max: null
+  prefix: ''
+  suffix: ''
+field_type: integer

conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml

@@ -0,0 +1,24 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_service_list_services
+    - paragraphs.paragraphs_type.service_list_search
+id: paragraph.service_list_search.field_service_list_services
+field_name: field_service_list_services
+entity_type: paragraph
+bundle: service_list_search
+label: 'Additional services'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: views
+  handler_settings:
+    view:
+      view_name: service_list
+      display_name: entity_reference_1
+      arguments: {  }
+field_type: entity_reference

conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml

@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_service_list_title
+    - paragraphs.paragraphs_type.service_list_search
+id: paragraph.service_list_search.field_service_list_title
+field_name: field_service_list_title
+entity_type: paragraph
+bundle: service_list_search
+label: Title
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string

conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml

@@ -0,0 +1,20 @@
+uuid: b424ec76-ae10-4cce-97a2-73118c94f168
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+id: paragraph.field_service_list_service_ids
+field_name: field_service_list_service_ids
+entity_type: paragraph
+type: integer
+settings:
+  unsigned: false
+  size: normal
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml

@@ -0,0 +1,26 @@
+content:
+  errand_services:
+    settings:
+      sort_order:
+        ESERVICE:
+          label: E-service
+        CHAT:
+          label: Chat
+        EMAIL:
+          label: Sähköposti
+        TELEPHONE:
+          label: Puhelin
+        PRINTABLE_FORM:
+          label: Lomake
+        LOCAL:
+          label: 'Local service'
+        SMS:
+          label: SMS
+        WEBPAGE:
+          label: Webpage
+        MAIL:
+          label: 'Postal mail'
+        TELEFAX:
+          label: Telefax
+        OFFICE:
+          label: Palvelupiste

conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_description.yml

@@ -0,0 +1 @@
+label: ' Kuvaus'

conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_services.yml

@@ -0,0 +1 @@
+label: Lisäpalvelut

conf/cmi/language/fi/paragraphs.paragraphs_type.service_list_search.yml

@@ -0,0 +1 @@
+label: ' Palveluluettelohaku'

conf/cmi/language/fi/views.view.service_list.yml

@@ -24,3 +24,18 @@ display:
         id:
           exception:
             title: Kaikki
+  block_search:
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Etsi
+      pager:
+        options:
+          tags:
+            previous: Edellinen
+            next: Seuraava
+      filters:
+        combine:
+          expose:
+            label: 'Neuvontapalvelun nimi tai hakusana'
+            placeholder: 'Esim. Sosiaalineuvonta, terveys tai digi'