Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge updateActionData with an evaluation #38548

Open
wants to merge 2 commits into
base: release
Choose a base branch
from
Open

Conversation

vsvamsi1
Copy link
Contributor

@vsvamsi1 vsvamsi1 commented Jan 9, 2025

Description

Whenever we have debounced updateActionData and an evalTree we will merge that to a single evaluation. Seeing a 10-20% reduction in LCP, for a configured customer app we are seeing the LCP reduce from 20-23 seconds to about 15-20 seconds.

Fixes #Issue Number
or
Fixes Issue URL

Warning

If no issue exists, please create an issue first, and check with the maintainers if the issue is valid.

Automation

/ok-to-test tags="@tag.All"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/12715835754
Commit: 693a3f8
Cypress dashboard.
Tags: @tag.All
Spec:


Sat, 11 Jan 2025 16:27:52 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

Summary by CodeRabbit

  • New Features

    • Enhanced evaluation and linting processes with support for consolidated action data payloads.
    • Improved dynamic updating of evaluation trees based on action data.
  • Chores

    • Updated type definitions to support new data payload consolidation.
  • Technical Improvements

    • Expanded functionality for handling complex action updates during tree evaluation.
    • Improved modularity and clarity in the code structure for action data updates.

@vsvamsi1 vsvamsi1 self-assigned this Jan 9, 2025
Copy link
Contributor

coderabbitai bot commented Jan 9, 2025

Walkthrough

The pull request introduces enhancements to the evaluation and linting processes in the application's client-side code. The primary modification involves adding an optional actionDataPayloadConsolidated parameter across multiple files, enabling more comprehensive handling of action data during tree evaluation. This change allows for better consolidation and processing of action-related information during evaluation and linting workflows.

Changes

File Change Summary
app/client/src/sagas/EvaluationsSaga.ts Added optional actionDataPayloadConsolidated to saga methods and interfaces.
app/client/src/workers/Evaluation/handlers/evalTree.ts Introduced actionDataPayloadConsolidated to update evaluation tree.
app/client/src/workers/Evaluation/types.ts Added new optional property to EvalTreeRequestData interface.
app/client/src/workers/Evaluation/handlers/updateActionData.ts Enhanced action data update handling with new functions.
app/client/src/workers/common/DataTreeEvaluator/index.ts Modified setupUpdateTree method to include consolidated action data.
app/client/src/sagas/EvaluationsSaga.test.ts Updated tests to include actionDataPayloadConsolidated in payloads.

Possibly related PRs

Suggested Labels

Bug, Task, Query & JS Pod, JS Objects

Suggested Reviewers

  • AmanAgarwal041
  • ayushpahwa
  • sneha122
  • dvj1988

Poem

🌟 Code flows like a river grand,
Payloads dancing, hand in hand
Evaluations bloom with grace,
Actions find their rightful place
Saga's magic, clear and bright! 🚀


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 6611264 and 693a3f8.

📒 Files selected for processing (1)
  • app/client/src/sagas/EvaluationsSaga.ts (6 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • app/client/src/sagas/EvaluationsSaga.ts
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-prettier / prettier-check
  • GitHub Check: client-build / client-build

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@vsvamsi1 vsvamsi1 added the ok-to-test Required label for CI label Jan 9, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
app/client/src/sagas/EvaluationsSaga.ts (1)

251-251: Consider adding JSDoc for the new parameter.

Document the purpose and expected structure of actionDataPayloadConsolidated.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5978a96 and ac60150.

📒 Files selected for processing (4)
  • app/client/src/sagas/EvaluationsSaga.ts (6 hunks)
  • app/client/src/workers/Evaluation/dataStore/utils.ts (1 hunks)
  • app/client/src/workers/Evaluation/handlers/evalTree.ts (3 hunks)
  • app/client/src/workers/Evaluation/types.ts (2 hunks)
✅ Files skipped from review due to trivial changes (1)
  • app/client/src/workers/Evaluation/dataStore/utils.ts
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-prettier / prettier-check
  • GitHub Check: client-build / client-build
🔇 Additional comments (2)
app/client/src/workers/Evaluation/handlers/evalTree.ts (1)

196-215: LGTM! Well-structured action data handling.

The implementation correctly:

  1. Handles data path references
  2. Updates evaluation tree and context
  3. Manages data store updates
app/client/src/sagas/EvaluationsSaga.ts (1)

845-857: Verify the order of operations in buffered action handling.

The new condition handles both debounced updates and buffered actions together. Ensure this doesn't affect the evaluation order or cause race conditions.

✅ Verification successful

The order of operations in buffered action handling is properly implemented and safe.

The implementation uses a buffer queue system with proper guards and debouncing mechanisms to prevent race conditions. The test suite confirms correct handling of various scenarios including action clubbing and concurrent updates.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for other places where buffered actions are handled
rg -A 5 "BUFFERED_ACTION" --type ts

Length of output: 9180

@@ -51,6 +52,7 @@ export interface EvalTreeRequestData {
widgetsMeta: Record<string, any>;
shouldRespondWithLogs?: boolean;
affectedJSObjects: AffectedJSObjects;
actionDataPayloadConsolidated: any;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Define a proper type for actionDataPayloadConsolidated.

Using any type reduces type safety. Consider defining a proper interface or type for the consolidated action data payload.

-  actionDataPayloadConsolidated: any;
+  actionDataPayloadConsolidated?: {
+    dataPath: string;
+    dataPathRef?: string;
+    entityName: string;
+    data: unknown;
+  }[];
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
actionDataPayloadConsolidated: any;
actionDataPayloadConsolidated?: {
dataPath: string;
dataPathRef?: string;
entityName: string;
data: unknown;
}[];

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (2)
app/client/src/workers/Evaluation/types.ts (1)

55-55: Consider defining a more specific type for actionDataPayloadConsolidated.

Using any reduces type safety. Consider creating a dedicated type or interface that accurately represents the structure of the consolidated action data payload.

app/client/src/sagas/EvaluationsSaga.ts (1)

251-251: Consider adding JSDoc for the new parameter.

Add documentation for the actionDataPayloadConsolidated parameter to improve code maintainability.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5978a96 and ac60150.

📒 Files selected for processing (4)
  • app/client/src/sagas/EvaluationsSaga.ts (6 hunks)
  • app/client/src/workers/Evaluation/dataStore/utils.ts (1 hunks)
  • app/client/src/workers/Evaluation/handlers/evalTree.ts (3 hunks)
  • app/client/src/workers/Evaluation/types.ts (2 hunks)
✅ Files skipped from review due to trivial changes (1)
  • app/client/src/workers/Evaluation/dataStore/utils.ts
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-build / client-build
🔇 Additional comments (2)
app/client/src/workers/Evaluation/handlers/evalTree.ts (1)

196-215: Verify data consistency across updates.

The code updates multiple data stores (tree, context, and DataStore) with the same data. Ensure that:

  1. The order of updates is correct to maintain consistency
  2. Error handling is in place for failed updates
  3. The datastore path construction is safe from injection

Consider extracting this logic into a separate function for better maintainability and reusability.

app/client/src/sagas/EvaluationsSaga.ts (1)

845-857: Review the order of operations in buffered action handling.

The new condition block handles both debounced updates and buffered actions together. Ensure that:

  1. The order of operations is correct
  2. No race conditions exist between updates
  3. Error handling is consistent with other code paths

@vsvamsi1 vsvamsi1 added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Jan 9, 2025
@vsvamsi1 vsvamsi1 changed the title wip changes chore: merge updateActionData with an evaluation Jan 10, 2025
@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Jan 10, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (3)
app/client/src/workers/Evaluation/handlers/updateActionData.ts (1)

32-45: Consider using a Set for better performance.

The code creates an array of updated properties and then iterates over it. Using a Set would be more efficient for this use case.

-  const updatedProperties: string[][] = [];
+  const updatedProperties = new Set<string[]>();
   
   actionsToUpdate.forEach(({ dataPath, entityName }) => {
-    updatedProperties.push([entityName, dataPath]);
+    updatedProperties.add([entityName, dataPath]);
   });
app/client/src/workers/common/DataTreeEvaluator/index.ts (1)

729-734: Consider using a more descriptive variable name.

pathsChangedSet could be renamed to better reflect its purpose, e.g., actionDataPaths.

app/client/src/workers/Evaluation/handlers/evalTree.ts (1)

195-198: Consider adding error handling.

The updateActionsToEvalTree call should be wrapped in a try-catch block to handle potential errors gracefully.

-      updateActionsToEvalTree(tree, actionDataPayloadConsolidated);
+      try {
+        updateActionsToEvalTree(tree, actionDataPayloadConsolidated);
+      } catch (error) {
+        errors.push({
+          type: EvalErrorTypes.UNKNOWN_ERROR,
+          message: `Failed to update actions: ${(error as Error).message}`,
+        });
+      }
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ac60150 and 6611264.

📒 Files selected for processing (6)
  • app/client/src/sagas/EvaluationsSaga.test.ts (3 hunks)
  • app/client/src/sagas/EvaluationsSaga.ts (6 hunks)
  • app/client/src/workers/Evaluation/handlers/evalTree.ts (4 hunks)
  • app/client/src/workers/Evaluation/handlers/updateActionData.ts (2 hunks)
  • app/client/src/workers/Evaluation/types.ts (2 hunks)
  • app/client/src/workers/common/DataTreeEvaluator/index.ts (5 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • app/client/src/workers/Evaluation/types.ts
  • app/client/src/sagas/EvaluationsSaga.ts
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: perform-test / rts-build / build
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-build / client-build
  • GitHub Check: client-prettier / prettier-check
🔇 Additional comments (7)
app/client/src/workers/Evaluation/handlers/updateActionData.ts (2)

30-31: LGTM! Good separation of concerns.

The extraction of action data update logic into a separate function improves code modularity.


47-50: LGTM! Clear function signature.

The function signature clearly indicates the optional nature of the actionsToUpdate parameter.

app/client/src/sagas/EvaluationsSaga.test.ts (1)

79-79: LGTM! Comprehensive test coverage.

The test cases properly verify the actionDataPayloadConsolidated parameter with different scenarios:

  1. Debug mode
  2. Non-debug mode
  3. JS object propagation

Also applies to: 125-125, 180-180

app/client/src/workers/common/DataTreeEvaluator/index.ts (2)

641-641: LGTM! Clear parameter addition.

The optional actionDataPayloadConsolidated parameter is properly typed.


751-762: LGTM! Efficient path skipping implementation.

The implementation properly maps and transforms paths for evaluation skipping.

app/client/src/workers/Evaluation/handlers/evalTree.ts (2)

37-37: LGTM! Clean import and destructuring.

The changes properly import the new function and destructure the required data.

Also applies to: 74-74


221-221: LGTM! Proper parameter passing.

The actionDataPayloadConsolidated is correctly passed to setupUpdateTree.

Copy link

🔴🔴🔴 Cyclic Dependency Check:

This PR has increased the number of cyclic dependencies by 1, when compared with the release branch.

Refer this document to identify the cyclic dependencies introduced by this PR.

@vsvamsi1 vsvamsi1 requested review from rajatagrawal and removed request for ApekshaBhosale January 10, 2025 19:06
@vsvamsi1 vsvamsi1 added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Jan 10, 2025
Copy link

🔴🔴🔴 Cyclic Dependency Check:

This PR has increased the number of cyclic dependencies by 1, when compared with the release branch.

Refer this document to identify the cyclic dependencies introduced by this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Required label for CI skip-changelog Adding this label to a PR prevents it from being listed in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant