diff --git a/composer.lock b/composer.lock index fc96e943..b71d1e63 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.1", + "version": "5.5.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30" + "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/bea997016c5b4156677e97ac8162f694ff9f7f30", - "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", + "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-03T11:31:25+00:00" + "time": "2023-08-09T07:34:44+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.16", + "version": "2.4.17", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383" + "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", - "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4c3d285d0399b949db2ec6443fdd04937ee22532", + "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532", "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.16", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.17", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-07-10T06:57:27+00:00" + "time": "2023-08-04T05:28:12+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88" + "reference": "856ba5ec598cd55684f8e7e2b43a5dd17fcd9924" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7e25a554d05444ff5e8031d7b19d5d240a402d88", - "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/856ba5ec598cd55684f8e7e2b43a5dd17fcd9924", + "reference": "856ba5ec598cd55684f8e7e2b43a5dd17fcd9924", "shasum": "" }, "require": { @@ -4123,10 +4123,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-03T07:23:36+00:00" + "time": "2023-08-09T07:34:38+00:00" }, { "name": "drupal/helfi_proxy", @@ -5483,6 +5483,10 @@ "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" }, + { + "name": "Kristen Pol", + "homepage": "https://www.drupal.org/user/8389" + }, { "name": "pifagor", "homepage": "https://www.drupal.org/user/2375692" @@ -6493,17 +6497,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.4", + "version": "4.2.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.4" + "reference": "4.2.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.4.zip", - "reference": "4.2.4", - "shasum": "26f1dea73780fab2e338380ae803feca989172e1" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.5.zip", + "reference": "4.2.5", + "shasum": "220479c5187b1619d5703f64c6f8c272afecf897" }, "require": { "drupal/core": "^9.4 || ^10", @@ -6518,8 +6522,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.4", - "datestamp": "1685368786", + "version": "4.2.5", + "datestamp": "1691066184", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7553,16 +7557,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { @@ -7616,7 +7620,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.0" + "source": "https://github.com/guzzle/promises/tree/2.0.1" }, "funding": [ { @@ -7632,7 +7636,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T13:50:22+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", @@ -8330,26 +8334,26 @@ }, { "name": "league/mime-type-detection", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "c7f2872fb273bf493811473dafc88d60ae829f48" + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/c7f2872fb273bf493811473dafc88d60ae829f48", - "reference": "c7f2872fb273bf493811473dafc88d60ae829f48", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" + "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, "type": "library", "autoload": { @@ -8370,7 +8374,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.12.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" }, "funding": [ { @@ -8382,7 +8386,7 @@ "type": "tidelift" } ], - "time": "2023-08-03T07:14:11+00:00" + "time": "2023-08-05T12:09:49+00:00" }, { "name": "league/uri", @@ -15629,16 +15633,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.0", + "version": "1.23.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "a2b24135c35852b348894320d47b3902a94bc494" + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494", - "reference": "a2b24135c35852b348894320d47b3902a94bc494", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { @@ -15670,9 +15674,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.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" }, - "time": "2023-07-23T22:17:56+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml index 6ede96dd..539777b7 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml @@ -6,12 +6,12 @@ dependencies: - field.storage.paragraph.field_title - paragraphs.paragraphs_type.contact_card_listing _core: - default_config_hash: kdKc_1jRpFFpVgiylfofxe6JZyl5xOjMYEAlvcwPdCU + default_config_hash: wVwE7xrXuQ3BymCdqpyrTEoV_pKubFHD709zQ7JDZW4 id: paragraph.contact_card_listing.field_title field_name: field_title entity_type: paragraph bundle: contact_card_listing -label: 'Job title' +label: Title description: '' required: false translatable: false 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 7071fe8f..2660cf0f 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 @@ -7,10 +7,13 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text @@ -43,6 +46,9 @@ settings: from_library: from_library remote_video: remote_video phasing: phasing + contact_card_listing: contact_card_listing + map: map + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -54,9 +60,15 @@ settings: columns: weight: 0 enabled: true + contact_card_listing: + weight: 0 + enabled: true content_cards: weight: 0 enabled: true + event_list: + weight: 0 + enabled: true from_library: weight: 0 enabled: true @@ -66,6 +78,9 @@ settings: list_of_links: weight: 0 enabled: true + map: + weight: 0 + enabled: true phasing: weight: 0 enabled: true 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 55ce397e..d88f424a 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 @@ -7,15 +7,18 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.text module: - entity_reference_revisions - helfi_tpr @@ -47,6 +50,9 @@ settings: news_list: news_list event_list: event_list phasing: phasing + text: text + contact_card_listing: contact_card_listing + map: map negate: 0 target_bundles_drag_drop: accordion: @@ -58,6 +64,9 @@ settings: columns: weight: 0 enabled: true + contact_card_listing: + weight: 0 + enabled: true content_cards: weight: 0 enabled: true @@ -76,6 +85,9 @@ settings: list_of_links: weight: 0 enabled: true + map: + weight: 0 + enabled: true news_list: weight: 0 enabled: true @@ -85,4 +97,7 @@ settings: remote_video: weight: 0 enabled: true + text: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 28eb6224..e623ee00 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -6,8 +6,6 @@ dependencies: - helfi_tpr - user - views_bulk_operations - - views_bulk_edit - - content_lock id: tpr_unit_list label: 'TPR unit list' module: views @@ -76,6 +74,7 @@ display: batch: true batch_size: 50 form_step: true + ajax_loader: false buttons: false action_title: Action clear_on_exposed: true