The Unified and Autonomous Development Platform
chore: Refactored notebook rendering
Robin Shen381e37567576
diff --git a/.cursor/rules/no-mvn-compile.mdc b/.cursor/rules/no-mvn-compile.mdcnew file mode 100644index 0000000000..65b198e4da--- /dev/null+++ b/.cursor/rules/no-mvn-compile.mdc@@ -0,0 +1,19 @@+---+description: Do not run mvn compile; rely on IDE lint errors+alwaysApply: true+---++# Do Not Run `mvn compile`++Running `mvn compile` (or other Maven build goals like `mvn install`,+`mvn package`, `mvn verify`) in this workspace is very slow and should be+avoided.++To verify code correctness after edits:++- Use the `ReadLints` tool to check linter/compiler errors for the files you+ edited.+- Inspect the IDE console / problems output instead of triggering a Maven+ build.++Only run Maven goals if the user explicitly asks for it.diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/notebook/NotebookViewResourceReference.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/asset/notebook/NotebookViewResourceReference.javaindex 8a1f340332..6556d0ca23 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/asset/notebook/NotebookViewResourceReference.java@@ -1,13 +1,13 @@-package io.onedev.server.web.page.project.blob.render.renderers.notebook;+package io.onedev.server.web.asset.notebook;import java.util.List;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.request.resource.JavaScriptResourceReference;import io.onedev.server.web.asset.marked.MarkedResourceReference;-import io.onedev.server.web.asset.notebookjs.NotebookjsResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -22,7 +22,8 @@ public class NotebookViewResourceReference extends BaseDependentResourceReferenc@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new NotebookjsResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(+ NotebookViewResourceReference.class, "notebook.js")));dependencies.add(JavaScriptHeaderItem.forReference(new MarkedResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(NotebookViewResourceReference.class, "notebook-view.css")));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/notebook-view.css b/server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook-view.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/notebook-view.cssrename to server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook-view.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/notebook-view.js b/server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook-view.jssimilarity index 62%rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/notebook-view.jsrename to server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook-view.jsindex 047a959568..dd1bcb9fa7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/notebook-view.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook-view.js@@ -1,5 +1,5 @@onedev.server.notebookView = {- render: async function(containerId, notebookUrl, directoryUrl) {+ render: async function(containerId, notebookUrl) {const container = document.getElementById(containerId);if (!container)return;@@ -22,7 +22,7 @@ onedev.server.notebookView = {container.innerHTML = '';container.appendChild(rendered);- onedev.server.notebookView.rewriteRelativeUrls(container, directoryUrl);+ onedev.server.notebookView.rewriteRelativeUrls(container, notebookUrl);$(window).resize();} catch (error) {@@ -31,14 +31,10 @@ onedev.server.notebookView = {}},- rewriteRelativeUrls: function(container, directoryUrl) {- if (!directoryUrl)- return;-- const baseHref = directoryUrl.endsWith('/') ? directoryUrl : directoryUrl + '/';+ rewriteRelativeUrls: function(container, notebookUrl) {let base;try {- base = new URL(baseHref, window.location.href);+ base = new URL(notebookUrl, window.location.href);} catch (e) {return;}@@ -52,15 +48,12 @@ onedev.server.notebookView = {if (!value || isExternal(value))return;try {- const resolved = new URL(value, base);- resolved.searchParams.set('raw', 'true');- el.setAttribute(attr, resolved.toString());+ el.setAttribute(attr, new URL(value, base).toString());} catch (e) {console.warn('Failed to rewrite ' + attr, value, e);}};- container.querySelectorAll('img[src]').forEach(el => rewrite(el, 'src'));- container.querySelectorAll('video[src], audio[src], source[src]').forEach(el => rewrite(el, 'src'));+ container.querySelectorAll('img[src],video[src], audio[src], source[src]').forEach(el => rewrite(el, 'src'));}};diff --git a/server-core/src/main/java/io/onedev/server/web/asset/notebookjs/notebook.js b/server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook.jssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/asset/notebookjs/notebook.jsrename to server-core/src/main/java/io/onedev/server/web/asset/notebook/notebook.jsdiff --git a/server-core/src/main/java/io/onedev/server/web/asset/notebookjs/NotebookjsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/notebookjs/NotebookjsResourceReference.javadeleted file mode 100644index 2f6a052789..0000000000--- a/server-core/src/main/java/io/onedev/server/web/asset/notebookjs/NotebookjsResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.asset.notebookjs;--import org.apache.wicket.request.resource.JavaScriptResourceReference;--public class NotebookjsResourceReference extends JavaScriptResourceReference {-- private static final long serialVersionUID = 1L;-- public NotebookjsResourceReference() {- super(NotebookjsResourceReference.class, "notebook.js");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewPanel.javaindex 6592144e83..d733d967c8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/notebook/NotebookViewPanel.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.request.cycle.RequestCycle;import org.unbescape.javascript.JavaScriptEscape;+import io.onedev.server.web.asset.notebook.NotebookViewResourceReference;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;import io.onedev.server.web.resource.RawBlobResource;@@ -34,12 +35,10 @@ public class NotebookViewPanel extends BlobViewPanel {String notebookUrl = RequestCycle.get().urlFor(new RawBlobResourceReference(),RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent())).toString();- String directoryUrl = context.getDirectoryUrl();- String script = String.format("onedev.server.notebookView.render('%s', '%s', '%s');",+ String script = String.format("onedev.server.notebookView.render('%s', '%s');",get("notebook").getMarkupId(),- JavaScriptEscape.escapeJavaScript(notebookUrl),- JavaScriptEscape.escapeJavaScript(directoryUrl));+ JavaScriptEscape.escapeJavaScript(notebookUrl));response.render(OnDomReadyHeaderItem.forScript(script));}