Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions app/client/src/workers/Evaluation/__tests__/evaluation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;

Expand Down Expand Up @@ -674,7 +673,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);

const dataTree = evaluator.evalTree;
Expand Down Expand Up @@ -722,7 +720,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;

Expand Down Expand Up @@ -787,7 +784,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;
const updatedDependencies = evaluator.dependencies;
Expand Down Expand Up @@ -832,7 +828,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;
const updatedDependencies = evaluator.dependencies;
Expand Down Expand Up @@ -898,7 +893,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;
const updatedDependencies = evaluator.dependencies;
Expand Down Expand Up @@ -971,7 +965,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree1,
unEvalUpdates,
[],
evaluator.evalTree,
);
expect(evaluator.dependencies["Api2.config.body"]).toStrictEqual([
"Api2.config.pluginSpecifiedTemplates[0].value",
Expand Down Expand Up @@ -1007,7 +1000,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree2,
unEvalUpdates2,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;

Expand Down Expand Up @@ -1050,7 +1042,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree3,
unEvalUpdates3,
[],
evaluator.evalTree,
);
const dataTree3 = evaluator.evalTree;

Expand Down Expand Up @@ -1094,7 +1085,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
const dataTree = evaluator.evalTree;

Expand Down Expand Up @@ -1135,7 +1125,6 @@ describe("DataTreeEvaluator", () => {
updatedConfigTree,
unEvalUpdates,
[],
evaluator.evalTree,
);
// Hard check to not regress on the number of clone operations. Try to improve this number.
// Not a good assertion because in one piece of code im cloning multiple times, however the value im cloning is very small.
Expand Down
11 changes: 0 additions & 11 deletions app/client/src/workers/Evaluation/evalTreeWithChanges.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ describe("evaluateAndPushResponse", () => {
},
[],
[],
{},
);
// check if push response has been called
expect(pushResponseToMainThreadMock).toHaveBeenCalled();
Expand Down Expand Up @@ -226,7 +225,6 @@ describe("evaluateAndGenerateResponse", () => {
},
[],
[],
{},
);
const parsedUpdates = getParsedUpdatesFromWebWorkerResp(webworkerResponse);

Expand Down Expand Up @@ -261,7 +259,6 @@ describe("evaluateAndGenerateResponse", () => {
},
[],
[],
{},
);
const parsedUpdates = getParsedUpdatesFromWebWorkerResp(webworkerResponse);

Expand Down Expand Up @@ -301,7 +298,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
[],
{},
);

expect(webworkerResponse.workerResponse.dependencies).toEqual({
Expand Down Expand Up @@ -342,7 +338,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
[],
{},
);
const parsedUpdates =
getParsedUpdatesFromWebWorkerResp(webworkerResponse);
Expand Down Expand Up @@ -376,7 +371,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
[],
{},
);

const parsedUpdates =
Expand Down Expand Up @@ -420,7 +414,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
["Text1.text"],
{},
);
const parsedUpdates =
getParsedUpdatesFromWebWorkerResp(webworkerResponse);
Expand Down Expand Up @@ -466,7 +459,6 @@ describe("evaluateAndGenerateResponse", () => {
response,
metaUpdates,
[],
{},
);

expect(workerResponse.evalMetaUpdates).toEqual(metaUpdates);
Expand Down Expand Up @@ -497,7 +489,6 @@ describe("evaluateAndGenerateResponse", () => {
response,
metaUpdates,
[],
{},
);

// the function properties should be stripped out
Expand Down Expand Up @@ -529,7 +520,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
[],
{},
);

const parsedUpdates =
Expand Down Expand Up @@ -568,7 +558,6 @@ describe("evaluateAndGenerateResponse", () => {
updateTreeResponse,
[],
[],
{},
);
const parsedUpdates =
getParsedUpdatesFromWebWorkerResp(webworkerResponse);
Expand Down
8 changes: 0 additions & 8 deletions app/client/src/workers/Evaluation/evalTreeWithChanges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
import type DataTreeEvaluator from "workers/common/DataTreeEvaluator";
import type { Diff } from "deep-diff";
import type { DataTree } from "entities/DataTree/dataTreeTypes";
import { klona as klonaJson } from "klona/json";

const getDefaultEvalResponse = (): EvalTreeResponseData => ({
updates: "[]",
Expand Down Expand Up @@ -71,10 +70,8 @@ export function evalTreeWithChanges(
);

let setupUpdateTreeResponse = {} as UpdateTreeResponse;
let oldEvalTree: DataTree = {};

if (dataTreeEvaluator) {
oldEvalTree = klonaJson(dataTreeEvaluator.getEvalTree());
setupUpdateTreeResponse = dataTreeEvaluator.setupUpdateTreeWithDifferences(
updatedValuePaths,
pathsToSkipFromEval,
Expand All @@ -86,7 +83,6 @@ export function evalTreeWithChanges(
setupUpdateTreeResponse,
metaUpdates,
pathsToSkipFromEval,
oldEvalTree,
);
}

Expand All @@ -107,14 +103,12 @@ export const evaluateAndPushResponse = (
setupUpdateTreeResponse: UpdateTreeResponse,
metaUpdates: EvalMetaUpdates,
additionalPathsAddedAsUpdates: string[],
oldEvalTree: DataTree,
) => {
const response = evaluateAndGenerateResponse(
dataTreeEvaluator,
setupUpdateTreeResponse,
metaUpdates,
additionalPathsAddedAsUpdates,
oldEvalTree,
);

return pushResponseToMainThread(response);
Expand All @@ -125,7 +119,6 @@ export const evaluateAndGenerateResponse = (
setupUpdateTreeResponse: UpdateTreeResponse,
metaUpdates: EvalMetaUpdates,
additionalPathsAddedAsUpdates: string[],
oldEvalTree: DataTree,
): UpdateDataTreeMessageData => {
// generate default response first and later add updates to it
const defaultResponse = getDefaultEvalResponse();
Expand Down Expand Up @@ -158,7 +151,6 @@ export const evaluateAndGenerateResponse = (
dataTreeEvaluator.oldConfigTree,
unEvalUpdates,
[],
oldEvalTree,
);

const dataTree = updateEvalProps(dataTreeEvaluator) || {};
Expand Down
3 changes: 0 additions & 3 deletions app/client/src/workers/Evaluation/handlers/evalTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import type { CanvasWidgetsReduxState } from "ee/reducers/entityReducers/canvasW
import type { MetaWidgetsReduxState } from "reducers/entityReducers/metaWidgetsReducer";
import type { Attributes } from "instrumentation/types";
import { updateActionsToEvalTree } from "./updateActionData";
import { klona as klonaJSON } from "klona/json";

// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down Expand Up @@ -194,7 +193,6 @@ export async function evalTree(
isNewTree = true;
} else {
const tree = dataTreeEvaluator.getEvalTree();
const oldDataTree = klonaJSON(tree);

// during update cycles update actions to the dataTree directly
// this is useful in cases where we have debounced updateActionData and a regular evaluation
Expand Down Expand Up @@ -243,7 +241,6 @@ export async function evalTree(
configTree,
unEvalUpdates,
Object.keys(metaWidgets),
oldDataTree,
),
);

Expand Down
4 changes: 0 additions & 4 deletions app/client/src/workers/Evaluation/handlers/evalTrigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { dataTreeEvaluator } from "./evalTree";
import type { EvalWorkerASyncRequest } from "../types";
import ExecutionMetaData from "../fns/utils/ExecutionMetaData";
import { evaluateAndPushResponse } from "../evalTreeWithChanges";
import { klona as klonaJson } from "klona/json";

export default async function (request: EvalWorkerASyncRequest) {
const { data } = request;
Expand All @@ -21,8 +20,6 @@ export default async function (request: EvalWorkerASyncRequest) {

ExecutionMetaData.setExecutionMetaData({ triggerMeta, eventType });

const oldEvalTree = klonaJson(dataTreeEvaluator.getEvalTree());

if (!triggerMeta.onPageLoad) {
const { evalOrder, unEvalUpdates } = dataTreeEvaluator.setupUpdateTree(
unEvalTree.unEvalTree,
Expand All @@ -37,7 +34,6 @@ export default async function (request: EvalWorkerASyncRequest) {
{ evalOrder, unEvalUpdates, jsUpdates: {} },
[],
[],
oldEvalTree,
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ describe("DataTreeEvaluator", () => {
configTree as unknown as ConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);

expect(dataTreeEvaluator.dependencies).toStrictEqual({
Expand Down Expand Up @@ -478,7 +477,6 @@ describe("DataTreeEvaluator", () => {
arrayAccessorCyclicDependencyConfig.apiSuccessConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);
expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(
undefined,
Expand All @@ -503,7 +501,6 @@ describe("DataTreeEvaluator", () => {
arrayAccessorCyclicDependencyConfig.apiFailureConfigTree,
unEvalUpdates2,
[],
dataTreeEvaluator.evalTree,
);

expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(
Expand Down Expand Up @@ -533,7 +530,6 @@ describe("DataTreeEvaluator", () => {
arrayAccessorCyclicDependencyConfig.apiSuccessConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);

// success: response -> [{...}, {...}]
Expand All @@ -548,7 +544,6 @@ describe("DataTreeEvaluator", () => {
arrayAccessorCyclicDependencyConfig.apiSuccessConfigTree2,
unEvalUpdates2,
[],
dataTreeEvaluator.evalTree,
);

expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(undefined);
Expand Down Expand Up @@ -577,7 +572,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiSuccessConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);
expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(
undefined,
Expand Down Expand Up @@ -605,7 +599,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiFailureConfigTree,
unEvalUpdates2,
[],
dataTreeEvaluator.evalTree,
);
expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(
undefined,
Expand Down Expand Up @@ -637,7 +630,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiSuccessConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);

// success: response -> [ [{...}, {...}, {...}], [{...}, {...}, {...}] ]
Expand All @@ -652,7 +644,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiSuccessConfigTree2,
unEvalUpdates2,
[],
dataTreeEvaluator.evalTree,
);

expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(undefined);
Expand Down Expand Up @@ -680,7 +671,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiSuccessConfigTree,
unEvalUpdates,
[],
dataTreeEvaluator.evalTree,
);

// success: response -> [ [{...}, {...}, {...}], [{...}, {...}, {...}], [] ]
Expand All @@ -695,7 +685,6 @@ describe("DataTreeEvaluator", () => {
nestedArrayAccessorCyclicDependencyConfig.apiSuccessConfigTree3,
unEvalUpdates2,
[],
dataTreeEvaluator.evalTree,
);
expect(dataTreeEvaluator.dependencies["Api1"]).toStrictEqual(undefined);
expect(dataTreeEvaluator.dependencies["Api1.data"]).toStrictEqual([]);
Expand Down
Loading
Loading