Skip to content

Commit

Permalink
Merge pull request #369 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Release 9.11.2022
  • Loading branch information
teroelonen authored Nov 9, 2022
2 parents accda69 + 9e64e6f commit dbdde01
Show file tree
Hide file tree
Showing 66 changed files with 948 additions and 250 deletions.
1 change: 1 addition & 0 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sonar.exclusions=public/modules/custom/**/tests/**
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"drupal/helfi_proxy": "^2.0",
"drupal/helfi_tpr": "^2.0",
"drupal/helfi_tunnistamo": "^2.0",
"drupal/openid_connect": "2.0.0-alpha12",
"drupal/raven": "^3.2",
"drupal/redis": "^1.5",
"drupal/stage_file_proxy": "^1.2",
Expand Down
296 changes: 143 additions & 153 deletions composer.lock

Large diffs are not rendered by default.

78 changes: 78 additions & 0 deletions conf/cmi/core.entity_form_display.paragraph.news_list.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
uuid: 7df1901f-3c86-41a6-a63c-007d317f6c62
langcode: en
status: true
dependencies:
config:
- field.field.paragraph.news_list.field_helfi_news_groups
- field.field.paragraph.news_list.field_helfi_news_neighbourhoods
- field.field.paragraph.news_list.field_helfi_news_tags
- field.field.paragraph.news_list.field_limit
- field.field.paragraph.news_list.field_news_list_description
- field.field.paragraph.news_list.field_news_list_title
- paragraphs.paragraphs_type.news_list
module:
- select2
- text
_core:
default_config_hash: I_u6U4oQKvo0EjopuKoM3qEFFz3lzE8J-jWIN0OJqYg
id: paragraph.news_list.default
targetEntityType: paragraph
bundle: news_list
mode: default
content:
field_helfi_news_groups:
type: select2_entity_reference
weight: 4
region: content
settings:
width: 100%
autocomplete: true
match_operator: CONTAINS
match_limit: 10
third_party_settings: { }
field_helfi_news_neighbourhoods:
type: select2_entity_reference
weight: 5
region: content
settings:
width: 100%
autocomplete: true
match_operator: CONTAINS
match_limit: 10
third_party_settings: { }
field_helfi_news_tags:
type: select2_entity_reference
weight: 3
region: content
settings:
width: 100%
autocomplete: true
match_operator: CONTAINS
match_limit: 10
third_party_settings: { }
field_limit:
type: number
weight: 2
region: content
settings:
placeholder: ''
third_party_settings: { }
field_news_list_description:
type: text_textarea
weight: 1
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_news_list_title:
type: string_textfield
weight: 0
region: content
settings:
size: 60
placeholder: ''
third_party_settings: { }
hidden:
created: true
status: true
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@ content:
duplicate: duplicate
third_party_settings: { }
field_phasing_item_title_level:
type: options_select
weight: 4
region: content
settings: { }
third_party_settings: { }
field_phasing_title_level:
type: options_select
weight: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
uuid: 329d2e65-7a59-488a-84b2-0ebb7b1bc7c0
langcode: en
status: true
dependencies:
module:
- external_entities
- imagecache_external
_core:
default_config_hash: k-bIvgFdaVICd0s60Gng2zWabkpeZTQ53HF1Eff7zDk
id: helfi_news.helfi_news.default
targetEntityType: helfi_news
bundle: helfi_news
mode: default
content:
main_image:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_link: ''
imagecache_external_responsive_style: gallery_thumbnail
third_party_settings: { }
weight: 1
region: content
title:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 0
region: content
hidden:
groups: true
neighbourhoods: true
node_url: true
published_at: true
short_title: true
tags: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
uuid: 3b524002-16df-4f5b-87fd-ce8103a92cc3
langcode: en
status: true
dependencies:
config:
- core.entity_view_mode.helfi_news.medium_teaser
module:
- external_entities
- imagecache_external
_core:
default_config_hash: XArB74ImuiEIsNGh_ic_b4csmzDUre1hUeswj9kCiOc
id: helfi_news.helfi_news.medium_teaser
targetEntityType: helfi_news
bundle: helfi_news
mode: medium_teaser
content:
main_image:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_link: ''
imagecache_external_responsive_style: gallery_thumbnail
third_party_settings: { }
weight: 1
region: content
title:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 0
region: content
hidden:
groups: true
neighbourhoods: true
node_url: true
published_at: true
short_title: true
tags: true
70 changes: 70 additions & 0 deletions conf/cmi/core.entity_view_display.paragraph.news_list.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
uuid: ef83b857-16d7-4f2b-93d2-b4d9c1e1d5ab
langcode: en
status: true
dependencies:
config:
- field.field.paragraph.news_list.field_helfi_news_groups
- field.field.paragraph.news_list.field_helfi_news_neighbourhoods
- field.field.paragraph.news_list.field_helfi_news_tags
- field.field.paragraph.news_list.field_limit
- field.field.paragraph.news_list.field_news_list_description
- field.field.paragraph.news_list.field_news_list_title
- paragraphs.paragraphs_type.news_list
module:
- text
_core:
default_config_hash: eCdT_XU1aIhxOLfurTn16KTFSsxHyWZu3HHm3q_5Mi8
id: paragraph.news_list.default
targetEntityType: paragraph
bundle: news_list
mode: default
content:
field_helfi_news_groups:
type: entity_reference_entity_view
label: above
settings:
view_mode: default
link: true
third_party_settings: { }
weight: 3
region: content
field_helfi_news_neighbourhoods:
type: entity_reference_entity_view
label: above
settings:
view_mode: default
link: true
third_party_settings: { }
weight: 5
region: content
field_helfi_news_tags:
type: entity_reference_entity_view
label: above
settings:
view_mode: default
link: true
third_party_settings: { }
weight: 4
region: content
field_news_list_description:
type: text_default
label: hidden
settings: { }
third_party_settings: { }
weight: 1
region: content
field_news_list_title:
type: string
label: hidden
settings:
link_to_entity: false
third_party_settings: { }
weight: 0
region: content
news_list:
settings: { }
third_party_settings: { }
weight: 2
region: content
hidden:
field_limit: true
10 changes: 2 additions & 8 deletions conf/cmi/core.entity_view_display.paragraph.phasing.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ content:
third_party_settings: { }
weight: 2
region: content
field_phasing_item_title_level:
type: list_default
label: hidden
settings: { }
third_party_settings: { }
weight: 3
region: content
field_phasing_title_level:
type: list_key
label: hidden
Expand All @@ -67,4 +60,5 @@ content:
third_party_settings: { }
weight: 0
region: content
hidden: { }
hidden:
field_phasing_item_title_level: true
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ content:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_responsive_style: image__3_2
imagecache_external_link: ''
imagecache_external_responsive_style: image__3_2
third_party_settings: { }
weight: 3
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ content:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_responsive_style: image__3_2
imagecache_external_link: ''
imagecache_external_responsive_style: image__3_2
third_party_settings: { }
weight: 0
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ content:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_responsive_style: image__3_2
imagecache_external_link: ''
imagecache_external_responsive_style: image__3_2
third_party_settings: { }
weight: 0
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ content:
type: imagecache_external_responsive_image
label: hidden
settings:
imagecache_external_responsive_style: image__3_2
imagecache_external_link: ''
imagecache_external_responsive_style: image__3_2
third_party_settings: { }
weight: 0
region: content
Expand Down
12 changes: 12 additions & 0 deletions conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
uuid: 7aae4199-2b1c-4d4f-8168-190a37a3c85e
langcode: en
status: true
dependencies:
module:
- external_entities
_core:
default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk
id: helfi_news.medium_teaser
label: 'Medium Teaser'
targetEntityType: helfi_news
cache: true
3 changes: 2 additions & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ module:
entity: 0
entity_reference_revisions: 0
entity_usage: 0
external_entities: 0
field: 0
field_group: 0
field_ui: 0
file: 0
filelog: 0
filter: 0
flysystem: 0
flysystem_azure: 0
Expand All @@ -58,6 +58,7 @@ module:
helfi_media_map: 0
helfi_media_map_config: 0
helfi_navigation: 0
helfi_news_feed: 0
helfi_news_item: 0
helfi_platform_config: 0
helfi_proxy: 0
Expand Down
4 changes: 4 additions & 0 deletions conf/cmi/eu_cookie_compliance.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,7 @@ cookie_value_disagreed: '0'
cookie_value_agreed_show_thank_you: '1'
cookie_value_agreed: '2'
accessibility_focus: false
close_button_action: close_banner
reject_button_label: ''
reject_button_enabled: false
close_button_enabled: false
42 changes: 42 additions & 0 deletions conf/cmi/external_entities.external_entity_type.helfi_news.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
uuid: a59907e9-8dfe-482c-a091-df1469e35bd4
langcode: en
status: true
dependencies: { }
_core:
default_config_hash: BzWvGC8hEXxFUxhZtUxQ30sNFcsZNIAFC5JX9okISYY
id: helfi_news
label: 'Helfi: News'
label_plural: 'Helfi: News'
description: ''
read_only: true
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
id:
value: $.id
uuid:
value: $.id
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'']'
tags:
value: '$.relationships[''tags''][''data''][*][''attributes''][''name'']'
groups:
value: '$.relationships[''groups''][''data''][*][''attributes''][''name'']'
neighbourhoods:
value: '$.relationships[''neighbourhoods''][''data''][*][''attributes''][''name'']'
node_url:
value: '$.attributes[''path''][''alias'']'
published_at:
value: '$.attributes[''published_at'']'
short_title:
value: '$.attributes[''short_title'']'
storage_client_id: helfi_news
storage_client_config: { }
persistent_cache_max_age: -1
annotation_entity_type_id: null
annotation_bundle_id: null
annotation_field_name: null
inherits_annotation_fields: false
Loading

0 comments on commit dbdde01

Please sign in to comment.