Skip to content
Snippets Groups Projects
Commit 38e4bc43 authored by catch's avatar catch
Browse files

Revert "Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub...

Revert "Issue #3438769 by vinmayiswamy, antonnavi, michelle, amateescu: Sub workspace does not clear"

This reverts commit c1f7b85d.

(cherry picked from commit 2b536b6c)
parent bf3ee6cd
No related branches found
No related tags found
2 merge requests!11185Issue #3477324 by andypost, alexpott: Fix usage of str_getcsv() and fgetcsv() for PHP 8.4,!9944Issue #3483353: Consider making the createCopy config action optionally fail...
Pipeline #287868 passed with warnings
+6
......@@ -440,18 +440,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);
}
}
}
}
......@@ -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.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment