Skip to content

The Unified and Autonomous Development Platform

fix: Sometimes auto saved file content appears again even saved successfully

Robin Shen69e0895fcb68
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index 915d0550e3..90a7120794 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -359,7 +359,7 @@ public class BlobNavigator extends Panel {
return null;
}
} else {
- throw new IllegalStateException();
+ return null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
index 9af073b244..3bf699782e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java
@@ -135,4 +135,18 @@ public interface BlobRenderContext extends Serializable {
String getInitialNewPath();
String appendRaw(String url);
+
+ static String getAutosaveKey(Project project, String path) {
+ return "project:" + project.getId() + ":" + path;
+ }
+
+ @Nullable
+ default String getEditorAutosaveKey() {
+ String path = getNewPath();
+ if (path == null)
+ path = getBlobIdent().path;
+ if (path == null)
+ return null;
+ return getAutosaveKey(getProject(), path);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index b373ce2c9a..a1b5e78f4d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -59,6 +59,7 @@ import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.RevisionResolved;
import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
@@ -394,6 +395,7 @@ public class CommitOptionPanel extends Panel {
}
}
if (newCommitId != null) {
+ removeBlobAutosaveKeys();
context.onCommitted(target, newCommitId);
target.appendJavaScript("$(window).resize();");
return true;
@@ -466,5 +468,16 @@ public class CommitOptionPanel extends Panel {
getMarkupId(), isBlobModified());
partialPageRequestHandler.appendJavaScript(script);
}
+
+ private void removeBlobAutosaveKeys() {
+ if (!(getPage() instanceof BasePage))
+ return;
+ BasePage page = (BasePage) getPage();
+ for (String path : oldPaths)
+ page.removeAutosaveKey(BlobRenderContext.getAutosaveKey(context.getProject(), path));
+ String newPath = context.getNewPath();
+ if (newPath != null)
+ page.removeAutosaveKey(BlobRenderContext.getAutosaveKey(context.getProject(), newPath));
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index 72a0cddf32..f5d09397ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -71,12 +71,7 @@ class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
@Nullable
@Override
protected String getAutosaveKey() {
- String path = context.getNewPath();
- if (path == null)
- path = context.getBlobIdent().path;
- if (path == null)
- return null;
- return "project:" + context.getProject().getId() + ":" + path;
+ return context.getEditorAutosaveKey();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
index b1d650856f..3f219a6a07 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
@@ -48,12 +48,7 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
protected String getAutosaveKey() {
- String path = context.getNewPath();
- if (path == null)
- path = context.getBlobIdent().path;
- if (path == null)
- return null;
- return "project:" + context.getProject().getId() + ":" + path;
+ return context.getEditorAutosaveKey();
}
};
}