Fix issue with updating both config & tree value (#1190)

* fix

* chlog

Author: ukrbublik

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+- 6.6.11
+  - Fix issue with updating both config & tree value (PR #1190) (issue #1187)
 - 6.6.10
   - Fix escape/unescape for LIKE operator (PR #1177) (issue #982)
   - Fix tags tokenization (antd) (PR #1182) (issue #1115)

packages/ui/modules/components/QueryContainer.jsx

@@ -96,6 +96,7 @@ export default class QueryContainer extends Component {
     const currentTree = isTreeChanged ? (nextProps.value || defaultRoot(nextProps)) : storeValue;
     const isTreeTrulyChanged = isTreeChanged && !immutableEqual(nextProps.value, this.prevTree) && !immutableEqual(nextProps.value, this.prevprevTree);
     this.sanitizeTree = isTreeTrulyChanged || isConfigChanged;
+    const canUseOldConfig = isConfigChanged && !isTreeChanged;
 
     if (isConfigChanged) {
       if (prevProps.settings.renderProvider !== nextProps.settings.renderProvider) {
@@ -105,7 +106,7 @@ export default class QueryContainer extends Component {
     }
 
     if (isTreeChanged || isConfigChanged) {
-      const validatedTree = this.getMemoizedTree(nextConfig, currentTree, oldConfig, this.sanitizeTree);
+      const validatedTree = this.getMemoizedTree(nextConfig, currentTree, canUseOldConfig ? oldConfig : undefined, this.sanitizeTree);
       //return Promise.resolve().then(() => {
       this.state.store.dispatch(
         actions.tree.setTree(nextConfig, validatedTree)