From 2b536b6c970efa932298c72a9b07b3f852418d28 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Thu, 19 Sep 2024 12:08:17 +0100
Subject: [PATCH] Revert "Issue #3438769 by vinmayiswamy, antonnavi, michelle,
amateescu: Sub workspace does not clear"
This reverts commit c1f7b85decd7b1281b00d891c72963551b57d622.
---
.../workspaces/src/WorkspaceAssociation.php | 12 ------
.../src/Kernel/WorkspaceAssociationTest.php | 37 -------------------
2 files changed, 49 deletions(-)
diff --git a/core/modules/workspaces/src/WorkspaceAssociation.php b/core/modules/workspaces/src/WorkspaceAssociation.php
index 579aee87699c..02d6924c4e4b 100644
--- a/core/modules/workspaces/src/WorkspaceAssociation.php
+++ b/core/modules/workspaces/src/WorkspaceAssociation.php
@@ -392,18 +392,6 @@ public static function getSubscribedEvents(): array {
*/
public function onPostPublish(WorkspacePublishEvent $event): void {
$this->deleteAssociations($event->getWorkspace()->id());
-
- // Cleanup sub-workspaces on deploy to Live (no parent) workspace.
- if (!$event->getWorkspace()->hasParent()) {
- foreach ($event->getPublishedRevisionIds() as $target_entity_type_id => $target_entity_ids) {
- // Extract target entity IDs and revision IDs.
- $target_entity_ids_list = array_keys($target_entity_ids);
- $target_entity_revision_ids = array_keys($target_entity_ids);
-
- $this->deleteAssociations(NULL, $target_entity_type_id, $target_entity_ids_list, $target_entity_revision_ids);
- }
- }
-
}
}
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
index 7dae5f4c3375..4d7e8d80e628 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php
@@ -158,43 +158,6 @@ public function testWorkspaceAssociation(): void {
$this->assertWorkspaceAssociations('node', $expected_latest_revisions, $expected_all_revisions, $expected_initial_revisions);
}
- /**
- * Tests cleanup of sub-workspaces on publishing to Live.
- */
- public function testSubWorkspaceCleanupOnPublishToLive(): void {
- $workspaceName = 'stage';
- $this->switchToWorkspace($workspaceName);
-
- // Create and save a node in the 'stage' workspace.
- $node = $this->createNode([
- 'title' => 'Test article - stage - unpublished',
- 'type' => 'article',
- 'status' => 0,
- ]);
- $node->save();
-
- // Simulate the publishing operation.
- $node->set('status', 1);
- $node->save();
-
- // Manually perform cleanup if no service is available.
- $database = \Drupal::database();
- $database->delete('workspace_association')
- ->condition('workspace', $workspaceName)
- ->execute();
-
- // Query database to ensure that the workspace associations were cleaned up.
- $queryAfter = $database->select('workspace_association', 'wa')
- ->fields('wa')
- ->condition('workspace', $workspaceName)
- ->execute();
- $resultsAfter = $queryAfter->fetchAll();
-
- // Assert that the workspace association table is empty for
- // the 'stage' workspace.
- $this->assertEmpty($resultsAfter, 'Workspace associations were not cleaned up properly for the stage workspace.');
- }
-
/**
* Checks the workspace associations for a test scenario.
*
--
GitLab