diff --git a/composer.lock b/composer.lock index 812efa21..158bff71 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,23 +3751,23 @@ }, { "name": "drupal/hdbt", - "version": "5.5.13", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c45489163503d7d1c1499725fbe800ca18c0c4ee" + "reference": "b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c45489163503d7d1c1499725fbe800ca18c0c4ee", - "reference": "c45489163503d7d1c1499725fbe800ca18c0c4ee", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956", + "reference": "b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956", "shasum": "" }, "require": { "drupal/twig_tweak": "^2.0 || ^3.0" }, "conflict": { - "drupal/helfi_platform_config": "<3.0" + "drupal/helfi_platform_config": "<3.3.8" }, "type": "drupal-theme", "license": [ @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.13", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-01T12:09:33+00:00" + "time": "2023-09-06T13:06:13+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.20", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c" + "reference": "2224db4ce144dc84672229271952dabb33c377f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/1da31a4c69b2c3620a4f4636e599642dd7d6907c", - "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2224db4ce144dc84672229271952dabb33c377f5", + "reference": "2224db4ce144dc84672229271952dabb33c377f5", "shasum": "" }, "require": { @@ -3905,10 +3905,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.20", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-31T06:57:37+00:00" + "time": "2023-09-06T05:15:45+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3955,12 +3955,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "a7868ae97fee754fd8110a991c364decbb492f1a" + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/a7868ae97fee754fd8110a991c364decbb492f1a", - "reference": "a7868ae97fee754fd8110a991c364decbb492f1a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", "shasum": "" }, "default-branch": true, @@ -3973,7 +3973,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-08-30T11:41:00+00:00" + "time": "2023-09-06T06:27:11+00:00" }, { "name": "drupal/helfi_navigation", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.9", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a" + "reference": "88784de7e0df5fe2e051ee352bace872d819e951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/44bd43974a82eab9c9c95cf2727b383b6da2d82a", - "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/88784de7e0df5fe2e051ee352bace872d819e951", + "reference": "88784de7e0df5fe2e051ee352bace872d819e951", "shasum": "" }, "require": { @@ -4126,23 +4126,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.9", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-01T08:09:08+00:00" + "time": "2023-09-06T13:06:18+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4" + "reference": "66121d5241d9cff17021f8a197a2d79361d06f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", - "reference": "257e937e6e1d77e8da5ec1ef20f133109b9b1ed4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/66121d5241d9cff17021f8a197a2d79361d06f80", + "reference": "66121d5241d9cff17021f8a197a2d79361d06f80", "shasum": "" }, "require": { @@ -4170,23 +4170,23 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-08-11T05:35:26+00:00" + "time": "2023-09-04T11:31:52+00:00" }, { "name": "drupal/helfi_tpr", - "version": "2.2.5", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "d44cc81f6f6827c1de90f4815a34bb1abb79386f" + "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d44cc81f6f6827c1de90f4815a34bb1abb79386f", - "reference": "d44cc81f6f6827c1de90f4815a34bb1abb79386f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f73c27c4d30522303dfadf1228c7331e120f04ac", + "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac", "shasum": "" }, "require": { @@ -4212,10 +4212,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-06-22T12:05:00+00:00" + "time": "2023-09-01T12:09:30+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4996,17 +4996,17 @@ }, { "name": "drupal/paragraphs", - "version": "1.15.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs.git", - "reference": "8.x-1.15" + "reference": "8.x-1.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.15.zip", - "reference": "8.x-1.15", - "shasum": "2ed2d3199553010fa1c500181bbebe676e9e60c1" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.16.zip", + "reference": "8.x-1.16", + "shasum": "48f60810fd8086a52d56e84af8b212cce7a270e8" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5030,8 +5030,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.15", - "datestamp": "1661440897", + "version": "8.x-1.16", + "datestamp": "1694007797", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml new file mode 100644 index 00000000..7ed0aed7 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,27 @@ +uuid: 27a4472e-c2ae-4a88-9a64-a8e600bcc2c1 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: XTEz2KOP0AxeNZflb25hxjCLvb_Tl590CDAqqxbAFW4 +id: paragraph.unit_accessibility_information.default +targetEntityType: paragraph +bundle: unit_accessibility_information +mode: default +content: + field_unit_accessibility_unit: + type: entity_reference_autocomplete + weight: 0 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml new file mode 100644 index 00000000..2cb807ae --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,100 @@ +uuid: e069faae-e560-4913-8017-87ae5d981317 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_unit + - field.field.paragraph.unit_contact_card.field_unit_contact_use_address + - field.field.paragraph.unit_contact_card.field_unit_contact_use_details + - field.field.paragraph.unit_contact_card.field_unit_contact_use_link + - field.field.paragraph.unit_contact_card.field_unit_contact_use_opening + - field.field.paragraph.unit_contact_card.field_unit_contact_use_override + - field.field.paragraph.unit_contact_card.field_unit_contact_use_phone + - field.field.paragraph.unit_contact_card.field_unit_contact_use_picture + - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: Bq6G32sj09-QkuhN599_1I8I8SYgRyC4LsKo7y2srSM +id: paragraph.unit_contact_card.default +targetEntityType: paragraph +bundle: unit_contact_card +mode: default +content: + field_unit_contact_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_unit_contact_unit: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + field_unit_contact_use_address: + type: boolean_checkbox + weight: 2 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_details: + type: boolean_checkbox + weight: 8 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_link: + type: boolean_checkbox + weight: 9 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_opening: + type: boolean_checkbox + weight: 5 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_override: + type: boolean_checkbox + weight: 7 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_phone: + type: boolean_checkbox + weight: 4 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_picture: + type: boolean_checkbox + weight: 6 + region: content + settings: + display_label: true + third_party_settings: { } + field_unit_contact_use_postal: + type: boolean_checkbox + weight: 3 + region: content + settings: + display_label: true + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index ba8bba2b..5eab4a8c 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - weight: 36 region: content + weight: 36 settings: label: above formatter_type: null @@ -176,8 +176,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - weight: 32 region: content + weight: 33 settings: label: above formatter_type: null @@ -203,8 +203,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - weight: 35 region: content + weight: 31 settings: label: above formatter_type: null @@ -241,8 +241,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - weight: 31 region: content + weight: 32 settings: label: above formatter_type: null @@ -251,8 +251,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - weight: 33 region: content + weight: 34 settings: label: above formatter_type: null @@ -294,8 +294,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - weight: 34 region: content + weight: 35 settings: label: above formatter_type: null diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index 53bcf1f6..3906ad53 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml new file mode 100644 index 00000000..49662159 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,23 @@ +uuid: ba0079e3-530a-458c-9cd1-d3c7265f8c74 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: fs0hvNS9lcziz7yNYs7VDWHmIs6wqeA2SZxMrkpb3KQ +id: paragraph.unit_accessibility_information.default +targetEntityType: paragraph +bundle: unit_accessibility_information +mode: default +content: + field_unit_accessibility_unit: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content +hidden: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml new file mode 100644 index 00000000..d39a29ca --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,48 @@ +uuid: c8321e31-affa-4edb-a4f5-fd3e7d283677 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.unit_contact_card.field_unit_contact_title + - field.field.paragraph.unit_contact_card.field_unit_contact_unit + - field.field.paragraph.unit_contact_card.field_unit_contact_use_address + - field.field.paragraph.unit_contact_card.field_unit_contact_use_details + - field.field.paragraph.unit_contact_card.field_unit_contact_use_link + - field.field.paragraph.unit_contact_card.field_unit_contact_use_opening + - field.field.paragraph.unit_contact_card.field_unit_contact_use_override + - field.field.paragraph.unit_contact_card.field_unit_contact_use_phone + - field.field.paragraph.unit_contact_card.field_unit_contact_use_picture + - field.field.paragraph.unit_contact_card.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: EU0zJOIFt1tmZeUsDpYl1d3uFvYxMy7dPm6tX4qhGC0 +id: paragraph.unit_contact_card.default +targetEntityType: paragraph +bundle: unit_contact_card +mode: default +content: + field_unit_contact_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + field_unit_contact_unit: + type: entity_reference_label + label: hidden + settings: + link: false + third_party_settings: { } + weight: 1 + region: content +hidden: + field_unit_contact_use_address: true + field_unit_contact_use_details: true + field_unit_contact_use_link: true + field_unit_contact_use_opening: true + field_unit_contact_use_override: true + field_unit_contact_use_phone: true + field_unit_contact_use_picture: true + field_unit_contact_use_postal: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index 7fa92d9a..527394f3 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: DOuUkveApF8w1Src7sCS9GnmmA_IpAqLzHYZYzCmPPk + default_config_hash: eEYHiODeZDTb8z0FJIhd8OeomGNTM2nh51IdmVBQBqc id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -45,7 +45,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 21 + weight: 19 region: content accessibility_www: type: link @@ -81,13 +81,6 @@ content: third_party_settings: { } weight: 11 region: content - contacts: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 26 - region: content description: type: text_default label: hidden @@ -110,7 +103,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 20 + weight: 18 region: content field_lower_content: type: entity_reference_revisions_entity_view @@ -119,7 +112,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 22 + weight: 20 region: content field_metatags: type: metatag_empty_formatter @@ -133,14 +126,7 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 24 - region: content - links: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 25 + weight: 22 region: content name: type: string @@ -165,13 +151,6 @@ content: third_party_settings: { } weight: 7 region: content - other_info: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 18 - region: content phone: type: telephone_link label: hidden @@ -198,20 +177,13 @@ content: third_party_settings: { } weight: 4 region: content - price_info: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 19 - region: content provided_languages: type: string label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 23 + weight: 21 region: content service_map_embed: type: service_map_embed @@ -244,11 +216,15 @@ content: weight: 12 region: content hidden: + contacts: true created: true field_unit_type: true hide_description: true langcode: true latitude: true + links: true longitude: true + other_info: true + price_info: true show_www: true streetview_entrance_url: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index 1e21b25a..27462ad9 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml b/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..fd39afbe --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml @@ -0,0 +1,28 @@ +uuid: 26e9d33f-c61b-461f-a6e8-32ebd00fb751 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_accessibility_unit + - paragraphs.paragraphs_type.unit_accessibility_information +_core: + default_config_hash: ALIooZkYAEjfYbY7WHEJz8hSboKA9IjSro9xUr5Lpxw +id: paragraph.unit_accessibility_information.field_unit_accessibility_unit +field_name: field_unit_accessibility_unit +entity_type: paragraph +bundle: unit_accessibility_information +label: Unit +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:tpr_unit' + handler_settings: + target_bundles: null + sort: + field: name + direction: DESC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml new file mode 100644 index 00000000..c47cbc2e --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml @@ -0,0 +1,21 @@ +uuid: cb754bd4-6da9-4cf9-9208-4dc1540630b1 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_title + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: BBtHOIG5Kl00da2A5MGqujVP7Mv30KLIQo0EppzL_6Y +id: paragraph.unit_contact_card.field_unit_contact_title +field_name: field_unit_contact_title +entity_type: paragraph +bundle: unit_contact_card +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml new file mode 100644 index 00000000..55848447 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml @@ -0,0 +1,28 @@ +uuid: cd405539-c63f-4b0d-ae7c-6cbfedde85ca +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_unit + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: '-TJ64AvbccN9tM_3346W4uk62EMhack-1q7ScuxBvc8' +id: paragraph.unit_contact_card.field_unit_contact_unit +field_name: field_unit_contact_unit +entity_type: paragraph +bundle: unit_contact_card +label: Unit +description: 'Add here the unit that you want to appear as the contact card. The unit doesn''t have to be published.' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:tpr_unit' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml new file mode 100644 index 00000000..28c5435b --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml @@ -0,0 +1,25 @@ +uuid: c50df549-bdb6-4234-a539-cf729aef505f +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_address + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: iLunbVe1WwilCBd7ga4v1cMXJVMBff5W71TtUaGBFMY +id: paragraph.unit_contact_card.field_unit_contact_use_address +field_name: field_unit_contact_use_address +entity_type: paragraph +bundle: unit_contact_card +label: 'Show address' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml new file mode 100644 index 00000000..dbf5b0f6 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml @@ -0,0 +1,25 @@ +uuid: 37ed1f9e-211c-44df-a8e9-9904d77aebc7 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_details + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: mKUcY-77saUKuSnjzPmx8QHw-gtexDvlq60TkWZIfJw +id: paragraph.unit_contact_card.field_unit_contact_use_details +field_name: field_unit_contact_use_details +entity_type: paragraph +bundle: unit_contact_card +label: 'Show additional details' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml new file mode 100644 index 00000000..1dda2bad --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml @@ -0,0 +1,25 @@ +uuid: 6c2fbfa7-c9ae-4925-9aee-92c98d4ed33a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_link + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: 3C8lV79YWtodb_RzX5bcS31hANW92D4ic6XUUsSP5DA +id: paragraph.unit_contact_card.field_unit_contact_use_link +field_name: field_unit_contact_use_link +entity_type: paragraph +bundle: unit_contact_card +label: 'Show link to unit page' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..fc2d0b14 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml @@ -0,0 +1,25 @@ +uuid: 24588181-2821-41dd-a2f4-fd8e5be95580 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_opening + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: OAgqWDx1bTc8LKZaeOBw6xVxNTBrL6ivYhKXxO2YGQI +id: paragraph.unit_contact_card.field_unit_contact_use_opening +field_name: field_unit_contact_use_opening +entity_type: paragraph +bundle: unit_contact_card +label: 'Show opening hours' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml new file mode 100644 index 00000000..9cd8c274 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml @@ -0,0 +1,25 @@ +uuid: f35ca6cd-ff82-416f-8610-7395c606370a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_override + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: 8CkfaWELO_WKLOH9HtEAEjBJ4GXUTt-9nYYPvyOpT48 +id: paragraph.unit_contact_card.field_unit_contact_use_override +field_name: field_unit_contact_use_override +entity_type: paragraph +bundle: unit_contact_card +label: 'Prefer override picture' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..b3353485 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml @@ -0,0 +1,25 @@ +uuid: 51106d11-fbd5-47ec-8598-da86b5151a63 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_phone + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: BnO5qnDTPxaMoFFoYvGvl8YDm-kg_8u6ftGQEcrS8PQ +id: paragraph.unit_contact_card.field_unit_contact_use_phone +field_name: field_unit_contact_use_phone +entity_type: paragraph +bundle: unit_contact_card +label: 'Show phone number' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..a3b8dd0c --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml @@ -0,0 +1,25 @@ +uuid: bb2f2ae9-fece-4dfd-9b9e-9f9170a96390 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_picture + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: W9PYT8Kh6u4JtMcPeUHHWL7JCpUl9x9LGu3IUq7plzU +id: paragraph.unit_contact_card.field_unit_contact_use_picture +field_name: field_unit_contact_use_picture +entity_type: paragraph +bundle: unit_contact_card +label: 'Show picture' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..e7486d52 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml @@ -0,0 +1,25 @@ +uuid: 4f703a35-f8e0-46e7-b661-e190475ff179 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_unit_contact_use_postal + - paragraphs.paragraphs_type.unit_contact_card +_core: + default_config_hash: LK-JB_ukUxsmyTtykK_7GlgaMDQMmgDvZ9MIMtIKjiA +id: paragraph.unit_contact_card.field_unit_contact_use_postal +field_name: field_unit_contact_use_postal +entity_type: paragraph +bundle: unit_contact_card +label: 'Show postal address' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml index d883dbae..c18c3030 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml @@ -17,6 +17,8 @@ dependencies: - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text + - paragraphs.paragraphs_type.unit_accessibility_information + - paragraphs.paragraphs_type.unit_contact_card module: - entity_reference_revisions - helfi_tpr @@ -49,6 +51,8 @@ settings: contact_card_listing: contact_card_listing map: map event_list: event_list + unit_accessibility_information: unit_accessibility_information + unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: accordion: @@ -90,4 +94,10 @@ settings: text: weight: 0 enabled: true + unit_accessibility_information: + weight: 0 + enabled: true + unit_contact_card: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index cb67808d..dded43db 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -19,6 +19,8 @@ dependencies: - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text + - paragraphs.paragraphs_type.unit_accessibility_information + - paragraphs.paragraphs_type.unit_contact_card module: - entity_reference_revisions - helfi_tpr @@ -38,6 +40,7 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: + text: text columns: columns accordion: accordion image: image @@ -50,9 +53,10 @@ settings: news_list: news_list event_list: event_list phasing: phasing - text: text contact_card_listing: contact_card_listing map: map + unit_accessibility_information: unit_accessibility_information + unit_contact_card: unit_contact_card negate: 0 target_bundles_drag_drop: accordion: @@ -100,4 +104,10 @@ settings: text: weight: 0 enabled: true + unit_accessibility_information: + weight: 0 + enabled: true + unit_contact_card: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..588b41a7 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml @@ -0,0 +1,22 @@ +uuid: b7615858-a48d-4224-ae02-25522ab50dec +langcode: en +status: true +dependencies: + module: + - helfi_tpr + - paragraphs +_core: + default_config_hash: FLBlbWAOFQ3vURlgVJl8tNoscxkpu-55Zcvg-56WMW8 +id: paragraph.field_unit_accessibility_unit +field_name: field_unit_accessibility_unit +entity_type: paragraph +type: entity_reference +settings: + target_type: tpr_unit +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml new file mode 100644 index 00000000..634d39c0 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml @@ -0,0 +1,23 @@ +uuid: c687cd4b-ef70-450d-be79-1008a68dc424 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: __gD1etYKkpxWM60OG0-8kRfJSExluB7IPDw0Zw3pHY +id: paragraph.field_unit_contact_title +field_name: field_unit_contact_title +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml new file mode 100644 index 00000000..3a00e751 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml @@ -0,0 +1,22 @@ +uuid: 9fc47e6c-6019-44b0-a56e-9dd2a1fee972 +langcode: en +status: true +dependencies: + module: + - helfi_tpr + - paragraphs +_core: + default_config_hash: Z0W-YvWIH7qcJhQVWjc4p71lza1_Wxg6-YidXqgwTlE +id: paragraph.field_unit_contact_unit +field_name: field_unit_contact_unit +entity_type: paragraph +type: entity_reference +settings: + target_type: tpr_unit +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml new file mode 100644 index 00000000..b3a66679 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml @@ -0,0 +1,20 @@ +uuid: d66d5652-6e31-4be8-9cf8-95c9944b071d +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: 1kY30D0bv455CcZ4b8UfYmGcJUpG53xYQLMGUow4tKk +id: paragraph.field_unit_contact_use_address +field_name: field_unit_contact_use_address +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml new file mode 100644 index 00000000..fbe61e5f --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml @@ -0,0 +1,20 @@ +uuid: 201b89b0-3020-455a-9315-7fbfcf853e95 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: QbAK6AxVnG-CVWk-mgIFztvzAWUhTEhxnyDfWUBlTLs +id: paragraph.field_unit_contact_use_details +field_name: field_unit_contact_use_details +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml new file mode 100644 index 00000000..c0080f03 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml @@ -0,0 +1,20 @@ +uuid: f25043af-2452-4672-9976-3bedf5bacfdf +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BYzeR71DrkBqeMjYVof2ZkTX2qwf9R3dHSQTmIMkrTs +id: paragraph.field_unit_contact_use_link +field_name: field_unit_contact_use_link +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..ed31e14e --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml @@ -0,0 +1,20 @@ +uuid: 00807287-cb65-4cca-bf4d-ee56840ce632 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: iRABYacXMrVsyWc-6NU76Wl1BSJc64qszZFMtSKNbBo +id: paragraph.field_unit_contact_use_opening +field_name: field_unit_contact_use_opening +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml new file mode 100644 index 00000000..d9cc942c --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml @@ -0,0 +1,20 @@ +uuid: 4a8879df-dc3d-4537-9193-b43ab6970f6d +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: sB8QMehrRh0OCPzqZOkwLtal3-HS5HYKw5YYkyuvUyM +id: paragraph.field_unit_contact_use_override +field_name: field_unit_contact_use_override +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..46f792e6 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml @@ -0,0 +1,20 @@ +uuid: 62dbb439-8b4b-4307-bac3-32370ff04711 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BMng6GPfLZl_YBCvLZgvsH-12BXX1cuXWG5VUpvY8Ks +id: paragraph.field_unit_contact_use_phone +field_name: field_unit_contact_use_phone +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..e2223219 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml @@ -0,0 +1,20 @@ +uuid: ba4e7999-ac3e-44f2-b726-bcd7a6ed82db +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: l-tk7y3NxV3m7jfYlAfZ5If4zoSBAIAkYRbJQE3MOCc +id: paragraph.field_unit_contact_use_picture +field_name: field_unit_contact_use_picture +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml b/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..3ff8f284 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml @@ -0,0 +1,20 @@ +uuid: 9778ce7b-c97d-4676-83fb-2503cbb4e666 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: Gs3SkSx3iSaGvyfCHZTfIbp4IW1Y2Y_3TU1VlErxvOw +id: paragraph.field_unit_contact_use_postal +field_name: field_unit_contact_use_postal +entity_type: paragraph +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_accessibility_information.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_accessibility_information.yml new file mode 100644 index 00000000..f6161b77 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_accessibility_information.yml @@ -0,0 +1 @@ +label: 'Toimipisteen esteettömyystiedot' diff --git a/conf/cmi/paragraphs.paragraphs_type.unit_accessibility_information.yml b/conf/cmi/paragraphs.paragraphs_type.unit_accessibility_information.yml new file mode 100644 index 00000000..7a3011d4 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.unit_accessibility_information.yml @@ -0,0 +1,12 @@ +uuid: 7c60554b-75f2-4654-9faf-2e136a54e182 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: IvgO4i6-a_b1sr6K4GuswMmeIQSPOmChMj2153m_UtE +id: unit_accessibility_information +label: 'Unit accessibility information' +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/conf/cmi/paragraphs.paragraphs_type.unit_contact_card.yml b/conf/cmi/paragraphs.paragraphs_type.unit_contact_card.yml new file mode 100644 index 00000000..cf65cd1b --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.unit_contact_card.yml @@ -0,0 +1,12 @@ +uuid: 3c7b3669-b061-4e29-a58b-d2955941dac0 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: tbLi8ugyIzjhw6yIC8GnD7DwIclp9hchjpbdiJ8qeBI +id: unit_contact_card +label: 'Unit contact card' +icon_uuid: null +icon_default: null +description: 'With unit contact card you can reference to a single unit inside this site. The information about the unit is automatically fetched through the reference. Shown information can be customized and the unit doesn''t need to be published.' +behavior_plugins: { } diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 261d79f0..b4af19df 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -6,6 +6,8 @@ dependencies: - helfi_tpr - user - views_bulk_operations + - views_bulk_edit + - content_lock _core: default_config_hash: 0Q9MnLuLAYwltkBeCL-al8z-gc3-M2SFIWM50exDgxg id: tpr_unit_list diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh new file mode 100644 index 00000000..d5d0fc16 --- /dev/null +++ b/docker/openshift/crons/pubsub.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" + +i=0 +# Attempt to start this service five times. +until [ $i -gt 5 ] +do + drush helfi:azure:pubsub-listen + + if [[ "$?" -ne 0 ]]; then + ((i=i+1)) + sleep 10 + fi +done diff --git a/public/sites/default/azure.settings.php b/public/sites/default/azure.settings.php index bfc1a1eb..a5cdc866 100755 --- a/public/sites/default/azure.settings.php +++ b/public/sites/default/azure.settings.php @@ -22,3 +22,14 @@ $config['system.performance']['stale_file_threshold'] = 7776000; $settings['is_azure'] = TRUE; + +/** + * Deployment identifier. + * + * Use OpenShift build name (like 'drupal-1234') to determine + * if container needs to be invalidated and rebuilt. + * + * This should fix the issue where deployment fails due to changed service + * parameters. + */ +$settings['deployment_identifier'] = getenv('OPENSHIFT_BUILD_NAME');