Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #780

Merged
merged 17 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
333 changes: 193 additions & 140 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- link
- text
_core:
default_config_hash: gdwGWJ777jQK9Sp9u3B8_ezV69VGMbEqOiKax-7vUM8
default_config_hash: RPiB_poa2hBtdepgZvpwegxerpRhNyCkRIr_OEt_l-M
id: media.helfi_chart.default
targetEntityType: media
bundle: helfi_chart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- text
_core:
default_config_hash: 15dE9cINIClD6CbC9j7i4xZaZ4eI95MVmLKSkvXb1P4
default_config_hash: 7I7JgqwSLHKPVnnYpmVSQ0-RS8tUb0ayNGVynJiS_Jg
id: media.helfi_chart.media_library
targetEntityType: media
bundle: helfi_chart
Expand Down
6 changes: 3 additions & 3 deletions conf/cmi/core.entity_form_display.node.news_item.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
module:
- field_group
- hdbt_admin_tools
- linkit
- helfi_platform_config
- media_library
- paragraphs
- path
Expand Down Expand Up @@ -71,7 +71,7 @@ third_party_settings:
description: ''
required_fields: true
_core:
default_config_hash: dW1Kmx2dOCHZosI85sWLQGupPRXvS8NL-lmM_O44boc
default_config_hash: 8VB52G7NLFlO7n5sxx7SGXc03Mixt3Kogv33toVIV2Q
id: node.news_item.default
targetEntityType: node
bundle: news_item
Expand Down Expand Up @@ -126,7 +126,7 @@ content:
placeholder: ''
third_party_settings: { }
field_news_item_links_link:
type: linkit
type: helfi_linkit
weight: 20
region: content
settings:
Expand Down
114 changes: 57 additions & 57 deletions conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@ content:
allowed_formats:
hide_help: '1'
hide_guidelines: '1'
field_categories:
type: readonly_field_widget
weight: 39
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_content:
type: paragraphs
weight: 31
Expand All @@ -152,6 +162,16 @@ content:
collapse_edit_all: collapse_edit_all
duplicate: duplicate
third_party_settings: { }
field_hs_front_page:
type: entity_reference_autocomplete
weight: 31
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_lower_content:
type: paragraphs
weight: 33
Expand Down Expand Up @@ -179,6 +199,16 @@ content:
sidebar: false
use_details: true
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_phone_label:
type: string_textfield
weight: 11
Expand All @@ -194,6 +224,16 @@ content:
settings:
display_label: true
third_party_settings: { }
field_study_field:
type: select2_entity_reference
weight: 31
region: content
settings:
width: 100%
autocomplete: false
match_operator: CONTAINS
match_limit: 10
third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 34
Expand All @@ -204,6 +244,13 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
hide_description:
type: boolean_checkbox
weight: 18
region: content
settings:
display_label: true
third_party_settings: { }
hide_sidebar_navigation:
type: boolean_checkbox
weight: 35
Expand Down Expand Up @@ -391,6 +438,16 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
toc_enabled:
type: boolean_checkbox
weight: 3
Expand Down Expand Up @@ -439,63 +496,6 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
field_categories:
type: readonly_field_widget
weight: 39
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_hs_front_page:
type: entity_reference_autocomplete
weight: 31
region: content
settings:
match_operator: CONTAINS
match_limit: 10
size: 60
placeholder: ''
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_study_field:
type: select2_entity_reference
weight: 31
region: content
settings:
width: 100%
autocomplete: false
match_operator: CONTAINS
match_limit: 10
third_party_settings: { }
hide_description:
type: boolean_checkbox
weight: 18
region: content
settings:
display_label: true
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
hidden:
created: true
field_districts: true
Expand Down
13 changes: 9 additions & 4 deletions conf/cmi/core.entity_view_display.media.helfi_chart.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ dependencies:
- field.field.media.helfi_chart.field_helfi_chart_url
- media.type.helfi_chart
module:
- helfi_media_chart
- link
- text
_core:
default_config_hash: 1xd_Ay1Sm-oy3t_qPIo9gRcIHleOgRxGwiLk41gA6Yw
default_config_hash: FUv-BgecAAz5WBHKaQdV8sD8uNcYSfMUOpMez76--HA
id: media.helfi_chart.default
targetEntityType: media
bundle: helfi_chart
Expand All @@ -33,9 +33,14 @@ content:
weight: 2
region: content
field_helfi_chart_url:
type: helfi_chart
type: link
label: hidden
settings: { }
settings:
trim_length: 80
url_only: true
url_plain: false
rel: ''
target: ''
third_party_settings: { }
weight: 1
region: content
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- helfi_media_chart
_core:
default_config_hash: FHz7mlEZIIXRsyZiI6EMFXkkmC4Qtdt1d4kzEN_fSY0
default_config_hash: 28nwEZaRGXg0zD-nmyYusiqAx3gMir52iQG7f5pcyJM
id: media.helfi_chart.media_library
targetEntityType: media
bundle: helfi_chart
Expand Down
28 changes: 14 additions & 14 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ content:
third_party_settings: { }
weight: 17
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
field_phone_label:
type: string
label: hidden
Expand Down Expand Up @@ -280,6 +287,13 @@ content:
third_party_settings: { }
weight: 16
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
toc_enabled:
type: boolean
label: hidden
Expand Down Expand Up @@ -316,20 +330,6 @@ content:
third_party_settings: { }
weight: 12
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
hidden:
created: true
field_categories: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- field.storage.media.field_helfi_chart_title
- media.type.helfi_chart
_core:
default_config_hash: NkVp00nT1XM4LgzHMR5KpcZejQka35JJzP47xH7r1yE
default_config_hash: 1-AJXcAy0ANS-0BXwAAz8RiB9_s6MfjOP7Mh02yl1X4
id: media.helfi_chart.field_helfi_chart_title
field_name: field_helfi_chart_title
entity_type: media
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ third_party_settings:
allowed_formats:
- minimal
_core:
default_config_hash: eYXYJE9ziG8ujmLaO266WejbGDf4DUbUQU6QJac4zXY
default_config_hash: 59V-xqzI9H6QWi8JxWcfumBdgctyJuIKKQwy-fIz8xA
id: media.helfi_chart.field_helfi_chart_transcript
field_name: field_helfi_chart_transcript
entity_type: media
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
module:
- link
_core:
default_config_hash: V1HwyhpRiVfBUpG1VW9xYqhX2nyWcObeJLStCHAWJ0U
default_config_hash: fLnEZJ-Xn6hrPAbX1Rm-QF5wD7iFzgfGYmC7ZHQb3Uo
id: media.helfi_chart.field_helfi_chart_url
field_name: field_helfi_chart_url
entity_type: media
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/field.field.media.image.field_media_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ third_party_settings:
title: title
file: '0'
_core:
default_config_hash: uuOLryur4r1samXCVX2yDZ5xFTBOK5d5vtciBb0wMBk
default_config_hash: sqUCzZKbsacNIaBSbqEOIYmTe71GQajeaFPNIVlSXVE
id: media.image.field_media_image
field_name: field_media_image
entity_type: media
Expand All @@ -30,7 +30,7 @@ settings:
handler: 'default:file'
handler_settings: { }
file_directory: ''
file_extensions: 'png gif jpg jpeg'
file_extensions: 'png jpg jpeg'
max_filesize: ''
max_resolution: ''
min_resolution: ''
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.media.field_helfi_chart_title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- media
_core:
default_config_hash: yLiblI3eUbV0Sc4-XQIRmuXcC_86RLrjM1x7hpE7sgM
default_config_hash: E9vNuq40qcDWpbVXzhJZIT-bS2dY1UtXzBLkSzXX5cM
id: media.field_helfi_chart_title
field_name: field_helfi_chart_title
entity_type: media
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- media
- text
_core:
default_config_hash: uqaIgIT9IhvV9B6Q2Lv7oC-6c3Tdc6DKqKrL5tenzWE
default_config_hash: XBAZ5mxW37dvu50a4J6YRsS1nIMmSrrbp6o123TjEPU
id: media.field_helfi_chart_transcript
field_name: field_helfi_chart_transcript
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/field.storage.media.field_helfi_chart_url.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- link
- media
_core:
default_config_hash: 5_rvFqrv3gOFWntv-K-YqlVVzLGf2qMtMHNV5JRlOAQ
default_config_hash: TFCN5mPRa-KucnPSitp_Q9YBEVittmV1k3IB-cdhq6I
id: media.field_helfi_chart_url
field_name: field_helfi_chart_url
entity_type: media
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/language.content_settings.media.helfi_chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
config:
- media.type.helfi_chart
_core:
default_config_hash: 2BVN4f7oVA6fKcWq9zF90vKpBQ122PgyhnrbvoSn_gk
default_config_hash: Ohvg1161oVX8a2EjOkWgQumATkIUd0YaZeQfqCSZ-d8
id: media.helfi_chart
target_entity_type_id: media
target_bundle: helfi_chart
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/language/fi/views.view.files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ display:
label: Muutospäivämäärä
count:
label: Käytetään
format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
pager:
options:
tags:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/media.type.helfi_chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
module:
- helfi_media_chart
_core:
default_config_hash: 1503jEWhXt0uww_73X1tsvrKBnZlbrduYrVR0J4IugA
default_config_hash: fE_5vzXaso2zcPNu6y4-ltGFLCUYWlG98COd3d7SbIk
id: helfi_chart
label: 'Chart embed'
description: 'Media type Chart can be used to present interactive charts. Supports Microsoft Power BI.'
Expand Down
Loading