From a657749a233b80a40af461a1c2c2be795c5e4ec8 Mon Sep 17 00:00:00 2001 From: "Peter Droogmans (attiks)" Date: Thu, 30 Sep 2021 09:08:55 +0200 Subject: [PATCH 1/2] IASC-722: Linkit profile and matchers --- config/editor.editor.basic_html.yml | 6 +-- config/editor.editor.full_html.yml | 6 +-- config/editor.editor.iasc_wysiwyg.yml | 12 +++--- config/filter.format.basic_html.yml | 3 +- config/filter.format.full_html.yml | 3 +- config/filter.format.iasc_wysiwyg.yml | 24 ++++++++++- config/linkit.linkit_profile.content.yml | 52 ++++++++++++++++++++++++ 7 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 config/linkit.linkit_profile.content.yml diff --git a/config/editor.editor.basic_html.yml b/config/editor.editor.basic_html.yml index 12573043f..74837b295 100644 --- a/config/editor.editor.basic_html.yml +++ b/config/editor.editor.basic_html.yml @@ -43,15 +43,15 @@ settings: items: - Source plugins: + drupallink: + linkit_enabled: true + linkit_profile: content stylescombo: styles: '' language: language_list: un tokenbrowser: token_types: { } - drupallink: - linkit_enabled: true - linkit_profile: '' image_upload: status: true scheme: public diff --git a/config/editor.editor.full_html.yml b/config/editor.editor.full_html.yml index 3fcbe39f6..73647d38f 100644 --- a/config/editor.editor.full_html.yml +++ b/config/editor.editor.full_html.yml @@ -51,15 +51,15 @@ settings: - ShowBlocks - Source plugins: + drupallink: + linkit_enabled: true + linkit_profile: content stylescombo: styles: '' language: language_list: un tokenbrowser: token_types: { } - drupallink: - linkit_enabled: true - linkit_profile: '' image_upload: status: true scheme: public diff --git a/config/editor.editor.iasc_wysiwyg.yml b/config/editor.editor.iasc_wysiwyg.yml index a9714b56d..5e9201fba 100644 --- a/config/editor.editor.iasc_wysiwyg.yml +++ b/config/editor.editor.iasc_wysiwyg.yml @@ -37,13 +37,15 @@ settings: items: - Source plugins: - language: - language_list: un - stylescombo: - styles: '' drupallink: linkit_enabled: true - linkit_profile: '' + linkit_profile: content + stylescombo: + styles: '' + language: + language_list: un + tokenbrowser: + token_types: { } image_upload: status: false scheme: public diff --git a/config/filter.format.basic_html.yml b/config/filter.format.basic_html.yml index e7ab5c213..9e7e4c813 100644 --- a/config/filter.format.basic_html.yml +++ b/config/filter.format.basic_html.yml @@ -4,6 +4,7 @@ status: true dependencies: module: - editor + - linkit - media - spamspan - token_filter @@ -107,4 +108,4 @@ filters: status: true weight: -50 settings: - title: false + title: true diff --git a/config/filter.format.full_html.yml b/config/filter.format.full_html.yml index cb3ccb9bf..ce501dee3 100644 --- a/config/filter.format.full_html.yml +++ b/config/filter.format.full_html.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: module: + - linkit - media - token_filter _core: @@ -48,4 +49,4 @@ filters: status: true weight: -11 settings: - title: false + title: true diff --git a/config/filter.format.iasc_wysiwyg.yml b/config/filter.format.iasc_wysiwyg.yml index fff61387b..471cfc7d0 100644 --- a/config/filter.format.iasc_wysiwyg.yml +++ b/config/filter.format.iasc_wysiwyg.yml @@ -1,7 +1,11 @@ uuid: 648f1709-4772-4d9b-9c36-d6ab58adcd4e langcode: en status: true -dependencies: { } +dependencies: + module: + - linkit + - media + - token_filter name: 'IASC wysiwyg' format: iasc_wysiwyg weight: 0 @@ -21,4 +25,20 @@ filters: status: true weight: -11 settings: - title: false + title: true + media_embed: + id: media_embed + provider: media + status: false + weight: 100 + settings: + default_view_mode: default + allowed_media_types: { } + allowed_view_modes: { } + token_filter: + id: token_filter + provider: token_filter + status: false + weight: 0 + settings: + replace_empty: '0' diff --git a/config/linkit.linkit_profile.content.yml b/config/linkit.linkit_profile.content.yml new file mode 100644 index 000000000..447cae0b5 --- /dev/null +++ b/config/linkit.linkit_profile.content.yml @@ -0,0 +1,52 @@ +uuid: 0cbe5ea5-33a9-4d70-8e02-38eed72799aa +langcode: en +status: true +dependencies: + module: + - node +id: content +label: Content +description: '' +matchers: + 5e852c7f-03dd-4a7d-a85f-733c6b7e745a: + uuid: 5e852c7f-03dd-4a7d-a85f-733c6b7e745a + id: 'entity:node' + weight: 0 + settings: + include_unpublished: false + metadata: '' + bundles: + announcement: announcement + oa_event: oa_event + oa_wiki_page: oa_wiki_page + panopoly_landing_page: panopoly_landing_page + panopoly_page: panopoly_page + service: service + group_by_bundle: false + substitution_type: canonical + limit: 20 + 1941feed-c3cd-487c-9866-580195e55f3d: + uuid: 1941feed-c3cd-487c-9866-580195e55f3d + id: front_page + weight: 0 + settings: { } + da52eea3-2b6d-4bb2-8a12-68484cf9337c: + uuid: da52eea3-2b6d-4bb2-8a12-68484cf9337c + id: 'entity:group' + weight: 0 + settings: + metadata: '' + bundles: { } + group_by_bundle: false + substitution_type: canonical + limit: 20 + 86c33064-df3a-44d7-b931-3479ea10b411: + uuid: 86c33064-df3a-44d7-b931-3479ea10b411 + id: 'entity:group_content' + weight: 0 + settings: + metadata: '' + bundles: { } + group_by_bundle: false + substitution_type: canonical + limit: 20 From 0ed76ada5f49afd5d878d1d5519131c2571a4bfa Mon Sep 17 00:00:00 2001 From: "Peter Droogmans (attiks)" Date: Thu, 30 Sep 2021 09:17:39 +0200 Subject: [PATCH 2/2] IASC-722: Update linkit --- composer.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 616de4e9a..19fb6404b 100644 --- a/composer.lock +++ b/composer.lock @@ -4211,17 +4211,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0-beta2", + "version": "6.0.0-beta3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0-beta2" + "reference": "6.0.0-beta3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-beta2.zip", - "reference": "6.0.0-beta2", - "shasum": "388cd47159eef6c505646c7d5a96e7e653439a94" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-beta3.zip", + "reference": "6.0.0-beta3", + "shasum": "39a5bf54cbc88324d788a573df7b3fecf7622065" }, "require": { "drupal/core": "^8.7.7 || ^9" @@ -4232,8 +4232,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0-beta2", - "datestamp": "1608957496", + "version": "6.0.0-beta3", + "datestamp": "1632933683", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -5734,17 +5734,17 @@ }, { "name": "drupal/token_filter", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token_filter.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token_filter-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "4d22feb0c96aeb747152d947499258e49769c237" + "url": "https://ftp.drupal.org/files/projects/token_filter-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "6ac6ae8349731512696d2c3d1cd11846a95cd1a7" }, "require": { "drupal/core": "^8 || ^9", @@ -5753,8 +5753,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1588029999", + "version": "8.x-1.3", + "datestamp": "1632199659", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5763,13 +5763,9 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ - { - "name": "Darvanen", - "homepage": "https://www.drupal.org/user/1068770" - }, { "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" @@ -5786,6 +5782,10 @@ "name": "asciikewl", "homepage": "https://www.drupal.org/user/147292" }, + { + "name": "darvanen", + "homepage": "https://www.drupal.org/user/1068770" + }, { "name": "pescetti", "homepage": "https://www.drupal.org/user/436244"