batch updates trigger value

appsmithorg · Nov 27, 2024 · 9bd05ce · 9bd05ce
1 parent 534fd11
commit 9bd05ce
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 deletions.
diff --git a/app/client/src/ce/actions/evaluationActionsList.ts b/app/client/src/ce/actions/evaluationActionsList.ts
@@ -107,7 +107,8 @@ export const EVALUATE_REDUX_ACTIONS = [
   // Buffer
   ReduxActionTypes.BUFFERED_ACTION,
   // Generic
-  ReduxActionTypes.TRIGGER_EVAL,
+  // ReduxActionTypes.TRIGGER_EVAL,
+  ReduxActionTypes.TRIGGER_EVAL_BATCH,
 ];
 // Topics used for datasource and query form evaluations
 export const FORM_EVALUATION_REDUX_ACTIONS = [

diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx
@@ -297,6 +297,7 @@ const EvaluationActionTypes = {
   BUFFERED_ACTION: "BUFFERED_ACTION",
   CLEAR_CACHE: "CLEAR_CACHE",
   TRIGGER_EVAL: "TRIGGER_EVAL",
+  TRIGGER_EVAL_BATCH: "TRIGGER_EVAL_BATCH",
   UPDATE_ACTION_DATA: "UPDATE_ACTION_DATA",
   SET_ACTIVE_EDITOR_FIELD: "SET_ACTIVE_EDITOR_FIELD",
   RESET_ACTIVE_EDITOR_FIELD: "RESET_ACTIVE_EDITOR_FIELD",

diff --git a/app/client/src/sagas/ActionExecution/PluginActionSaga.ts b/app/client/src/sagas/ActionExecution/PluginActionSaga.ts
@@ -11,7 +11,6 @@ import {
   takeLatest,
 } from "redux-saga/effects";
 import * as Sentry from "@sentry/react";
-import type { updateActionDataPayloadType } from "actions/pluginActionActions";
 import {
   clearActionResponse,
   executePageLoadActions,
@@ -1676,9 +1675,8 @@ function* softRefreshActionsSaga() {
   yield put({ type: ReduxActionTypes.SWITCH_ENVIRONMENT_SUCCESS });
 }
 
-function* handleUpdateActionData(
-  action: ReduxAction<updateActionDataPayloadType>,
-) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function* handleUpdateActionData(action: any) {
   const { actionDataPayload, parentSpan } = action;
 
   yield call(
@@ -1692,6 +1690,38 @@ function* handleUpdateActionData(
   }
 }
 
+function* captureActionsWithinPeriodTriggers() {
+  while (true) {
+    const buffer = []; // Initialize a new buffer for each batch
+    const endTime = Date.now() + 10000;
+    // eslint-disable-next-line prefer-const
+
+    while (Date.now() < endTime) {
+      try {
+        // Use a non-blocking `take` to capture actions within the period
+
+        const { action } = yield race({
+          action: take(ReduxActionTypes.TRIGGER_EVAL),
+          del: delay(1000),
+        });
+
+        if (!action) continue;
+
+        buffer.push(action);
+      } catch (e) {
+        // Handle errors if needed
+      }
+    }
+
+    // After the time period, dispatch the collected actions
+    if (buffer.length > 0) {
+      yield put({
+        type: ReduxActionTypes.TRIGGER_EVAL_BATCH,
+      });
+    }
+  }
+}
+
 // Use a channel to queue all actions
 
 function* captureActionsWithinPeriod() {
@@ -1745,5 +1775,9 @@ export function* watchPluginActionExecutionSagas() {
     takeLatest(ReduxActionTypes.PLUGIN_SOFT_REFRESH, softRefreshActionsSaga),
     takeEvery(ReduxActionTypes.EXECUTE_JS_UPDATES, makeUpdateJSCollection),
     takeEvery(ReduxActionTypes.START_EVALUATION, captureActionsWithinPeriod),
+    takeEvery(
+      ReduxActionTypes.START_EVALUATION,
+      captureActionsWithinPeriodTriggers,
+    ),
   ]);
 }
diff --git a/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts b/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts
@@ -82,12 +82,12 @@ const logsHandler = deferredBatchedActionHandler((batchedData) =>
 
 TriggerEmitter.on(BatchKey.process_logs, logsHandler);
 
-const storeUpdatesHandler = priorityBatchedActionHandler((batchedData) =>
-  WorkerMessenger.ping({
+const storeUpdatesHandler = priorityBatchedActionHandler((batchedData) => {
+  return WorkerMessenger.ping({
     method: MAIN_THREAD_ACTION.PROCESS_STORE_UPDATES,
     data: batchedData,
-  }),
-);
+  });
+});
 
 TriggerEmitter.on(BatchKey.process_store_updates, storeUpdatesHandler);