chore: set datasourceId in executeActionDTO during execution #37626
Conversation
WalkthroughThe changes in this pull request modify the Changes
Assessment against linked issues
Possibly related PRs
Suggested reviewers
📜 Recent review detailsConfiguration used: .coderabbit.yaml 📒 Files selected for processing (1)
🔇 Additional comments (2)app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java (2)
The conditional logic properly sets the datasourceId from either publishedAction or unpublishedAction based on the viewMode, which aligns with the PR objective.
While the logic is correct, it might be good to add a null check for the datasource object before accessing its ID. Let's verify if there are cases where datasource could be null: Consider adding null checks: if (TRUE.equals(executeActionDTO.getViewMode())) {
+ if (newAction.getPublishedAction().getDatasource() != null) {
populatedExecuteActionDTO.setDatasourceId(
newAction.getPublishedAction().getDatasource().getId());
+ }
} else {
+ if (newAction.getUnpublishedAction().getDatasource() != null) {
populatedExecuteActionDTO.setDatasourceId(
newAction.getUnpublishedAction().getDatasource().getId());
+ }
}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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
Documentation and Community
|
github-actions
bot
added
the
skip-changelog
github-actions
bot
added
Anvil Pod
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Outside diff range and nitpick comments (1)
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java (1)
255-272: LGTM with a suggestion for defensive programming.The conditional logic for setting datasourceId based on viewMode is correct. However, consider adding null checks for the datasource object.
Consider this safer implementation:
if (TRUE.equals(executeActionDTO.getViewMode())) { - populatedExecuteActionDTO.setDatasourceId( - newAction.getPublishedAction().getDatasource().getId()); + Datasource publishedDatasource = newAction.getPublishedAction().getDatasource(); + if (publishedDatasource != null) { + populatedExecuteActionDTO.setDatasourceId(publishedDatasource.getId()); + } } else { - populatedExecuteActionDTO.setDatasourceId( - newAction.getUnpublishedAction().getDatasource().getId()); + Datasource unpublishedDatasource = newAction.getUnpublishedAction().getDatasource(); + if (unpublishedDatasource != null) { + populatedExecuteActionDTO.setDatasourceId(unpublishedDatasource.getId()); + } }
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
📒 Files selected for processing (1)
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java(1 hunks)
Failed server tests
|
…horg#37626) ## Description > Set the correct datasourceId to executeActionDTO when an action is being executed. Fixes appsmithorg#37627 ## Automation /ok-to-test tags="@tag.Sanity" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/11948824843> > Commit: 458b5c0 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=11948824843&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Thu, 21 Nov 2024 08:22:41 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Enhanced functionality to set the correct `datasourceId` based on the action's context, improving action execution accuracy. - **Refactor** - Improved code formatting for clarity without altering existing logic. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
Description
Fixes #37627
Automation
/ok-to-test tags="@tag.Sanity"
🔍 Cypress test results
Tip
🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/11948824843
Commit: 458b5c0
Cypress dashboard.
Tags:
@tag.SanitySpec:
Thu, 21 Nov 2024 08:22:41 UTC
Communication
Should the DevRel and Marketing teams inform users about this change?
Summary by CodeRabbit
New Features
datasourceIdbased on the action's context, improving action execution accuracy.Refactor