Issue #3488664 by phenaproxima: The PlaceBlock config action breaks when placing a block in an empty region

(cherry picked from commit 43717fbb01)
merge-requests/10341/head
Dave Long 2024-11-22 13:08:20 +00:00
parent 6e4863ffb5
commit 4c899033a9
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
2 changed files with 34 additions and 8 deletions

View File

@ -74,15 +74,17 @@ final class PlaceBlock implements ConfigActionPluginInterface, ContainerFactoryP
'theme' => $theme,
'region' => $value['region'],
]);
// Sort the blocks by weight. Don't use \Drupal\block\Entity\Block::sort()
// here because it seems to be intended to sort blocks in the UI, where
// we really just want to get the weights right in this situation.
uasort($blocks, fn (BlockInterface $a, BlockInterface $b) => $a->getWeight() <=> $b->getWeight());
if ($blocks) {
// Sort the blocks by weight. Don't use \Drupal\block\Entity\Block::sort()
// here because it seems to be intended to sort blocks in the UI, where
// we really just want to get the weights right in this situation.
uasort($blocks, fn (BlockInterface $a, BlockInterface $b) => $a->getWeight() <=> $b->getWeight());
$value['weight'] = match ($value['position']) {
'first' => reset($blocks)->getWeight() - 1,
'last' => end($blocks)->getWeight() + 1,
};
$value['weight'] = match ($value['position']) {
'first' => reset($blocks)->getWeight() - 1,
'last' => end($blocks)->getWeight() + 1,
};
}
}
// Remove values that are not valid properties of block entities.
unset($value['position'], $value['default_region']);

View File

@ -163,4 +163,28 @@ class ConfigActionsTest extends KernelTestBase {
$this->assertSame('last', end($blocks));
}
/**
* Tests using the PlaceBlock action in an empty region.
*/
public function testPlaceBlockInEmptyRegion(): void {
/** @var \Drupal\Core\Entity\Query\QueryInterface $query */
$query = $this->container->get(EntityTypeManagerInterface::class)
->getStorage('block')
->getQuery()
->count()
->condition('theme', 'olivero')
->condition('region', 'footer_top');
$this->assertSame(0, $query->execute());
// Place a block in that region.
$this->configActionManager->applyAction('placeBlockInDefaultTheme', 'block.block.test', [
'plugin' => 'system_powered_by_block',
'region' => [
'olivero' => 'footer_top',
],
'position' => 'first',
]);
$this->assertSame(1, $query->execute());
}
}