Accept legacy site handle arrays when updating collections and taxonomies

GlobalSetSites with origins disabled now processes both UI rows and the old flat handle list so existing payloads keep working.

Author: jaygeorge

src/Fieldtypes/GlobalSetSites.php

@@ -22,6 +22,20 @@ protected function configFieldItems(): array
         ];
     }
 
+    public function process($data)
+    {
+        if ($this->config('origins', true)) {
+            return $data;
+        }
+
+        return collect($data ?? [])
+            ->filter(fn ($site) => is_string($site) ? filled($site) : ($site['enabled'] ?? false))
+            ->map(fn ($site) => is_string($site) ? $site : $site['handle'])
+            ->filter()
+            ->values()
+            ->all();
+    }
+
     public function rules(): array
     {
         $rules = [
@@ -42,7 +56,9 @@ private function atLeastOneSiteEnabledRule()
         {
             public function passes($attribute, $value)
             {
-                return collect($value)->filter->enabled->isNotEmpty();
+                return collect($value)->contains(function ($site) {
+                    return is_string($site) ? filled($site) : ($site['enabled'] ?? false);
+                });
             }
 
             public function message()

src/Http/Controllers/CP/Collections/CollectionsController.php

@@ -354,14 +354,6 @@ public function update(Request $request, $collection)
             ->previewTargets($values['preview_targets']);
 
         if ($sites = Arr::get($values, 'sites')) {
-            if (Site::multiEnabled()) {
-                $sites = collect($sites)
-                    ->filter(fn ($site) => $site['enabled'] ?? false)
-                    ->map(fn ($site) => $site['handle'])
-                    ->values()
-                    ->all();
-            }
-
             $collection
                 ->sites($sites)
                 ->originBehavior($values['origin_behavior']);

src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php

@@ -201,14 +201,6 @@ public function update(Request $request, $taxonomy)
             ->layout($values['layout'] ?? null);
 
         if ($sites = Arr::get($values, 'sites')) {
-            if (Site::multiEnabled()) {
-                $sites = collect($sites)
-                    ->filter(fn ($site) => $site['enabled'] ?? false)
-                    ->map(fn ($site) => $site['handle'])
-                    ->values()
-                    ->all();
-            }
-
             $taxonomy->sites($sites);
         }
 

tests/Feature/Collections/UpdateCollectionTest.php

@@ -187,6 +187,32 @@ public function it_updates_collection_sites_from_enabled_rows_and_ignores_origin
         $this->assertTrue($updated->propagate());
     }
 
+    #[Test]
+    public function it_updates_collection_sites_from_legacy_handle_array()
+    {
+        $this->setSites([
+            'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+            'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+            'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://de.test.com/'],
+        ]);
+
+        $collection = Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->update($collection, [
+                'sites' => ['en', 'de'],
+                'origin_behavior' => 'root',
+                'propagate' => false,
+                'structured' => false,
+                'require_slugs' => true,
+                'preview_targets' => [],
+            ])
+            ->assertOk();
+
+        $this->assertEquals(['en', 'de'], Collection::findByHandle('test')->sites()->all());
+    }
+
     private function userWithoutPermission()
     {
         $this->setTestRoles(['test' => ['access cp']]);

tests/Feature/Taxonomies/UpdateTaxonomyTest.php

@@ -102,6 +102,29 @@ public function it_updates_taxonomy_sites_from_enabled_rows_and_ignores_origins(
         $this->assertEquals(['en', 'de'], Taxonomy::findByHandle('test')->sites()->all());
     }
 
+    #[Test]
+    public function it_updates_taxonomy_sites_from_legacy_handle_array()
+    {
+        $this->setSites([
+            'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+            'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+            'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://de.test.com/'],
+        ]);
+
+        $taxonomy = tap(Taxonomy::make('test')->sites(['en', 'fr']))->save();
+
+        $this
+            ->actingAs($this->userWithPermission())
+            ->update($taxonomy, [
+                'sites' => ['en', 'de'],
+                'preview_targets' => [],
+                'collections' => [],
+            ])
+            ->assertOk();
+
+        $this->assertEquals(['en', 'de'], Taxonomy::findByHandle('test')->sites()->all());
+    }
+
     private function userWithoutPermission()
     {
         $this->setTestRoles(['test' => ['access cp']]);