From 48b05535541d9c4faf8ecba2a87d7e20aef79ca5 Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Thu, 29 Sep 2022 10:28:53 -0700 Subject: [PATCH 1/4] SRL-666: Missing Webform matcher patch until module fix --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index d2d5a5a8..9d1716f4 100644 --- a/composer.json +++ b/composer.json @@ -297,6 +297,9 @@ }, "drupal/fillpdf": { "Secure user data after pdf is rendered.": "patches/webform-pdf-protect.patch" + }, + "drupal/linkit": { + "Add Webform matcher to fix link creation autocomplete": "https://www.drupal.org/files/issues/2022-07-06/2946234-30.patch" } }, "installer-paths": { From fe0aed8b7681f0a7332416d1a89b9b1a860e03cc Mon Sep 17 00:00:00 2001 From: Mel Wong Date: Thu, 29 Sep 2022 11:37:05 -0700 Subject: [PATCH 2/4] SRL-665: enable anchor link feature --- composer-manifest.yaml | 2 + composer.json | 1 + composer.lock | 141 ++++++++++++++++++ config/config-default/core.extension.yml | 1 + .../editor.editor.basic_html.yml | 3 +- .../filter.format.basic_html.yml | 14 +- 6 files changed, 153 insertions(+), 9 deletions(-) diff --git a/composer-manifest.yaml b/composer-manifest.yaml index e5ee698b..02b9680a 100644 --- a/composer-manifest.yaml +++ b/composer-manifest.yaml @@ -36,11 +36,13 @@ packages: drupal/adminimal_theme: 1.6.0 drupal/advagg: 4.1.0 drupal/allowed_formats: 1.5.0 + drupal/anchor_link: 1.9.0 drupal/autosave_form: 1.3.0 drupal/block_field: 1.0.0-rc2 drupal/captcha: 1.3.0 drupal/chosen: 2.10.0 drupal/chosen_lib: 2.10.0 + drupal/ckeditor: 1.0.1 drupal/ckeditor_templates: 1.2.0 drupal/components: 2.4.0 drupal/config_filter: 1.9.0 diff --git a/composer.json b/composer.json index d2d5a5a8..a4ecceba 100644 --- a/composer.json +++ b/composer.json @@ -103,6 +103,7 @@ "drupal/adminimal_theme": "^1.5", "drupal/advagg": "^4.1", "drupal/allowed_formats": "^1.1", + "drupal/anchor_link": "^1.9", "drupal/autosave_form": "^1.0", "drupal/block_field": "^1.0@alpha", "drupal/chosen": "^2.8", diff --git a/composer.lock b/composer.lock index 9b2467fe..aea1a689 100644 --- a/composer.lock +++ b/composer.lock @@ -2353,6 +2353,55 @@ "issues": "https://www.drupal.org/project/issues/allowed_formats" } }, + { + "name": "drupal/anchor_link", + "version": "1.9.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/anchor_link.git", + "reference": "8.x-1.9" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/anchor_link-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "48d343f29dc034bf2deb7de858498fb80d558ca8" + }, + "require": { + "drupal/ckeditor": "*", + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.9", + "datestamp": "1643826959", + "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": "Mohammed J. Razem", + "homepage": "https://www.drupal.org/user/255384" + }, + { + "name": "Rajab Natshah", + "homepage": "https://www.drupal.org/user/1414312" + } + ], + "description": "This plugin module adds the better link dialog and anchor related features to CKEditor in Drupal 9", + "homepage": "https://www.drupal.org/project/anchor_link", + "support": { + "source": "https://git.drupalcode.org/project/anchor_link" + } + }, { "name": "drupal/autosave_form", "version": "1.3.0", @@ -2688,6 +2737,98 @@ "source": "https://git.drupalcode.org/project/chosen" } }, + { + "name": "drupal/ckeditor", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/ckeditor.git", + "reference": "1.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ckeditor-1.0.1.zip", + "reference": "1.0.1", + "shasum": "d3dd8bfb2301b749599ba48cf76208becdf0eeb3" + }, + "require": { + "drupal/core": "^9.4 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.1", + "datestamp": "1662977541", + "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": "dczepierga", + "homepage": "https://www.drupal.org/user/911466" + }, + { + "name": "hass", + "homepage": "https://www.drupal.org/user/85918" + }, + { + "name": "jcisio", + "homepage": "https://www.drupal.org/user/210762" + }, + { + "name": "Jorrit", + "homepage": "https://www.drupal.org/user/161217" + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742" + }, + { + "name": "Magnus", + "homepage": "https://www.drupal.org/user/73919" + }, + { + "name": "mkesicki", + "homepage": "https://www.drupal.org/user/922884" + }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + }, + { + "name": "p.wiaderny", + "homepage": "https://www.drupal.org/user/2956619" + }, + { + "name": "vokiel", + "homepage": "https://www.drupal.org/user/2793801" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" + }, + { + "name": "wwalc", + "homepage": "https://www.drupal.org/user/184556" + }, + { + "name": "xjm", + "homepage": "https://www.drupal.org/user/65776" + } + ], + "description": "WYSIWYG editing for rich text fields using CKEditor.", + "homepage": "https://www.drupal.org/project/ckeditor", + "support": { + "source": "https://git.drupalcode.org/project/ckeditor" + } + }, { "name": "drupal/ckeditor_templates", "version": "1.2.0", diff --git a/config/config-default/core.extension.yml b/config/config-default/core.extension.yml index a5e8674c..aed4570e 100644 --- a/config/config-default/core.extension.yml +++ b/config/config-default/core.extension.yml @@ -11,6 +11,7 @@ module: advagg_css_minify: 0 advagg_js_minify: 0 allowed_formats: 0 + anchor_link: 0 automated_cron: 0 ban: 0 block: 0 diff --git a/config/config-default/editor.editor.basic_html.yml b/config/config-default/editor.editor.basic_html.yml index 9889db20..36fb4fc8 100644 --- a/config/config-default/editor.editor.basic_html.yml +++ b/config/config-default/editor.editor.basic_html.yml @@ -34,6 +34,7 @@ settings: items: - DrupalLink - DrupalUnlink + - Anchor - name: Lists items: @@ -70,8 +71,6 @@ settings: drupallink: linkit_enabled: true linkit_profile: default - language: - language_list: un stylescombo: styles: "p.jcc-lead|Lead paragraph\r\na.usa-button|Button: Primary\r\na.usa-button.usa-button--secondary|Button: Secondary\r\na.usa-button.usa-button--accent-warm|Button: Accent Warm\r\na.usa-button.usa-button--external.external-button|Button: External\r\na.usa-button.usa-button--secondary.js-back-button|Button: Back Secondary\r\n" templates: diff --git a/config/config-default/filter.format.basic_html.yml b/config/config-default/filter.format.basic_html.yml index 37789fe1..05a8592f 100644 --- a/config/config-default/filter.format.basic_html.yml +++ b/config/config-default/filter.format.basic_html.yml @@ -25,7 +25,7 @@ filters: status: true weight: -49 settings: - allowed_html: '