Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3366257 by amateescu: The active workspace is not deactivated when it's deleted

merge-requests/4505/head
Lauri Eskola 2023-07-29 11:11:33 +03:00
parent 917678cf43
commit 96939a6ba0
No known key found for this signature in database
GPG Key ID: 382FC0F5B0DF53F8
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/modules/workspaces/src/Entity/Workspace.php
View File

@ -174,16 +174,27 @@ class Workspace extends ContentEntityBase implements WorkspaceInterface {
public static function postDelete(EntityStorageInterface $storage, array $entities) { public static function postDelete(EntityStorageInterface $storage, array $entities) {
parent::postDelete($storage, $entities); parent::postDelete($storage, $entities);
// Add the IDs of the deleted workspaces to the list of workspaces that will /** @var \Drupal\workspaces\WorkspaceManagerInterface $workspace_manager */
// be purged on cron. $workspace_manager = \Drupal::service('workspaces.manager');
$state = \Drupal::state(); // Disable the currently active workspace if it has been deleted.
$deleted_workspace_ids = $state->get('workspace.deleted', []); if ($workspace_manager->hasActiveWorkspace()
$deleted_workspace_ids += array_combine(array_keys($entities), array_keys($entities)); && in_array($workspace_manager->getActiveWorkspace()->id(), array_keys($entities), TRUE)) {
$state->set('workspace.deleted', $deleted_workspace_ids); $workspace_manager->switchToLive();
}
// Trigger a batch purge to allow empty workspaces to be deleted // Ensure that workspace batch purging does not happen inside a workspace.
// immediately. $workspace_manager->executeOutsideWorkspace(function () use ($workspace_manager, $entities) {
\Drupal::service('workspaces.manager')->purgeDeletedWorkspacesBatch(); // Add the IDs of the deleted workspaces to the list of workspaces that will
// be purged on cron.
$state = \Drupal::state();
$deleted_workspace_ids = $state->get('workspace.deleted', []);
$deleted_workspace_ids += array_combine(array_keys($entities), array_keys($entities));
$state->set('workspace.deleted', $deleted_workspace_ids);
// Trigger a batch purge to allow empty workspaces to be deleted
// immediately.
$workspace_manager->purgeDeletedWorkspacesBatch();
});
} }
} }

3
core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
View File

@ -201,6 +201,9 @@ class WorkspaceCRUDTest extends KernelTestBase {
$workspace_deleted = \Drupal::state()->get('workspace.deleted'); $workspace_deleted = \Drupal::state()->get('workspace.deleted');
$this->assertCount(0, $workspace_deleted); $this->assertCount(0, $workspace_deleted);
// Check that the deleted workspace is no longer active.
$this->assertFalse($this->workspaceManager->hasActiveWorkspace());
} }
/** /**