diff --git a/composer.lock b/composer.lock index 7fb16234..cbece90c 100644 --- a/composer.lock +++ b/composer.lock @@ -475,25 +475,25 @@ }, { "name": "consolidation/annotated-command", - "version": "4.9.2", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "b5255dcbee1de95036185062a103dabc622224de" + "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/b5255dcbee1de95036185062a103dabc622224de", - "reference": "b5255dcbee1de95036185062a103dabc622224de", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e830ba908c9ffb1ba7ca056203531b27188812c", + "reference": "1e830ba908c9ffb1ba7ca056203531b27188812c", "shasum": "" }, "require": { "consolidation/output-formatters": "^4.3.1", "php": ">=7.1.3", "psr/log": "^1 || ^2 || ^3", - "symfony/console": "^4.4.8 || ^5 || ^6", - "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6", - "symfony/finder": "^4.4.8 || ^5 || ^6" + "symfony/console": "^4.4.8 || ^5 || ^6 || ^7", + "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6 || ^7", + "symfony/finder": "^4.4.8 || ^5 || ^6 || ^7" }, "require-dev": { "composer-runtime-api": "^2.0", @@ -525,9 +525,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.9.2" + "source": "https://github.com/consolidation/annotated-command/tree/4.10.0" }, - "time": "2023-12-26T14:30:50+00:00" + "time": "2024-04-05T21:05:39+00:00" }, { "name": "consolidation/config", @@ -875,23 +875,23 @@ }, { "name": "consolidation/site-alias", - "version": "4.0.1", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-alias.git", - "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5" + "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-alias/zipball/b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5", - "reference": "b0eeb8c8f3d54d072824ee31b5e00cb5181f91c5", + "url": "https://api.github.com/repos/consolidation/site-alias/zipball/1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", + "reference": "1056ceb93f6aafe6f7600d7bbe1b62b8488abccf", "shasum": "" }, "require": { - "consolidation/config": "^1.2.1 || ^2", + "consolidation/config": "^1.2.1 || ^2 || ^3", "php": ">=7.4", - "symfony/filesystem": "^5.4 || ^6", - "symfony/finder": "^5 || ^6" + "symfony/filesystem": "^5.4 || ^6 || ^7", + "symfony/finder": "^5 || ^6 || ^7" }, "require-dev": { "php-coveralls/php-coveralls": "^2.4.2", @@ -928,30 +928,30 @@ "description": "Manage alias records for local and remote sites.", "support": { "issues": "https://github.com/consolidation/site-alias/issues", - "source": "https://github.com/consolidation/site-alias/tree/4.0.1" + "source": "https://github.com/consolidation/site-alias/tree/4.1.0" }, - "time": "2023-04-29T17:18:10+00:00" + "time": "2024-04-05T15:58:04+00:00" }, { "name": "consolidation/site-process", - "version": "5.3.0", + "version": "5.4.0", "source": { "type": "git", "url": "https://github.com/consolidation/site-process.git", - "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77" + "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/site-process/zipball/5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", - "reference": "5e8eff50fd0015e7ca0b6ce4082cacef012f2f77", + "url": "https://api.github.com/repos/consolidation/site-process/zipball/7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", + "reference": "7ab3ffe4195a89b8dc334ea22e7881abe79ffd9a", "shasum": "" }, "require": { - "consolidation/config": "^2", + "consolidation/config": "^2 || ^3", "consolidation/site-alias": "^3 || ^4", "php": ">=8.0.14", - "symfony/console": "^5.4 || ^6", - "symfony/process": "^6" + "symfony/console": "^5.4 || ^6 || ^7", + "symfony/process": "^6 || ^7" }, "require-dev": { "phpunit/phpunit": "^9", @@ -985,9 +985,9 @@ "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.", "support": { "issues": "https://github.com/consolidation/site-process/issues", - "source": "https://github.com/consolidation/site-process/tree/5.3.0" + "source": "https://github.com/consolidation/site-process/tree/5.4.0" }, - "time": "2024-04-01T12:42:12+00:00" + "time": "2024-04-06T00:00:28+00:00" }, { "name": "cweagans/composer-patches", @@ -4292,16 +4292,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.40", + "version": "4.3.41", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f62abb1abfc3d66f00767e9e9a81ba18b5544729" + "reference": "e79725631ab8ce474b48ddda048710ded1fe6063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f62abb1abfc3d66f00767e9e9a81ba18b5544729", - "reference": "f62abb1abfc3d66f00767e9e9a81ba18b5544729", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e79725631ab8ce474b48ddda048710ded1fe6063", + "reference": "e79725631ab8ce474b48ddda048710ded1fe6063", "shasum": "" }, "require": { @@ -4417,10 +4417,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.40", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.41", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-04-05T12:55:10+00:00" + "time": "2024-04-08T07:25:27+00:00" }, { "name": "drupal/helfi_proxy", @@ -6285,17 +6285,17 @@ }, { "name": "drupal/search_api", - "version": "1.33.0", + "version": "1.34.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.33" + "reference": "8.x-1.34" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.33.zip", - "reference": "8.x-1.33", - "shasum": "6414709995217599839167bc638e0e49243ff714" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.34.zip", + "reference": "8.x-1.34", + "shasum": "dd08166888f90adaf01cc1a759266097709efe7c" }, "require": { "drupal/core": "^10.1 || ^11" @@ -6316,8 +6316,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.33", - "datestamp": "1712242225", + "version": "8.x-1.34", + "datestamp": "1712400445", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7888,33 +7888,29 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.3", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0" + "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/0795b7db12838ffb7bc564e0a02cf53fb1463ec0", - "reference": "0795b7db12838ffb7bc564e0a02cf53fb1463ec0", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", + "reference": "4ea9ac8d7fc599fffe7108f8821a7b324b5d0af4", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=7.4" }, "require-dev": { "composer-runtime-api": "^2.0.0", - "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9 | ^10", "sebastian/comparator": ">=4", "sebastian/diff": ">=4", - "squizlabs/php_codesniffer": ">=3.6", "symfony/console": ">=5.4", "symfony/filesystem": ">=5.4", "symfony/var-dumper": ">=5.4", - "symfony/yaml": ">=5.4", - "vimeo/psalm": "^4.23 | ^5" + "symfony/yaml": ">=5.4" }, "bin": [ "bin/fileeye-mimemap" @@ -7944,9 +7940,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.3" + "source": "https://github.com/FileEye/MimeMap/tree/2.1.0" }, - "time": "2023-11-11T14:14:23+00:00" + "time": "2024-04-06T13:00:52+00:00" }, { "name": "fileeye/pel", 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 cc238816..e49ffc82 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 @@ -133,6 +133,16 @@ content: allowed_formats: hide_help: '1' hide_guidelines: '1' + field_categories: + type: readonly_field_widget + weight: 39 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } field_content: type: paragraphs weight: 31 @@ -152,6 +162,16 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + field_hs_front_page: + type: entity_reference_autocomplete + weight: 31 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } field_lower_content: type: paragraphs weight: 33 @@ -179,6 +199,16 @@ content: sidebar: false use_details: true third_party_settings: { } + field_ontologyword_details: + type: readonly_field_widget + weight: 40 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } field_phone_label: type: string_textfield weight: 11 @@ -194,6 +224,16 @@ content: settings: display_label: true third_party_settings: { } + field_study_field: + type: select2_entity_reference + weight: 31 + region: content + settings: + width: 100% + autocomplete: false + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } field_unit_type: type: entity_reference_autocomplete weight: 34 @@ -204,6 +244,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + hide_description: + type: boolean_checkbox + weight: 18 + region: content + settings: + display_label: true + third_party_settings: { } hide_sidebar_navigation: type: boolean_checkbox weight: 35 @@ -391,6 +438,16 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + subgroup: + type: readonly_field_widget + weight: 40 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } toc_enabled: type: boolean_checkbox weight: 3 @@ -439,63 +496,6 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - field_categories: - type: readonly_field_widget - weight: 39 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } - field_hs_front_page: - type: entity_reference_autocomplete - weight: 31 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } - field_ontologyword_details: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } - field_study_field: - type: select2_entity_reference - weight: 31 - region: content - settings: - width: 100% - autocomplete: false - match_operator: CONTAINS - match_limit: 10 - third_party_settings: { } - hide_description: - type: boolean_checkbox - weight: 18 - region: content - settings: - display_label: true - third_party_settings: { } - subgroup: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } hidden: created: true field_districts: true 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 9a535d4c..1696fa32 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 @@ -143,6 +143,13 @@ content: third_party_settings: { } weight: 17 region: content + field_ontologyword_details: + type: tpr_ontologyword_details_formatter + label: hidden + settings: { } + third_party_settings: { } + weight: 28 + region: content field_phone_label: type: string label: hidden @@ -280,6 +287,13 @@ content: third_party_settings: { } weight: 16 region: content + subgroup: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 32 + region: content toc_enabled: type: boolean label: hidden @@ -316,20 +330,6 @@ content: third_party_settings: { } weight: 12 region: content - field_ontologyword_details: - type: tpr_ontologyword_details_formatter - label: hidden - settings: { } - third_party_settings: { } - weight: 28 - region: content - subgroup: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 32 - region: content hidden: created: true field_categories: true diff --git a/tools/make/ansible.mk b/tools/make/ansible.mk index 5244b756..132f84c1 100644 --- a/tools/make/ansible.mk +++ b/tools/make/ansible.mk @@ -1,27 +1,24 @@ -ANSIBLE_INVENTORY_PATH ?= ansible/inventory ANSIBLE_ROLES_PATH ?= ansible/roles ANSIBLE_CHECK_ROLE ?= geerlingguy.docker ANSIBLE_PLAYBOOK ?= ansible-playbook ANSIBLE_PROVISION ?= ansible/provision.yml ANSIBLE_REQUIREMENTS ?= ansible/requirements.yml +ANSIBLE_FLAGS ?= PHONY += provision -provision: INVENTORY ?= production provision: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning $(call step,Ansible: Make dry run on provisioning...\n) - @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) + @$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) $(ANSIBLE_FLAGS) PHONY += provision-% -provision-%: INVENTORY ?= production provision-%: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make provisioning by tag $(call step,Ansible: Make provisioning by tag "$*"...\n) - @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --tags="$*" + @$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) --tags="$*" $(ANSIBLE_FLAGS) PHONY += provision-dry-run -provision-dry-run: INVENTORY ?= production provision-dry-run: $(ANSIBLE_ROLES_PATH)/$(ANSIBLE_CHECK_ROLE) ## Make dry run on provisioning $(call step,Ansible: Make dry run on provisioning...\n) - @$(ANSIBLE_PLAYBOOK) -i $(ANSIBLE_INVENTORY_PATH)/$(INVENTORY) $(ANSIBLE_PROVISION) --check + @$(ANSIBLE_PLAYBOOK) $(ANSIBLE_PROVISION) $(ANSIBLE_FLAGS) --check PHONY += ansible-install-roles ansible-install-roles: ## Install Ansible roles