fix: Update datasource deletion message for clarity by AnnaHariprasad5123 · Pull Request #34822 · appsmithorg/appsmith

AnnaHariprasad5123 · 2024-07-09T11:22:00Z

Screenshots :
Earlier :

After update the error message :

Summary by CodeRabbit

Bug Fixes
- Updated error messages during datasource deletion to improve clarity: "Cannot delete datasource since it has 1 query using it."
Tests
- Adjusted test cases to reflect updated error messages and ensure accurate verification.
Documentation
- Improved error message documentation for better user understanding during datasource deletions.

coderabbitai · 2024-07-09T11:22:09Z

Walkthrough

The changes involve updating error messages related to datasource deletion in both client-side and server-side code. Specifically, the term "action(s)" is replaced with "query" in error messages to make them more user-friendly. The updates span across Cypress tests, server-side service implementations, and test cases.

Changes

Files	Change Summary
`app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts`	Updated string message in `after` block from "action(s)" to "query".
`app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/...`	Updated `archiveById` method to construct an error message based on the count of actions.
`app/server/appsmith-server/src/test/java/com/appsmith/server/services/...`	Added an additional argument `"query"` in the `AppsmithError.DATASOURCE_HAS_ACTIONS.getMessage()` call.
`app/client/cypress/support/Pages/DataSources.ts`	Changed error message from "action(s) using it" to "Cannot delete datasource".

Assessment against linked issues

Objective	Addressed	Explanation
Change error message from "action(s)" to "query" (34604)	✅
Error message should distinguish between singular and plural queries (34604)	✅

Poem

🎉 In code's embrace, changes bright and true,
Error messages now speak clear to you.
No more "actions," just "queries" in sight,
Making deletions a user-friendly delight.
With thoughtful tweaks and gentle care,
Our app evolves, a joy to share! 🚀

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: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 08c3ea9 and 43ce6a6.

Files selected for processing (3)

app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts (1 hunks)
app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java (1 hunks)
app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java (1 hunks)

Additional context used

Path-based instructions (1)

app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts (1)

Pattern app/client/cypress/**/**.*: Follow best practices for Cypress code and e2e automation.
Avoid using cy.wait in code.
Avoid using cy.pause in code.
Use variables for locators, not strings.
Use data-* attributes for selectors; avoid Xpaths and CSS attributes.
Avoid selectors like .btn.submit or button[type=submit].
Perform logins via API with LoginFromAPI.
Only interact with controlled sites/servers.
Ensure tests can run with it.only and are independent.
Use before, beforeEach, after, afterEach correctly; clean state before tests.
Check new specs for flakiness by running them 10 times on CI.
Use multiple assertions; don't treat Cypress as unit tests.
Use constants for strings.
Include datasource operations in before hooks.

Additional comments not posted (3)

app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts (1)

94-94: LGTM! The updated error message improves clarity.

The change from "action(s)" to "query" or "queries" makes the error message more user-friendly.

app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java (1)

505-505: LGTM! The updated error message improves clarity and provides intelligent error messaging.

The change from "action(s)" to "query" or "queries" based on the count makes the error message more user-friendly.

app/server/appsmith-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java (1)

809-811: LGTM! The updated error message improves clarity and provides intelligent error messaging.

The change from "action(s)" to "query" or "queries" based on the count makes the error message more user-friendly.

NilanshBansal · 2024-07-11T06:49:36Z

/build-deploy-preview skip-tests=true

github-actions · 2024-07-11T06:49:59Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/9886831097.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 34822.
recreate: .

github-actions · 2024-07-11T07:02:42Z

Deploy-Preview-URL: https://ce-34822.dp.appsmith.com

NilanshBansal · 2024-07-11T08:11:50Z

@AnnaHariprasad5123 thanks for your contribution!
There is one server unit test (deleteDatasourceWithActions) failing in this PR, can you please check.

We might need to add the second parameter "query" also in the error message here

NilanshBansal · 2024-07-11T08:12:53Z

Other than this failing test, rest changes LGTM.

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 43ce6a6 and e0d3d53.

Files selected for processing (1)

app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java (1 hunks)

Additional comments not posted (1)

app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java (1)

950-951: LGTM! Ensure consistency with the new error message format.

The test method correctly verifies the updated error message. Ensure that all related error messages in the codebase are also updated for consistency.

AnnaHariprasad5123 · 2024-07-11T08:51:48Z

Hi @NilanshBansal , Could you check once.

NilanshBansal · 2024-07-11T09:01:43Z

@AnnaHariprasad5123 there are a large number of cypress test case failures due to this assertion.

appsmith/app/client/cypress/support/Pages/DataSources.ts

Line 887 in c48aaac

: "action(s) using it",

Can you change this assertion to "Cannot delete datasource"
cc: @sneha122 @AmanAgarwal041

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 e0d3d53 and 766dec4.

Files selected for processing (2)

app/client/cypress/support/Pages/DataSources.ts (1 hunks)
app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java (1 hunks)

Files skipped from review due to trivial changes (1)

app/client/cypress/support/Pages/DataSources.ts

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

app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java

AnnaHariprasad5123 · 2024-07-11T09:38:58Z

@AnnaHariprasad5123 there are a large number of cypress test case failures due to this assertion.

appsmith/app/client/cypress/support/Pages/DataSources.ts

Line 887 in c48aaac

: "action(s) using it",

Can you change this assertion to "Cannot delete datasource" cc: @sneha122 @AmanAgarwal041

Done

NilanshBansal · 2024-07-11T12:20:57Z

The testing on the following has been done. The PR is ready to be merged!

Code Review
DP Testing
Test Suite
All tests have passed on the clone PR.
Thanks @AnnaHariprasad5123 for your contribution! Looking forward to more such PRs from you!

fix: Update datasource deletion message for clarity

43ce6a6

AnnaHariprasad5123 requested review from ApekshaBhosale, nidhi-nair, sagar-qa007 and sondermanish as code owners July 9, 2024 11:22

coderabbitai bot reviewed Jul 9, 2024

View reviewed changes

NilanshBansal requested review from NilanshBansal and removed request for ApekshaBhosale, nidhi-nair, sagar-qa007 and sondermanish July 11, 2024 06:25

coderabbitai bot reviewed Jul 11, 2024

View reviewed changes

fix: DataSourceServiceTest

766dec4

AnnaHariprasad5123 force-pushed the Issue-#34604/bug-datasource-deletion-message branch from e0d3d53 to 766dec4 Compare July 11, 2024 09:32

coderabbitai bot reviewed Jul 11, 2024

View reviewed changes

NilanshBansal approved these changes Jul 11, 2024

View reviewed changes

yatinappsmith merged commit 5d9382b into appsmithorg:release Jul 11, 2024

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 Dec 11, 2024

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

Merged

2 tasks

Conversation

AnnaHariprasad5123 commented Jul 9, 2024 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Assessment against linked issues

Poem

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

NilanshBansal commented Jul 11, 2024

Uh oh!

github-actions bot commented Jul 11, 2024

Uh oh!

github-actions bot commented Jul 11, 2024

Uh oh!

NilanshBansal commented Jul 11, 2024

Uh oh!

NilanshBansal commented Jul 11, 2024

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

AnnaHariprasad5123 commented Jul 11, 2024

Uh oh!

NilanshBansal commented Jul 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

AnnaHariprasad5123 commented Jul 11, 2024

Uh oh!

NilanshBansal commented Jul 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

AnnaHariprasad5123 commented Jul 9, 2024 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jul 9, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)

NilanshBansal commented Jul 11, 2024 •

edited

Loading

NilanshBansal commented Jul 11, 2024 •

edited

Loading