Fix duplicate name in updateValue bug

Doenet · Feb 11, 2023 · f1e39d1 · f1e39d1
1 parent ea923e3
commit f1e39d1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js b/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js
@@ -2088,4 +2088,41 @@ describe('UpdateValue Tag Tests', function () {
 
   })
 
+  it.only('bug fix: no duplicate name error, #1921', () => {
+
+    cy.window().then(async (win) => {
+      win.postMessage({
+        doenetML: `
+    <updateValue target="v.tail.coords" newValue="(3,4)"><label>Move tail</label></updateValue>
+    <triggerSet>
+      <label>Move both</label>
+      <updateValue target="v.head.coords" newValue="(5,6)" />
+      <updateValue target="v.tail.coords" newValue="(7,2)" />
+    </triggerSet><graph>
+      <vector name="v" />
+    </graph><copy source="v.tail" assignNames="vt" /><copy source="v.head" assignNames="vh" />
+    `}, "*");
+    });
+
+    cy.get('#\\/_updatevalue1').should('contain.text', 'Move tail')
+    cy.get('#\\/_triggerset1').should('contain.text', 'Move both')
+    cy.get('#\\/vh .mjx-mrow').eq(0).should('have.text', "(1,0)")
+    cy.get('#\\/vt .mjx-mrow').eq(0).should('have.text', "(0,0)")
+
+    cy.get('#\\/_updatevalue1').click();
+
+    cy.get('#\\/vt .mjx-mrow').should('contain.text', "(3,4)")
+
+    cy.get('#\\/vt .mjx-mrow').eq(0).should('have.text', "(3,4)")
+    cy.get('#\\/vh .mjx-mrow').eq(0).should('have.text', "(4,4)")
+
+    cy.get('#\\/_triggerset1').click();
+    cy.get('#\\/vt .mjx-mrow').should('contain.text', "(7,2)")
+
+    cy.get('#\\/vt .mjx-mrow').eq(0).should('have.text', "(7,2)")
+    cy.get('#\\/vh .mjx-mrow').eq(0).should('have.text', "(9,4)")
+
+
+  })
+
 });
diff --git a/src/Core/Core.js b/src/Core/Core.js
@@ -1253,7 +1253,7 @@ export default class Core {
         });
 
       }
-      
+
       if (componentClass.keepChildrenSerialized) {
         let childrenAddressed = new Set([]);
 

diff --git a/src/Core/utils/serializedStateProcessing.js b/src/Core/utils/serializedStateProcessing.js
@@ -151,7 +151,7 @@ export async function expandDoenetMLsToFullSerializedComponents({
           };
 
           originalCopyWithUri.children = [extContent, ...originalCopyWithUri.children];
-          
+
         }
       }
     }
@@ -586,9 +586,9 @@ function copyTargetOrFromURIAttributeCreatesCopyComponent(serializedComponents,
   }
 }
 
-function breakUpTargetIntoPropsAndIndices(serializedComponents, componentInfoObjects) {
+function breakUpTargetIntoPropsAndIndices(serializedComponents, componentInfoObjects, ancestorString = "") {
 
-  for (let component of serializedComponents) {
+  for (let [component_ind, component] of serializedComponents.entries()) {
 
     // Note: do not do this for collect, as this dot notation would be confusing for collect
 
@@ -703,7 +703,7 @@ function breakUpTargetIntoPropsAndIndices(serializedComponents, componentInfoObj
                 // then wrap the extract in a setup and append
                 // and modify the updateValue/animateFromSequence to point to the extract
 
-                let longNameId = "fromExtendedSource|" + serializedComponents.length;
+                let longNameId = "fromExtendedSource" + ancestorString + "|" + component_ind;
                 let nameForExtract = createUniqueName("extract", longNameId);
                 newComponent.doenetAttributes.prescribedName = nameForExtract;
                 newComponent.doenetAttributes.createdFromMacro = true;
@@ -752,7 +752,7 @@ function breakUpTargetIntoPropsAndIndices(serializedComponents, componentInfoObj
     }
 
     if (component.children) {
-      breakUpTargetIntoPropsAndIndices(component.children, componentInfoObjects);
+      breakUpTargetIntoPropsAndIndices(component.children, componentInfoObjects, ancestorString + "|" + component_ind);
     }
   }
 }
@@ -2475,7 +2475,7 @@ export function createComponentNames({ serializedComponents, namespaceStack = []
 
           children = children.slice(1)
 
-          let separateNewNamespaceInfo = { namespace: prescribedName, componentCounts: {}, namesUsed:{} };
+          let separateNewNamespaceInfo = { namespace: prescribedName, componentCounts: {}, namesUsed: {} };
           namespaceStack.push(separateNewNamespaceInfo);
 
           createComponentNames({