fix(SFT-1353) issue with UIDs of field layout elements when duplicati…

…ng calendars (#313)
solspace · Sep 12, 2024 · 543fb73 · 543fb73
1 parent 5249173
commit 543fb73
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/packages/plugin/src/Controllers/CalendarsController.php b/packages/plugin/src/Controllers/CalendarsController.php
@@ -138,11 +138,20 @@ public function actionDuplicate(): Response
             $oldLayoutTabs = $oldLayout->getTabs();
 
             foreach ($oldLayoutTabs as $oldLayoutTab) {
+                $newElements = [];
+                foreach ($oldLayoutTab->getElements() as $oldElement) {
+                    unset($oldElement['uid']);
+
+                    $oldElement->uid = CraftStringHelper::UUID();
+                    $newElements[] = $oldElement;
+                }
+
                 $newLayoutTab = new FieldLayoutTab();
+                $newLayoutTab->uid = CraftStringHelper::UUID();
                 $newLayoutTab->name = $oldLayoutTab->name;
                 $newLayoutTab->sortOrder = $oldLayoutTab->sortOrder;
                 $newLayoutTab->setLayout($newLayout);
-                $newLayoutTab->setElements($oldLayoutTab->getElements());
+                $newLayoutTab->setElements($newElements);
 
                 $newLayoutTabs[] = $newLayoutTab;
             }
@@ -172,15 +181,15 @@ public function actionDuplicate(): Response
 
         $iterator = 0;
         foreach ($handles as $handle) {
-            if (preg_match('/-(\d+)$/', $handle, $matches)) {
-                $iterator = max($iterator, (int) $matches[1]);
+            if (preg_match('/^(.*)(\d+)$/', $handle, $matches)) {
+                $iterator = max($iterator, (int) $matches[2]);
             }
         }
 
         ++$iterator;
 
         $clone->name = preg_replace('/^(.*) \d+$/', '$1', $clone->name).' '.$iterator;
-        $clone->handle = preg_replace('/^(.*)-\d+$/', '$1', $clone->handle).$iterator;
+        $clone->handle = preg_replace('/^(.*)\d+$/', '$1', $clone->handle).$iterator;
 
         if ($this->getCalendarService()->saveCalendar($clone)) {
             return $this->asJson(['success' => true]);