From 5d24c8d8c5ae9f9728b0f9edc080ca8d2130695e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Mon, 16 Dec 2024 19:00:51 -0500
Subject: [PATCH] Revert "Issue #3493442 by jurgenhaas, phenaproxima, catch,
pameeela: Klaro should be inactive until Vimeo or Youtube content is added"
This reverts commit a3751589c72a9726ae69cf62f3d3429dd82812fc.
---
MODULES.md | 7 +-
.../Functional/ComponentValidationTest.php | 8 -
.../Functional/ComponentValidationTest.php | 9 +-
.../drupal_cms_privacy_basic/composer.json | 2 -
.../config/eca.eca.privacy_setting_link.yml | 126 -----
.../config/eca.model.privacy_setting_link.yml | 306 ------------
.../menu_link_content/my-privacy-settings.yml | 2 +-
recipes/drupal_cms_privacy_basic/recipe.yml | 5 -
.../Functional/ComponentValidationTest.php | 11 +-
recipes/drupal_cms_remote_video/composer.json | 4 +-
.../config/eca.eca.remote_video_consent.yml | 181 -------
.../config/eca.model.remote_video_consent.yml | 451 ------------------
recipes/drupal_cms_remote_video/recipe.yml | 14 -
.../Functional/ComponentValidationTest.php | 26 -
14 files changed, 10 insertions(+), 1142 deletions(-)
delete mode 100644 recipes/drupal_cms_privacy_basic/config/eca.eca.privacy_setting_link.yml
delete mode 100644 recipes/drupal_cms_privacy_basic/config/eca.model.privacy_setting_link.yml
delete mode 100644 recipes/drupal_cms_remote_video/config/eca.eca.remote_video_consent.yml
delete mode 100644 recipes/drupal_cms_remote_video/config/eca.model.remote_video_consent.yml
diff --git a/MODULES.md b/MODULES.md
index 0e2e661e6..9f62bd8c8 100644
--- a/MODULES.md
+++ b/MODULES.md
@@ -61,15 +61,10 @@
## Person profiles
* [Pathauto](https://www.drupal.org/project/pathauto)
## Basic Privacy
-* [BPMN.iO for ECA](https://www.drupal.org/project/bpmn_io)
-* [ECA Core](https://www.drupal.org/project/eca)
-* [Klaro Cookie & Consent Manager](https://www.drupal.org/project/klaro)
+* [Klaro Consent Manager](https://www.drupal.org/project/klaro)
* [Menu Link Attributes](http://drupal.org/project/menu_link_attributes)
## Projects
* [Pathauto](https://www.drupal.org/project/pathauto)
-## Remote Video
-* [BPMN.iO for ECA](https://www.drupal.org/project/bpmn_io)
-* [ECA Core](https://www.drupal.org/project/eca)
## Search
* [Search API](https://www.drupal.org/project/search_api)
* [Search API Autocomplete](https://www.drupal.org/project/search_api_autocomplete)
diff --git a/recipes/drupal_cms_analytics/tests/src/Functional/ComponentValidationTest.php b/recipes/drupal_cms_analytics/tests/src/Functional/ComponentValidationTest.php
index 364711b9c..2ab9bb8bb 100644
--- a/recipes/drupal_cms_analytics/tests/src/Functional/ComponentValidationTest.php
+++ b/recipes/drupal_cms_analytics/tests/src/Functional/ComponentValidationTest.php
@@ -38,14 +38,6 @@ class ComponentValidationTest extends BrowserTestBase {
'--input=drupal_cms_analytics.property_id=nonsense',
];
$this->assertStringContainsString('This value is not valid.', $this->applyRecipe($dir, 1, $options)->getErrorOutput());
-
- // The privacy links should be visible to anonymous users in the footer.
- $this->drupalPlaceBlock('system_menu_block:footer', ['label' => 'Footer']);
- $this->drupalGet('<front>');
- $footer_menu = $this->assertSession()
- ->elementExists('css', 'nav > h2:contains("Footer") + ul');
- // The privacy setting should be visible to anonymous users in the footer.
- $this->assertTrue($footer_menu->hasLink('My privacy settings'));
}
}
diff --git a/recipes/drupal_cms_events/tests/src/Functional/ComponentValidationTest.php b/recipes/drupal_cms_events/tests/src/Functional/ComponentValidationTest.php
index f205399d1..0b821c1e4 100644
--- a/recipes/drupal_cms_events/tests/src/Functional/ComponentValidationTest.php
+++ b/recipes/drupal_cms_events/tests/src/Functional/ComponentValidationTest.php
@@ -150,14 +150,7 @@ class ComponentValidationTest extends BrowserTestBase {
'title' => 'Grand Jubilee',
]);
$this->assertStringEndsWith('/events/grand-jubilee', $node->toUrl()->toString());
-
- // The privacy links should be visible to anonymous users in the footer.
- $this->drupalPlaceBlock('system_menu_block:footer', ['label' => 'Footer']);
- $this->drupalGet('<front>');
- $footer_menu = $this->assertSession()
- ->elementExists('css', 'nav > h2:contains("Footer") + ul');
- // The privacy setting should be visible to anonymous users in the footer.
- $this->assertTrue($footer_menu->hasLink('My privacy settings'));
}
+
}
diff --git a/recipes/drupal_cms_privacy_basic/composer.json b/recipes/drupal_cms_privacy_basic/composer.json
index c5c43f0ca..77dde5678 100644
--- a/recipes/drupal_cms_privacy_basic/composer.json
+++ b/recipes/drupal_cms_privacy_basic/composer.json
@@ -4,9 +4,7 @@
"type": "drupal-recipe",
"license": ["GPL-2.0-or-later"],
"require": {
- "drupal/bpmn_io": "^2.0.2",
"drupal/core": ">=10.3",
- "drupal/eca": "^2.1.0-beta1",
"drupal/drupal_cms_page": "*",
"drupal/klaro": "^3-rc10",
"drupal/menu_link_attributes": "^1.5"
diff --git a/recipes/drupal_cms_privacy_basic/config/eca.eca.privacy_setting_link.yml b/recipes/drupal_cms_privacy_basic/config/eca.eca.privacy_setting_link.yml
deleted file mode 100644
index 57eabc8c0..000000000
--- a/recipes/drupal_cms_privacy_basic/config/eca.eca.privacy_setting_link.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-langcode: en
-status: true
-dependencies:
- module:
- - eca_base
- - eca_config
- - eca_content
- - eca_user
-id: privacy_setting_link
-modeller: bpmn_io
-label: 'Enable privacy setting link'
-version: 0.0.0
-weight: 0
-events:
- Event_save_config:
- plugin: 'config:save'
- label: 'Save config'
- configuration: { }
- successors:
- -
- id: Activity_and_1
- condition: Flow_klaro_app
-conditions:
- Flow_klaro_app:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[config_name]'
- right: klaro.klaro_app.
- operator: beginswith
- type: value
- Flow_enabled:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[config:status]'
- right: '1'
- operator: equal
- type: value
- Flow_was_disabled:
- plugin: eca_scalar
- configuration:
- case: false
- left: '[config_original:status]'
- right: '1'
- operator: equal
- type: value
- negate: true
- Flow_disabled:
- plugin: eca_entity_field_value
- configuration:
- case: false
- expected_value: '1'
- field_name: enabled
- operator: equal
- type: value
- negate: true
- entity: menulink
- Flow_not_required:
- plugin: eca_scalar
- configuration:
- case: false
- left: '[config:required]'
- right: '1'
- operator: equal
- type: value
- negate: true
-gateways: { }
-actions:
- Activity_and_1:
- plugin: eca_void_and_condition
- label: AND
- configuration: { }
- successors:
- -
- id: Activity_and_2
- condition: Flow_enabled
- Activity_and_2:
- plugin: eca_void_and_condition
- label: AND
- configuration: { }
- successors:
- -
- id: Activity_and_3
- condition: Flow_was_disabled
- Activity_and_3:
- plugin: eca_switch_account
- label: 'Switch to user 1'
- configuration:
- user_id: '1'
- successors:
- -
- id: Activity_load_menu_link
- condition: Flow_not_required
- Activity_load_menu_link:
- plugin: eca_token_load_entity
- label: 'Load menu link'
- configuration:
- token_name: menulink
- from: properties
- entity_type: menu_link_content
- entity_id: ''
- revision_id: ''
- properties: 'uuid: d7f4f1b2-af94-46b8-ac63-a8a5b14fb0f5'
- langcode: _interface
- latest_revision: false
- unchanged: false
- object: ''
- successors:
- -
- id: Activity_enable_menu_link
- condition: Flow_disabled
- Activity_enable_menu_link:
- plugin: eca_set_field_value
- label: 'Enable menu link'
- configuration:
- field_name: enabled
- field_value: '1'
- method: 'set:clear'
- strip_tags: false
- trim: false
- save_entity: true
- object: menulink
- successors: { }
diff --git a/recipes/drupal_cms_privacy_basic/config/eca.model.privacy_setting_link.yml b/recipes/drupal_cms_privacy_basic/config/eca.model.privacy_setting_link.yml
deleted file mode 100644
index 33e725996..000000000
--- a/recipes/drupal_cms_privacy_basic/config/eca.model.privacy_setting_link.yml
+++ /dev/null
@@ -1,306 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - eca.eca.privacy_setting_link
-id: privacy_setting_link
-label: 'Enable privacy setting link'
-tags:
- - untagged
-documentation: ''
-filename: ''
-modeldata: |
- <?xml version="1.0" encoding="UTF-8"?>
- <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:qa="http://some-company/schema/bpmn/qa" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="privacy_setting_link" name="Enable privacy setting link" isExecutable="true" camunda:versionTag="0.0.0">
- <bpmn2:startEvent id="Event_save_config" name="Save config" camunda:modelerTemplate="org.drupal.event.config:save">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="config:save" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:outgoing>Flow_klaro_app</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:task id="Activity_and_1" name="AND" camunda:modelerTemplate="org.drupal.action.eca_void_and_condition">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_void_and_condition" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_klaro_app</bpmn2:incoming>
- <bpmn2:outgoing>Flow_enabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_klaro_app" name="Klaro app?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Event_save_config" targetRef="Activity_and_1">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config_name]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>beginswith</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>klaro.klaro_app.</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_and_2" name="AND" camunda:modelerTemplate="org.drupal.action.eca_void_and_condition">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_void_and_condition" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_enabled</bpmn2:incoming>
- <bpmn2:outgoing>Flow_was_disabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_enabled" name="enabled?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_and_1" targetRef="Activity_and_2">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config:status]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_and_3" name="Switch to user 1" camunda:modelerTemplate="org.drupal.action.eca_switch_account">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_switch_account" />
- </camunda:properties>
- <camunda:field name="user_id">
- <camunda:string>1</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_was_disabled</bpmn2:incoming>
- <bpmn2:outgoing>Flow_not_required</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_was_disabled" name="was disabled?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_and_2" targetRef="Activity_and_3">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config_original:status]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_load_menu_link" name="Load menu link" camunda:modelerTemplate="org.drupal.action.eca_token_load_entity">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_token_load_entity" />
- </camunda:properties>
- <camunda:field name="token_name">
- <camunda:string>menulink</camunda:string>
- </camunda:field>
- <camunda:field name="from">
- <camunda:string>properties</camunda:string>
- </camunda:field>
- <camunda:field name="entity_type">
- <camunda:string>menu_link_content</camunda:string>
- </camunda:field>
- <camunda:field name="entity_id">
- <camunda:string></camunda:string>
- </camunda:field>
- <camunda:field name="revision_id">
- <camunda:string></camunda:string>
- </camunda:field>
- <camunda:field name="langcode">
- <camunda:string>_interface</camunda:string>
- </camunda:field>
- <camunda:field name="latest_revision">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="unchanged">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="properties">
- <camunda:string>uuid: d7f4f1b2-af94-46b8-ac63-a8a5b14fb0f5</camunda:string>
- </camunda:field>
- <camunda:field name="object">
- <camunda:string></camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_not_required</bpmn2:incoming>
- <bpmn2:outgoing>Flow_disabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:task id="Activity_enable_menu_link" name="Enable menu link" camunda:modelerTemplate="org.drupal.action.eca_set_field_value">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_set_field_value" />
- </camunda:properties>
- <camunda:field name="method">
- <camunda:string>set:clear</camunda:string>
- </camunda:field>
- <camunda:field name="strip_tags">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="field_name">
- <camunda:string>enabled</camunda:string>
- </camunda:field>
- <camunda:field name="trim">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="field_value">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="save_entity">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- <camunda:field name="object">
- <camunda:string>menulink</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_disabled</bpmn2:incoming>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_disabled" name="disabled?" camunda:modelerTemplate="org.drupal.condition.eca_entity_field_value" sourceRef="Activity_load_menu_link" targetRef="Activity_enable_menu_link">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_entity_field_value" />
- </camunda:properties>
- <camunda:field name="field_name">
- <camunda:string>enabled</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="expected_value">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- <camunda:field name="entity">
- <camunda:string>menulink</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:sequenceFlow id="Flow_not_required" name="not required?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_and_3" targetRef="Activity_load_menu_link">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config:required]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- </bpmn2:process>
- <bpmndi:BPMNDiagram id="BPMNDiagram_privacy_setting_link">
- <bpmndi:BPMNPlane id="BPMNPlane_privacy_setting_link" bpmnElement="privacy_setting_link">
- <bpmndi:BPMNShape id="Event_save_config_di" bpmnElement="Event_save_config">
- <dc:Bounds x="57" y="52" width="36" height="36" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_and_1_di" bpmnElement="Activity_and_1">
- <dc:Bounds x="175" y="30" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_and_2_di" bpmnElement="Activity_and_2">
- <dc:Bounds x="345" y="30" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_and_3_di" bpmnElement="Activity_and_3">
- <dc:Bounds x="515" y="30" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_load_menu_link_di" bpmnElement="Activity_load_menu_link">
- <dc:Bounds x="685" y="30" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_enable_menu_link_di" bpmnElement="Activity_enable_menu_link">
- <dc:Bounds x="855" y="30" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Flow_klaro_app_di" bpmnElement="Flow_klaro_app">
- <di:waypoint x="93" y="70" />
- <di:waypoint x="175" y="70" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_enabled_di" bpmnElement="Flow_enabled">
- <di:waypoint x="275" y="70" />
- <di:waypoint x="345" y="70" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="287" y="45" width="46" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_was_disabled_di" bpmnElement="Flow_was_disabled">
- <di:waypoint x="445" y="70" />
- <di:waypoint x="515" y="70" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="456" y="38" width="48" height="27" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_disabled_di" bpmnElement="Flow_disabled">
- <di:waypoint x="785" y="70" />
- <di:waypoint x="855" y="70" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="796" y="45" width="48" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_1gv7iqa_di" bpmnElement="Flow_not_required">
- <di:waypoint x="615" y="70" />
- <di:waypoint x="685" y="70" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="628" y="38" width="47" height="27" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
- </bpmn2:definitions>
diff --git a/recipes/drupal_cms_privacy_basic/content/menu_link_content/my-privacy-settings.yml b/recipes/drupal_cms_privacy_basic/content/menu_link_content/my-privacy-settings.yml
index 8cce557a6..da9c16430 100644
--- a/recipes/drupal_cms_privacy_basic/content/menu_link_content/my-privacy-settings.yml
+++ b/recipes/drupal_cms_privacy_basic/content/menu_link_content/my-privacy-settings.yml
@@ -7,7 +7,7 @@ _meta:
default:
enabled:
-
- value: false
+ value: true
title:
-
value: 'My privacy settings'
diff --git a/recipes/drupal_cms_privacy_basic/recipe.yml b/recipes/drupal_cms_privacy_basic/recipe.yml
index c329ea39b..7c772efb5 100644
--- a/recipes/drupal_cms_privacy_basic/recipe.yml
+++ b/recipes/drupal_cms_privacy_basic/recipe.yml
@@ -4,11 +4,6 @@ type: Drupal CMS
recipes:
- drupal_cms_page
install:
- - bpmn_io
- - eca_base
- - eca_config
- - eca_content
- - eca_user
- klaro
- menu_link_attributes
- menu_link_content
diff --git a/recipes/drupal_cms_privacy_basic/tests/src/Functional/ComponentValidationTest.php b/recipes/drupal_cms_privacy_basic/tests/src/Functional/ComponentValidationTest.php
index 66f227ec1..988bb246c 100644
--- a/recipes/drupal_cms_privacy_basic/tests/src/Functional/ComponentValidationTest.php
+++ b/recipes/drupal_cms_privacy_basic/tests/src/Functional/ComponentValidationTest.php
@@ -36,9 +36,12 @@ class ComponentValidationTest extends BrowserTestBase {
// The privacy links should be visible to anonymous users in the footer.
$this->drupalPlaceBlock('system_menu_block:footer', ['label' => 'Footer']);
$this->drupalGet('<front>');
- $footer_menu = 'nav > h2:contains("Footer") + ul';
- $assert_session = $this->assertSession();
- $assert_session->elementNotExists('css', $footer_menu);
+ $footer_menu = $this->assertSession()
+ ->elementExists('css', 'nav > h2:contains("Footer") + ul');
+ // The privacy links should be visible to anonymous users in the footer, but
+ // the privacy policy is unpublished by default, so it shouldn't appear.
+ $this->assertTrue($footer_menu->hasLink('My privacy settings'));
+ $this->assertFalse($footer_menu->hasLink('Privacy policy'));
// Publish the privacy policy and ensure it shows up in the footer.
$this->container->get(EntityRepositoryInterface::class)
@@ -46,8 +49,6 @@ class ComponentValidationTest extends BrowserTestBase {
?->setPublished()
->save();
$this->getSession()->reload();
- $footer_menu = $assert_session->elementExists('css', $footer_menu);
- $this->assertFalse($footer_menu->hasLink('My privacy settings'));
$this->assertTrue($footer_menu->hasLink('Privacy policy'));
}
diff --git a/recipes/drupal_cms_remote_video/composer.json b/recipes/drupal_cms_remote_video/composer.json
index ef235c0fb..122c139e3 100644
--- a/recipes/drupal_cms_remote_video/composer.json
+++ b/recipes/drupal_cms_remote_video/composer.json
@@ -4,8 +4,6 @@
"description": "Configures display options for remote video.",
"license": ["GPL-2.0-or-later"],
"require": {
- "drupal/bpmn_io": "^2.0.2",
- "drupal/core": ">=10.3",
- "drupal/eca": "^2.1.0-beta1"
+ "drupal/core": ">=10.3"
}
}
diff --git a/recipes/drupal_cms_remote_video/config/eca.eca.remote_video_consent.yml b/recipes/drupal_cms_remote_video/config/eca.eca.remote_video_consent.yml
deleted file mode 100644
index cc19e8cd9..000000000
--- a/recipes/drupal_cms_remote_video/config/eca.eca.remote_video_consent.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - media.type.remote_video
- module:
- - eca_base
- - eca_config
- - eca_content
- - eca_user
-id: remote_video_consent
-modeller: bpmn_io
-label: 'Enable consent management for remote video'
-version: 0.0.0
-weight: 0
-events:
- Event_insert_remote_video:
- plugin: 'content_entity:insert'
- label: 'Insert remote video'
- configuration:
- type: 'media remote_video'
- successors:
- -
- id: Activity_set_default_provider
- condition: ''
- Event_save_config:
- plugin: 'config:save'
- label: 'Save config'
- configuration: { }
- successors:
- -
- id: Activity_and_1
- condition: Flow_is_youtube
- -
- id: Activity_and_1
- condition: Flow_is
-conditions:
- Flow_is_vimeo:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[media:field_media_oembed_video]'
- right: vimeo.com
- operator: contains
- type: value
- Flow_is_provider_disabled:
- plugin: eca_scalar
- configuration:
- case: false
- left: '[status]'
- right: '1'
- operator: equal
- type: value
- negate: true
- Flow_is_youtube:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[config_name]'
- right: klaro.klaro_app.youtube
- operator: equal
- type: value
- Flow_is:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[config_name]'
- right: klaro.klaro_app.vimeo
- operator: equal
- type: value
- Flow_disabled:
- plugin: eca_scalar
- configuration:
- case: false
- left: '[config:status]'
- right: '1'
- operator: equal
- type: value
- negate: true
- Flow_was_enabled:
- plugin: eca_scalar
- configuration:
- negate: false
- case: false
- left: '[config_original:status]'
- right: '1'
- operator: equal
- type: value
-gateways: { }
-actions:
- Activity_set_default_provider:
- plugin: eca_token_set_value
- label: 'Set default provider to YouTube'
- configuration:
- token_name: provider
- token_value: youtube
- use_yaml: false
- successors:
- -
- id: Activity_set_vimeo_provider
- condition: Flow_is_vimeo
- -
- id: Activity_switch_user
- condition: ''
- Activity_set_vimeo_provider:
- plugin: eca_token_set_value
- label: 'Set provider to Vimeo'
- configuration:
- token_name: provider
- token_value: vimeo
- use_yaml: false
- successors: { }
- Activity_read_current_setting:
- plugin: eca_config_read
- label: 'Read current setting'
- configuration:
- token_name: status
- include_overridden: true
- config_name: 'klaro.klaro_app.[provider]'
- config_key: status
- successors:
- -
- id: Activity_enable_provider
- condition: Flow_is_provider_disabled
- Activity_enable_provider:
- plugin: eca_config_write
- label: 'Enable provider'
- configuration:
- config_value: 'true'
- use_yaml: false
- save_config: true
- config_name: 'klaro.klaro_app.[provider]'
- config_key: status
- successors: { }
- Activity_switch_user:
- plugin: eca_switch_account
- label: 'Switch user account'
- configuration:
- user_id: '1'
- successors:
- -
- id: Activity_read_current_setting
- condition: ''
- Activity_and_1:
- plugin: eca_void_and_condition
- label: AND
- configuration: { }
- successors:
- -
- id: Activity_and_2
- condition: Flow_disabled
- Activity_and_2:
- plugin: eca_void_and_condition
- label: AND
- configuration: { }
- successors:
- -
- id: Activity_switch_
- condition: Flow_was_enabled
- Activity_re_enable_provider:
- plugin: eca_config_write
- label: 'Re-enable provider'
- configuration:
- config_value: '1'
- use_yaml: false
- save_config: true
- config_name: '[config_name]'
- config_key: status
- successors: { }
- Activity_switch_:
- plugin: eca_switch_account
- label: 'Switch user'
- configuration:
- user_id: '1'
- successors:
- -
- id: Activity_re_enable_provider
- condition: ''
diff --git a/recipes/drupal_cms_remote_video/config/eca.model.remote_video_consent.yml b/recipes/drupal_cms_remote_video/config/eca.model.remote_video_consent.yml
deleted file mode 100644
index a7a29e55b..000000000
--- a/recipes/drupal_cms_remote_video/config/eca.model.remote_video_consent.yml
+++ /dev/null
@@ -1,451 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - eca.eca.remote_video_consent
-id: remote_video_consent
-label: 'Enable consent management for remote video'
-tags:
- - untagged
-documentation: ''
-filename: ''
-modeldata: |
- <?xml version="1.0" encoding="UTF-8"?>
- <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:qa="http://some-company/schema/bpmn/qa" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
- <bpmn2:process id="remote_video_consent" name="Enable consent management for remote video" isExecutable="true" camunda:versionTag="0.0.0">
- <bpmn2:startEvent id="Event_insert_remote_video" name="Insert remote video" camunda:modelerTemplate="org.drupal.event.content_entity:insert">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="content_entity:insert" />
- </camunda:properties>
- <camunda:field name="type">
- <camunda:string>media remote_video</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:outgoing>Flow_0o2v0f1</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:sequenceFlow id="Flow_0o2v0f1" sourceRef="Event_insert_remote_video" targetRef="Activity_set_default_provider" />
- <bpmn2:task id="Activity_set_default_provider" name="Set default provider to YouTube" camunda:modelerTemplate="org.drupal.action.eca_token_set_value">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_token_set_value" />
- </camunda:properties>
- <camunda:field name="token_name">
- <camunda:string>provider</camunda:string>
- </camunda:field>
- <camunda:field name="token_value">
- <camunda:string>youtube</camunda:string>
- </camunda:field>
- <camunda:field name="use_yaml">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_0o2v0f1</bpmn2:incoming>
- <bpmn2:outgoing>Flow_is_vimeo</bpmn2:outgoing>
- <bpmn2:outgoing>Flow_1gwdsj0</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:task id="Activity_set_vimeo_provider" name="Set provider to Vimeo" camunda:modelerTemplate="org.drupal.action.eca_token_set_value">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_token_set_value" />
- </camunda:properties>
- <camunda:field name="token_name">
- <camunda:string>provider</camunda:string>
- </camunda:field>
- <camunda:field name="token_value">
- <camunda:string>vimeo</camunda:string>
- </camunda:field>
- <camunda:field name="use_yaml">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_is_vimeo</bpmn2:incoming>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_is_vimeo" name="is vimeo?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_set_default_provider" targetRef="Activity_set_vimeo_provider">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[media:field_media_oembed_video]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>contains</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>vimeo.com</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_read_current_setting" name="Read current setting" camunda:modelerTemplate="org.drupal.action.eca_config_read">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_config_read" />
- </camunda:properties>
- <camunda:field name="config_name">
- <camunda:string>klaro.klaro_app.[provider]</camunda:string>
- </camunda:field>
- <camunda:field name="config_key">
- <camunda:string>status</camunda:string>
- </camunda:field>
- <camunda:field name="include_overridden">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- <camunda:field name="token_name">
- <camunda:string>status</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_0udkfsk</bpmn2:incoming>
- <bpmn2:outgoing>Flow_is_provider_disabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_1gwdsj0" sourceRef="Activity_set_default_provider" targetRef="Activity_switch_user" />
- <bpmn2:task id="Activity_enable_provider" name="Enable provider" camunda:modelerTemplate="org.drupal.action.eca_config_write">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_config_write" />
- </camunda:properties>
- <camunda:field name="config_name">
- <camunda:string>klaro.klaro_app.[provider]</camunda:string>
- </camunda:field>
- <camunda:field name="config_key">
- <camunda:string>status</camunda:string>
- </camunda:field>
- <camunda:field name="config_value">
- <camunda:string>true</camunda:string>
- </camunda:field>
- <camunda:field name="use_yaml">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="save_config">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_is_provider_disabled</bpmn2:incoming>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_is_provider_disabled" name="disabled?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_read_current_setting" targetRef="Activity_enable_provider">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[status]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_switch_user" name="Switch user account" camunda:modelerTemplate="org.drupal.action.eca_switch_account">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_switch_account" />
- </camunda:properties>
- <camunda:field name="user_id">
- <camunda:string>1</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_1gwdsj0</bpmn2:incoming>
- <bpmn2:outgoing>Flow_0udkfsk</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_0udkfsk" sourceRef="Activity_switch_user" targetRef="Activity_read_current_setting" />
- <bpmn2:startEvent id="Event_save_config" name="Save config" camunda:modelerTemplate="org.drupal.event.config:save">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="config:save" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:outgoing>Flow_is_youtube</bpmn2:outgoing>
- <bpmn2:outgoing>Flow_is</bpmn2:outgoing>
- </bpmn2:startEvent>
- <bpmn2:task id="Activity_and_1" name="AND" camunda:modelerTemplate="org.drupal.action.eca_void_and_condition">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_void_and_condition" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_is_youtube</bpmn2:incoming>
- <bpmn2:incoming>Flow_is</bpmn2:incoming>
- <bpmn2:outgoing>Flow_disabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_is_youtube" name="YouTube?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Event_save_config" targetRef="Activity_and_1">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config_name]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>klaro.klaro_app.youtube</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:sequenceFlow id="Flow_is" name="Vimeo" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Event_save_config" targetRef="Activity_and_1">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config_name]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>klaro.klaro_app.vimeo</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_and_2" name="AND" camunda:modelerTemplate="org.drupal.action.eca_void_and_condition">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_void_and_condition" />
- </camunda:properties>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_disabled</bpmn2:incoming>
- <bpmn2:outgoing>Flow_was_enabled</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_disabled" name="disabled?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_and_1" targetRef="Activity_and_2">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config:status]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_re_enable_provider" name="Re-enable provider" camunda:modelerTemplate="org.drupal.action.eca_config_write">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_config_write" />
- </camunda:properties>
- <camunda:field name="config_name">
- <camunda:string>[config_name]</camunda:string>
- </camunda:field>
- <camunda:field name="config_key">
- <camunda:string>status</camunda:string>
- </camunda:field>
- <camunda:field name="config_value">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="use_yaml">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="save_config">
- <camunda:string>yes</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_1furhpi</bpmn2:incoming>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_was_enabled" name="was enabled?" camunda:modelerTemplate="org.drupal.condition.eca_scalar" sourceRef="Activity_and_2" targetRef="Activity_switch_">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_scalar" />
- </camunda:properties>
- <camunda:field name="left">
- <camunda:string>[config_original:status]</camunda:string>
- </camunda:field>
- <camunda:field name="operator">
- <camunda:string>equal</camunda:string>
- </camunda:field>
- <camunda:field name="right">
- <camunda:string>1</camunda:string>
- </camunda:field>
- <camunda:field name="type">
- <camunda:string>value</camunda:string>
- </camunda:field>
- <camunda:field name="case">
- <camunda:string>no</camunda:string>
- </camunda:field>
- <camunda:field name="negate">
- <camunda:string>no</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- </bpmn2:sequenceFlow>
- <bpmn2:task id="Activity_switch_" name="Switch user" camunda:modelerTemplate="org.drupal.action.eca_switch_account">
- <bpmn2:extensionElements>
- <camunda:properties>
- <camunda:property name="pluginid" value="eca_switch_account" />
- </camunda:properties>
- <camunda:field name="user_id">
- <camunda:string>1</camunda:string>
- </camunda:field>
- </bpmn2:extensionElements>
- <bpmn2:incoming>Flow_was_enabled</bpmn2:incoming>
- <bpmn2:outgoing>Flow_1furhpi</bpmn2:outgoing>
- </bpmn2:task>
- <bpmn2:sequenceFlow id="Flow_1furhpi" sourceRef="Activity_switch_" targetRef="Activity_re_enable_provider" />
- </bpmn2:process>
- <bpmndi:BPMNDiagram id="sid-3bf35103-39ba-4209-b46a-3c0418160cb4">
- <bpmndi:BPMNPlane id="sid-dfa0a8a4-848d-4877-9add-0eaf03678633" bpmnElement="remote_video_consent">
- <bpmndi:BPMNShape id="Event_0tay54w_di" bpmnElement="Event_insert_remote_video">
- <dc:Bounds x="482" y="162" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="466" y="205" width="68" height="27" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_0y5adi5_di" bpmnElement="Activity_set_default_provider">
- <dc:Bounds x="570" y="140" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1y31jh0_di" bpmnElement="Activity_set_vimeo_provider">
- <dc:Bounds x="730" y="140" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1el0j23_di" bpmnElement="Activity_read_current_setting">
- <dc:Bounds x="890" y="250" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_0908w9n_di" bpmnElement="Activity_enable_provider">
- <dc:Bounds x="1050" y="250" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1vsips5_di" bpmnElement="Activity_switch_user">
- <dc:Bounds x="730" y="250" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Event_0sk9om5_di" bpmnElement="Event_save_config">
- <dc:Bounds x="482" y="402" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="472" y="445" width="58" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1mdwp9m_di" bpmnElement="Activity_and_1">
- <dc:Bounds x="570" y="380" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1fp6lpt_di" bpmnElement="Activity_and_2">
- <dc:Bounds x="730" y="380" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_19p9lm0_di" bpmnElement="Activity_re_enable_provider">
- <dc:Bounds x="1050" y="380" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_0tu7dij_di" bpmnElement="Activity_switch_">
- <dc:Bounds x="890" y="380" width="100" height="80" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Flow_0o2v0f1_di" bpmnElement="Flow_0o2v0f1">
- <di:waypoint x="518" y="180" />
- <di:waypoint x="570" y="180" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_16vwpi3_di" bpmnElement="Flow_is_vimeo">
- <di:waypoint x="670" y="180" />
- <di:waypoint x="730" y="180" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="677" y="162" width="47" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_1gwdsj0_di" bpmnElement="Flow_1gwdsj0">
- <di:waypoint x="670" y="180" />
- <di:waypoint x="700" y="180" />
- <di:waypoint x="700" y="290" />
- <di:waypoint x="730" y="290" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_116fbm6_di" bpmnElement="Flow_is_provider_disabled">
- <di:waypoint x="990" y="290" />
- <di:waypoint x="1050" y="290" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="997" y="272" width="48" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_0udkfsk_di" bpmnElement="Flow_0udkfsk">
- <di:waypoint x="830" y="290" />
- <di:waypoint x="890" y="290" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_0ntspdo_di" bpmnElement="Flow_is_youtube">
- <di:waypoint x="500" y="402" />
- <di:waypoint x="500" y="350" />
- <di:waypoint x="620" y="350" />
- <di:waypoint x="620" y="380" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="537" y="332" width="50" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_0763vyh_di" bpmnElement="Flow_is">
- <di:waypoint x="518" y="420" />
- <di:waypoint x="570" y="420" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="529" y="402" width="31" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_0nyk8vr_di" bpmnElement="Flow_disabled">
- <di:waypoint x="670" y="420" />
- <di:waypoint x="730" y="420" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="677" y="402" width="48" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_0cq3416_di" bpmnElement="Flow_was_enabled">
- <di:waypoint x="830" y="420" />
- <di:waypoint x="890" y="420" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="837" y="386" width="46" height="27" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Flow_1furhpi_di" bpmnElement="Flow_1furhpi">
- <di:waypoint x="990" y="420" />
- <di:waypoint x="1050" y="420" />
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
- </bpmn2:definitions>
diff --git a/recipes/drupal_cms_remote_video/recipe.yml b/recipes/drupal_cms_remote_video/recipe.yml
index a1bf5db3b..c67094981 100644
--- a/recipes/drupal_cms_remote_video/recipe.yml
+++ b/recipes/drupal_cms_remote_video/recipe.yml
@@ -3,13 +3,6 @@ type: Drupal CMS
description: 'Configures display options for remote video.'
recipes:
- core/recipes/remote_video_media_type
- - drupal_cms_privacy_basic
-install:
- - bpmn_io
- - eca_base
- - eca_config
- - eca_content
- - eca_user
config:
strict: false
actions:
@@ -19,10 +12,3 @@ config:
- langcode
- path
- created
- # These two Klaro apps get automatically enabled as soon as a remote video of the
- # respective provider is created as a media entity. This is implemented by ECA with
- # the eca.eca.remote_video_consent model, contained in the config directory.
- klaro.klaro_app.vimeo:
- disable: []
- klaro.klaro_app.youtube:
- disable: []
diff --git a/recipes/drupal_cms_remote_video/tests/src/Functional/ComponentValidationTest.php b/recipes/drupal_cms_remote_video/tests/src/Functional/ComponentValidationTest.php
index efcdf1e38..c75854c8f 100644
--- a/recipes/drupal_cms_remote_video/tests/src/Functional/ComponentValidationTest.php
+++ b/recipes/drupal_cms_remote_video/tests/src/Functional/ComponentValidationTest.php
@@ -4,8 +4,6 @@ declare(strict_types=1);
namespace Drupal\Tests\drupal_cms_remote_video\Functional;
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\FunctionalTests\Core\Recipe\RecipeTestTrait;
use Drupal\Tests\BrowserTestBase;
@@ -28,30 +26,6 @@ class ComponentValidationTest extends BrowserTestBase {
$this->applyRecipe($dir);
// Apply it again to prove that it is idempotent.
$this->applyRecipe($dir);
-
- // The privacy links should be visible to anonymous users in the footer.
- $this->drupalPlaceBlock('system_menu_block:footer', ['label' => 'Footer']);
- $this->drupalGet('<front>');
- $footer_menu = 'nav > h2:contains("Footer") + ul';
- $assert_session = $this->assertSession();
- $assert_session->elementNotExists('css', $footer_menu);
-
- // Create a remote video media entity and make sure that the footer menu
- // will then appear and contains the privacy settings link but not the
- // privacy poplicy.
- $this->container->get(EntityTypeManagerInterface::class)
- ->getStorage('media')
- ->create([
- 'bundle' => 'remote_video',
- 'status' => 1,
- 'name' => 'Driesnote',
- 'field_media_oembed_video' => 'https://www.youtube.com/watch?v=U6o8ou71oyE',
- ])
- ->save();
- $this->getSession()->reload();
- $footer_menu = $assert_session->elementExists('css', $footer_menu);
- $this->assertTrue($footer_menu->hasLink('My privacy settings'));
- $this->assertFalse($footer_menu->hasLink('Privacy policy'));
}
}
--
GitLab