From 511fc6314ee2ac64a633064e62c48968dc833d36 Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 12 Mar 2025 09:51:18 +0100 Subject: [PATCH] more updates --- composer.json | 6 +- composer.lock | 327 ++++-------------- .../sync/system.action.immediate_delete.yml | 13 + .../system.action.mark_file_for_deletion.yml | 13 + config/sync/user.role.admin.yml | 3 +- config/sync/user.role.authenticated.yml | 3 + config/sync/user.role.editeur.yml | 3 +- config/sync/user.role.user.yml | 3 + .../sync/views.view.centre_de_ressources.yml | 7 + web/profiles/d8-starterkit-profile | 2 +- 10 files changed, 117 insertions(+), 263 deletions(-) create mode 100644 config/sync/system.action.immediate_delete.yml create mode 100644 config/sync/system.action.mark_file_for_deletion.yml diff --git a/composer.json b/composer.json index 2fb456f0..612facf3 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "drupal/address": "1.x-dev@dev", "drupal/administerusersbyrole": "3.x-dev@dev", "drupal/advanced_text_formatter": "^3.0@RC", - "drupal/better_exposed_filters": "^6", + "drupal/better_exposed_filters": "^7.0", "drupal/betterlogin": "^2.0", "drupal/ckeditor": "^1.0", "drupal/ckeditor_iframe": "^3.0@alpha", @@ -31,7 +31,7 @@ "drupal/core-recommended": "^10.3", "drupal/devel": "^5.0", "drupal/fakeobjects": "^2.0", - "drupal/file_delete": "^2.0", + "drupal/file_delete": "^3.0", "drupal/file_replace": "^1.4", "drupal/filter_perms": "^2.0", "drupal/geocoder": "^3.20 || ^4.0", @@ -56,7 +56,7 @@ "drupal/pathologic": "^2.0@alpha", "drupal/robotstxt": "^1.4", "drupal/role_delegation": "^1.1", - "drupal/selective_better_exposed_filters": "2.x-dev@dev", + "drupal/selective_better_exposed_filters": "^3.0", "drupal/seo_checklist": "^5.1", "drupal/smart_date": "^4.0@beta", "drupal/structure_sync": "^2.0", diff --git a/composer.lock b/composer.lock index 1f250c03..29ab5998 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b1ffd739c885c1685133cafa04a476d1", + "content-hash": "ed7540f74a4608912ba2cd456c6a9e74", "packages": [ { "name": "ajgl/breakpoint-twig-extension", @@ -2395,17 +2395,17 @@ }, { "name": "drupal/autologout", - "version": "1.6.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/autologout.git", - "reference": "8.x-1.6" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/autologout-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "ec666b324ac8aaffe2f5012b1b21c27d9c1780c9" + "url": "https://ftp.drupal.org/files/projects/autologout-2.0.1.zip", + "reference": "2.0.1", + "shasum": "61407ffa8b857b1e5d22d03ededac94b5119bd60" }, "require": { "drupal/core": "^9.2 || ^10 || ^11", @@ -2414,8 +2414,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1732235148", + "version": "2.0.1", + "datestamp": "1732235105", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2493,30 +2493,27 @@ }, { "name": "drupal/better_exposed_filters", - "version": "6.0.6", + "version": "7.0.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/better_exposed_filters.git", - "reference": "6.0.6" + "reference": "7.0.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-6.0.6.zip", - "reference": "6.0.6", - "shasum": "558ca591d450fc64512cae7f98cb4b0241e15ba3" + "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-7.0.5.zip", + "reference": "7.0.5", + "shasum": "a215444c39a6ae384710a6c707caf593f6dd1e2d" }, "require": { - "drupal/core": "^9 || ^10", - "drupal/jquery_ui": "*", - "drupal/jquery_ui_datepicker": "*", - "drupal/jquery_ui_slider": "*", - "drupal/jquery_ui_touch_punch": "*" + "drupal/core": "^10 || ^11", + "drupal/nouislider_js": "^15.8" }, "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.6", - "datestamp": "1716397541", + "version": "7.0.5", + "datestamp": "1738353781", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4762,29 +4759,26 @@ }, { "name": "drupal/file_delete", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_delete.git", - "reference": "2.0.0" + "reference": "3.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_delete-2.0.0.zip", - "reference": "2.0.0", - "shasum": "39933b698ed2f6500f1d94a681172b2c4cc94feb" + "url": "https://ftp.drupal.org/files/projects/file_delete-3.0.0.zip", + "reference": "3.0.0", + "shasum": "36830bef31df1c1392400692cca6e7a07731bcb7" }, "require": { - "drupal/core": "^8 || ^9 || ^10" - }, - "require-dev": { - "drupal/coder": "^8.3" + "drupal/core": "^10.3 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1664902819", + "version": "3.0.0", + "datestamp": "1735917789", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4793,7 +4787,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -4813,7 +4807,7 @@ "File" ], "support": { - "source": "http://cgit.drupalcode.org/file_delete", + "source": "https://git.drupalcode.org/project/file_delete", "issues": "https://www.drupal.org/project/issues/file_delete" } }, @@ -5884,71 +5878,6 @@ "source": "https://git.drupalcode.org/project/jquery_ui_controlgroup" } }, - { - "name": "drupal/jquery_ui_datepicker", - "version": "2.1.1", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui_datepicker.git", - "reference": "2.1.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_datepicker-2.1.1.zip", - "reference": "2.1.1", - "shasum": "29e56e8fa351fefd34e80529768ddc69a460149d" - }, - "require": { - "drupal/core": "^9.2 || ^10 || ^11", - "drupal/jquery_ui": "^1.7" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.1.1", - "datestamp": "1730932612", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "jrockowitz", - "homepage": "https://www.drupal.org/user/371407" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "nod_", - "homepage": "https://www.drupal.org/user/598310" - }, - { - "name": "phenaproxima", - "homepage": "https://www.drupal.org/user/205645" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI Datepicker library.", - "homepage": "https://www.drupal.org/project/jquery_ui_datepicker", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui_datepicker" - } - }, { "name": "drupal/jquery_ui_draggable", "version": "2.1.0", @@ -6056,115 +5985,6 @@ "source": "https://git.drupalcode.org/project/jquery_ui_droppable" } }, - { - "name": "drupal/jquery_ui_slider", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui_slider.git", - "reference": "2.1.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_slider-2.1.0.zip", - "reference": "2.1.0", - "shasum": "89e54ccf787ad3eb11fb2ca9e25ea4bfce3df5b1" - }, - "require": { - "drupal/core": "^9.2 || ^10 || ^11", - "drupal/jquery_ui": "^1.7" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.1.0", - "datestamp": "1717031321", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI Slider library.", - "homepage": "https://www.drupal.org/project/jquery_ui_slider", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui_slider" - } - }, - { - "name": "drupal/jquery_ui_touch_punch", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui_touch_punch.git", - "reference": "1.1.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_touch_punch-1.1.1.zip", - "reference": "1.1.1", - "shasum": "f16bc2ffa500131f43c84427ff213e753de9b6a6" - }, - "require": { - "drupal/core": "^9.2 || ^10 || ^11", - "drupal/jquery_ui": "^1.0", - "politsin/jquery-ui-touch-punch": "^1.0" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "1.1.1", - "datestamp": "1717663479", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Naveen Valecha", - "homepage": "https://drupal.org/u/naveenvalecha", - "role": "Maintainer" - }, - { - "name": "naveenvalecha", - "homepage": "https://www.drupal.org/user/2665733" - } - ], - "description": "Provides jQuery UI Touch Punch library.", - "homepage": "https://www.drupal.org/project/jquery_ui_touch_punch", - "keywords": [ - "Drupal", - "jquery_ui_touch_punch" - ], - "support": { - "source": "https://www.drupal.org/project/jquery_ui_touch_punch", - "issues": "https://www.drupal.org/project/issues/jquery_ui_touch_punch" - } - }, { "name": "drupal/js_cookie", "version": "1.0.1", @@ -7168,6 +6988,35 @@ "docs": "https://www.drupal.org/docs/8/modules/metatag" } }, + { + "name": "drupal/nouislider_js", + "version": "15.8.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/nouislider_js.git", + "reference": "b5610d5842784581e4c766cd1c3852ca0b355ed5" + }, + "dist": { + "type": "zip", + "url": "https://git.drupalcode.org/api/v4/projects/project%2Fnouislider_js/repository/archive.zip?sha=b5610d5842784581e4c766cd1c3852ca0b355ed5", + "reference": "b5610d5842784581e4c766cd1c3852ca0b355ed5", + "shasum": "" + }, + "type": "drupal-library", + "extra": { + "installer-name": "nouislider" + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT License" + ], + "description": "Mirror of the noUiSlider javascript library tagged as a Drupal library.", + "homepage": "https://github.com/leongersen/noUiSlider", + "support": { + "source": "https://git.drupalcode.org/project/nouislider_js/-/tree/15.8.0" + }, + "time": "2025-01-03T10:53:20+00:00" + }, { "name": "drupal/page_manager", "version": "dev-4.x", @@ -8277,27 +8126,30 @@ }, { "name": "drupal/selective_better_exposed_filters", - "version": "dev-2.x", + "version": "3.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/selective_better_exposed_filters.git", - "reference": "5b36d73ccbcaa6dd029d9de76b3e2d28edfc7706" + "reference": "3.0.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/selective_better_exposed_filters-3.0.3.zip", + "reference": "3.0.3", + "shasum": "31890e23361bf22641b2355c78c5e21c02e2e1bc" }, "require": { - "drupal/better_exposed_filters": "^4.0 || ^5.0 || ^6.0", - "drupal/core": "^8 || ^9 || ^10" + "drupal/better_exposed_filters": "^4.0 || ^5.0 || ^6.0 || ^7.0", + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, "drupal": { - "version": "8.x-2.0-beta6+7-dev", - "datestamp": "1671833027", + "version": "3.0.3", + "datestamp": "1719744192", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -11985,44 +11837,6 @@ }, "time": "2024-09-11T15:52:35+00:00" }, - { - "name": "politsin/jquery-ui-touch-punch", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/politsin/jquery-ui-touch-punch.git", - "reference": "2fe375e05821e267f0f3c0e063197f5c406896dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/politsin/jquery-ui-touch-punch/zipball/2fe375e05821e267f0f3c0e063197f5c406896dd", - "reference": "2fe375e05821e267f0f3c0e063197f5c406896dd", - "shasum": "" - }, - "type": "drupal-library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dave Furfero", - "email": "furf@furf.com" - } - ], - "description": "Extension to jQuery UI for mobile touch event support.", - "homepage": "http://touchpunch.furf.com/", - "keywords": [ - "gestures", - "mobile", - "touch" - ], - "support": { - "issues": "https://github.com/politsin/jquery-ui-touch-punch/issues", - "source": "https://github.com/politsin/jquery-ui-touch-punch/tree/1.0" - }, - "time": "2020-12-15T10:26:18+00:00" - }, { "name": "psr/cache", "version": "3.0.0", @@ -15401,7 +15215,6 @@ "drupal/path_alias_xt": 20, "drupal/pathologic": 15, "drupal/profile": 5, - "drupal/selective_better_exposed_filters": 20, "drupal/smart_date": 10, "drupal/smtp": 10, "drupal/translation_views": 15, diff --git a/config/sync/system.action.immediate_delete.yml b/config/sync/system.action.immediate_delete.yml new file mode 100644 index 00000000..5df1e148 --- /dev/null +++ b/config/sync/system.action.immediate_delete.yml @@ -0,0 +1,13 @@ +uuid: 6524248b-fa9a-428b-9186-2c00c3d8b7b0 +langcode: en +status: true +dependencies: + module: + - file_delete +_core: + default_config_hash: CpbkN02AJ7cbTdlqLC2v6Iv4Bpte1hXIYO-Yg-V3eko +id: immediate_delete +label: 'Immediately delete (with usage checks)' +type: file +plugin: immediate_delete +configuration: { } diff --git a/config/sync/system.action.mark_file_for_deletion.yml b/config/sync/system.action.mark_file_for_deletion.yml new file mode 100644 index 00000000..e93b5964 --- /dev/null +++ b/config/sync/system.action.mark_file_for_deletion.yml @@ -0,0 +1,13 @@ +uuid: b72de79a-02bf-424d-9bf3-03ffbda0f29a +langcode: en +status: true +dependencies: + module: + - file_delete +_core: + default_config_hash: N6NpCPAL1xbJfRswAFc8ppGuRZ6e2pLGIz2r0zKuSpM +id: mark_file_for_deletion +label: 'Mark file for deletion' +type: file +plugin: mark_file_for_deletion +configuration: { } diff --git a/config/sync/user.role.admin.yml b/config/sync/user.role.admin.yml index 8cae3b94..8acb0791 100644 --- a/config/sync/user.role.admin.yml +++ b/config/sync/user.role.admin.yml @@ -87,7 +87,8 @@ permissions: - 'delete any static content' - 'delete any theme content' - 'delete evenement revisions' - - 'delete files' + - 'delete files immediately' + - 'delete files override usage' - 'delete iframe revisions' - 'delete own actualite content' - 'delete own evenement content' diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index 5deb4ad7..662b8a0c 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -6,6 +6,7 @@ dependencies: - filter.format.wysiwyg module: - file + - file_delete - filter - matomo - system @@ -17,6 +18,8 @@ weight: -9 is_admin: false permissions: - 'access content' + - 'delete files immediately' + - 'delete files override usage' - 'delete own files' - 'opt-in or out of matomo tracking' - 'use text format wysiwyg' diff --git a/config/sync/user.role.editeur.yml b/config/sync/user.role.editeur.yml index 606a7d78..43f53325 100644 --- a/config/sync/user.role.editeur.yml +++ b/config/sync/user.role.editeur.yml @@ -55,7 +55,8 @@ permissions: - 'create terms in villes' - 'create theme content' - 'delete any ressource content' - - 'delete files' + - 'delete files immediately' + - 'delete files override usage' - 'delete own files' - 'edit any actualite content' - 'edit any evenement content' diff --git a/config/sync/user.role.user.yml b/config/sync/user.role.user.yml index e932e4fc..562c49e6 100644 --- a/config/sync/user.role.user.yml +++ b/config/sync/user.role.user.yml @@ -4,6 +4,7 @@ status: true dependencies: module: - file + - file_delete _core: default_config_hash: i1HX2g6ycNxMoSaVKRrMZtmApin-bVKG1d0FG04peQw id: user @@ -11,4 +12,6 @@ label: User weight: -4 is_admin: null permissions: + - 'delete files immediately' + - 'delete files override usage' - 'delete own files' diff --git a/config/sync/views.view.centre_de_ressources.yml b/config/sync/views.view.centre_de_ressources.yml index caebb24d..1bca0011 100644 --- a/config/sync/views.view.centre_de_ressources.yml +++ b/config/sync/views.view.centre_de_ressources.yml @@ -633,6 +633,7 @@ display: allow_secondary: false secondary_label: 'Options avancées' secondary_open: false + autosubmit_textfield_minimum_length: 3 pager: plugin_id: default advanced: @@ -645,6 +646,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: false options_show_only_used_filtered: false field_programme_target_id: @@ -657,6 +659,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: false options_show_only_used_filtered: false field_theme_target_id: @@ -669,6 +672,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: false options_show_only_used_filtered: false field_ville_target_id: @@ -681,6 +685,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: 0 options_show_only_used_filtered: 0 field_type_de_ressource_target_id: @@ -693,6 +698,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: 0 options_show_only_used_filtered: 0 field_collections_target_id: @@ -705,6 +711,7 @@ display: collapsible: false collapsible_disable_automatic_open: false is_secondary: false + hide_label: false options_show_only_used: 0 options_show_only_used_filtered: 0 access: diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 64aaef11..71db21a5 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 64aaef110c2ce9bf97162afd54123e57b627c963 +Subproject commit 71db21a57303ed1e6520d86ec2f79af40c315e26