Smarter saving of Taxonomies, less redundant

assets/js/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '5.1.99.20';
+export const version = '5.1.99.21';

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bolt",
-    "version": "5.1.99.21",
+    "version": "5.1.99.23",
     "homepage": "https://boltcms.io",
     "author": "Bob den Otter <[email protected]> (https://boltcms.io)",
     "license": "MIT",

src/Controller/Backend/ContentEditController.php

@@ -555,29 +555,40 @@ public function updateField(Field $field, $value, ?string $locale): void
         }
     }
 
-    public function updateTaxonomy(Content $content, string $key, $taxonomy, int $order): void
+    public function updateTaxonomy(Content $content, string $key, $postedTaxonomy, int $order): void
     {
-        $taxonomy = (new Collection(Json::findArray($taxonomy)))->filter();
+        $postedTaxonomy = (new Collection(Json::findArray($postedTaxonomy)))->filter();
+        $contentTaxoSlugs = [];
 
-        // Remove old ones
+        // Remove old ones, if they are not in the current ones
         foreach ($content->getTaxonomies($key) as $current) {
-            $content->removeTaxonomy($current);
+            // If it's not still present, remove it
+            if (! in_array($current->getSlug(), $postedTaxonomy->all())) {
+                $content->removeTaxonomy($current);
+            }
+
+            $contentTaxoSlugs[] = $current->getSlug();
         }
 
         // Then (re-) add selected ones
-        foreach ($taxonomy as $slug) {
-            $taxonomy = $this->taxonomyRepository->findOneBy([
+        foreach ($postedTaxonomy as $slug) {
+            // If we already have it, continue.
+            if (in_array($slug, $contentTaxoSlugs)) {
+                continue;
+            }
+
+            $repoTaxonomy = $this->taxonomyRepository->findOneBy([
                 'type' => $key,
                 'slug' => $slug,
             ]);
 
-            if ($taxonomy === null) {
-                $taxonomy = $this->taxonomyRepository->factory($key, (string) $slug);
+            if ($repoTaxonomy === null) {
+                $repoTaxonomy = $this->taxonomyRepository->factory($key, (string) $slug);
             }
 
-            $taxonomy->setSortorder($order);
+            $repoTaxonomy->setSortorder($order);
 
-            $content->addTaxonomy($taxonomy);
+            $content->addTaxonomy($repoTaxonomy);
         }
     }
 

src/Version.php

@@ -23,7 +23,7 @@ final class Version
      *   Stable — 3.0.0
      *   Development — 3.1.0 alpha 1
      */
-    public const VERSION = '5.2.0 beta 22';
+    public const VERSION = '5.2.0 beta 23';
     public const CODENAME = '';
 
     /**