The Unified and Autonomous Development Platform
Generify blob render mark as position and add positioning support for CISpec view
Robin Shen1016f26f9039
diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javaindex bcbb6e2019..cf0243c079 100644--- a/core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -29,6 +29,8 @@ public class Job implements Serializable, Validatable {private static final long serialVersionUID = 1L;+ public static final String SELECTION_PREFIX = "jobs/";+private String name;private String environment;diff --git a/core/src/main/java/io/onedev/server/model/support/MarkPos.java b/core/src/main/java/io/onedev/server/model/support/MarkPos.javaindex eca6e08620..2fe31155df 100644--- a/core/src/main/java/io/onedev/server/model/support/MarkPos.java+++ b/core/src/main/java/io/onedev/server/model/support/MarkPos.java@@ -53,14 +53,14 @@ public class MarkPos implements Serializable {public void setRange(PlanarRange range) {this.range = range;}-+public MarkPos() {}- public MarkPos(String commit, @Nullable String path, @Nullable PlanarRange mark) {+ public MarkPos(String commit, @Nullable String path, @Nullable PlanarRange range) {this.commit = commit;this.path = path;- this.range = mark;+ this.range = range;}@Override@@ -73,19 +73,19 @@ public class MarkPos implements Serializable {return commit;}- public static MarkPos fromString(@Nullable String str) {- if (str != null) {- String commit = StringUtils.substringBefore(str, ":");+ public static MarkPos fromString(@Nullable String string) {+ if (string != null) {+ String commit = StringUtils.substringBefore(string, ":");String path = null;- PlanarRange mark = null;- String pathAndMark = StringUtils.substringAfter(str, ":");- if (pathAndMark.length() != 0) {- path = StringUtils.substringBefore(pathAndMark, ":");- String markStr = StringUtils.substringAfter(pathAndMark, ":");- if (markStr.length() != 0)- mark = new PlanarRange(markStr);+ PlanarRange range = null;+ String pathAndRange = StringUtils.substringAfter(string, ":");+ if (pathAndRange.length() != 0) {+ path = StringUtils.substringBefore(pathAndRange, ":");+ String rangeString = StringUtils.substringAfter(pathAndRange, ":");+ if (rangeString.length() != 0)+ range = new PlanarRange(rangeString);}- return new MarkPos(commit, path, mark);+ return new MarkPos(commit, path, range);} else {return null;}diff --git a/core/src/main/java/io/onedev/server/web/component/job/JobLink.java b/core/src/main/java/io/onedev/server/web/component/job/JobLink.javaindex e72964460a..7dcea105c2 100644--- a/core/src/main/java/io/onedev/server/web/component/job/JobLink.java+++ b/core/src/main/java/io/onedev/server/web/component/job/JobLink.java@@ -1,9 +1,5 @@package io.onedev.server.web.component.job;-import java.io.UnsupportedEncodingException;-import java.net.URLEncoder;--import org.apache.commons.io.Charsets;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.model.IModel;@@ -11,10 +7,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.job.Job;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;@SuppressWarnings("serial")public class JobLink extends BookmarkablePageLink<Void> {@@ -53,17 +51,10 @@ public class JobLink extends BookmarkablePageLink<Void> {@Overridepublic PageParameters getPageParameters() {- return ProjectBlobPage.paramsOf(projectModel.getObject(),- new BlobIdent(revision, CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()));- }-- @Override- protected CharSequence getURL() {- try {- return super.getURL() + "#jobs/" + URLEncoder.encode(jobName, Charsets.UTF_8.name());- } catch (UnsupportedEncodingException e) {- throw new RuntimeException(e);- }+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(revision, CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());+ state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);+ return ProjectBlobPage.paramsOf(projectModel.getObject(), state);}}diff --git a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex a528fd33d9..ee78045ce5 100644--- a/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -45,6 +45,7 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;@SuppressWarnings("serial")@@ -292,7 +293,7 @@ public abstract class SymbolTooltipPanel extends Panel {public PageParameters getQueryHitParams(QueryHit hit) {BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.mark = hit.getTokenPos();+ state.position = SourceRendererProvider.getPosition(hit.getTokenPos());return ProjectBlobPage.paramsOf(projectModel.getObject(), state);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 4a61cf6033..911a1a5565 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -94,7 +94,8 @@ import io.onedev.server.web.page.project.blob.navigator.BlobNavigator;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;import io.onedev.server.web.page.project.blob.render.BlobUploadException;-import io.onedev.server.web.page.project.blob.render.view.Markable;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;+import io.onedev.server.web.page.project.blob.render.view.Positionable;import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel;import io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;@@ -121,7 +122,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {private static final String PARAM_QUERY = "query";- private static final String PARAM_MARK = "mark";+ private static final String PARAM_POSITION = "position";private static final String PARAM_RAW = "raw";@@ -167,7 +168,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);- state.mark = PlanarRange.of(params.get(PARAM_MARK).toString());+ state.position = params.get(PARAM_POSITION).toString();state.requestId = params.get(PARAM_REQUEST).toOptionalLong();@@ -558,7 +559,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {protected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- ProjectBlobPage.this.onSelect(target, selected, hit.getTokenPos());+ ProjectBlobPage.this.onSelect(target, selected, SourceRendererProvider.getPosition(hit.getTokenPos()));modal.close();}@@ -730,7 +731,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);state.commentId = comment.getId();- state.mark = comment.getMarkPos().getRange();+ state.position = SourceRendererProvider.getPosition(comment.getMarkPos().getRange());return state;}@@ -747,8 +748,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {params.add(PARAM_REVISION, state.blobIdent.revision);if (state.blobIdent.path != null)params.add(PARAM_PATH, state.blobIdent.path);- if (state.mark != null)- params.add(PARAM_MARK, state.mark.toString());+ if (state.position != null)+ params.add(PARAM_POSITION, state.position.toString());if (state.requestId != null)params.add(PARAM_REQUEST, state.requestId);if (state.commentId != null)@@ -827,23 +828,23 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public PlanarRange getMark() {- return state.mark;+ public String getPosition() {+ return state.position;}@Override- public void onMark(AjaxRequestTarget target, PlanarRange mark) {- state.mark = mark;+ public void onPosition(AjaxRequestTarget target, String position) {+ state.position = position;pushState(target);}@Override- public String getMarkUrl(PlanarRange mark) {- State markState = SerializationUtils.clone(state);- markState.blobIdent.revision = resolvedRevision.name();- markState.commentId = null;- markState.mark = mark;- PageParameters params = paramsOf(getProject(), markState);+ public String getPositionUrl(String position) {+ State positionState = SerializationUtils.clone(state);+ positionState.blobIdent.revision = resolvedRevision.name();+ positionState.commentId = null;+ positionState.position = position;+ PageParameters params = paramsOf(getProject(), positionState);return RequestCycle.get().urlFor(ProjectBlobPage.class, params).toString();}@@ -853,9 +854,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable PlanarRange tokenPos) {- PlanarRange prevMark = state.mark;- state.mark = tokenPos;+ public void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position) {+ String prevPosition = state.position;+ state.position = position;if (!blobIdent.revision.equals(state.blobIdent.revision)) {state.blobIdent = blobIdent;state.mode = Mode.VIEW;@@ -873,18 +874,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {newBlobContent(target);resizeWindow(target);OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);- } else if (state.mark != null) {- if (get(BLOB_CONTENT_ID) instanceof Markable) {+ } else if (state.position != null) {+ if (get(BLOB_CONTENT_ID) instanceof Positionable) {// This logic is added for performance reason, we do not want to// reload the file if go to different mark positions in same file- ((Markable)get(BLOB_CONTENT_ID)).mark(target, state.mark);+ ((Positionable)get(BLOB_CONTENT_ID)).position(target, state.position);} else {state.mode = Mode.VIEW;newBlobOperations(target);newBlobContent(target);resizeWindow(target);}- } else if (prevMark != null) {+ } else if (prevPosition != null) {state.mode = Mode.VIEW;newBlobOperations(target);newBlobContent(target);@@ -903,20 +904,20 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {if (comment != null) {state.commentId = comment.getId();- state.mark = Preconditions.checkNotNull(comment.mapRange(state.blobIdent));+ state.position = SourceRendererProvider.getPosition(Preconditions.checkNotNull(comment.mapRange(state.blobIdent)));} else {state.commentId = null;- state.mark = null;+ state.position = null;}OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);pushState(target);}@Override- public void onAddComment(AjaxRequestTarget target, PlanarRange mark) {+ public void onAddComment(AjaxRequestTarget target, PlanarRange range) {state.commentId = null;OneDev.getInstance(WebSocketManager.class).notifyObserverChange(this);- state.mark = mark;+ state.position = SourceRendererProvider.getPosition(range);pushState(target);}@@ -952,7 +953,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {public Long commentId;- public PlanarRange mark;+ public String position;public Mode mode = Mode.VIEW;@@ -1046,7 +1047,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {if (newBlobIdent != null) {state.blobIdent = newBlobIdent;- state.mark = null;+ state.position = null;state.commentId = null;state.mode = Mode.VIEW;onResolvedRevisionChange(target);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.javaindex a79a943a6b..96af911a96 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java@@ -40,11 +40,11 @@ public interface BlobRenderContext extends Serializable {BlobIdent getBlobIdent();@Nullable- PlanarRange getMark();+ String getPosition();- void onMark(AjaxRequestTarget target, PlanarRange mark);+ void onPosition(AjaxRequestTarget target, String position);- String getMarkUrl(PlanarRange mark);+ String getPositionUrl(String position);/*** Get directory of the blob. If the blob itself is a directory, the blob path will be returned instead@@ -71,7 +71,7 @@ public interface BlobRenderContext extends Serializable {boolean isOnBranch();- void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable PlanarRange tokenPos);+ void onSelect(AjaxRequestTarget target, BlobIdent blobIdent, @Nullable String position);void onSearchComplete(AjaxRequestTarget target, List<QueryHit> hits);@@ -81,7 +81,7 @@ public interface BlobRenderContext extends Serializable {void onCommentOpened(AjaxRequestTarget target, @Nullable CodeComment comment);- void onAddComment(AjaxRequestTarget target, PlanarRange mark);+ void onAddComment(AjaxRequestTarget target, PlanarRange range);RefUpdated uploadFiles(Collection<FileUpload> uploads, @Nullable String directory, String commitMessage);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 2476f383be..68d4f9976e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -8,12 +10,16 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Throwables;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.git.Blob;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@@ -22,6 +28,8 @@ import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@SuppressWarnings("serial")public class CISpecBlobViewPanel extends BlobViewPanel {+ private AbstractPostAjaxBehavior behavior;+public CISpecBlobViewPanel(String id, BlobRenderContext context) {super(id, context);}@@ -63,13 +71,29 @@ public class CISpecBlobViewPanel extends BlobViewPanel {invalidFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));add(invalidFrag);}++ add(behavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ String selection = params.getParameterValue("selection").toString();+ String position = CISpecRendererProvider.getPosition(selection);+ context.onSelect(target, context.getBlobIdent(), position);+ }++ });}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.onDomReady();"));+ String selection = CISpecRendererProvider.getSelection(context.getPosition());+ String script = String.format("onedev.ciSpec.onDomReady(%s, %s);",+ selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined",+ behavior.getCallbackFunction(CallbackParameter.explicit("selection")));+ response.render(OnDomReadyHeaderItem.forScript(script));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex 1883c48f26..1e30bad393 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -21,6 +21,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.Model;import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidator;+import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Charsets;import com.google.common.base.Throwables;@@ -45,6 +46,8 @@ import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public class CISpecEditPanel extends FormComponentPanel<byte[]> {+ private final BlobRenderContext context;+private Serializable parseResult;private RepeatingView jobNavs;@@ -53,6 +56,7 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {public CISpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {super(id, Model.of(initialContent));+ this.context = context;parseResult = parseCISpec(getModelObject());}@@ -235,7 +239,10 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.onDomReady();"));+ String selection = CISpecRendererProvider.getSelection(context.getPosition());+ String script = String.format("onedev.ciSpec.onDomReady(%s);",+ selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined");+ response.render(OnDomReadyHeaderItem.forScript(script));}@Nullablediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.javaindex fcf7c5fcfb..0fb8046f35 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java@@ -9,16 +9,33 @@ import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceEditPanel;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;import io.onedev.server.web.page.project.blob.render.renderers.source.SourceViewPanel;public class CISpecRendererProvider implements BlobRendererContribution {private static final long serialVersionUID = 1L;+ private static final String POSITION_PREFIX = "cispec-";+private boolean isCISpec(@Nullable String blobPath) {return CISpec.BLOB_PATH.equals(blobPath);}+ @Nullable+ public static String getPosition(@Nullable String selection) {+ return selection!=null? POSITION_PREFIX + selection: null;+ }++ @Nullable+ public static String getSelection(@Nullable String position) {+ if (position != null && position.startsWith(POSITION_PREFIX))+ return position.substring(POSITION_PREFIX.length());+ else+ return null;+ }+@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.ADD && isCISpec(context.getNewPath())@@ -29,7 +46,10 @@ public class CISpecRendererProvider implements BlobRendererContribution {@Overridepublic Component render(String componentId) {- return new CISpecBlobEditPanel(componentId, context);+ if (SourceRendererProvider.getRange(context.getPosition()) != null)+ return new SourceEditPanel(componentId, context);+ else+ return new CISpecBlobEditPanel(componentId, context);}@Override@@ -46,7 +66,7 @@ public class CISpecRendererProvider implements BlobRendererContribution {@Overridepublic Component render(String componentId) {- if (context.getMark() != null || context.getMode() == Mode.BLAME)+ if (SourceRendererProvider.getRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)return new SourceViewPanel(componentId, context, false);else if (context.getMode() == Mode.VIEW_PLAIN)return new SourceViewPanel(componentId, context, true);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.javaindex d1fef31c89..5cf3f7b42c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java@@ -4,9 +4,7 @@ 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 io.onedev.server.web.asset.uri.URIResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -21,7 +19,6 @@ public class CISpecResourceReference extends BaseDependentResourceReference {@Overridepublic List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new URIResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(CISpecResourceReference.class, "ci-spec.css")));return dependencies;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsindex 16c1c34ed2..af3b82de21 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -1,5 +1,5 @@onedev.ciSpec = {- onDomReady: function() {+ onDomReady: function(selection, callback) {var activeJobIndex = -1;var $body = $(".ci-spec>.valid>.jobs>.body");$body.find(">.contents>.content").each(function() {@@ -10,10 +10,8 @@ onedev.ciSpec = {}});if (activeJobIndex == -1) {- var uri = URI(window.location.href);- var fragment = decodeURIComponent(uri.fragment());- if (fragment.startsWith("jobs/")) {- var activeJobName = fragment.substring("jobs/".length);+ if (selection && selection.startsWith("jobs/")) {+ var activeJobName = selection.substring("jobs/".length);activeJobIndex = $body.find(">.side>.navs>.nav[data-name='" + activeJobName.escape() + "']").index();}}@@ -23,7 +21,10 @@ onedev.ciSpec = {onedev.ciSpec.showJob(activeJobIndex);$body.find(".side>.navs>.nav>.select").click(function() {- onedev.ciSpec.showJob($(this).parent().index());+ var $nav = $(this).parent();+ onedev.ciSpec.showJob($nav.index());+ if (callback)+ callback("jobs/" + $nav.data("name"));});},showJob: function(index) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.javaindex 54b3a29894..c28525a6d0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java@@ -47,7 +47,7 @@ public class MarkdownRendererProvider implements BlobRendererContribution {@Overridepublic Component render(String componentId) {- if (context.getMark() != null || context.getMode() == Mode.BLAME)+ if (context.getPosition() != null || context.getMode() == Mode.BLAME)return new SourceViewPanel(componentId, context, false);elsereturn new MarkdownBlobViewPanel(componentId, context);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.javaindex 67d910f172..aa2f6a4691 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java@@ -19,10 +19,10 @@ import io.onedev.server.web.component.sourceformat.SourceFormatPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;-import io.onedev.server.web.page.project.blob.render.view.Markable;+import io.onedev.server.web.page.project.blob.render.view.Positionable;@SuppressWarnings("serial")-public class SourceEditPanel extends BlobEditPanel implements Markable {+public class SourceEditPanel extends BlobEditPanel implements Positionable {private SourceFormatPanel sourceFormat;@@ -74,7 +74,8 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());- String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";+ PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());+ String jsonOfMark = mark!=null?getJson(mark):"undefined";String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",getEditor().getMarkupId(),JavaScriptEscape.escapeJavaScript(context.getNewPath()),@@ -100,8 +101,9 @@ public class SourceEditPanel extends BlobEditPanel implements Markable {}@Override- public void mark(AjaxRequestTarget target, PlanarRange mark) {+ public void position(AjaxRequestTarget target, String position) {String script;+ PlanarRange mark = SourceRendererProvider.getRange(position);if (mark != null) {script = String.format("onedev.server.sourceEdit.mark('%s', %s);",getEditor().getMarkupId(), getJson(mark));diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.javaindex 14569728cb..634a924ad1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java@@ -1,7 +1,10 @@package io.onedev.server.web.page.project.blob.render.renderers.source;+import javax.annotation.Nullable;+import org.apache.wicket.Component;+import io.onedev.commons.utils.PlanarRange;import io.onedev.server.web.PrioritizedComponentRenderer;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;@@ -11,6 +14,21 @@ public class SourceRendererProvider implements BlobRendererContribution {private static final long serialVersionUID = 1L;+ private static final String POSITION_PREFIX = "source-";++ @Nullable+ public static PlanarRange getRange(@Nullable String position) {+ if (position != null && position.startsWith(POSITION_PREFIX))+ return PlanarRange.of(position.substring(POSITION_PREFIX.length()));+ else+ return null;+ }++ @Nullable+ public static String getPosition(@Nullable PlanarRange range) {+ return range!=null? POSITION_PREFIX + range.toString(): null;+ }+@Overridepublic PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {if (context.getMode() == Mode.ADDdiff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 31b994bbfb..dda48927c5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -60,8 +60,8 @@ import io.onedev.commons.jsymbol.Symbol;import io.onedev.commons.jsymbol.SymbolExtractor;import io.onedev.commons.jsymbol.SymbolExtractorRegistry;import io.onedev.commons.utils.LinearRange;-import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.PlanarRange;+import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;@@ -100,7 +100,7 @@ import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;-import io.onedev.server.web.page.project.blob.render.view.Markable;+import io.onedev.server.web.page.project.blob.render.view.Positionable;import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;@@ -116,7 +116,7 @@ import io.onedev.server.web.websocket.PageDataChanged;**/@SuppressWarnings("serial")-public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMenuContributor {+public class SourceViewPanel extends BlobViewPanel implements Positionable, SearchMenuContributor {private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);@@ -328,8 +328,10 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe} else {mark = (PlanarRange) commentContainer.getDefaultModelObject();}- mark(target, mark);- context.onMark(target, mark);++ String position = SourceRendererProvider.getPosition(mark);+ position(target, position);+ context.onPosition(target, position);target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));}@@ -421,8 +423,9 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe}}+ String position = SourceRendererProvider.getPosition(mark);String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",- getJson(mark), context.getMarkUrl(mark), SecurityUtils.getUser()!=null,+ getJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null,unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");target.appendJavaScript(script);break;@@ -487,7 +490,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeclearComment(target);target.appendJavaScript("onedev.server.sourceView.mark(undefined);");target.appendJavaScript("$(window).resize();");- context.onMark(target, null);+ context.onPosition(target, null);}});@@ -690,7 +693,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe@Overridepublic void onClick(AjaxRequestTarget target) {- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));}};@@ -722,7 +725,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeprotected void onSelect(AjaxRequestTarget target, QueryHit hit) {BlobIdent blobIdent = new BlobIdent(getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- context.onSelect(target, blobIdent, hit.getTokenPos());+ context.onSelect(target, blobIdent, SourceRendererProvider.getPosition(hit.getTokenPos()));}@Override@@ -897,7 +900,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMethrow new RuntimeException(e);}- String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";+ PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());+ String jsonOfMark = mark!=null? getJson(mark): "undefined";CharSequence callback = ajaxBehavior.getCallbackFunction(explicit("action"), explicit("param1"), explicit("param2"),@@ -964,8 +968,9 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe}@Override- public void mark(AjaxRequestTarget target, PlanarRange mark) {+ public void position(AjaxRequestTarget target, String position) {String script;+ PlanarRange mark = SourceRendererProvider.getRange(position);if (mark != null) {script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));} else {@@ -1032,7 +1037,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe@Overridepublic void onClick(AjaxRequestTarget target) {modal.close();- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));}};@@ -1123,7 +1128,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe} else if (key.equals("return")) {int symbolIndex = params.getParameterValue("param").toInt();Symbol symbol = filteredSymbols.get(symbolIndex);- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());+ context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));modal.close();} else {throw new IllegalStateException("Unrecognized key: " + key);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.javasimilarity index 52%rename from core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.javarename to core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.javaindex e6782e177b..d9837ca205 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/Positionable.java@@ -4,10 +4,8 @@ import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;-import io.onedev.commons.utils.PlanarRange;+public interface Positionable {-public interface Markable {-- void mark(AjaxRequestTarget target, @Nullable PlanarRange mark);+ void position(AjaxRequestTarget target, @Nullable String position);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.javaindex d39a7f590b..0bafd3ee86 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java@@ -46,6 +46,7 @@ import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.RunTaskBehavior;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@@ -260,7 +261,7 @@ public abstract class QuickSearchPanel extends Panel {BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.mark = hit.getTokenPos();+ state.position = SourceRendererProvider.getPosition(hit.getTokenPos());PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);link.add(AttributeAppender.replace("href", url.toString()));diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.javaindex 26fd2251ce..ca07e37183 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java@@ -38,6 +38,7 @@ import io.onedev.server.search.code.hit.TextHit;import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;@SuppressWarnings("serial")public abstract class SearchResultPanel extends Panel {@@ -150,7 +151,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());- context.onSelect(target, selected, hit.getTokenPos());+ context.onSelect(target, selected, SourceRendererProvider.getPosition(hit.getTokenPos()));}private String getActiveBlobPath(ActiveIndex activeIndex) {@@ -509,7 +510,7 @@ public abstract class SearchResultPanel extends Panel {BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),FileMode.REGULAR_FILE.getBits());ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- state.mark = hit.getTokenPos();+ state.position = SourceRendererProvider.getPosition(hit.getTokenPos());PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);add(AttributeAppender.replace("href", url.toString()));