fix: loading state for pull (#36363)
## Description Fixes issue of missing loader when pulling changes from remote Fixes https://github.com/appsmithorg/appsmith/issues/36273 Fixes https://github.com/appsmithorg/appsmith/issues/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: 4b8a1175b3728c6c743f46b08998ce74e3308bbc > <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 -->
This commit is contained in:
parent
c6eaed4ca6
commit
e89fb0c2e4
|
|
@ -36,6 +36,7 @@ import {
|
|||
getIsFetchingGitStatus,
|
||||
getIsGitConnected,
|
||||
getIsPollingAutocommit,
|
||||
getIsPullingProgress,
|
||||
getPullFailed,
|
||||
protectedModeSelector,
|
||||
} from "selectors/gitSyncSelectors";
|
||||
|
|
@ -306,9 +307,11 @@ export default function QuickGitActions() {
|
|||
const { disabled: pullDisabled, message: pullTooltipMessage } =
|
||||
getPullBtnStatus(gitStatus, !!pullFailed, isProtectedMode);
|
||||
|
||||
const isPullInProgress = useSelector(getIsDiscardInProgress);
|
||||
const isDiscardInProgress = useSelector(getIsDiscardInProgress);
|
||||
const isPullInProgress = useSelector(getIsPullingProgress);
|
||||
const isFetchingGitStatus = useSelector(getIsFetchingGitStatus);
|
||||
const showPullLoadingState = isPullInProgress || isFetchingGitStatus;
|
||||
const showPullLoadingState =
|
||||
isDiscardInProgress || isPullInProgress || isFetchingGitStatus;
|
||||
const changesToCommit = useSelector(getCountOfChangesToCommit);
|
||||
|
||||
const isAutocommitFeatureEnabled = useFeatureFlag(
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user