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

fix: datasource switch behaviour #38949

Merged
merged 1 commit into from
Feb 1, 2025
Merged

fix: datasource switch behaviour #38949

merged 1 commit into from
Feb 1, 2025

Conversation

KelvinOm
Copy link
Collaborator

@KelvinOm KelvinOm commented Feb 1, 2025

Description

Current behavior: If editing mode is enabled for few datasources, then when switching datasources, we do not update the state(check before video). Also, if something has been changed in the datasource form, then when switching, we call the confirm modal. Changes: now, when switching datasources, we switch to view mode if nothing has been changed on the form and if something has been changed, we still call the modal.

Before:
https://github.com/user-attachments/assets/a91437fa-dd1d-43ef-8c99-8521999b80be

After:
https://github.com/user-attachments/assets/2868f628-9996-4566-a5b1-73e19bdd491c

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

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/13089216392
Commit: 256bcbb
Cypress dashboard.
Tags: @tag.Datasource
Spec:


Sat, 01 Feb 2025 16:30:00 UTC

Communication

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

  • Yes
  • No

Summary by CodeRabbit

  • New Features
    • Updated the datasource editor so that switching to a new datasource now automatically activates the proper view mode, ensuring a consistent and smoother experience for users.

@KelvinOm KelvinOm requested a review from ayushpahwa as a code owner February 1, 2025 09:09
Copy link
Contributor

coderabbitai bot commented Feb 1, 2025

Walkthrough

This pull request adds an additional dispatch call in the mapDispatchToProps function within the DatasourceEditorRouter component. Now, immediately after the switchDatasource action is dispatched, the setDatasourceViewModeFlag(true) action is also dispatched. This modification ensures that the view mode flag is explicitly updated whenever the datasource is switched without altering any existing method structures or functionalities.

Changes

File Change Summary
app/.../DataSourceEditor/index.tsx Modified mapDispatchToProps to dispatch setDatasourceViewModeFlag(true) immediately after the switchDatasource action.

Sequence Diagram(s)

sequenceDiagram
    participant E as DatasourceEditorRouter
    participant R as Redux Store
    E->>R: dispatch(switchDatasource(id))
    R-->>E: datasource switched
    E->>R: dispatch(setDatasourceViewModeFlag(true))
    R-->>E: view mode updated
Loading

Suggested labels

Bug, Enhancement, IDE Product, Task, IDE Pod, ok-to-test

Suggested reviewers

  • albinAppsmith
  • hetunandu

Poem

In code we merge with flair and might,
A new dispatch sets the view flag right.
Datasource changes now align in tune,
Our component sings a cleaner rune.
Cheers to progress under bright, starry night!
🚀✨


📜 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 b7c06d6 and 256bcbb.

📒 Files selected for processing (1)
  • app/client/src/pages/Editor/DataSourceEditor/index.tsx (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: perform-test / rts-build / build
  • GitHub Check: perform-test / client-build / client-build
  • GitHub Check: perform-test / server-build / server-unit-tests
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-build / client-build
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-prettier / prettier-check
🔇 Additional comments (1)
app/client/src/pages/Editor/DataSourceEditor/index.tsx (1)

1240-1241: LGTM! The change improves datasource switching behavior.

The addition of setDatasourceViewModeFlag(true) ensures consistent view mode state when switching between datasources, aligning with the PR objectives.


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.

@KelvinOm KelvinOm added the ok-to-test Required label for CI label Feb 1, 2025
@github-actions github-actions bot added the Bug Something isn't working label Feb 1, 2025
@KelvinOm KelvinOm added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Feb 1, 2025
@KelvinOm KelvinOm merged commit 81c5d47 into release Feb 1, 2025
57 of 78 checks passed
@KelvinOm KelvinOm deleted the fix/datasource-switch branch February 1, 2025 17:27
github-actions bot pushed a commit to Zeral-Zhang/appsmith that referenced this pull request Feb 7, 2025
## Description
Current behavior: If editing mode is enabled for few datasources, then
when switching datasources, we do not update the state(check before
video). Also, if something has been changed in the datasource form, then
when switching, we call the confirm modal. Changes: now, when switching
datasources, we switch to view mode if nothing has been changed on the
form and if something has been changed, we still call the modal.

Before:

https://github.com/user-attachments/assets/a91437fa-dd1d-43ef-8c99-8521999b80be


After:

https://github.com/user-attachments/assets/2868f628-9996-4566-a5b1-73e19bdd491c

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

### 🔍 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/13089216392>
> Commit: 256bcbb
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=13089216392&attempt=2"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Datasource`
> Spec:
> <hr>Sat, 01 Feb 2025 16:30:00 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**
- Updated the datasource editor so that switching to a new datasource
now automatically activates the proper view mode, ensuring a consistent
and smoother experience for users.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working ok-to-test Required label for CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants