Fix fluid display when referencing deleted fields

Author: bryannielsen

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Handle a scenario where Fluid fields save an empty string in their list of associated fields
+- Displaying Fluid field when one of the content fields has been deleted but not unassociated
 
 ## [1.1.0] - 2023-06-14
 

src/Fieldtypes/Presenters/FluidFieldPresenter.php

@@ -20,11 +20,11 @@ public function present(FieldContent $content, $arguments)
         $groupIds = $content->field->field_settings['field_channel_field_groups'] ?? [];
         $fieldIds = $content->field->field_settings['field_channel_fields'] ?? [];
 
-        $fields = collect($groupIds)->filter()->reduce(function ($carry, $group) {
-            return $carry->merge(app(FieldtypeManager::class)->fieldsForFieldGroup($group));
-        }, new Collection)->merge(collect($fieldIds)->filter()->reduce(function ($carry, $field) {
-            return $carry->push(app(FieldtypeManager::class)->getField($field));
-        }, new Collection));
+        $fields = (new Collection(collect($groupIds)->flatmap(function ($group) {
+            return app(FieldtypeManager::class)->fieldsForFieldGroup($group);
+        })->merge(collect($fieldIds)->map(function ($field) {
+            return app(FieldtypeManager::class)->getField($field);
+        }))->filter()))->unique();
 
         if ($content->entry->isPreview()) {
             $order = 0;