Skip to content

The Unified and Autonomous Development Platform

fix: Revision indexing message shown and never disappear sometimes after editing CI/CD spec (OD-2661)

Robin Shen49e16799e271
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.java
index 8517469ad1..f91196a4b5 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
@@ -1468,9 +1468,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
state.mode = Mode.VIEW;
onResolvedRevisionChange(target);
}
-
- // fix the issue that sometimes indexing indicator of new commit does not disappear
- target.appendJavaScript("Wicket.WebSocket.send('RenderCallback');");
}
}
}
diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
new file mode 100644
index 0000000000..4a2813f4c3
--- /dev/null
+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.protocol.ws.api;
+
+import java.util.List;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.ajax.WicketAjaxJQueryResourceReference;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+
+/**
+ * A resource reference that provides the JavaScript that may be used to create WebSocket
+ * connections in the browser. The benefit over usage of plain <code>window.WebSocket<code>
+ * is that it supports handling of Wicket's <ajax-response> responses.
+ *
+ * @since 6.0
+ */
+public class WicketWebSocketJQueryResourceReference extends JavaScriptResourceReference
+{
+ private static final long serialVersionUID = 1;
+
+ private static final WicketWebSocketJQueryResourceReference instance = new WicketWebSocketJQueryResourceReference();
+
+ /**
+ * @return the singleton instance
+ */
+ public static WicketWebSocketJQueryResourceReference get()
+ {
+ return instance;
+ }
+
+ private WicketWebSocketJQueryResourceReference()
+ {
+ super(WicketWebSocketJQueryResourceReference.class, "wicket-websocket-jquery.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies()
+ {
+ final ResourceReference wicketAjaxReference;
+ if (Application.exists())
+ {
+ wicketAjaxReference = Application.get().getJavaScriptLibrarySettings().getWicketAjaxReference();
+ }
+ else
+ {
+ wicketAjaxReference = WicketAjaxJQueryResourceReference.get();
+ }
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
+ return dependencies;
+ }
+}
diff --git a/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js
new file mode 100644
index 0000000000..919cdb2bb3
--- /dev/null
+++ b/server-core/src/main/java/org/apache/wicket/protocol/ws/api/wicket-websocket-jquery.js
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*jshint evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true, undef: true, maxlen: 160, curly: true, eqeqeq: true */
+/*global document: false, jQuery:false, DOMParser: true, window: false, Wicket: true */
+
+;(function (undefined) {
+
+ 'use strict';
+
+ if (typeof(Wicket) === 'undefined' || typeof(Wicket.Ajax) === 'undefined') {
+ throw 'Wicket.WebSocket needs wicket-ajax.js as prerequisite.';
+ }
+
+ jQuery.extend(Wicket.Event.Topic, {
+ WebSocket: {
+ Opened: '/websocket/open',
+ Message: '/websocket/message',
+ Closed: '/websocket/closed',
+ Error: '/websocket/error',
+ NotSupported: '/websocket/notsupported'
+ }
+ });
+
+ Wicket.WebSocket = Wicket.Class.create();
+
+ Wicket.WebSocket.MESSAGE_CHANNEL = 'websocketMessage|s';
+
+ Wicket.WebSocket.prototype = {
+
+ ws: null,
+
+ initialize: function () {
+ var topics = Wicket.Event.Topic.WebSocket;
+
+ if (('WebSocket' in window)) {
+
+ var self = this,
+ url,
+ protocol,
+ WWS = Wicket.WebSocket,
+ port = WWS.port || document.location.port,
+ securePort = WWS.securePort || document.location.port,
+ _port;
+
+ protocol = document.location.protocol
+ .replace('https:', 'wss:')
+ .replace('http:', 'ws:');
+
+ if ('wss:' === protocol) {
+ _port = securePort ? ':' + securePort : '';
+ } else {
+ _port = port ? ':' + port : '';
+ }
+ url = protocol + '//' + document.location.hostname + _port + WWS.contextPath + WWS.filterPrefix + '/wicket/websocket';
+
+ if (WWS.pageId !== false) {
+ url += '?pageId=' + encodeURIComponent(WWS.pageId);
+ } else if (WWS.resourceName) {
+ url += '?resourceName=' + encodeURIComponent(WWS.resourceName);
+ }
+
+ url += '&wicket-ajax-baseurl=' + encodeURIComponent(WWS.baseUrl);
+ url += '&wicket-app-name=' + encodeURIComponent(WWS.appName);
+ self.ws = new WebSocket(url);
+
+ self.ws.onopen = function (evt) {
+ Wicket.Event.publish(topics.Opened, evt);
+ };
+
+ self.ws.onmessage = function (event) {
+ var message = event.data;
+ if (typeof(message) === 'string' && message.indexOf('<ajax-response>') > -1) {
+ function handleAjaxResponse() {
+ if (onedev.server.ajaxRequests.count > 0) {
+ setTimeout(handleAjaxResponse, 100);
+ } else {
+ Wicket.channelManager.schedule(Wicket.WebSocket.MESSAGE_CHANNEL, Wicket.bind(function () {
+ var context = {
+ attrs: {},
+ steps: []
+ };
+ var xmlDocument = Wicket.Xml.parse(message);
+ this.loadedCallback(xmlDocument, context);
+ context.steps.push(function () {
+ Wicket.channelManager.done(Wicket.WebSocket.MESSAGE_CHANNEL);
+ return Wicket.ChannelManager.FunctionsExecuter.DONE;
+ });
+ var executer = new Wicket.ChannelManager.FunctionsExecuter(context.steps);
+ executer.start();
+ }, new Wicket.Ajax.Call()));
+ }
+ }
+ handleAjaxResponse();
+ } else {
+ Wicket.Event.publish(topics.Message, message);
+ }
+ };
+
+ self.ws.onclose = function (evt) {
+ if (self.ws) {
+ self.ws.close();
+ self.ws = null;
+ Wicket.Event.publish(topics.Closed, evt);
+ }
+ };
+
+ self.ws.onerror = function (evt) {
+ if (self.ws) {
+ self.ws.close();
+ self.ws = null;
+ Wicket.Event.publish(topics.Error, evt);
+ }
+ };
+ } else {
+ var errMessage = '[WebSocket.initialize] WebSocket is not supported in your browser!';
+ Wicket.Log.error(errMessage);
+ Wicket.Event.publish(topics.NotSupported, errMessage);
+ }
+ },
+
+ send: function (text) {
+ if (this.ws && text) {
+ Wicket.Log.info('[WebSocket.send] Sending: ' + text);
+ this.ws.send(text);
+ } else if (!text) {
+ Wicket.Log.error('[WebSocket.send] Cannot send an empty text message!');
+ } else {
+ Wicket.Log.error('[WebSocket.send] No open WebSocket connection! Cannot send text message: ' + text);
+ }
+ },
+
+ close: function () {
+ if (this.ws) {
+ this.ws.close();
+ Wicket.Log.info('[WebSocket.close] Connection closed.');
+ } else {
+ Wicket.Log.info('[WebSocket.close] Connection already closed.');
+ }
+ }
+ };
+
+ Wicket.WebSocket.createDefaultConnection = function () {
+ if (!Wicket.WebSocket.INSTANCE) {
+ Wicket.WebSocket.INSTANCE = new Wicket.WebSocket();
+ }
+ };
+
+ Wicket.WebSocket.send = function (text) {
+ if (Wicket.WebSocket.INSTANCE) {
+ Wicket.WebSocket.INSTANCE.send(text);
+ } else {
+ Wicket.Log.error('[WebSocket.send] No default connection available!');
+ }
+ };
+
+ Wicket.WebSocket.close = function () {
+ if (Wicket.WebSocket.INSTANCE) {
+ Wicket.WebSocket.INSTANCE.close();
+ delete Wicket.WebSocket.INSTANCE;
+ } else {
+ Wicket.Log.info('[WebSocket.close] No default connection to close.');
+ }
+ };
+
+})();