Issue #3320512 by muriqui: EventInstances field keys don't conform to... (25378b95) · Commits · project / recurring_events

src/Plugin/ComputedField/EventInstances.php

+12 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@ namespace Drupal\recurring_events\Plugin\ComputedField;
		use Drupal\Core\Field\EntityReferenceFieldItemList;
		use Drupal\Core\TypedData\ComputedItemListTrait;

		/**
		* Computed field referencing the instances of an event series.
		*/
		class EventInstances extends EntityReferenceFieldItemList {

		use ComputedItemListTrait;
		@@ -15,13 +18,20 @@ class EventInstances extends EntityReferenceFieldItemList {
		protected function computeValue() {
		$entity = $this->getEntity();
		if (!empty($entity->id())) {
		$event_instances = \Drupal::entityTypeManager()->getStorage('eventinstance')->loadByProperties([
		$instances = \Drupal::entityTypeManager()->getStorage('eventinstance')->loadByProperties([
		'eventseries_id' => $entity->id(),
		]);

		foreach ($event_instances as $key => $instance) {
		// Sort by instance start date and reindex by field item delta, as
		// expected by EntityReferenceFieldItemListInterface::referencedEntities.
		usort($instances, function ($instanceA, $instanceB) {
		return $instanceA->date->value <=> $instanceB->date->value;
		});

		foreach ($instances as $key => $instance) {
		$this->list[$key] = $this->createItem($key, $instance);
		}
		}
		}

		}