## Description Debugger logs were only updated according to the evaluation order earlier this led to an issue as after revalidation we need to update the debugger errors. #### PR fixes following issue(s) Fixes #24905 #### Type of change - Bug fix (non-breaking change which fixes an issue) ## Testing #### Test Plan - Validation sanity test #### Issues raised during DP testing ## Checklist: #### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag #### QA activity: - [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-) have been covered - [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-) - [ ] Test plan has been peer reviewed by project stakeholders and other QA members - [x] Manually tested functionality on DP - [ ] We had an implementation alignment call with stakeholders post QA Round 2 - [ ] Cypress test cases have been added and approved by SDET/manual QA - [ ] Added `Test Plan Approved` label after Cypress tests were reviewed - [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
107 lines
3.4 KiB
TypeScript
107 lines
3.4 KiB
TypeScript
import type {
|
|
ConfigTree,
|
|
DataTree,
|
|
UnEvalTree,
|
|
} from "entities/DataTree/dataTreeFactory";
|
|
import { dataTreeEvaluator } from "./handlers/evalTree";
|
|
import type { DataTreeDiff } from "@appsmith/workers/Evaluation/evaluationUtils";
|
|
import type { EvalMetaUpdates } from "@appsmith/workers/common/DataTreeEvaluator/types";
|
|
import type { DependencyMap, EvalError } from "utils/DynamicBindingUtils";
|
|
import { makeEntityConfigsAsObjProperties } from "@appsmith/workers/Evaluation/dataTreeUtils";
|
|
import type { EvalTreeResponseData } from "./types";
|
|
import { MessageType, sendMessage } from "utils/MessageUtil";
|
|
import { MAIN_THREAD_ACTION } from "@appsmith/workers/Evaluation/evalWorkerActions";
|
|
import type { UpdateDataTreeMessageData } from "sagas/EvalWorkerActionSagas";
|
|
import type { JSUpdate } from "utils/JSPaneUtils";
|
|
import { setEvalContext } from "./evaluate";
|
|
|
|
export function evalTreeWithChanges(
|
|
updatedValuePaths: string[][],
|
|
metaUpdates: EvalMetaUpdates = [],
|
|
) {
|
|
let evalOrder: string[] = [];
|
|
let reValidatedPaths: string[] = [];
|
|
let jsUpdates: Record<string, JSUpdate> = {};
|
|
let unEvalUpdates: DataTreeDiff[] = [];
|
|
let nonDynamicFieldValidationOrder: string[] = [];
|
|
const isCreateFirstTree = false;
|
|
let dataTree: DataTree = {};
|
|
const errors: EvalError[] = [];
|
|
const logs: any[] = [];
|
|
const dependencies: DependencyMap = {};
|
|
let evalMetaUpdates: EvalMetaUpdates = [...metaUpdates];
|
|
let staleMetaIds: string[] = [];
|
|
const pathsToClearErrorsFor: any[] = [];
|
|
let unevalTree: UnEvalTree = {};
|
|
let configTree: ConfigTree = {};
|
|
|
|
if (dataTreeEvaluator) {
|
|
const setupUpdateTreeResponse =
|
|
dataTreeEvaluator.setupUpdateTreeWithDifferences(updatedValuePaths);
|
|
|
|
evalOrder = setupUpdateTreeResponse.evalOrder;
|
|
unEvalUpdates = setupUpdateTreeResponse.unEvalUpdates;
|
|
jsUpdates = setupUpdateTreeResponse.jsUpdates;
|
|
|
|
nonDynamicFieldValidationOrder =
|
|
setupUpdateTreeResponse.nonDynamicFieldValidationOrder;
|
|
const updateResponse = dataTreeEvaluator.evalAndValidateSubTree(
|
|
evalOrder,
|
|
nonDynamicFieldValidationOrder,
|
|
dataTreeEvaluator.oldConfigTree,
|
|
unEvalUpdates,
|
|
);
|
|
|
|
reValidatedPaths = updateResponse.reValidatedPaths;
|
|
|
|
setEvalContext({
|
|
dataTree: dataTreeEvaluator.getEvalTree(),
|
|
configTree: dataTreeEvaluator.getConfigTree(),
|
|
isDataField: false,
|
|
isTriggerBased: true,
|
|
});
|
|
|
|
dataTree = makeEntityConfigsAsObjProperties(dataTreeEvaluator.evalTree, {
|
|
evalProps: dataTreeEvaluator.evalProps,
|
|
});
|
|
|
|
evalMetaUpdates = [...evalMetaUpdates, ...updateResponse.evalMetaUpdates];
|
|
|
|
staleMetaIds = updateResponse.staleMetaIds;
|
|
unevalTree = dataTreeEvaluator.getOldUnevalTree();
|
|
configTree = dataTreeEvaluator.oldConfigTree;
|
|
}
|
|
|
|
const evalTreeResponse: EvalTreeResponseData = {
|
|
dataTree,
|
|
dependencies,
|
|
errors,
|
|
evalMetaUpdates,
|
|
evaluationOrder: evalOrder,
|
|
reValidatedPaths,
|
|
jsUpdates,
|
|
logs,
|
|
unEvalUpdates,
|
|
isCreateFirstTree,
|
|
configTree,
|
|
staleMetaIds,
|
|
pathsToClearErrorsFor,
|
|
isNewWidgetAdded: false,
|
|
undefinedEvalValuesMap: dataTreeEvaluator?.undefinedEvalValuesMap || {},
|
|
jsVarsCreatedEvent: [],
|
|
};
|
|
|
|
const data: UpdateDataTreeMessageData = {
|
|
workerResponse: evalTreeResponse,
|
|
unevalTree,
|
|
};
|
|
|
|
sendMessage.call(self, {
|
|
messageType: MessageType.DEFAULT,
|
|
body: {
|
|
data,
|
|
method: MAIN_THREAD_ACTION.UPDATE_DATATREE,
|
|
},
|
|
});
|
|
}
|