diff --git a/composer.lock b/composer.lock index d4498908..d809d555 100644 --- a/composer.lock +++ b/composer.lock @@ -461,16 +461,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -520,9 +520,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -538,7 +538,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "consolidation/annotated-command", @@ -2639,10 +2639,6 @@ { "name": "tatarbj", "homepage": "https://www.drupal.org/user/649590" - }, - { - "name": "volkswagenchick", - "homepage": "https://www.drupal.org/user/3332522" } ], "description": "Adds configuration to the system breadcrumbs.", @@ -3751,23 +3747,23 @@ }, { "name": "drupal/hdbt", - "version": "5.5.9", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a" + "reference": "b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", + "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 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.9", + "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-08-28T13:26:21+00:00" + "time": "2023-09-06T13:06:13+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3866,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.19", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289" + "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/917de458ac2ed2b046a9c4125094f3d233c47289", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/10f5700e4c38c403d2cc54d2733cadaff72d67c1", + "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1", "shasum": "" }, "require": { @@ -3905,10 +3901,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.19", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-25T05:23:13+00:00" + "time": "2023-09-08T09:03:20+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3955,12 +3951,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0" + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5445ad9e47c0231243068982ef6eeb64fa1363b0", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", + "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", "shasum": "" }, "default-branch": true, @@ -3973,7 +3969,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-07-25T08:32:03+00:00" + "time": "2023-09-06T06:27:11+00:00" }, { "name": "drupal/helfi_navigation", @@ -4011,16 +4007,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.7", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" + "reference": "b58e4e2065a44b3fb89d8fcb6972e0510d7e2611" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b58e4e2065a44b3fb89d8fcb6972e0510d7e2611", + "reference": "b58e4e2065a44b3fb89d8fcb6972e0510d7e2611", "shasum": "" }, "require": { @@ -4113,9 +4109,6 @@ "drupal/social_media": { "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, - "drupal/translatable_menu_link_uri": { - "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" - }, "drupal/simple_sitemap": { "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } @@ -4126,23 +4119,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T11:40:56+00:00" + "time": "2023-09-11T05:24:41+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 +4163,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 +4205,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 +4989,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 +5023,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" @@ -5449,17 +5442,17 @@ }, { "name": "drupal/redirect", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "a7a440423434472ff7115ae69df01553f763f839" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "2987de20f509e9f7cec8a0f81d3a6774f9b0ba3e" }, "require": { "drupal/core": "^9.2 || ^10" @@ -5467,8 +5460,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1661806955", + "version": "8.x-1.9", + "datestamp": "1693393506", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6206,26 +6199,26 @@ }, { "name": "drupal/translatable_menu_link_uri", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/translatable_menu_link_uri.git", - "reference": "2.0.0" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.0.0.zip", - "reference": "2.0.0", - "shasum": "6960a485565d886cf35ee6dd56310de47e04e430" + "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.1.0.zip", + "reference": "2.1.0", + "shasum": "3bafa0a19761524560a2d232c945f10643e91053" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1597491393", + "version": "2.1.0", + "datestamp": "1694361965", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15783,16 +15776,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.1", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", "shasum": "" }, "require": { @@ -15824,9 +15817,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" }, - "time": "2023-08-03T16:32:59+00:00" + "time": "2023-09-07T20:46:32+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml new file mode 100644 index 00000000..548c93d5 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.hearings.default.yml @@ -0,0 +1,36 @@ +uuid: 7311f299-b957-429a-9982-ad24824fd111 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.hearings.field_hearings_description + - field.field.paragraph.hearings.field_hearings_title + - paragraphs.paragraphs_type.hearings + module: + - text +_core: + default_config_hash: l2kryFebseDJ_OFETKLTOsXMlUe1CuLoZiQne_X2Glk +id: paragraph.hearings.default +targetEntityType: paragraph +bundle: hearings +mode: default +content: + field_hearings_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_hearings_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true 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..8e10a868 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,27 @@ +uuid: 97e1b0db-551c-4704-a7f3-39177b53009b +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..b7c96b11 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,100 @@ +uuid: 678abd8a-899d-4cf2-83ea-8228e13a8c4a +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 05c6db9d..4821aca7 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 @@ -85,8 +85,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - weight: 36 region: content + weight: 36 settings: label: above formatter_type: null @@ -177,8 +177,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - weight: 32 region: content + weight: 33 settings: label: above formatter_type: null @@ -204,8 +204,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - weight: 35 region: content + weight: 31 settings: label: above formatter_type: null @@ -242,8 +242,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - weight: 31 region: content + weight: 32 settings: label: above formatter_type: null @@ -252,8 +252,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - weight: 33 region: content + weight: 34 settings: label: above formatter_type: null @@ -295,8 +295,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.helfi_hearings.helfi_hearings.default.yml b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml new file mode 100644 index 00000000..79729234 --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml @@ -0,0 +1,123 @@ +uuid: 8adc69e5-b0e7-4964-93ee-3f9529f30e09 +langcode: en +status: true +dependencies: + config: + - responsive_image.styles.image__3_2 + module: + - external_entities + - imagecache_external +_core: + default_config_hash: fILQEVNfZTZZh_DbxUgOfgAwVP5-S0z3Ud7QI4g8ato +id: helfi_hearings.helfi_hearings.default +targetEntityType: helfi_hearings +bundle: helfi_hearings +mode: default +content: + close_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + comments: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + count: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + created_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + existing_translations: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + langcode: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 + third_party_settings: { } + weight: 1 + region: content + main_image_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + open_at: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + organization: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + slug: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + url: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + abstract: true diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml new file mode 100644 index 00000000..0ee5ded0 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -0,0 +1,39 @@ +uuid: 37a0c678-6723-46a4-84a6-c33cb83466b4 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.hearings.field_hearings_description + - field.field.paragraph.hearings.field_hearings_title + - paragraphs.paragraphs_type.hearings + module: + - text +_core: + default_config_hash: kS2OalHOAuM9YHvNdaO9be_ys26-Wdo1tQjjgSniWoI +id: paragraph.hearings.default +targetEntityType: paragraph +bundle: hearings +mode: default +content: + field_hearings_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_hearings_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + list: + weight: 100 + settings: { } + third_party_settings: { } + 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..380119b6 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_accessibility_information.default.yml @@ -0,0 +1,23 @@ +uuid: d5ad2635-b753-42fb-bf36-f76f8dd3202f +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..0de6fb62 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.unit_contact_card.default.yml @@ -0,0 +1,48 @@ +uuid: b43a5dc3-a9ef-4382-9f05-ecfef15d2871 +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.extension.yml b/conf/cmi/core.extension.yml index 25955fb5..79a1e3eb 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -61,6 +61,7 @@ module: helfi_paragraphs_contact_card_listing: 0 helfi_paragraphs_content_cards: 0 helfi_paragraphs_content_liftup: 0 + helfi_paragraphs_hearings: 0 helfi_paragraphs_hero: 0 helfi_paragraphs_image: 0 helfi_paragraphs_liftup_with_image: 0 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml new file mode 100644 index 00000000..4c20a918 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -0,0 +1,54 @@ +uuid: ff9095e6-dbf8-4ffa-8f3f-3c7c1d2246e9 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: V9lWeTxHnS6dVGfiP_eapxOGbHw6NEaSSO5ePjVzWNc +id: helfi_hearings +label: 'Helfi: Hearing' +label_plural: 'Helfi: Hearing' +description: 'Helfi hearings from hearing api.' +generate_aliases: false +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: $.title + close_at: + value: $.close_at + created_at: + value: $.created_at + open_at: + value: $.open_at + slug: + value: $.slug + comments: + value: $.n_comments + organization: + value: $.organization + abstract: + value: $.abstract + main_image: + uri: $.main_image_url + main_image_title: + value: $.main_image_caption + count: + value: $.count + url: + value: $.url + langcode: + value: $.langcode + existing_translations: + value: $.existing_translations +storage_client_id: helfi_hearings +storage_client_config: { } +persistent_cache_max_age: 3600 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 10b43571..c8e84791 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.content_liftup - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library + - paragraphs.paragraphs_type.hearings - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.map @@ -59,6 +60,7 @@ settings: unit_search: unit_search service_list: service_list service_list_search: service_list_search + hearings: hearings negate: 0 target_bundles_drag_drop: banner: @@ -82,6 +84,9 @@ settings: from_library: weight: 0 enabled: true + hearings: + weight: 0 + enabled: true liftup_with_image: weight: 0 enabled: true diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml new file mode 100644 index 00000000..04e62302 --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml @@ -0,0 +1,28 @@ +uuid: 8d8dd103-670d-4480-98c6-a285c0ad9fc8 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hearings_description + - paragraphs.paragraphs_type.hearings + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: Hzutod731PQFSGM7oIqDKlHOOuWhCgfVW6PrPTUzBps +id: paragraph.hearings.field_hearings_description +field_name: field_hearings_description +entity_type: paragraph +bundle: hearings +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml new file mode 100644 index 00000000..7009237c --- /dev/null +++ b/conf/cmi/field.field.paragraph.hearings.field_hearings_title.yml @@ -0,0 +1,21 @@ +uuid: 2257db84-ae5f-4411-bb2c-33c93f98b804 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hearings_title + - paragraphs.paragraphs_type.hearings +_core: + default_config_hash: 7ND3L8b6WIkrG6ew034kRIVRBdyKZXVhRhEdlBu-tJ4 +id: paragraph.hearings.field_hearings_title +field_name: field_hearings_title +entity_type: paragraph +bundle: hearings +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_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..69b754be --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml @@ -0,0 +1,28 @@ +uuid: 4c0c41cc-3011-4774-8435-194dc93492c9 +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..e4f4e6d1 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml @@ -0,0 +1,21 @@ +uuid: edab7ce4-1805-45aa-a37c-2d8c0ea4e06a +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..95a45818 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml @@ -0,0 +1,28 @@ +uuid: 078a513f-dfea-413e-935a-f8107a08a5d5 +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..9a0df691 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml @@ -0,0 +1,25 @@ +uuid: c9dc3508-baca-43d9-9f33-57ea850c41f8 +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..c4b90f71 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml @@ -0,0 +1,25 @@ +uuid: e742fe3e-de8c-4737-99d2-828f1d108131 +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..655efee3 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml @@ -0,0 +1,25 @@ +uuid: 7e396192-95c0-49fc-b1b1-b01007caec20 +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..de92432e --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml @@ -0,0 +1,25 @@ +uuid: b900c94e-1c39-4458-b9fe-87efbdfd7b8e +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..5d860aaf --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml @@ -0,0 +1,25 @@ +uuid: 6ddfdd65-b487-4f3c-ac68-ebfc323ca23d +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..f6fc6fd6 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml @@ -0,0 +1,25 @@ +uuid: 38fb8aae-3cdb-4661-879e-f570adcc7dc3 +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..18575460 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml @@ -0,0 +1,25 @@ +uuid: 36440bdf-1940-46a0-8642-f59d0287d343 +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..2c19b81b --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml @@ -0,0 +1,25 @@ +uuid: e3485497-5d73-493f-8684-fa962f9d36cc +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 b30ec812..96db2333 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 8d11eb7a..a7fde611 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_hearings_description.yml b/conf/cmi/field.storage.paragraph.field_hearings_description.yml new file mode 100644 index 00000000..951b3094 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_description.yml @@ -0,0 +1,21 @@ +uuid: 522cb2db-169d-4753-874f-2cc65a16ba4b +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +_core: + default_config_hash: '-wixoAUHw5pe0XRvRilN50lCY_xQEdOGkGO5nVM-22M' +id: paragraph.field_hearings_description +field_name: field_hearings_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_hearings_title.yml b/conf/cmi/field.storage.paragraph.field_hearings_title.yml new file mode 100644 index 00000000..29cdc6ba --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_hearings_title.yml @@ -0,0 +1,23 @@ +uuid: 29e1e790-8c33-435d-890e-b2a7c58bc217 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: xpZE8O1B6Kf07XLP2CWf7FdWEwtSMvHUfl_gsLicNEo +id: paragraph.field_hearings_title +field_name: field_hearings_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_accessibility_unit.yml b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..9ee74afe --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_accessibility_unit.yml @@ -0,0 +1,22 @@ +uuid: b82b8d9c-b8c0-466d-90ba-c1d6e66a0230 +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..0ee52f12 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_title.yml @@ -0,0 +1,23 @@ +uuid: cd6c66b5-1c2c-44c1-a834-dd4042d47411 +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..daf2cb8c --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_unit.yml @@ -0,0 +1,22 @@ +uuid: d376fc4b-7c54-43cf-a4d5-414c6c07b7f3 +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..b4b31934 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_address.yml @@ -0,0 +1,20 @@ +uuid: b17917b8-c467-4b01-b814-bd99e0ac9ebe +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..47f2b2c9 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_details.yml @@ -0,0 +1,20 @@ +uuid: 30ddbbea-2533-4a95-9f44-3ecbdf0ce62a +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..07c41de5 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_link.yml @@ -0,0 +1,20 @@ +uuid: 9b87e21b-66e3-47d0-8ee7-c3441f49f07c +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..e0be2c67 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_opening.yml @@ -0,0 +1,20 @@ +uuid: a9a2fc4f-d8a1-4103-ad3b-1584b65f04e8 +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..f493a46d --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_override.yml @@ -0,0 +1,20 @@ +uuid: 342431df-6027-4900-a1df-41d9f59ad11e +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..3d347fc9 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_phone.yml @@ -0,0 +1,20 @@ +uuid: ddce8e0b-f56a-4aa9-a872-6f61b7ca5ac3 +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..e0c2e655 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_picture.yml @@ -0,0 +1,20 @@ +uuid: 2b78667c-3c5f-455f-a82f-0c8ec00add2e +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..92078355 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_unit_contact_use_postal.yml @@ -0,0 +1,20 @@ +uuid: 4c732e3c-6dbc-4681-bbb2-037baefe63e6 +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/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.hearings.field_hearings_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml b/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..88e5b786 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml @@ -0,0 +1 @@ +label: Toimipiste diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml new file mode 100644 index 00000000..2b7d9378 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml @@ -0,0 +1,2 @@ +label: Toimipiste +description: 'Lisää tähän sen toimipisteen otsikko jonka haluat nostaa sivulle. Toimipisteen ei tarvitse olla julkaistu.' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml new file mode 100644 index 00000000..4ec927ba --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml @@ -0,0 +1 @@ +label: 'Näytä katuosoite' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml new file mode 100644 index 00000000..cea1720e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml @@ -0,0 +1 @@ +label: 'Näytä lisätiedot' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml new file mode 100644 index 00000000..d7e060bc --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml @@ -0,0 +1 @@ +label: 'Näytä linkki toimipistesivulle' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..9c558e5b --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml @@ -0,0 +1 @@ +label: 'Näytä aukioloajat' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml new file mode 100644 index 00000000..7ced463e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml @@ -0,0 +1 @@ +label: 'Suosi ylikirjoituskuvaa' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..e2d3e1b5 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml @@ -0,0 +1 @@ +label: 'Näytä puhelinnumero' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..eae45b58 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml @@ -0,0 +1 @@ +label: 'Näytä kuva' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..ee9ef69e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml @@ -0,0 +1 @@ +label: 'Näytä postiosoite' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml new file mode 100644 index 00000000..2f308756 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.hearings.yml @@ -0,0 +1,2 @@ +label: Kuulemiset +description: 'Listaa viimeisimmät kuulemiset Kerrokantasi palvelusta.' 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.hearings.yml b/conf/cmi/paragraphs.paragraphs_type.hearings.yml new file mode 100644 index 00000000..d0ed4fe8 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.hearings.yml @@ -0,0 +1,12 @@ +uuid: 2ac2fc23-63f7-428f-8a4f-f6fa5eaf8af3 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: d0QTGlsuM8eoA_FwYt3CPKctSfup5wapuDC__Kj5Os4 +id: hearings +label: Hearings +icon_uuid: null +icon_default: null +description: 'Lists latest hearings from Kerrokantasi service. ' +behavior_plugins: { } 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..25f9af91 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.unit_accessibility_information.yml @@ -0,0 +1,12 @@ +uuid: b56a0d04-7d75-4849-a83c-8aa1d5486181 +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..4ca04d5a --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.unit_contact_card.yml @@ -0,0 +1,12 @@ +uuid: 59df443c-8b31-4364-b972-2720b5eb39e6 +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.redirect.yml b/conf/cmi/views.view.redirect.yml index 2dd66c6a..cd1e8825 100644 --- a/conf/cmi/views.view.redirect.yml +++ b/conf/cmi/views.view.redirect.yml @@ -247,7 +247,7 @@ display: type: basic options: submit_button: Filter - reset_button: false + reset_button: true reset_button_label: Reset exposed_sorts_label: 'Sort by' expose_sort_order: true diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 73531832..4b57cba4 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 100644 --- 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'); diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 91ae77dd..fb6e9839 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -276,3 +276,13 @@ include_once __DIR__ . '/azure.settings.php'; // NOSONAR } } + +/** + * Deployment identifier. + * + * Default 'deployment_identifier' cache key to modified time of 'composer.lock' + * file in case it's not already defined. + */ +if (empty($settings['deployment_identifier'])) { + $settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock'); +} diff --git a/tools/make/docker.mk b/tools/make/docker.mk index 0aa08006..d7271e80 100644 --- a/tools/make/docker.mk +++ b/tools/make/docker.mk @@ -38,7 +38,7 @@ stop: ## Stop the environment PHONY += up up: ## Launch the environment $(call step,Start up the container(s)...\n) - $(call docker_compose,up -d --remove-orphans) + $(call docker_compose,up --wait --remove-orphans) PHONY += shell shell: ## Login to CLI container diff --git a/tools/make/qa.mk b/tools/make/qa.mk index c3596a79..f4988fbe 100644 --- a/tools/make/qa.mk +++ b/tools/make/qa.mk @@ -60,11 +60,11 @@ endef ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes) define cs -$(call docker_compose_exec,$(1)) +$(call docker_compose_exec,vendor/bin/$(1)) endef else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no) define cs -$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) +$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2)) endef else define cs diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk index a756dc7b..73672075 100644 --- a/tools/make/symfony.mk +++ b/tools/make/symfony.mk @@ -1,6 +1,7 @@ SF_FRESH_TARGETS := up build sf-cw sf-about sf-open FIX_TARGETS += fix-symfony LINT_PHP_TARGETS += lint-symfony +CS_FIXER_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/php-cs-fixer && echo yes || echo no) PHONY += encore-dev encore-dev: ## Do Encore development build @@ -49,13 +50,12 @@ fresh: ## Build fresh development environment PHONY += fix-symfony fix-symfony: ## Fix Symfony code style $(call step,Fix Symfony code style...\n) - $(call docker_compose_exec,PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --ansi) + $(call cs_symfony,fix --ansi src) PHONY += lint-symfony -lint-symfony: PATHS := src lint-symfony: ## Lint Symfony code style $(call step,Lint Symfony code style...\n) - $(call cs_symfony,$(PATHS)) + $(call cs_symfony,fix --dry-run --diff --ansi --verbose src) ifeq ($(RUN_ON),docker) define sf_console @@ -67,12 +67,12 @@ define sf_console endef endif -ifeq ($(CS_INSTALLED),yes) +ifeq ($(CS_FIXER_INSTALLED),yes) define cs_symfony -$(call docker_compose_exec,vendor/bin/phpcs --ignore=node_modules $(1)) +$(call docker_compose_exec,vendor/bin/php-cs-fixer $(1)) endef else define cs_symfony -$(call warn,CodeSniffer is not installed!) +$(call warn,PHP CS Fixer is not installed!) endef endif