fix: enable pull when branch is protected (#28901)

## Description
When uncommitted changes and remote changes are present, protected
branches should have pull enabled


#### PR fixes following issue(s)
Fixes #28900

<img width="1728" alt="image"
src="https://github.com/appsmithorg/appsmith/assets/8724051/47a47969-39fd-4970-9f99-a763cec3bbaa">


#### Type of change
- Bug fix (non-breaking change which fixes an issue)
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [ ] JUnit
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
This commit is contained in:
Rudraprasad Das 2023-11-16 16:22:26 +05:30 committed by GitHub
parent 8cc031610b
commit 95d2801ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -130,13 +130,20 @@ function QuickActionButton({
);
}
const getPullBtnStatus = (gitStatus: any, pullFailed: boolean) => {
const getPullBtnStatus = (
gitStatus: any,
pullFailed: boolean,
isProtected: boolean,
) => {
const { behindCount, isClean } = gitStatus || {};
let message = createMessage(NO_COMMITS_TO_PULL);
let disabled = behindCount === 0;
if (!isClean) {
if (!isClean && !isProtected) {
disabled = true;
message = createMessage(CANNOT_PULL_WITH_LOCAL_UNCOMMITTED_CHANGES);
} else if (!isClean && isProtected && behindCount > 0) {
disabled = false;
message = createMessage(PULL_CHANGES);
} else if (pullFailed) {
message = createMessage(CONFLICTS_FOUND);
} else if (behindCount > 0) {
@ -315,7 +322,7 @@ export default function QuickGitActions() {
const isProtectedMode = useSelector(protectedModeSelector);
const { disabled: pullDisabled, message: pullTooltipMessage } =
getPullBtnStatus(gitStatus, !!pullFailed);
getPullBtnStatus(gitStatus, !!pullFailed, isProtectedMode);
const isPullInProgress = useSelector(getPullInProgress);
const isFetchingGitStatus = useSelector(getIsFetchingGitStatus);