chore: add null check for the datasource #34691

AnaghHegde · 2024-07-03T19:29:26Z

Description

Tip

Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team).

Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR.

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.Git"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/9789434801
Commit: 52a84a3
Cypress dashboard.
Tags: @tag.Git

Communication

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

Yes
No

Summary by CodeRabbit

Bug Fixes
- Improved the validation and assignment logic for data sources during action import to ensure proper association and prevent errors when data source or plugin IDs are missing.

coderabbitai · 2024-07-03T19:29:34Z

Walkthrough

The changes in the NewActionImportableServiceCEImpl class involve refining the logic for validating and assigning datasources within the createImportNewActionsMono method. Key adjustments address cases where the datasource is not null but the plugin ID is null. Additionally, the retrieval and assignment of the datasource ID have been refactored to ensure proper association, improving overall datasource handling and assignment.

Changes

File	Change Summary
`app/server/appsmith-server/src/main/java/.../NewActionImportableServiceCEImpl.java`	Adjusted and refactored logic for datasource validation, retrieval, and assignment within the `createImportNewActionsMono` method.

Sequence Diagram(s)

sequenceDiagram
    participant ImportService as NewActionImportableServiceCEImpl
    participant Action as Action
    participant Datasource as Datasource

    ImportService->>Action: Get Unpublished Action
    Action-->>ImportService: Return Action
    ImportService->>Datasource: Validate Datasource not null and Plugin ID null
    Datasource-->>ImportService: Return Validation
    ImportService->>Datasource: Retrieve Datasource ID
    Datasource-->>ImportService: Return Datasource ID
    ImportService->>Datasource: Set IsAutoGenerated to false
    ImportService->>Action: Set Datasource
    ImportService-->>System: Action Updated with Datasource

Poem

Amidst the code where datasources dwell,
We fixed the flows and all is well.
IDs are checked, nulls are tamed,
With plugins set, actions are framed.
Now datasources take their place,
Refactoring brings us grace.

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>.
- 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 generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @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 as 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 resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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.

coderabbitai

Actionable comments posted: 1

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ffc09cf and b725d04.

Files selected for processing (1)

app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java (2 hunks)

Additional comments not posted (1)

app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java (1)
324-326: Add a null check for datasource before accessing its getPluginId method.

To prevent potential NullPointerException, add a null check for datasource before accessing datasource.getPluginId().
- if (datasource != null && datasource.getPluginId() == null) {
+ if (datasource != null && datasource.getPluginId() == null) {
+   if (datasource.getPluginId() == null) {
+     continue;
+   }
}
Likely invalid or redundant comment.

...rc/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java

github-actions · 2024-07-03T19:55:48Z

Failed server tests

com.appsmith.server.fork.ForkingServiceTest#cloneApplication_whenDslParsingFails_shouldSucceed
com.appsmith.server.refactors.ce.RefactoringServiceCETest#testRefactorActionName_withInvalidName_throwsError

nsarupr

Added comments

nsarupr · 2024-07-03T22:08:16Z

...rc/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java

-                            if (datasource == null || datasource.getPluginId() == null) {
+                            if (datasource != null && datasource.getPluginId() == null) {


Can you please add more comments around this change?

@AnaghHegde this will not catch the exceptions where we end up with null datasource if we are expecting any.

...rc/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java

coderabbitai

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between b725d04 and 52a84a3.

Files selected for processing (1)

app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java (3 hunks)

Files skipped from review as they are similar to previous changes (1)

app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java

github-actions · 2024-07-04T06:10:42Z

Failed server tests

com.appsmith.server.services.ce.ApplicationServiceCETest#validGetApplicationById

## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ 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.Git" ### 🔍 Cypress test results  > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/9789434801> > Commit: 52a84a3 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9789434801&attempt=2" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Git`  ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No  ## Summary by CodeRabbit - **Bug Fixes** - Improved the validation and assignment logic for data sources during action import to ensure proper association and prevent errors when data source or plugin IDs are missing.

add null check for the datasource

b725d04

AnaghHegde self-assigned this Jul 3, 2024

AnaghHegde requested review from nidhi-nair and sondermanish as code owners July 3, 2024 19:29

AnaghHegde requested a review from abhvsn July 3, 2024 19:29

github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Jul 3, 2024

AnaghHegde added the ok-to-test Required label for CI label Jul 3, 2024

coderabbitai bot reviewed Jul 3, 2024

View reviewed changes

...rc/main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java Outdated Show resolved Hide resolved

nsarupr reviewed Jul 3, 2024

View reviewed changes

AnaghHegde removed request for nidhi-nair and sondermanish July 4, 2024 05:36

review comments

52a84a3

coderabbitai bot reviewed Jul 4, 2024

View reviewed changes

abhvsn approved these changes Jul 4, 2024

View reviewed changes

AnaghHegde added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Jul 4, 2024

AnaghHegde merged commit 6c48a39 into release Jul 4, 2024
44 checks passed

AnaghHegde deleted the chore/datasource-import-refactor branch July 4, 2024 07:06

coderabbitai bot mentioned this pull request Oct 30, 2024

fix: datasource name not reflecting in schema pane #37131

Merged

2 tasks

coderabbitai bot mentioned this pull request Nov 21, 2024

chore: set datasourceId in executeActionDTO during execution #37626

Merged

2 tasks

This was referenced Dec 11, 2024

fix: Updating the logic for datasource selector to fox the client build failure on prod #38107

Merged

chore: refactor datasource storage to use custom repo method #38143

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: add null check for the datasource #34691

chore: add null check for the datasource #34691

AnaghHegde commented Jul 3, 2024 •

edited by github-actions bot

Loading

coderabbitai bot commented Jul 3, 2024 •

edited

Loading

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

Documentation and Community

coderabbitai bot left a comment

github-actions bot commented Jul 3, 2024

nsarupr left a comment

nsarupr Jul 3, 2024

abhvsn Jul 4, 2024

coderabbitai bot left a comment

github-actions bot commented Jul 4, 2024

		if (datasource == null \|\| datasource.getPluginId() == null) {
		if (datasource != null && datasource.getPluginId() == null) {

chore: add null check for the datasource #34691

chore: add null check for the datasource #34691

Conversation

AnaghHegde commented Jul 3, 2024 • edited by github-actions bot Loading

Description

Automation

🔍 Cypress test results

Communication

Summary by CodeRabbit

coderabbitai bot commented Jul 3, 2024 • edited Loading

Walkthrough

Changes

Sequence Diagram(s)

Poem

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

coderabbitai bot left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 3, 2024

Failed server tests

nsarupr left a comment

Choose a reason for hiding this comment

nsarupr Jul 3, 2024

Choose a reason for hiding this comment

abhvsn Jul 4, 2024

Choose a reason for hiding this comment

coderabbitai bot left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 4, 2024

Failed server tests

AnaghHegde commented Jul 3, 2024 •

edited by github-actions bot

Loading

coderabbitai bot commented Jul 3, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)