Had some Issues When Testing Sorted Them

awcodes · May 18, 2024 · c1e0ff0 · c1e0ff0
1 parent 3a4b9ad
commit c1e0ff0
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Components/Forms/CuratorPicker.php b/src/Components/Forms/CuratorPicker.php
@@ -521,26 +521,29 @@ public function relationship(string | Closure $relationshipName, string | Closur
                     $orderColumn = $component->getOrderColumn();
                     $typeColumn = $component->getTypeColumn();
                     $typeValue = $component->getTypeValue();
-                    $existingIds = $relationship->pluck('id')->toArray();
+                    $existingItems = $relationship->where($typeColumn, $typeValue)->get()->keyBy('media_id')->toArray();
+                    $newIds = collect($state)->pluck('id')->toArray();
 
-                    $relationship->whereNotIn('id', Arr::pluck($state, 'id'))->delete();
+                    $relationship->whereNotIn('media_id', $newIds)
+                        ->where($typeColumn, $typeValue)
+                        ->delete();
 
-                    $i = 1;
+                    $i = count($existingItems) + 1;
                     foreach ($state as $item) {
                         $itemId = $item['id'];
                         $data = [
                             'media_id' => $itemId,
                             $orderColumn => $i,
                         ];
-                        if ($typeColumn && $typeValue) {
+                        if ($typeValue) {
                             $data[$typeColumn] = $typeValue;
                         }
-                        if (in_array($itemId, $existingIds)) {
+                        if (isset($existingItems[$itemId])) {
                             $relationship->where('media_id', $itemId)->update($data);
                         } else {
                             $relationship->create($data);
                         }
-                        $i++; // Increment counter
+                        $i++;
                     }
                     return;
                 }