resolve pr comments

appsmithorg · Dec 11, 2024 · 5c933fb · 5c933fb
1 parent 6203160
commit 5c933fb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts
@@ -117,7 +117,6 @@ import {
   getCurrentPageId,
 } from "selectors/editorSelectors";
 import { getInstanceId } from "ee/selectors/tenantSelectors";
-import { waitForFetchEnvironments } from "ee/sagas/EnvironmentSagas";
 
 const APPSMITH_CONFIGS = getAppsmithConfigs();
 
@@ -294,8 +293,6 @@ export function* evaluateTreeSaga(
     evalTreeRequestData,
   );
 
-  yield call(waitForFetchEnvironments);
-
   yield call(
     updateDataTreeHandler,
     {

diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts
@@ -41,6 +41,7 @@ import type { EvalTreeResponseData } from "workers/Evaluation/types";
 import { endSpan, startRootSpan } from "UITelemetry/generateTraces";
 import { getCollectionNameToDisplay } from "ee/utils/actionExecutionUtils";
 import { showToastOnExecutionError } from "./ActionExecution/errorUtils";
+import { waitForFetchEnvironments } from "ee/sagas/EnvironmentSagas";
 
 let successfulBindingsMap: SuccessfulBindingMap | undefined;
 
@@ -190,6 +191,9 @@ export function* logSuccessfulBindings(
 }
 
 export function* postEvalActionDispatcher(actions: Array<AnyReduxAction>) {
+  // Wait for environments api fetch before dispatching actions
+  yield call(waitForFetchEnvironments);
+
   for (const action of actions) {
     yield put(action);
   }

diff --git a/app/client/src/workers/Evaluation/evaluate.ts b/app/client/src/workers/Evaluation/evaluate.ts
@@ -375,7 +375,7 @@ export function evaluateSync(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   evalArguments?: Array<any>,
   configTree: ConfigTree = {},
-  scopeCache?: EvalContext,
+  evalContextCache?: EvalContext,
 ): EvalResult {
   return (function () {
     const errors: EvaluationError[] = [];
@@ -408,8 +408,8 @@ export function evaluateSync(
       Object.assign(EVAL_CONTEXT, context.globalContext);
     }
 
-    if (scopeCache) {
-      Object.assign(EVAL_CONTEXT, scopeCache);
+    if (evalContextCache) {
+      Object.assign(EVAL_CONTEXT, evalContextCache);
     } else {
       const dataTreeContext = getDataTreeContext({
         dataTree,

diff --git a/app/client/src/workers/common/DataTreeEvaluator/index.ts b/app/client/src/workers/common/DataTreeEvaluator/index.ts
@@ -1159,13 +1159,13 @@ export default class DataTreeEvaluator {
             unEvalPropertyValue = replaceThisDotParams(unEvalPropertyValue);
           }
 
-          let scopeCache;
+          let evalContextCache;
 
           if (WorkerEnv.flags.release_evaluation_scope_cache) {
             if (!!entity && isAnyJSAction(entity)) {
-              scopeCache = triggerBasedDataTreeContext;
+              evalContextCache = triggerBasedDataTreeContext;
             } else {
-              scopeCache = nonTriggerBasedDataTreeContext;
+              evalContextCache = nonTriggerBasedDataTreeContext;
             }
           }
 
@@ -1178,7 +1178,7 @@ export default class DataTreeEvaluator {
               contextData,
               undefined,
               fullPropertyPath,
-              scopeCache,
+              evalContextCache,
             );
           } catch (error) {
             this.errors.push({
@@ -1506,7 +1506,7 @@ export default class DataTreeEvaluator {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callBackData?: Array<any>,
     fullPropertyPath?: string,
-    scopeCache?: EvaluateContext,
+    evalContextCache?: EvaluateContext,
   ) {
     // Get the {{binding}} bound values
     let entity: DataTreeEntity | undefined = undefined;
@@ -1557,7 +1557,7 @@ export default class DataTreeEvaluator {
           !!entity && isAnyJSAction(entity),
           contextData,
           callBackData,
-          scopeCache,
+          evalContextCache,
         );
 
         if (fullPropertyPath && evalErrors.length) {
@@ -1651,7 +1651,7 @@ export default class DataTreeEvaluator {
     // TODO: Fix this the next time the file is edited
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callbackData?: Array<any>,
-    scopeCache?: EvaluateContext,
+    evalContextCache?: EvaluateContext,
   ): EvalResult {
     let evalResponse: EvalResult;
 
@@ -1667,7 +1667,7 @@ export default class DataTreeEvaluator {
         contextData,
         callbackData,
         {},
-        scopeCache,
+        evalContextCache,
       );
     } catch (error) {
       evalResponse = {