The Unified and Autonomous Development Platform
fix: regression : unable to open terminal in current step (OD-2671)
Robin Shen87a2ee366f86
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex 8eb3a0052b..480a34cb49 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -4,7 +4,6 @@ onedev.server.codeSupport = {var minHeight = $input.parent().data("minHeight");var height = $input.next().find(".CodeMirror-sizer").outerHeight();- console.log(height);if (height > maxHeight)height = maxHeight;if (height < minHeight)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex f91196a4b5..df407e0d01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -1677,108 +1677,112 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic List<ChatTool> getChatTools() {- var projectId = getProject().getId();- var commitId = getCommit().copy();-- return List.of(- wrapForChat(new GetRootFilesAndFolders() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- }),- wrapForChat(new GetFilesAndSubfolders() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- }),- wrapForChat(new GetFileContent(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QuerySymbolDefinitions(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QueryCodeSnippets(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QueryFilePaths() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- })- /*- wrapForChat(new AddCodeComment(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected Long getPullRequestId() {- return null;- }+ if (getCommit() != null) {+ var projectId = getProject().getId();+ var commitId = getCommit().copy();++ return List.of(+ wrapForChat(new GetRootFilesAndFolders() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ }),+ wrapForChat(new GetFilesAndSubfolders() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ }),+ wrapForChat(new GetFileContent(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }),+ wrapForChat(new QuerySymbolDefinitions(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }),+ wrapForChat(new QueryCodeSnippets(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }),+ wrapForChat(new QueryFilePaths() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ })+ /*+ wrapForChat(new AddCodeComment(false) {- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }- })- */- );+ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected Long getPullRequestId() {+ return null;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }+ })+ */+ );+ } else {+ return List.of();+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex 3e9c22a145..13b07bc371 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -16,7 +16,10 @@*/package io.onedev.server.web.websocket;+import java.io.IOException;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor;import org.eclipse.jetty.websocket.api.Session;@@ -26,6 +29,11 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.OneDev;+import io.onedev.server.persistence.SessionService;+/*** An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with* Jetty 9.x {@link Session web socket} implementation.@@ -57,36 +65,51 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We@Overridepublic void onWebSocketConnect(final Session session) {- PageKey pageKey = new PageKey(getSessionId(), getRegistryKey());- Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);- WebSocketConnection connection = new WebSocketConnection(session, WebSocketProcessor.this, pageKey, subject);- onConnect(connection);+ run(() -> {+ PageKey pageKey = new PageKey(getSessionId(), getRegistryKey());+ Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);+ WebSocketConnection connection = new WebSocketConnection(session, WebSocketProcessor.this, pageKey, subject);+ onConnect(connection);+ });}-++ private void run(Runnable runnable) {+ if (OneDev.getInstance().isReady()) {+ SessionService sessionService = AppLoader.getInstance(SessionService.class);+ Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);+ ThreadContext.bind(subject);+ sessionService.run(runnable);+ }+ }+@Overridepublic void onWebSocketText(final String message) {- if (!message.equals(WebSocketMessages.KEEP_ALIVE))- onMessage(message);+ if (!message.equals(WebSocketMessages.KEEP_ALIVE))+ run(() -> onMessage(message));}@Overridepublic void onWebSocketBinary(final byte[] payload, final int offset, final int len) {- onMessage(payload, offset, len);+ run(() -> onMessage(payload, offset, len));}@Overridepublic void onWebSocketClose(final int statusCode, final String reason) {- onClose(statusCode, reason);+ run(() -> onClose(statusCode, reason));}@Overridepublic void onWebSocketError(Throwable throwable) {- logger.error("An error occurred when using WebSocket", throwable);+ IOException ioException = ExceptionUtils.find(throwable, IOException.class);+ if (ioException != null && "Broken pipe".equals(ioException.getMessage()))+ logger.debug("WebSocket closed", throwable);+ else+ logger.error("An error occurred when using WebSocket.", throwable);}@Overridepublic void onOpen(Object connection) {onWebSocketConnect((Session)connection);}-+}