area17 · ifox · Oct 21, 2024 · Oct 15, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/src/Repositories/Behaviors/HandleRevisions.php b/src/Repositories/Behaviors/HandleRevisions.php
@@ -157,11 +157,9 @@ public function hydrateRelatedBrowsers(TwillModelContract $object, array $fields
 
         foreach ($relatedBrowsers as $browser) {
             $browserField = $fields['browsers'][$browser['browserName']] ?? [];
-
+            $position = 1;
             foreach ($browserField as $values) {
-                $position = 1;
-
-                $relatedBrowserItems->push(RelatedItem::make([
+                $relatedBrowserItems->push(new RelatedItem([
                     'subject_id' => $object->getKey(),
                     'subject_type' => $object->getMorphClass(),
                     'related_id' => $values['id'],

diff --git a/src/Repositories/BlockRepository.php b/src/Repositories/BlockRepository.php
@@ -5,14 +5,12 @@
 use A17\Twill\Facades\TwillBlocks;
 use A17\Twill\Models\Block;
 use A17\Twill\Models\Contracts\TwillModelContract;
+use A17\Twill\Models\RelatedItem;
 use A17\Twill\Repositories\Behaviors\HandleFiles;
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Services\Blocks\Block as BlockConfig;
 use Illuminate\Config\Repository as Config;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Schema;
-use ReflectionException;
 
 class BlockRepository extends ModuleRepository
 {
@@ -35,42 +33,36 @@ public function getCrops(string $role): array
 
     public function hydrate(TwillModelContract $model, array $fields): TwillModelContract
     {
-        if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
-            $relatedItems = Collection::make();
-
-            Collection::make($fields['browsers'])->each(function ($items, $browserName) use (&$relatedItems) {
-                Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) {
-                    try {
-                        // @todo: Repository could be null.
-                        $repository = $this->getModelRepository($item['endpointType'] ?? $browserName);
-                        $relatedItems->push(
-                            (object) [
-                                'related' => $repository->getById($item['id']),
-                                'browser_name' => $browserName,
-                            ]
-                        );
-                    } catch (ReflectionException $reflectionException) {
-                        Log::error($reflectionException);
-                    }
-                });
-            });
-
-            $model->setRelation('relatedItems', $relatedItems);
-        }
+        $relatedItems = collect($fields['browsers'])
+            ->flatMap(fn($it
8000
ems, $browserName) => collect($items)
+                ->map(fn($item, $position) => new RelatedItem([
+                    'subject_id' => $model->getKey(),
+                    'subject_type' => $model->getMorphClass(),
+                    'related_id' => $item['id'],
+                    'related_type' => $item['endpointType'],
+                    'browser_name' => $browserName,
+                    'position' => $position,
+                ])));
+
+        $model->setRelation('relatedItems', $relatedItems);
+        $model->loadMissing('relatedItems.related');
 
         return parent::hydrate($model, $fields);
     }
 
+    /** @param Block $model */
     public function afterSave(TwillModelContract $model, array $fields): void
     {
-        if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
+        if (!empty($fields['browsers'])) {
+            $browserNames = collect($fields['browsers'])->each(function ($items, $browserName) use ($model) {
+                // This will create items or delete them if they are missing
+                $model->saveRelated($items, $browserName);
+            })->keys();
+
+            // Delete all the related items that were emptied
+            RelatedItem::query()->whereMorphedTo('subject', $model)->whereNotIn('browser_name', $browserNames)->delete();
+        } else {
             $model->clearAllRelated();
-
-            if (isset($fields['browsers'])) {
-                Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($model) {
-                    $model->saveRelated($items, $browserName);
-                });
-            }
         }
 
         parent::afterSave($model, $fields);
@@ -82,9 +74,7 @@ public function afterDelete(TwillModelContract $object): void
         $object->medias()->detach();
         $object->files()->detach();
 
-        if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
-            $object->clearAllRelated();
-        }
+        $object->clearAllRelated();
     }
 
     public function buildFromCmsArray(array $block, bool $repeater = false): array