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: loading state for pull #36363

Merged
merged 2 commits into from
Sep 20, 2024
Merged

fix: loading state for pull #36363

merged 2 commits into from
Sep 20, 2024

Conversation

brayn003
Copy link
Contributor

@brayn003 brayn003 commented Sep 17, 2024

Description

Fixes issue of missing loader when pulling changes from remote

Fixes #36273
Fixes #31308

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/10958207646
Commit: 4b8a117
Cypress dashboard.
Tags: @tag.Git
Spec:


Fri, 20 Sep 2024 11:44:27 UTC

Communication

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

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Introduced a new selector to track the progress of pull operations.
    • Enhanced loading state logic to reflect multiple concurrent Git operations.
  • Bug Fixes

    • Improved accuracy of loading state for pull actions and discard operations.

@brayn003 brayn003 requested a review from a team as a code owner September 17, 2024 08:54
@brayn003 brayn003 self-assigned this Sep 17, 2024
@github-actions github-actions bot added Bug Something isn't working Git Platform Issues related to the git & the app platform Git Product Issues related to version control product Medium Issues that frustrate users due to poor UX labels Sep 17, 2024
@brayn003 brayn003 added the ok-to-test Required label for CI label Sep 17, 2024
@github-actions github-actions bot added Needs Triaging Needs attention from maintainers to triage Production labels Sep 17, 2024
Copy link
Contributor

coderabbitai bot commented Sep 17, 2024

Walkthrough

The changes in the QuickGitActions component primarily focus on enhancing state management for Git operations. A new selector, getIsPullingProgress, has been introduced to monitor pull operation progress. The existing variable isPullInProgress has been updated to utilize this selector, and the loading state for pull actions has been expanded to include additional conditions. This adjustment allows the component to provide a more accurate representation of loading states during concurrent operations.

Changes

Files Change Summary
app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx Added getIsPullingProgress selector, updated isPullInProgress to use this selector, and modified showPullLoadingState to include isDiscardInProgress.

Assessment against linked issues

Objective Addressed Explanation
Missing loader for git pull (#36273)

Suggested labels

IDE Product

Poem

In the land of code where Git does play,
A loader now dances, brightening the way.
With progress tracked and states aligned,
Pull operations smoother, joyfully designed!
So let’s cheer for changes, both clever and bright,
In the realm of the editor, all feels just right! 🎉


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

@brayn003 brayn003 merged commit e89fb0c into release Sep 20, 2024
42 checks passed
@brayn003 brayn003 deleted the fix/git-pull-loader-ce branch September 20, 2024 11:49
@coderabbitai coderabbitai bot mentioned this pull request Sep 20, 2024
2 tasks
Shivam-z pushed a commit to Shivam-z/appsmith that referenced this pull request Sep 26, 2024
## Description
Fixes issue of missing loader when pulling changes from remote

Fixes appsmithorg#36273
Fixes appsmithorg#31308

## Automation

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

### 🔍 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/10958207646>
> Commit: 4b8a117
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10958207646&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Git`
> Spec:
> <hr>Fri, 20 Sep 2024 11:44:27 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
	- Introduced a new selector to track the progress of pull operations.
- Enhanced loading state logic to reflect multiple concurrent Git
operations.

- **Bug Fixes**
- Improved accuracy of loading state for pull actions and discard
operations.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
@coderabbitai coderabbitai bot mentioned this pull request Oct 1, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Git Platform Issues related to the git & the app platform Git Product Issues related to version control product Medium Issues that frustrate users due to poor UX Needs Triaging Needs attention from maintainers to triage ok-to-test Required label for CI Production UX Improvement
Projects
None yet
2 participants