From d1e0a0d4f6c9b76c4a06dae8cc43c7890fcf0478 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 27 Nov 2023 21:20:39 +0100 Subject: [PATCH] removed rules, added notify --- composer.json | 1 + composer.lock | 55 ++++++++++++++++++- config/sync/core.extension.yml | 2 +- config/sync/filter.format.restricted_html.yml | 36 ------------ config/sync/notify.settings.yml | 16 ++++++ ...reaction.new_operation_node_send_email.yml | 52 ------------------ config/sync/rules.settings.yml | 9 --- config/sync/user.role.admin.yml | 2 + config/sync/user.role.anonymous.yml | 4 -- config/sync/user.role.editor.yml | 2 + 10 files changed, 76 insertions(+), 103 deletions(-) delete mode 100644 config/sync/filter.format.restricted_html.yml create mode 100644 config/sync/notify.settings.yml delete mode 100644 config/sync/rules.reaction.new_operation_node_send_email.yml delete mode 100644 config/sync/rules.settings.yml diff --git a/composer.json b/composer.json index 2e8daee..085f5fb 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "drupal/login_destination": "^2.0@beta", "drupal/mailsystem": "^4.4", "drupal/mimemail": "^1.0@alpha", + "drupal/notify": "^2.0@beta", "drupal/page_manager": "^4.0@RC", "drupal/panels": "^4.7", "drupal/paragraphs": "^1.16", diff --git a/composer.lock b/composer.lock index cf28fd4..e88600c 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": "cdf7fc854d9e9b3060ff43d97e7f3ed3", + "content-hash": "a73571264700d8d0446c0181bfc79ec9", "packages": [ { "name": "asm89/stack-cors", @@ -5757,6 +5757,58 @@ "issues": "https://www.drupal.org/project/issues/mimemail" } }, + { + "name": "drupal/notify", + "version": "2.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/notify.git", + "reference": "2.0.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/notify-2.0.0-beta1.zip", + "reference": "2.0.0-beta1", + "shasum": "a0f06792b4aed38c8c466389ae4c03497c4c9270" + }, + "require": { + "drupal/core": "^9 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0-beta1", + "datestamp": "1699808614", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "gisle", + "homepage": "https://www.drupal.org/user/409554" + }, + { + "name": "matt2000", + "homepage": "https://www.drupal.org/user/143172" + }, + { + "name": "rik.scholten", + "homepage": "https://www.drupal.org/user/3661104" + } + ], + "description": "Enables notifications of new content and comments by e-mail.", + "homepage": "https://www.drupal.org/project/notify", + "support": { + "source": "https://git.drupalcode.org/project/notify" + } + }, { "name": "drupal/page_manager", "version": "4.0.0-rc2", @@ -12748,6 +12800,7 @@ "stability-flags": { "drupal/login_destination": 20, "drupal/mimemail": 15, + "drupal/notify": 10, "drupal/page_manager": 5, "drupal/phone_number": 15, "drupal/rules": 15, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 10b2aeb..5434fc2 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -82,6 +82,7 @@ module: mimemail: 0 mysql: 0 node: 0 + notify: 0 options: 0 page_cache: 0 page_manager: 0 @@ -96,7 +97,6 @@ module: phone_number: 0 redis: 0 responsive_image: 0 - rules: 0 search_api: 0 search_api_db: 0 smart_trim: 0 diff --git a/config/sync/filter.format.restricted_html.yml b/config/sync/filter.format.restricted_html.yml deleted file mode 100644 index 3c37899..0000000 --- a/config/sync/filter.format.restricted_html.yml +++ /dev/null @@ -1,36 +0,0 @@ -uuid: fd70c6be-a93d-4df9-a4b8-79ddf2c8f36b -langcode: fr -status: true -dependencies: - enforced: - module: - - filter - - rules -_core: - default_config_hash: VrFjOQn2l2n6baaj2Z6IkYt9OdtsLjYPUVg7HgkkGLU -name: 'HTML restreint' -format: restricted_html -weight: 1 -filters: - filter_html: - id: filter_html - provider: filter - status: true - weight: -10 - settings: - allowed_html: '

    1. ' - filter_html_help: true - filter_html_nofollow: false - filter_autop: - id: filter_autop - provider: filter - status: true - weight: 0 - settings: { } - filter_url: - id: filter_url - provider: filter - status: true - weight: 0 - settings: - filter_url_length: 72 diff --git a/config/sync/notify.settings.yml b/config/sync/notify.settings.yml new file mode 100644 index 0000000..0d95ea5 --- /dev/null +++ b/config/sync/notify.settings.yml @@ -0,0 +1,16 @@ +_core: + default_config_hash: Mwe98N9-c2eNZHjq4Hl8H-LtBroHzGjgwLjjloMMIj8 +langcode: fr +notify_period: '300' +notify_send_hour: '9' +notify_attempts: '5' +notify_include_updates: '1' +notify_unpublished: '1' +notify_watchdog: '3' +notify_weightur: '20' +notify_reg_default: '0' +notify_def_node: '0' +notify_def_comment: '1' +notify_nodetypes: + operation: operation + static: 0 diff --git a/config/sync/rules.reaction.new_operation_node_send_email.yml b/config/sync/rules.reaction.new_operation_node_send_email.yml deleted file mode 100644 index 975dbbc..0000000 --- a/config/sync/rules.reaction.new_operation_node_send_email.yml +++ /dev/null @@ -1,52 +0,0 @@ -uuid: 4d858daa-ccb3-4f12-a54f-f9797f25aa85 -langcode: fr -status: true -dependencies: { } -id: new_operation_node_send_email -label: 'New opération node send email' -events: - - - event_name: 'rules_entity_insert:node--operation' -description: '' -tags: { } -config_version: '3' -expression: - id: rules_rule - uuid: bdb7ab88-8b7d-4b73-8736-6b81b89da83e - weight: 0 - conditions: - id: rules_and - uuid: f742b33f-3cd0-4685-84ac-4730946565f2 - weight: 0 - conditions: { } - actions: - id: rules_action_set - uuid: 52344b5b-f15b-4c76-a96d-dc7caf57f5c3 - weight: 0 - actions: - - - id: rules_action - uuid: 0c06331f-3d28-4886-a0c7-89e93f0d2989 - weight: 0 - action_id: rules_send_email - context_values: - to: - - webmaster@programme-reha-heritages.fr - - dev@figureslibres.io - subject: '[REHA] nouvelle opération crée' - message: test - reply: '' - language: '' - context_mapping: { } - context_processors: - to: - rules_tokens: { } - subject: - rules_tokens: { } - message: - rules_tokens: { } - reply: - rules_tokens: { } - language: - rules_tokens: { } - provides_mapping: { } diff --git a/config/sync/rules.settings.yml b/config/sync/rules.settings.yml deleted file mode 100644 index 7667750..0000000 --- a/config/sync/rules.settings.yml +++ /dev/null @@ -1,9 +0,0 @@ -_core: - default_config_hash: ZKaBtyYFEhfwE4xVP-khSsZabdsN3NSjwOfzaZksez0 -langcode: fr -system_log: - log_level: warning -debug_log: - enabled: false - system_debug: false - log_level: debug diff --git a/config/sync/user.role.admin.yml b/config/sync/user.role.admin.yml index ca8d3ed..53a438c 100644 --- a/config/sync/user.role.admin.yml +++ b/config/sync/user.role.admin.yml @@ -15,6 +15,7 @@ dependencies: - filter - menu_admin_per_menu - node + - notify - system - toolbar _core: @@ -26,6 +27,7 @@ is_admin: null permissions: - 'access administration pages' - 'access files overview' + - 'access notify' - 'access toolbar' - 'access user profiles' - 'administer footer menu items' diff --git a/config/sync/user.role.anonymous.yml b/config/sync/user.role.anonymous.yml index c44154f..51be32a 100644 --- a/config/sync/user.role.anonymous.yml +++ b/config/sync/user.role.anonymous.yml @@ -2,12 +2,9 @@ uuid: b348c4e0-5a35-4922-86ac-f5ee0e1e08c2 langcode: fr status: true dependencies: - config: - - filter.format.restricted_html module: - config_pages - devel - - filter - system _core: default_config_hash: jyuRv_5UazPqBsQ9L4kDkcVvxtGr0WytAUoWf1LhqOk @@ -18,7 +15,6 @@ is_admin: false permissions: - 'access content' - 'access devel information' - - 'use text format restricted_html' - 'view contact config page entity' - 'view mentions_legales config page entity' - 'view partenaires config page entity' diff --git a/config/sync/user.role.editor.yml b/config/sync/user.role.editor.yml index 8888068..d5d423a 100644 --- a/config/sync/user.role.editor.yml +++ b/config/sync/user.role.editor.yml @@ -11,6 +11,7 @@ dependencies: - content_lock - filter - node + - notify - system - toolbar id: editor @@ -20,6 +21,7 @@ is_admin: null permissions: - 'access administration pages' - 'access content overview' + - 'access notify' - 'access toolbar' - 'access user profiles' - 'break content lock'