Fix failing Cypress tests

Zeral-Zhang · Dec 23, 2024 · f0a7b1e · f0a7b1e
1 parent ba0fd8b
commit f0a7b1e
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/.../appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java b/.../appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
@@ -2245,8 +2245,10 @@ public Mono<? extends Artifact> discardChanges(String branchedArtifactId, Artifa
 
         Mono<? extends Artifact> branchedArtifactMonoCached =
                 gitArtifactHelper.getArtifactById(branchedArtifactId, artifactEditPermission);
+        Mono<? extends Artifact> discardChangeMono;
 
-        Mono<? extends Artifact> discardChangeMono = branchedArtifactMonoCached
+        // Rehydrate the artifact from local file system
+        discardChangeMono = branchedArtifactMonoCached
                 .flatMap(branchedArtifact -> {
                     GitArtifactMetadata branchedGitData = branchedArtifact.getGitArtifactMetadata();
                     if (branchedGitData == null || !hasText(branchedGitData.getDefaultArtifactId())) {
@@ -2287,18 +2289,17 @@ public Mono<? extends Artifact> discardChanges(String branchedArtifactId, Artifa
                                     branchName))
                             // Update the last deployed status after the rebase
                             .flatMap(importedArtifact ->
-                                    gitApplicationHelper.validateAndPublishArtifact(importedArtifact, true));
+                                    gitArtifactHelper.validateAndPublishArtifact(importedArtifact, true));
                 })
-                .flatMap(branchedArtifact ->
-                        this.addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCARD_CHANGES, branchedArtifact, null))
+                .flatMap(branchedArtifact -> releaseFileLock(
+                                branchedArtifact.getGitArtifactMetadata().getDefaultArtifactId())
+                        .then(this.addAnalyticsForGitOperation(
+                                AnalyticsEvents.GIT_DISCARD_CHANGES, branchedArtifact, null)))
+                .onErrorResume(error -> branchedArtifactMonoCached.flatMap(branchedArtifact -> releaseFileLock(
+                                branchedArtifact.getGitArtifactMetadata().getDefaultArtifactId())
+                        .then(Mono.error(error))))
                 .name(GitSpan.OPS_DISCARD_CHANGES)
-                .tap(Micrometer.observation(observationRegistry))
-                .doFinally(signalType -> {
-                    branchedArtifactMonoCached
-                            .flatMap(branchedArtifact -> releaseFileLock(
-                                    branchedArtifact.getGitArtifactMetadata().getDefaultArtifactId()))
-                            .subscribe();
-                });
+                .tap(Micrometer.observation(observationRegistry));
 
         return Mono.create(
                 sink -> discardChangeMono.subscribe(sink::success, sink::error, null, sink.currentContext()));