Fixed #12459

craftcms · Dec 15, 2022 · 2947da1 · 2947da1
1 parent 7f5e2cb
commit 2947da1
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 4
 
+## Unreleased
+
+- Fixed a bug where deleting a field layout tab could result in duplicated tabs. ([#12459](https://github.com/craftcms/cms/issues/12459))
+
 ## 4.3.5 - 2022-12-13
 
 - Fixed a bug where entry tab contents could remain visible when switching to other tabs, after changing the entry type.

diff --git a/src/models/FieldLayout.php b/src/models/FieldLayout.php
@@ -306,6 +306,7 @@ public function setTabs(array $tabs): void
         $this->_tabs = [];
 
         $index = 0;
+        $elementUids = [];
 
         foreach ($tabs as $tab) {
             if (is_array($tab)) {
@@ -315,6 +316,28 @@ public function setTabs(array $tabs): void
             } else {
                 $tab->setLayout($this);
             }
+
+            // Ensure there aren't any layout element UUID conflicts
+            $layoutElements = $tab->getElements();
+            $filteredLayoutElements = array_filter($layoutElements, function(FieldLayoutElement $layoutElement) use (&$elementUids) {
+                if (!isset($layoutElement->uid)) {
+                    return true;
+                }
+                if (isset($elementUids[$layoutElement->uid])) {
+                    return false;
+                }
+                $elementUids[$layoutElement->uid] = true;
+                return true;
+            });
+
+            if (empty($filteredLayoutElements)) {
+                continue;
+            }
+
+            if (count($filteredLayoutElements) !== count($layoutElements)) {
+                $tab->setElements($filteredLayoutElements);
+            }
+
             $tab->sortOrder = ++$index;
             $this->_tabs[] = $tab;
         }

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/FieldLayoutDesigner.js b/src/web/assets/cp/src/js/FieldLayoutDesigner.js
@@ -253,6 +253,7 @@ Craft.FieldLayoutDesigner.Tab = Garnish.Base.extend({
   uid: null,
   $container: null,
   slideout: null,
+  destroyed: false,
 
   init: function (designer, $container) {
     this.designer = designer;
@@ -485,6 +486,10 @@ Craft.FieldLayoutDesigner.Tab = Garnish.Base.extend({
   },
 
   set config(config) {
+    if (this.destroyed) {
+      return;
+    }
+
     // Is the name changing?
     if (config.name && config.name !== this.config.name) {
       this.$container.find('.tabs .tab span').text(config.name);
@@ -505,13 +510,21 @@ Craft.FieldLayoutDesigner.Tab = Garnish.Base.extend({
   },
 
   updateConfig: function (callback) {
+    if (this.destroyed) {
+      return;
+    }
+
     const config = callback(this.config);
     if (config !== false) {
       this.config = config;
     }
   },
 
   updatePositionInConfig: function () {
+    if (this.destroyed) {
+      return;
+    }
+
     this.designer.updateConfig((config) => {
       const tabConfig = this.config;
       const oldIndex = this.index;
@@ -528,6 +541,12 @@ Craft.FieldLayoutDesigner.Tab = Garnish.Base.extend({
   },
 
   destroy: function () {
+    if (this.destroyed) {
+      return;
+    }
+
+    this.destroyed = true;
+
     this.designer.updateConfig((config) => {
       const index = this.index;
       if (index === -1) {