#366 Don't copy uuid on layer clone (#367)

NASA-AMMOS · Apr 24, 2023 · 9cbe4ef · 9cbe4ef
1 parent a27b388
commit 9cbe4ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/API/Backend/Config/validate.js b/API/Backend/Config/validate.js
@@ -39,6 +39,7 @@ const validateStructure = (config) => {
 const validateLayers = (config) => {
   let errs = [];
 
+  let existingUUIDs = [];
   Utils.traverseLayers(config.layers, (layer) => {
     // Check layer name
     const validNameErrs = isValidLayerName(layer.name);
@@ -90,9 +91,17 @@ const validateLayers = (config) => {
           err(`Unknown layer type: '${layer.type}'`, ["layers[layer].type"])
         );
     }
-  });
 
-  errs = errs.concat(hasNonHeaderWithSublayers(config));
+    if (layer.uuid != null) {
+      if (existingUUIDs.includes(layer.uuid)) {
+        errs = errs.concat([
+          err(
+            `Found a layer with duplicate uuid: ${layer.name} - ${layer.uuid}`
+          ),
+        ]);
+      } else existingUUIDs.push(layer.uuid);
+    }
+  });
 
   return errs;
 };

diff --git a/config/js/config.js b/config/js/config.js
@@ -1954,10 +1954,9 @@ function mmgisLinkModalsToLayersCloneClick(e) {
   var mainThis = $(this).parent().parent().parent().parent();
   var mainId = mainThis.attr("id");
   mainId = mainId.substring(mainId.indexOf("_") + 1);
-  makeLayerBarAndModal(
-    dataOfLastUsedLayerSlot[mainId],
-    dataOfLastUsedLayerSlot[mainId].__level
-  );
+  const cloned = JSON.parse(JSON.stringify(dataOfLastUsedLayerSlot[mainId]));
+  delete cloned.uuid;
+  makeLayerBarAndModal(cloned, cloned.__level);
 
   refresh();
 }