Skip to content

chore: disabled autocommit (#41246) #41248

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: disabled autocommit (#41246) #41248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/Regression/ClientSide/Git/GitAutocommit_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe(
],
},
function () {
it("Check if autocommit progress bar is visible and network requests are properly called", function () {
it.skip("Check if autocommit progress bar is visible and network requests are properly called", function () {
agHelper.GenerateUUID();
cy.get("@guid").then((uid) => {
wsName = "GitAC-" + uid;
Expand Down
10 changes: 7 additions & 3 deletions ...-server/src/main/java/com/appsmith/server/git/controllers/GitApplicationControllerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.appsmith.server.domains.GitArtifactMetadata;
import com.appsmith.server.domains.GitAuth;
import com.appsmith.server.dtos.AutoCommitResponseDTO;
import com.appsmith.server.dtos.AutoCommitResponseDTO.AutoCommitResponse;
import com.appsmith.server.dtos.BranchProtectionRequestDTO;
import com.appsmith.server.dtos.GitAuthDTO;
import com.appsmith.server.dtos.GitConnectDTO;
Expand Down Expand Up @@ -288,9 +289,12 @@ public Mono<ResponseDTO<List<String>>> getProtectedBranches(@PathVariable String
artifactType = ArtifactType.APPLICATION,
operation = GitRouteOperation.AUTO_COMMIT)
public Mono<ResponseDTO<AutoCommitResponseDTO>> autoCommitApplication(@PathVariable String branchedApplicationId) {
return autoCommitService
.autoCommitApplication(branchedApplicationId)
.map(data -> new ResponseDTO<>(HttpStatus.OK, data));
// disabling autocommit till in-memory git has been incorporated in the auto-commit
AutoCommitResponseDTO autoCommitResponseDTO = new AutoCommitResponseDTO();
autoCommitResponseDTO.setAutoCommitResponse(AutoCommitResponse.IDLE);
autoCommitResponseDTO.setProgress(0);

return Mono.just(autoCommitResponseDTO).map(data -> new ResponseDTO<>(HttpStatus.OK, data));
}

@JsonView(Views.Public.class)
Expand Down
Loading