Buffered both trigger and Buffered

app/client/src/sagas/EvaluationsSaga.ts

@@ -6,6 +6,7 @@ import {
   delay,
   fork,
   put,
+  race,
   select,
   spawn,
   take,
@@ -58,7 +59,7 @@ import {
 import type { JSAction, JSCollection } from "entities/JSCollection";
 import { getAppMode } from "ee/selectors/applicationSelectors";
 import { APP_MODE } from "entities/App";
-import { get, isEmpty } from "lodash";
+import { get, isEmpty, isEqual } from "lodash";
 import type { TriggerMeta } from "ee/sagas/ActionExecution/ActionExecutionSagas";
 import { executeActionTriggers } from "ee/sagas/ActionExecution/ActionExecutionSagas";
 import {
@@ -753,24 +754,61 @@ function* evaluationChangeListenerSaga(): any {
     EVAL_AND_LINT_REDUX_ACTIONS,
     evalQueueBuffer(),
   );
+  let hasTriggerAction = false;
 
   while (true) {
-    const action: EvaluationReduxAction<unknown | unknown[]> =
-      yield take(evtActionChannel);
+    const { action, timeout } = yield race({
+      action: take(evtActionChannel),
+      timeout: delay(1000),
+    });
 
-    // We are dequing actions from the buffer and inferring the JS actions affected by each
-    // action. Through this we know ahead the nodes we need to specifically diff, thereby improving performance.
-    const affectedJSObjects = getAffectedJSObjectIdsFromAction(action);
+    if (
+      action?.type === ReduxActionTypes.TRIGGER_EVAL ||
+      isEqual(action, bufferedAction)
+    ) {
+      hasTriggerAction = true;
+      continue;
+    }
 
-    yield call(evalAndLintingHandler, true, action, {
-      shouldReplay: get(action, "payload.shouldReplay"),
-      forceEvaluation: shouldForceEval(action),
-      requiresLogging: shouldLog(action),
-      affectedJSObjects,
-    });
+    if (timeout) {
+      if (hasTriggerAction) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const action = bufferedAction as any;
+        const affectedJSObjects = getAffectedJSObjectIdsFromAction(action);
+
+        yield call(evalAndLintingHandler, true, action, {
+          shouldReplay: get(action, "payload.shouldReplay"),
+          forceEvaluation: shouldForceEval(action),
+          requiresLogging: shouldLog(action),
+          affectedJSObjects,
+        });
+      }
+    } else {
+      // We are dequing actions from the buffer and inferring the JS actions affected by each
+      // action. Through this we know ahead the nodes we need to specifically diff, thereby improving performance.
+      const affectedJSObjects = getAffectedJSObjectIdsFromAction(action);
+
+      yield call(evalAndLintingHandler, true, action, {
+        shouldReplay: get(action, "payload.shouldReplay"),
+        forceEvaluation: shouldForceEval(action),
+        requiresLogging: shouldLog(action),
+        affectedJSObjects,
+      });
+    }
+
+    hasTriggerAction = false;
   }
 }
 
+const bufferedAction = {
+  postEvalActions: [],
+  affectedJSObjects: {
+    isAllAffected: false,
+    ids: [],
+  },
+  type: "BUFFERED_ACTION",
+};
+
 // TODO: Fix this the next time the file is edited
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function* evaluateActionSelectorFieldSaga(action: any) {