Respect predefined volume UUIDs

CHANGELOG.md

@@ -9,7 +9,7 @@
 - Fixed errors that occurred when working with nested entries for a newly-added site. ([#15898](https://github.com/craftcms/cms/pull/15898))
 - Fixed a bug where it wasn’t possible to scroll the section select modal when moving entries to a different section. ([#15900](https://github.com/craftcms/cms/issues/15900))
 - Fixed a bug where query params in the format of `'<operator> <values>'` weren’t being parsed correctly.
-- Fixed a bug there `craft\services\Entries::saveSection()` wasn’t respecting predefined UUID values on new sections.
+- Fixed a bug `craft\services\Entries::saveSection()` and `craft\services\Volumes::saveVolume()` weren’t respecting predefined UUID values on new models.
 
 ## 5.4.8 - 2024-10-15
 

src/services/Volumes.php

@@ -296,7 +296,10 @@ public function saveVolume(Volume $volume, bool $runValidation = true): bool
         }
 
         if ($isNewVolume) {
-            $volume->uid = StringHelper::UUID();
+            if (!$volume->uid) {
+                $volume->uid = StringHelper::UUID();
+            }
+
             $volume->sortOrder = (new Query())
                     ->from([Table::VOLUMES])
                     ->max('[[sortOrder]]') + 1;