Merge pull request #4462 from obiba/bugfix/query-update

Make sure to update from correct target
obiba · Oct 10, 2024 · a6a86f7 · a6a86f7
2 parents 66e3016 + 3f3bffe
commit a6a86f7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/mica-webapp/src/main/webapp/assets/js/mica-query.js b/mica-webapp/src/main/webapp/assets/js/mica-query.js
@@ -241,7 +241,7 @@ class EntityQuery {
       theTree.addQuery(null, targetQuery);
     }
 
-    let query = this.__findQuery(theTree, updateQuery);
+    let query = this.__findQuery(theTree.asTree(targetQuery), updateQuery);
 
     if (!query) {
       theTree.addQuery(targetQuery, updateQuery);
@@ -280,10 +280,11 @@ class EntityQuery {
           // create target and add query as child, done!
           targetQuery = new RQL.Query(info.target);
           theTree.addQuery(null, targetQuery);
-          theTree.addQuery(targetQuery, info.query)
+          theTree.addQuery(targetQuery, info.query);
           alertEventData = {target: info.target, query: info.query, action: 'created'};
         } else {
-          let theQuery = this.__findQuery(theTree, info.query);
+          // Update from the parent targetQuery
+          let theQuery = this.__findQuery(theTree.asTree(targetQuery), info.query);
           if (theQuery) {
             // query exists, just update
             theQuery.name = info.newName || info.query.name;