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

Dev to main
City-of-Helsinki · May 22, 2024 · 63476da · 63476da
2 parents 115c960 + 3af92a9
commit 63476da
Show file tree

Hide file tree

Showing 46 changed files with 380 additions and 431 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -87,6 +87,28 @@ services:
       - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true"
       - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081"
       - "traefik.docker.network=stonehenge-network"
+  elastic-proxy:
+    container_name: "${COMPOSE_PROJECT_NAME}-elastic-proxy"
+    image: nginxinc/nginx-unprivileged:alpine-perl
+    environment:
+      ELASTICSEARCH_URL: "http://elastic:9200"
+    volumes:
+      - ./docker/elastic-proxy/nginx.conf:/etc/nginx/nginx.conf
+      - ./docker/elastic-proxy/elastic.conf:/etc/nginx/templates/default.conf.template
+    networks:
+      - stonehenge-network
+      - internal
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.nginx.entrypoints=https"
+      - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
+      - "traefik.http.services.nginx.loadbalancer.server.port=8080"
+      - "traefik.http.routers.nginx.tls=true"
+      - "traefik.docker.network=stonehenge-network"
+    depends_on:
+      - elastic
+    profiles:
+      - search
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.4.0
     container_name: "${COMPOSE_PROJECT_NAME}-elastic"

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.claro_help.yml b/conf/cmi/block.block.claro_help.yml
@@ -0,0 +1,22 @@
+uuid: d7572062-232b-44d4-9859-38c31b932ee9
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - claro
+_core:
+  default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM
+id: claro_help
+theme: claro
+region: help
+weight: 0
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  label_display: '0'
+  provider: help
+visibility: {  }
diff --git a/conf/cmi/block.block.gin_help.yml b/conf/cmi/block.block.gin_help.yml
@@ -0,0 +1,22 @@
+uuid: 9b9f3047-a6df-4f35-8542-ead96c35a1c7
+langcode: en
+status: true
+dependencies:
+  module:
+    - help
+  theme:
+    - gin
+_core:
+  default_config_hash: 8nOAry2oKqJOr0zbrlJ3sZHDFJLIO6j-0vT0K_TYca4
+id: gin_help
+theme: gin
+region: help
+weight: 0
+provider: null
+plugin: help_block
+settings:
+  id: help_block
+  label: Help
+  label_display: '0'
+  provider: help
+visibility: {  }
diff --git a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml
@@ -2,8 +2,6 @@ uuid: b95230b8-fb95-4373-b877-6117cf4d0f46
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -13,14 +11,6 @@ targetEntityType: helfi_news_groups
 bundle: helfi_news_groups
 mode: default
 content:
-  field_frontpage_term_id:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
@@ -29,4 +19,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  tid: true
diff --git a/.../core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/.../core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml
@@ -2,8 +2,6 @@ uuid: d13089ef-9704-4770-90a9-fd9fedc50405
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -13,14 +11,6 @@ targetEntityType: helfi_news_neighbourhoods
 bundle: helfi_news_neighbourhoods
 mode: default
 content:
-  field_frontpage_term_id:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
@@ -29,4 +19,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  tid: true
diff --git a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml
@@ -2,8 +2,6 @@ uuid: 972acdae-8e71-4d12-a335-bc91828f4851
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -13,14 +11,6 @@ targetEntityType: helfi_news_tags
 bundle: helfi_news_tags
 mode: default
 content:
-  field_frontpage_term_id:
-    type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: -5
@@ -29,4 +19,5 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  tid: true
diff --git a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml
@@ -2,8 +2,6 @@ uuid: 045f335b-7059-4d6a-9240-43909f3c1704
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -22,5 +20,5 @@ content:
     weight: 0
     region: content
 hidden:
-  field_frontpage_term_id: true
   search_api_excerpt: true
+  tid: true
diff --git a/.../core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/.../core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml
@@ -2,8 +2,6 @@ uuid: f8d0f0da-4aff-436c-a4b8-4df8c6ee82f8
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -22,5 +20,5 @@ content:
     weight: 0
     region: content
 hidden:
-  field_frontpage_term_id: true
   search_api_excerpt: true
+  tid: true
diff --git a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml
@@ -2,8 +2,6 @@ uuid: 7060dc64-5f95-4fa5-8046-bf0ad5e265c4
 langcode: en
 status: true
 dependencies:
-  config:
-    - field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id
   module:
     - external_entities
 _core:
@@ -22,5 +20,5 @@ content:
     weight: 0
     region: content
 hidden:
-  field_frontpage_term_id: true
   search_api_excerpt: true
+  tid: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -11,7 +11,6 @@ module:
   ckeditor5: 0
   ckeditor5_paste_filter: 0
   config: 0
-  config_filter: 0
   config_ignore: 0
   config_rewrite: 0
   config_translation: 0
@@ -83,6 +82,7 @@ module:
   helfi_tpr_config: 0
   helfi_tunnistamo: 0
   helfi_user_roles: 0
+  help: 0
   image: 0
   image_style_quality: 0
   imagecache_external: 0

diff --git a/conf/cmi/editoria11y.configuration.yml b/conf/cmi/editoria11y.configuration.yml
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -3,37 +3,40 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 3cezkDpNnpY89NCorCj-4mBIeItsVAEG803y-phaZTM
+  default_config_hash: daIUGTR2nijXztOFPGoKZP9hdqNwUXU1g1Iksa29Rxo
 id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
+generate_aliases: false
 read_only: true
-generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
     id:
-      value: $.id
+      value: '$._source.uuid_langcode[0]'
     uuid:
-      value: $.id
+      value: '$._source.uuid[0]'
     title:
-      value: "$.attributes['title']"
-    main_image:
-      uri: "$.relationships['main_image']['data']['relationships']['media_image']['data']['attributes']['uri']['url']"
-      title: "$.relationships['main_image']['data']['relationships']['media_image']['data']['meta']['alt']"
+      value: '$._source.title[0]'
+    tags_uuid:
+      value: '$._source.news_tags_uuid[*]'
     tags:
-      value: "$.relationships['tags']['data'][*]['attributes']['name']"
+      value: '$._source.field_news_item_tags[*]'
     groups:
-      value: "$.relationships['groups']['data'][*]['attributes']['name']"
+      value: '$._source.field_news_groups[*]'
+    groups_uuid:
+      value: '$._source.news_groups_uuid[*]'
     neighbourhoods:
-      value: "$.relationships['neighbourhoods']['data'][*]['attributes']['name']"
+      value: '$._source.field_news_neighbourhoods[*]'
+    neighbourhoods_uuid:
+      value: '$._source.neighbourhoods_uuid[*]'
     node_url:
-      value: "$.attributes['path']['alias']"
+      value: '$._source.url[0]'
     published_at:
-      value: "$.attributes['published_at']"
+      value: '$._source.published_at[0]'
     short_title:
-      value: "$.attributes['short_title']"
+      value: '$._source.short_title[0]'
 storage_client_id: helfi_news
 storage_client_config: {  }
 persistent_cache_max_age: 1800

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -3,24 +3,24 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: U7yZGEsFvk5UxcRUripTm4JXrM9_gU_UV1aMQ8986a4
+  default_config_hash: 1KCEz52lFemwPMfVitwlGcbzmkcAJPGSSe6loUbVJc8
 id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
     id:
-      value: $.id
+      value: '$._source.uuid_langcode[0]'
     uuid:
-      value: $.id
+      value: '$._source.uuid[0]'
     title:
-      value: '$.attributes["name"]'
-    field_frontpage_term_id:
-      value: '$.attributes["drupal_internal__tid"]'
+      value: '$._source.name[0]'
+    tid:
+      value: '$._source.tid[0]'
 storage_client_id: helfi_news_groups
 storage_client_config: {  }
 persistent_cache_max_age: 86400

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -3,24 +3,24 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: tM9Z1SfXjTcoCvjFIESPPl2sya7IyIQ9kZ-zQFFNppU
+  default_config_hash: 5s8g-adBsUuIIMte5BCEwSFlQjxwFJ_Gq2Do7EEwq2E
 id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
     id:
-      value: $.id
+      value: '$._source.uuid_langcode[0]'
     uuid:
-      value: $.id
+      value: '$._source.uuid[0]'
     title:
-      value: '$.attributes["name"]'
-    field_frontpage_term_id:
-      value: '$.attributes["drupal_internal__tid"]'
+      value: '$._source.name[0]'
+    tid:
+      value: '$._source.tid[0]'
 storage_client_id: helfi_news_neighbourhoods
 storage_client_config: {  }
 persistent_cache_max_age: 86400

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -3,24 +3,24 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: LOL9fkfvgT6MB8SjNXI0WXRQqedWBH2oV7g4gfQjkuc
+  default_config_hash: vs16WpCdsWseKb-U81zRJbzykB25mE69iOEXv4ZhxCM
 id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
     id:
-      value: $.id
+      value: '$._source.uuid_langcode[0]'
     uuid:
-      value: $.id
+      value: '$._source.uuid[0]'
     title:
-      value: '$.attributes["name"]'
-    field_frontpage_term_id:
-      value: '$.attributes["drupal_internal__tid"]'
+      value: '$._source.name[0]'
+    tid:
+      value: '$._source.tid[0]'
 storage_client_id: helfi_news_tags
 storage_client_config: {  }
 persistent_cache_max_age: 86400