The Unified and Autonomous Development Platform
Refactor to use InfiniteScrollBehavior
robin shine2eb799a009f4
diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.javasimilarity index 95%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.javarename to gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.javaindex 1ecbb1ef9a..bf391a0754 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.java+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageBehavior.java@@ -1,54 +1,54 @@-package com.gitplex.web.behavior;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.revwalk.RevCommit;-import org.unbescape.javascript.JavaScriptEscape;--import com.gitplex.core.entity.Depot;-import com.gitplex.web.util.DateUtils;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;--public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {-- private static final long serialVersionUID = 1L;-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();-- String tooltipId = params.getParameterValue("tooltip").toString();- String commitHash = params.getParameterValue("commit").toString();- RevCommit commit = getDepot().getRevCommit(commitHash);- String authoring;- if (commit.getAuthorIdent() != null) {- authoring = commit.getAuthorIdent().getName();- if (commit.getCommitterIdent() != null)- authoring += " " + DateUtils.formatAge(commit.getCommitterIdent().getWhen());- authoring = "'" + JavaScriptEscape.escapeJavaScript(authoring) + "'";- } else {- authoring = "undefined";- }- String message = JavaScriptEscape.escapeJavaScript(commit.getFullMessage());- String script = String.format("gitplex.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message);- target.appendJavaScript(script);- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);- response.render(JavaScriptHeaderItem.forReference(new BlameMessageResourceReference()));- }-- protected abstract Depot getDepot();-- public String getCallback() {- return getCallbackFunction(explicit("tooltip"), explicit("commit")).toString();- }--}+package com.gitplex.web.behavior.blamemessage;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.revwalk.RevCommit;+import org.unbescape.javascript.JavaScriptEscape;++import com.gitplex.core.entity.Depot;+import com.gitplex.web.util.DateUtils;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;++public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior {++ private static final long serialVersionUID = 1L;++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();++ String tooltipId = params.getParameterValue("tooltip").toString();+ String commitHash = params.getParameterValue("commit").toString();+ RevCommit commit = getDepot().getRevCommit(commitHash);+ String authoring;+ if (commit.getAuthorIdent() != null) {+ authoring = commit.getAuthorIdent().getName();+ if (commit.getCommitterIdent() != null)+ authoring += " " + DateUtils.formatAge(commit.getCommitterIdent().getWhen());+ authoring = "'" + JavaScriptEscape.escapeJavaScript(authoring) + "'";+ } else {+ authoring = "undefined";+ }+ String message = JavaScriptEscape.escapeJavaScript(commit.getFullMessage());+ String script = String.format("gitplex.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message);+ target.appendJavaScript(script);+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ response.render(JavaScriptHeaderItem.forReference(new BlameMessageResourceReference()));+ }++ protected abstract Depot getDepot();++ public String getCallback() {+ return getCallbackFunction(explicit("tooltip"), explicit("commit")).toString();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.javasimilarity index 84%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.javarename to gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.javaindex 633d587711..5dd5a7ae82 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.java+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageCssResourceReference.java@@ -1,13 +1,13 @@-package com.gitplex.web.behavior;--import com.gitplex.web.page.base.BaseDependentCssResourceReference;--public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public BlameMessageCssResourceReference() {- super(BlameMessageCssResourceReference.class, "blame-message.css");- }--}+package com.gitplex.web.behavior.blamemessage;++import com.gitplex.web.page.base.BaseDependentCssResourceReference;++public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public BlameMessageCssResourceReference() {+ super(BlameMessageCssResourceReference.class, "blame-message.css");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.javasimilarity index 90%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.javarename to gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.javaindex 02cfdc5c68..3a1ddda9b3 100644--- a/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.java+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/BlameMessageResourceReference.java@@ -1,25 +1,25 @@-package com.gitplex.web.behavior;--import java.util.List;--import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;--import com.gitplex.web.page.base.BaseDependentResourceReference;--public class BlameMessageResourceReference extends BaseDependentResourceReference {-- private static final long serialVersionUID = 1L;-- public BlameMessageResourceReference() {- super(BlameMessageResourceReference.class, "blame-message.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(CssHeaderItem.forReference(new BlameMessageCssResourceReference()));- return dependencies;- }--}+package com.gitplex.web.behavior.blamemessage;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import com.gitplex.web.page.base.BaseDependentResourceReference;++public class BlameMessageResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public BlameMessageResourceReference() {+ super(BlameMessageResourceReference.class, "blame-message.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BlameMessageCssResourceReference()));+ return dependencies;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.css b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.csssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.cssrename to gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.cssdiff --git a/gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.js b/gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.jssimilarity index 100%rename from gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.jsrename to gitplex.web/src/main/java/com/gitplex/web/behavior/blamemessage/blame-message.jsdiff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.javaindex f57d839f70..b25b6a6dad 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java@@ -1,933 +1,933 @@-package com.gitplex.web.component.depotfile.blobview.source;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashMap;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.UUID;--import javax.annotation.Nullable;-import javax.servlet.http.Cookie;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.image.Image;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.http.WebResponse;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;-import org.unbescape.javascript.JavaScriptEscape;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.CompareContext;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.web.behavior.BlameMessageBehavior;-import com.gitplex.web.component.comment.CodeCommentPanel;-import com.gitplex.web.component.comment.CommentInput;-import com.gitplex.web.component.comment.DepotAttachmentSupport;-import com.gitplex.web.component.comment.comparecontext.CompareContextPanel;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext;-import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.web.component.sourceformat.OptionChangeCallback;-import com.gitplex.web.component.sourceformat.SourceFormatPanel;-import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.util.DateUtils;-import com.google.common.base.Preconditions;-import com.gitplex.commons.git.Blame;-import com.gitplex.commons.git.Blob;-import com.gitplex.commons.git.BlobIdent;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.command.BlameCommand;-import com.gitplex.commons.lang.extractors.ExtractException;-import com.gitplex.commons.lang.extractors.Extractor;-import com.gitplex.commons.lang.extractors.Extractors;-import com.gitplex.commons.lang.extractors.Symbol;-import com.gitplex.commons.util.Range;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;-import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;--/**- * Make sure to add only one source view panel per page- *- * @author robin- *- */-@SuppressWarnings("serial")-public class SourceViewPanel extends BlobViewPanel {-- private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);-- private static final String COOKIE_OUTLINE = "sourceView.outline";-- private static final String BODY_ID = "body";-- private final List<Symbol> symbols = new ArrayList<>();-- private final IModel<Collection<CodeComment>> commentsModel =- new LoadableDetachableModel<Collection<CodeComment>>() {-- @Override- protected Collection<CodeComment> load() {- return GitPlex.getInstance(CodeCommentManager.class).findAll(- context.getDepot(), context.getCommit(), context.getBlobIdent().path);- }-- };-- private WebMarkupContainer commentContainer;-- private WebMarkupContainer outlineContainer;-- private SourceFormatPanel sourceFormat;-- private SymbolTooltipPanel symbolTooltip;-- private AbstractPostAjaxBehavior ajaxBehavior;-- private BlameMessageBehavior blameMessageBehavior;-- public SourceViewPanel(String id, BlobViewContext context) {- super(id, context);-- Blob blob = context.getDepot().getBlob(context.getBlobIdent());- Preconditions.checkArgument(blob.getText() != null);-- Extractor extractor = GitPlex.getInstance(Extractors.class).getExtractor(context.getBlobIdent().path);- if (extractor != null) {- try {- symbols.addAll(extractor.extract(blob.getText().getContent()));- } catch (ExtractException e) {- logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);- }- }-- }-- @Override- protected WebMarkupContainer newOptions(String id) {- sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.sourceview.onTabSizeChange(%s);", sourceFormat.getTabSize());- target.appendJavaScript(script);- }-- }, new OptionChangeCallback() {-- @Override- public void onOptioneChange(AjaxRequestTarget target) {- String script = String.format("gitplex.sourceview.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());- target.appendJavaScript(script);- }-- });- return sourceFormat;- }-- @Override- public WebMarkupContainer newAdditionalActions(String id) {- WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);- actions.add(new PreventDefaultAjaxLink<Void>("blame") {-- @Override- public void onClick(AjaxRequestTarget target) {- boolean blamed = (context.getMode() != Mode.BLAME);- String jsonOfBlameInfos = getJsonOfBlameInfos(blamed);- String script = String.format("gitplex.sourceview.onBlame(%s);", jsonOfBlameInfos);- target.appendJavaScript(script);- context.onBlameChange(target, blamed);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (context.getMode() == Mode.BLAME)- return "active";- else- return "";- }-- })));-- if (!symbols.isEmpty()) {- actions.add(new AjaxLink<Void>("outline") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleOutline(target);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (outlineContainer.isVisible())- return "active";- else- return "";- }-- })));- } else {- actions.add(new WebMarkupContainer("outline").setVisible(false));- }- return actions;- }-- private void toggleOutline(AjaxRequestTarget target) {- WebResponse response = (WebResponse) RequestCycle.get().getResponse();- Cookie cookie;- if (outlineContainer.isVisible()) {- cookie = new Cookie(COOKIE_OUTLINE, "no");- outlineContainer.setVisible(false);- } else {- cookie = new Cookie(COOKIE_OUTLINE, "yes");- outlineContainer.setVisible(true);- }- cookie.setMaxAge(Integer.MAX_VALUE);- response.addCookie(cookie);- target.add(outlineContainer);- target.appendJavaScript("gitplex.sourceview.onToggleOutline();");- }-- public void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {- String script;- if (mark != null) {- script = String.format("gitplex.sourceview.mark(%s, %s);", getJson(mark), scroll);- } else {- script = String.format("gitplex.sourceview.mark(undefined, false);");- }- target.appendJavaScript(script);- }-- private String getJson(TextRange mark) {- try {- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- @Override- protected void onInitialize() {- super.onInitialize();-- commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initComment();"));- }-- };-- commentContainer.add(new WebSocketRenderBehavior() {-- @Override- protected void onRender(WebSocketRequestHandler handler) {- if (commentContainer.isVisible())- handler.add(commentContainer.get("head").get("toggleResolve"));- }-- });-- WebMarkupContainer head = new WebMarkupContainer("head");- head.setOutputMarkupId(true);- commentContainer.add(head);-- head.add(new DropdownLink("context") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- @Override- protected Component newContent(String id) {- CompareContext compareContext = context.getOpenComment().getCompareContext();- return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {-- @Override- public CodeComment getObject() {- return context.getOpenComment();- }-- }, Model.of(compareContext.getWhitespaceOption()));- }-- });- head.add(new AjaxLink<Void>("locate") {-- @Override- public void onClick(AjaxRequestTarget target) {- CodeComment comment = context.getOpenComment();- TextRange mark;- if (comment != null) {- mark = comment.getCommentPos().getRange();- } else {- mark = (TextRange) commentContainer.getDefaultModelObject();- }- mark(target, mark, true);- context.onMark(target, mark);- target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));- }-- @Override- protected void onInitialize() {- super.onInitialize();- setOutputMarkupId(true);- }-- });-- // use this instead of bookmarkable link as we want to get the link- // updated whenever we re-render the comment container- AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (context.getOpenComment() != null) {- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent = new BlobIdent(context.getBlobIdent());- state.blobIdent.revision = context.getCommit().name();- state.commentId = context.getOpenComment().getId();- state.mark = context.getOpenComment().getCommentPos().getRange();- return urlFor(DepotFilePage.class, DepotFilePage.paramsOf(context.getDepot(), state)).toString();- } else {- return "";- }- }-- });- head.add(new WebMarkupContainer("permanent") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- }.add(appender));-- head.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));- }-- @Override- public void onClick(AjaxRequestTarget target) {- clearComment(target);- if (context.getOpenComment() != null)- context.onCommentOpened(target, null);- target.appendJavaScript("gitplex.sourceview.onCloseComment();");- }-- });-- head.add(new AjaxLink<Void>("toggleResolve") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(context.getOpenComment() != null);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- CodeComment comment = context.getOpenComment();- if (comment != null) {- if (comment.isResolved()) {- tag.put("title", "Comment is currently resolved, click to unresolve");- tag.put("class", "pull-right resolve resolved");- } else {- tag.put("title", "Comment is currently unresolved, click to resolve");- tag.put("class", "pull-right resolve unresolved");- }- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (SecurityUtils.getAccount() != null) {- ((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);- target.appendJavaScript("gitplex.sourceview.scrollToCommentBottom();");- } else {- Session.get().warn("Please login to resolve/unresolve comment");- }- }-- }.setOutputMarkupId(true));-- commentContainer.setOutputMarkupPlaceholderTag(true);- if (context.getOpenComment() != null && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.add(commentPanel);- } else {- commentContainer.add(new WebMarkupContainer(BODY_ID));- commentContainer.setVisible(false);- }- add(commentContainer);-- add(ajaxBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch(params.getParameterValue("action").toString()) {- case "openSelectionPopover":- TextRange mark = getMark(params, "param1", "param2", "param3", "param4");- String script = String.format("gitplex.sourceview.openSelectionPopover(%s, '%s', %s);",- getJson(mark), context.getMarkUrl(mark),- SecurityUtils.getAccount()!=null);- target.appendJavaScript(script);- break;- case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());-- mark = getMark(params, "param1", "param2", "param3", "param4");- commentContainer.setDefaultModelObject(mark);-- Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);- fragment.setOutputMarkupId(true);-- Form<?> form = new Form<Void>("form");-- String uuid = UUID.randomUUID().toString();-- CommentInput contentInput;- form.add(contentInput = new CommentInput("content", Model.of("")) {-- @Override- protected DepotAttachmentSupport getAttachmentSupport() {- return new DepotAttachmentSupport(context.getDepot(), uuid);- }-- @Override- protected Depot getDepot() {- return context.getDepot();- }-- });- contentInput.setRequired(true);-- NotificationPanel feedback = new NotificationPanel("feedback", form);- feedback.setOutputMarkupPlaceholderTag(true);- form.add(feedback);-- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));- }-- @Override- public void onClick(AjaxRequestTarget target) {- clearComment(target);- target.appendJavaScript("gitplex.sourceview.mark(undefined, false);");- target.appendJavaScript("gitplex.sourceview.onLayoutChange();");- context.onMark(target, null);- }-- });-- form.add(new AjaxButton("save") {-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(feedback);- }-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- CodeComment comment = new CodeComment();- comment.setUUID(uuid);- comment.setCommentPos(new CommentPos());- comment.getCommentPos().setCommit(context.getCommit().name());- comment.getCommentPos().setPath(context.getBlobIdent().path);- comment.setContent(contentInput.getModelObject());- comment.setDepot(context.getDepot());- comment.setUser(SecurityUtils.getAccount());- comment.getCommentPos().setRange(mark);- comment.setCompareContext(getCompareContext());-- GitPlex.getInstance(CodeCommentManager.class).save(comment);-- CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.replace(commentPanel);- target.add(commentContainer);-- String script = String.format("gitplex.sourceview.onCommentAdded(%s);",- getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, comment);- }-- });- fragment.add(form);- commentContainer.replace(fragment);- commentContainer.setVisible(true);- target.add(commentContainer);- context.onAddComment(target, mark);- target.appendJavaScript(String.format("gitplex.sourceview.onAddComment(%s);", getJson(mark)));- break;- case "openComment":- Long commentId = params.getParameterValue("param1").toLong();- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {-- @Override- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {- SourceViewPanel.this.onCommentDeleted(target, comment);- }-- @Override- protected CompareContext getCompareContext(CodeComment comment) {- return SourceViewPanel.this.getCompareContext();- }-- @Override- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {- target.add(commentContainer.get("head"));- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- };- commentContainer.replace(commentPanel);- commentContainer.setVisible(true);- target.add(commentContainer);- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);- script = String.format("gitplex.sourceview.onOpenComment(%s);", getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, comment);- break;- }- }-- });-- add(blameMessageBehavior = new BlameMessageBehavior() {-- @Override- protected Depot getDepot() {- return context.getDepot();- }- });-- outlineContainer = new WebMarkupContainer("outline") {-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initOutline();"));- }-- };- outlineContainer.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- toggleOutline(target);- }-- });- NestedTree<Symbol> tree;- outlineContainer.add(tree = new NestedTree<Symbol>(BODY_ID, new ITreeProvider<Symbol>() {-- @Override- public void detach() {- }-- @Override- public Iterator<? extends Symbol> getRoots() {- return getChildSymbols(null).iterator();- }-- @Override- public boolean hasChildren(Symbol symbol) {- return !getChildSymbols(symbol).isEmpty();- }-- @Override- public Iterator<? extends Symbol> getChildren(Symbol symbol) {- return getChildSymbols(symbol).iterator();- }-- @Override- public IModel<Symbol> model(Symbol symbol) {- return Model.of(symbol);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new HumanTheme());- }-- @Override- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);- Symbol symbol = nodeModel.getObject();-- fragment.add(new Image("icon", symbol.getIcon()));-- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- context.onSelect(target, context.getBlobIdent(), symbol.getPos());- }-- };- DepotFilePage.State state = new DepotFilePage.State();- state.blobIdent = context.getBlobIdent();- state.commentId = CodeComment.idOf(context.getOpenComment());- state.mark = TextRange.of(symbol.getPos());- PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);- link.add(AttributeAppender.replace("href", urlFor(DepotFilePage.class, params).toString()));- link.add(symbol.render("label", null));- fragment.add(link);-- return fragment;- }-- });-- for (Symbol root: getChildSymbols(null))- tree.expand(root);-- outlineContainer.setOutputMarkupPlaceholderTag(true);- add(outlineContainer);-- if (!symbols.isEmpty()) {- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie(COOKIE_OUTLINE);- if (cookie!=null && cookie.getValue().equals("no"))- outlineContainer.setVisible(false);- } else {- outlineContainer.setVisible(false);- }-- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {-- @Override- public Depot getObject() {- return context.getDepot();- }-- }) {-- @Override- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {- BlobIdent blobIdent = new BlobIdent(- getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());- context.onSelect(target, blobIdent, hit.getTokenPos());- }-- @Override- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- context.onSearchComplete(target, hits);- }-- @Override- protected String getBlobPath() {- return context.getBlobIdent().path;- }-- });- }-- private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,- String endLineParam, String endCharParam) {- int beginLine = params.getParameterValue(beginLineParam).toInt();- int beginChar = params.getParameterValue(beginCharParam).toInt();- int endLine = params.getParameterValue(endLineParam).toInt();- int endChar = params.getParameterValue(endCharParam).toInt();- TextRange mark = new TextRange();- mark.beginLine = beginLine;- mark.beginChar = beginChar;- mark.endLine = endLine;- mark.endChar = endChar;- return mark;- }-- private String getJsonOfComment(CodeComment comment) {- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = comment.getCommentPos().getRange();-- String jsonOfCommentInfo;- try {- jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- return jsonOfCommentInfo;- }-- private void clearComment(AjaxRequestTarget target) {- commentContainer.replace(new WebMarkupContainer(BODY_ID));- commentContainer.setVisible(false);- target.add(commentContainer);- }-- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {- clearComment(target);- String script = String.format("gitplex.sourceview.onCommentDeleted(%s);",- getJsonOfComment(comment));- target.appendJavaScript(script);- context.onCommentOpened(target, null);- }-- private List<Symbol> getChildSymbols(@Nullable Symbol parentSymbol) {- List<Symbol> children = new ArrayList<>();- for (Symbol symbol: symbols) {- if (symbol.getParent() == parentSymbol)- children.add(symbol);- }- return children;- }-- private String getJsonOfBlameInfos(boolean blamed) {- String jsonOfBlameInfos;- if (blamed) {- List<BlameInfo> blameInfos = new ArrayList<>();-- String commitHash = context.getCommit().name();-- BlameCommand cmd = new BlameCommand(context.getDepot().getDirectory());- cmd.commitHash(commitHash).file(context.getBlobIdent().path);- for (Blame blame: cmd.call().values()) {- BlameInfo blameInfo = new BlameInfo();- blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());- blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());- blameInfo.hash = blame.getCommit().getHash();- blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);- CommitDetailPage.State state = new CommitDetailPage.State();- state.revision = blame.getCommit().getHash();- state.pathFilter = context.getBlobIdent().path;- PageParameters params = CommitDetailPage.paramsOf(context.getDepot(), state);- blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();- blameInfo.ranges = blame.getRanges();- blameInfos.add(blameInfo);- }- try {- jsonOfBlameInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- } else {- jsonOfBlameInfos = "undefined";- }- return jsonOfBlameInfos;- }-- private CompareContext getCompareContext() {- CompareContext compareContext = new CompareContext();- compareContext.setCompareCommit(context.getCommit().name());- compareContext.setPathFilter(context.getBlobIdent().path);- return compareContext;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));-- Blob blob = context.getDepot().getBlob(context.getBlobIdent());-- String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);- Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();- for (CodeComment comment: commentsModel.getObject()) {- if (comment.getCommentPos().getRange() != null) {- int line = comment.getCommentPos().getRange().getBeginLine();- List<CommentInfo> commentInfosAtLine = commentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- commentInfos.put(line, commentInfosAtLine);- }- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = comment.getCommentPos().getRange();- commentInfosAtLine.add(commentInfo);- }- }- for (List<CommentInfo> value: commentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }-- String jsonOfCommentInfos;- try {- jsonOfCommentInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- CharSequence callback = ajaxBehavior.getCallbackFunction(- explicit("action"), explicit("param1"), explicit("param2"),- explicit("param3"), explicit("param4"));- String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);- String script = String.format("gitplex.sourceview.init('%s', '%s', %s, %s, '%s', '%s', "- + "%s, %s, %s, %s, %s, %s, %s, '%s');",- JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),- JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),- context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",- context.getMark()!=null?getJson(context.getMark()):"undefined",- symbolTooltip.getMarkupId(),- context.getBlobIdent().revision,- jsonOfBlameInfos,- jsonOfCommentInfos,- callback, blameMessageBehavior.getCallback(),- viewState!=null?"JSON.parse('"+viewState+"')":"undefined",- SecurityUtils.getAccount()!=null,- context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",- sourceFormat.getTabSize(),- sourceFormat.getLineWrapMode());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- @Override- protected void onDetach() {- commentsModel.detach();- super.onDetach();- }-- @SuppressWarnings("unused")- private static class BlameInfo {-- String abbreviatedHash;-- String hash;-- String url;-- String authorName;-- String commitDate;-- List<Range> ranges;- }-- @SuppressWarnings("unused")- private static class CommentInfo {- long id;-- String title;-- TextRange mark;- }--}+package com.gitplex.web.component.depotfile.blobview.source;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.UUID;++import javax.annotation.Nullable;+import javax.servlet.http.Cookie;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.image.Image;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.http.WebResponse;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import org.unbescape.javascript.JavaScriptEscape;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.CodeComment;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.PullRequest;+import com.gitplex.core.entity.support.CommentPos;+import com.gitplex.core.entity.support.CompareContext;+import com.gitplex.core.entity.support.TextRange;+import com.gitplex.core.manager.CodeCommentManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.search.hit.QueryHit;+import com.gitplex.web.behavior.blamemessage.BlameMessageBehavior;+import com.gitplex.web.component.comment.CodeCommentPanel;+import com.gitplex.web.component.comment.CommentInput;+import com.gitplex.web.component.comment.DepotAttachmentSupport;+import com.gitplex.web.component.comment.comparecontext.CompareContextPanel;+import com.gitplex.web.component.depotfile.blobview.BlobViewContext;+import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;+import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;+import com.gitplex.web.component.sourceformat.OptionChangeCallback;+import com.gitplex.web.component.sourceformat.SourceFormatPanel;+import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;+import com.gitplex.web.page.depot.commit.CommitDetailPage;+import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.web.util.DateUtils;+import com.google.common.base.Preconditions;+import com.gitplex.commons.git.Blame;+import com.gitplex.commons.git.Blob;+import com.gitplex.commons.git.BlobIdent;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.command.BlameCommand;+import com.gitplex.commons.lang.extractors.ExtractException;+import com.gitplex.commons.lang.extractors.Extractor;+import com.gitplex.commons.lang.extractors.Extractors;+import com.gitplex.commons.lang.extractors.Symbol;+import com.gitplex.commons.util.Range;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;++/**+ * Make sure to add only one source view panel per page+ *+ * @author robin+ *+ */+@SuppressWarnings("serial")+public class SourceViewPanel extends BlobViewPanel {++ private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);++ private static final String COOKIE_OUTLINE = "sourceView.outline";++ private static final String BODY_ID = "body";++ private final List<Symbol> symbols = new ArrayList<>();++ private final IModel<Collection<CodeComment>> commentsModel =+ new LoadableDetachableModel<Collection<CodeComment>>() {++ @Override+ protected Collection<CodeComment> load() {+ return GitPlex.getInstance(CodeCommentManager.class).findAll(+ context.getDepot(), context.getCommit(), context.getBlobIdent().path);+ }++ };++ private WebMarkupContainer commentContainer;++ private WebMarkupContainer outlineContainer;++ private SourceFormatPanel sourceFormat;++ private SymbolTooltipPanel symbolTooltip;++ private AbstractPostAjaxBehavior ajaxBehavior;++ private BlameMessageBehavior blameMessageBehavior;++ public SourceViewPanel(String id, BlobViewContext context) {+ super(id, context);++ Blob blob = context.getDepot().getBlob(context.getBlobIdent());+ Preconditions.checkArgument(blob.getText() != null);++ Extractor extractor = GitPlex.getInstance(Extractors.class).getExtractor(context.getBlobIdent().path);+ if (extractor != null) {+ try {+ symbols.addAll(extractor.extract(blob.getText().getContent()));+ } catch (ExtractException e) {+ logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);+ }+ }++ }++ @Override+ protected WebMarkupContainer newOptions(String id) {+ sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.sourceview.onTabSizeChange(%s);", sourceFormat.getTabSize());+ target.appendJavaScript(script);+ }++ }, new OptionChangeCallback() {++ @Override+ public void onOptioneChange(AjaxRequestTarget target) {+ String script = String.format("gitplex.sourceview.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());+ target.appendJavaScript(script);+ }++ });+ return sourceFormat;+ }++ @Override+ public WebMarkupContainer newAdditionalActions(String id) {+ WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);+ actions.add(new PreventDefaultAjaxLink<Void>("blame") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ boolean blamed = (context.getMode() != Mode.BLAME);+ String jsonOfBlameInfos = getJsonOfBlameInfos(blamed);+ String script = String.format("gitplex.sourceview.onBlame(%s);", jsonOfBlameInfos);+ target.appendJavaScript(script);+ context.onBlameChange(target, blamed);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (context.getMode() == Mode.BLAME)+ return "active";+ else+ return "";+ }++ })));++ if (!symbols.isEmpty()) {+ actions.add(new AjaxLink<Void>("outline") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleOutline(target);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (outlineContainer.isVisible())+ return "active";+ else+ return "";+ }++ })));+ } else {+ actions.add(new WebMarkupContainer("outline").setVisible(false));+ }+ return actions;+ }++ private void toggleOutline(AjaxRequestTarget target) {+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie;+ if (outlineContainer.isVisible()) {+ cookie = new Cookie(COOKIE_OUTLINE, "no");+ outlineContainer.setVisible(false);+ } else {+ cookie = new Cookie(COOKIE_OUTLINE, "yes");+ outlineContainer.setVisible(true);+ }+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(outlineContainer);+ target.appendJavaScript("gitplex.sourceview.onToggleOutline();");+ }++ public void mark(AjaxRequestTarget target, @Nullable TextRange mark, boolean scroll) {+ String script;+ if (mark != null) {+ script = String.format("gitplex.sourceview.mark(%s, %s);", getJson(mark), scroll);+ } else {+ script = String.format("gitplex.sourceview.mark(undefined, false);");+ }+ target.appendJavaScript(script);+ }++ private String getJson(TextRange mark) {+ try {+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(mark);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initComment();"));+ }++ };++ commentContainer.add(new WebSocketRenderBehavior() {++ @Override+ protected void onRender(WebSocketRequestHandler handler) {+ if (commentContainer.isVisible())+ handler.add(commentContainer.get("head").get("toggleResolve"));+ }++ });++ WebMarkupContainer head = new WebMarkupContainer("head");+ head.setOutputMarkupId(true);+ commentContainer.add(head);++ head.add(new DropdownLink("context") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ @Override+ protected Component newContent(String id) {+ CompareContext compareContext = context.getOpenComment().getCompareContext();+ return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {++ @Override+ public CodeComment getObject() {+ return context.getOpenComment();+ }++ }, Model.of(compareContext.getWhitespaceOption()));+ }++ });+ head.add(new AjaxLink<Void>("locate") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ CodeComment comment = context.getOpenComment();+ TextRange mark;+ if (comment != null) {+ mark = comment.getCommentPos().getRange();+ } else {+ mark = (TextRange) commentContainer.getDefaultModelObject();+ }+ mark(target, mark, true);+ context.onMark(target, mark);+ target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ setOutputMarkupId(true);+ }++ });++ // use this instead of bookmarkable link as we want to get the link+ // updated whenever we re-render the comment container+ AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (context.getOpenComment() != null) {+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent = new BlobIdent(context.getBlobIdent());+ state.blobIdent.revision = context.getCommit().name();+ state.commentId = context.getOpenComment().getId();+ state.mark = context.getOpenComment().getCommentPos().getRange();+ return urlFor(DepotFilePage.class, DepotFilePage.paramsOf(context.getDepot(), state)).toString();+ } else {+ return "";+ }+ }++ });+ head.add(new WebMarkupContainer("permanent") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ }.add(appender));++ head.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ clearComment(target);+ if (context.getOpenComment() != null)+ context.onCommentOpened(target, null);+ target.appendJavaScript("gitplex.sourceview.onCloseComment();");+ }++ });++ head.add(new AjaxLink<Void>("toggleResolve") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getOpenComment() != null);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ CodeComment comment = context.getOpenComment();+ if (comment != null) {+ if (comment.isResolved()) {+ tag.put("title", "Comment is currently resolved, click to unresolve");+ tag.put("class", "pull-right resolve resolved");+ } else {+ tag.put("title", "Comment is currently unresolved, click to resolve");+ tag.put("class", "pull-right resolve unresolved");+ }+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (SecurityUtils.getAccount() != null) {+ ((CodeCommentPanel)commentContainer.get("body")).onChangeStatus(target);+ target.appendJavaScript("gitplex.sourceview.scrollToCommentBottom();");+ } else {+ Session.get().warn("Please login to resolve/unresolve comment");+ }+ }++ }.setOutputMarkupId(true));++ commentContainer.setOutputMarkupPlaceholderTag(true);+ if (context.getOpenComment() != null && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.add(commentPanel);+ } else {+ commentContainer.add(new WebMarkupContainer(BODY_ID));+ commentContainer.setVisible(false);+ }+ add(commentContainer);++ add(ajaxBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ switch(params.getParameterValue("action").toString()) {+ case "openSelectionPopover":+ TextRange mark = getMark(params, "param1", "param2", "param3", "param4");+ String script = String.format("gitplex.sourceview.openSelectionPopover(%s, '%s', %s);",+ getJson(mark), context.getMarkUrl(mark),+ SecurityUtils.getAccount()!=null);+ target.appendJavaScript(script);+ break;+ case "addComment":+ Preconditions.checkNotNull(SecurityUtils.getAccount());++ mark = getMark(params, "param1", "param2", "param3", "param4");+ commentContainer.setDefaultModelObject(mark);++ Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);+ fragment.setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");++ String uuid = UUID.randomUUID().toString();++ CommentInput contentInput;+ form.add(contentInput = new CommentInput("content", Model.of("")) {++ @Override+ protected DepotAttachmentSupport getAttachmentSupport() {+ return new DepotAttachmentSupport(context.getDepot(), uuid);+ }++ @Override+ protected Depot getDepot() {+ return context.getDepot();+ }++ });+ contentInput.setRequired(true);++ NotificationPanel feedback = new NotificationPanel("feedback", form);+ feedback.setOutputMarkupPlaceholderTag(true);+ form.add(feedback);++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ clearComment(target);+ target.appendJavaScript("gitplex.sourceview.mark(undefined, false);");+ target.appendJavaScript("gitplex.sourceview.onLayoutChange();");+ context.onMark(target, null);+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(feedback);+ }++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ CodeComment comment = new CodeComment();+ comment.setUUID(uuid);+ comment.setCommentPos(new CommentPos());+ comment.getCommentPos().setCommit(context.getCommit().name());+ comment.getCommentPos().setPath(context.getBlobIdent().path);+ comment.setContent(contentInput.getModelObject());+ comment.setDepot(context.getDepot());+ comment.setUser(SecurityUtils.getAccount());+ comment.getCommentPos().setRange(mark);+ comment.setCompareContext(getCompareContext());++ GitPlex.getInstance(CodeCommentManager.class).save(comment);++ CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.replace(commentPanel);+ target.add(commentContainer);++ String script = String.format("gitplex.sourceview.onCommentAdded(%s);",+ getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, comment);+ }++ });+ fragment.add(form);+ commentContainer.replace(fragment);+ commentContainer.setVisible(true);+ target.add(commentContainer);+ context.onAddComment(target, mark);+ target.appendJavaScript(String.format("gitplex.sourceview.onAddComment(%s);", getJson(mark)));+ break;+ case "openComment":+ Long commentId = params.getParameterValue("param1").toLong();+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {++ @Override+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {+ SourceViewPanel.this.onCommentDeleted(target, comment);+ }++ @Override+ protected CompareContext getCompareContext(CodeComment comment) {+ return SourceViewPanel.this.getCompareContext();+ }++ @Override+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {+ target.add(commentContainer.get("head"));+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ };+ commentContainer.replace(commentPanel);+ commentContainer.setVisible(true);+ target.add(commentContainer);+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);+ script = String.format("gitplex.sourceview.onOpenComment(%s);", getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, comment);+ break;+ }+ }++ });++ add(blameMessageBehavior = new BlameMessageBehavior() {++ @Override+ protected Depot getDepot() {+ return context.getDepot();+ }+ });++ outlineContainer = new WebMarkupContainer("outline") {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("gitplex.sourceview.initOutline();"));+ }++ };+ outlineContainer.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ toggleOutline(target);+ }++ });+ NestedTree<Symbol> tree;+ outlineContainer.add(tree = new NestedTree<Symbol>(BODY_ID, new ITreeProvider<Symbol>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends Symbol> getRoots() {+ return getChildSymbols(null).iterator();+ }++ @Override+ public boolean hasChildren(Symbol symbol) {+ return !getChildSymbols(symbol).isEmpty();+ }++ @Override+ public Iterator<? extends Symbol> getChildren(Symbol symbol) {+ return getChildSymbols(symbol).iterator();+ }++ @Override+ public IModel<Symbol> model(Symbol symbol) {+ return Model.of(symbol);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ }++ @Override+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);+ Symbol symbol = nodeModel.getObject();++ fragment.add(new Image("icon", symbol.getIcon()));++ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ context.onSelect(target, context.getBlobIdent(), symbol.getPos());+ }++ };+ DepotFilePage.State state = new DepotFilePage.State();+ state.blobIdent = context.getBlobIdent();+ state.commentId = CodeComment.idOf(context.getOpenComment());+ state.mark = TextRange.of(symbol.getPos());+ PageParameters params = DepotFilePage.paramsOf(context.getDepot(), state);+ link.add(AttributeAppender.replace("href", urlFor(DepotFilePage.class, params).toString()));+ link.add(symbol.render("label", null));+ fragment.add(link);++ return fragment;+ }++ });++ for (Symbol root: getChildSymbols(null))+ tree.expand(root);++ outlineContainer.setOutputMarkupPlaceholderTag(true);+ add(outlineContainer);++ if (!symbols.isEmpty()) {+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_OUTLINE);+ if (cookie!=null && cookie.getValue().equals("no"))+ outlineContainer.setVisible(false);+ } else {+ outlineContainer.setVisible(false);+ }++ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Depot>() {++ @Override+ public Depot getObject() {+ return context.getDepot();+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {+ BlobIdent blobIdent = new BlobIdent(+ getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());+ context.onSelect(target, blobIdent, hit.getTokenPos());+ }++ @Override+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {+ context.onSearchComplete(target, hits);+ }++ @Override+ protected String getBlobPath() {+ return context.getBlobIdent().path;+ }++ });+ }++ private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,+ String endLineParam, String endCharParam) {+ int beginLine = params.getParameterValue(beginLineParam).toInt();+ int beginChar = params.getParameterValue(beginCharParam).toInt();+ int endLine = params.getParameterValue(endLineParam).toInt();+ int endChar = params.getParameterValue(endCharParam).toInt();+ TextRange mark = new TextRange();+ mark.beginLine = beginLine;+ mark.beginChar = beginChar;+ mark.endLine = endLine;+ mark.endChar = endChar;+ return mark;+ }++ private String getJsonOfComment(CodeComment comment) {+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = comment.getCommentPos().getRange();++ String jsonOfCommentInfo;+ try {+ jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ return jsonOfCommentInfo;+ }++ private void clearComment(AjaxRequestTarget target) {+ commentContainer.replace(new WebMarkupContainer(BODY_ID));+ commentContainer.setVisible(false);+ target.add(commentContainer);+ }++ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {+ clearComment(target);+ String script = String.format("gitplex.sourceview.onCommentDeleted(%s);",+ getJsonOfComment(comment));+ target.appendJavaScript(script);+ context.onCommentOpened(target, null);+ }++ private List<Symbol> getChildSymbols(@Nullable Symbol parentSymbol) {+ List<Symbol> children = new ArrayList<>();+ for (Symbol symbol: symbols) {+ if (symbol.getParent() == parentSymbol)+ children.add(symbol);+ }+ return children;+ }++ private String getJsonOfBlameInfos(boolean blamed) {+ String jsonOfBlameInfos;+ if (blamed) {+ List<BlameInfo> blameInfos = new ArrayList<>();++ String commitHash = context.getCommit().name();++ BlameCommand cmd = new BlameCommand(context.getDepot().getDirectory());+ cmd.commitHash(commitHash).file(context.getBlobIdent().path);+ for (Blame blame: cmd.call().values()) {+ BlameInfo blameInfo = new BlameInfo();+ blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());+ blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());+ blameInfo.hash = blame.getCommit().getHash();+ blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);+ CommitDetailPage.State state = new CommitDetailPage.State();+ state.revision = blame.getCommit().getHash();+ state.pathFilter = context.getBlobIdent().path;+ PageParameters params = CommitDetailPage.paramsOf(context.getDepot(), state);+ blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();+ blameInfo.ranges = blame.getRanges();+ blameInfos.add(blameInfo);+ }+ try {+ jsonOfBlameInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ } else {+ jsonOfBlameInfos = "undefined";+ }+ return jsonOfBlameInfos;+ }++ private CompareContext getCompareContext() {+ CompareContext compareContext = new CompareContext();+ compareContext.setCompareCommit(context.getCommit().name());+ compareContext.setPathFilter(context.getBlobIdent().path);+ return compareContext;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));++ Blob blob = context.getDepot().getBlob(context.getBlobIdent());++ String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);+ Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();+ for (CodeComment comment: commentsModel.getObject()) {+ if (comment.getCommentPos().getRange() != null) {+ int line = comment.getCommentPos().getRange().getBeginLine();+ List<CommentInfo> commentInfosAtLine = commentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ commentInfos.put(line, commentInfosAtLine);+ }+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = comment.getCommentPos().getRange();+ commentInfosAtLine.add(commentInfo);+ }+ }+ for (List<CommentInfo> value: commentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }++ String jsonOfCommentInfos;+ try {+ jsonOfCommentInfos = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ CharSequence callback = ajaxBehavior.getCallbackFunction(+ explicit("action"), explicit("param1"), explicit("param2"),+ explicit("param3"), explicit("param4"));+ String viewState = RequestCycle.get().getMetaData(DepotFilePage.VIEW_STATE_KEY);+ String script = String.format("gitplex.sourceview.init('%s', '%s', %s, %s, '%s', '%s', "+ + "%s, %s, %s, %s, %s, %s, %s, '%s');",+ JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),+ JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),+ context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",+ context.getMark()!=null?getJson(context.getMark()):"undefined",+ symbolTooltip.getMarkupId(),+ context.getBlobIdent().revision,+ jsonOfBlameInfos,+ jsonOfCommentInfos,+ callback, blameMessageBehavior.getCallback(),+ viewState!=null?"JSON.parse('"+viewState+"')":"undefined",+ SecurityUtils.getAccount()!=null,+ context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",+ sourceFormat.getTabSize(),+ sourceFormat.getLineWrapMode());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ protected void onDetach() {+ commentsModel.detach();+ super.onDetach();+ }++ @SuppressWarnings("unused")+ private static class BlameInfo {++ String abbreviatedHash;++ String hash;++ String url;++ String authorName;++ String commitDate;++ List<Range> ranges;+ }++ @SuppressWarnings("unused")+ private static class CommentInfo {+ long id;++ String title;++ TextRange mark;+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.javaindex 29c75ddcb4..e45dfe201b 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java@@ -1,178 +1,181 @@-package com.gitplex.web.component.depotselector;--import java.util.ArrayList;-import java.util.Collection;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.CallbackParameter;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;--@SuppressWarnings("serial")-public abstract class DepotSelector extends Panel {-- private final IModel<Collection<Depot>> depotsModel;-- private final Long currentDepotId;-- private ListView<Depot> depotsView;-- public DepotSelector(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {- super(id);-- this.depotsModel = depotsModel;- this.currentDepotId = currentDepotId;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebMarkupContainer depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- WebMarkupContainer noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- TextField<String> searchField = new TextField<String>("search", Model.of(""));- add(searchField);- searchField.add(new InputChangeBehavior() {-- @Override- protected void onInputChange(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- });- searchField.add(new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- Long id = params.getParameterValue("id").toLong();- onSelect(target, GitPlex.getInstance(DepotManager.class).load(id));- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);-- String script = String.format("gitplex.depotSelector.init('%s', %s)",- searchField.getMarkupId(true),- getCallbackFunction(CallbackParameter.explicit("id")));- response.render(OnDomReadyHeaderItem.forScript(script));- }-- });-- depotsContainer.add(depotsView = new ListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @Override- protected List<Depot> load() {- List<Depot> depots = new ArrayList<>();- for (Depot depot: depotsModel.getObject()) {- if (depot.matchesFQN(searchField.getInput())) {- depots.add(depot);- }- }- depots.sort(Depot::compareLastVisit);- return depots;- }-- }) {-- @Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- public void onClick(AjaxRequestTarget target) {- onSelect(target, item.getModelObject());- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- PageParameters params = DepotFilePage.paramsOf(item.getModelObject());- tag.put("href", urlFor(DepotFilePage.class, params).toString());- }-- };- if (depot.getId().equals(currentDepotId))- link.add(AttributeAppender.append("class", " current"));- link.add(new Label("name", depot.getFQN()));- item.add(link);-- if (item.getIndex() == 0)- item.add(AttributeAppender.append("class", "active"));- item.add(AttributeAppender.append("data-id", depot.getId()));- }-- });- }-- @Override- protected void onDetach() {- depotsModel.detach();-- super.onDetach();- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotSelectorResourceReference()));- }-- protected abstract void onSelect(AjaxRequestTarget target, Depot depot);--}+package com.gitplex.web.component.depotselector;++import java.util.ArrayList;+import java.util.Collection;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.behavior.InputChangeBehavior;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.manager.DepotManager;+import com.gitplex.web.page.depot.file.DepotFilePage;++@SuppressWarnings("serial")+public abstract class DepotSelector extends Panel {++ private final IModel<Collection<Depot>> depotsModel;++ private final Long currentDepotId;++ private ListView<Depot> depotsView;++ private String searchInput;++ public DepotSelector(String id, IModel<Collection<Depot>> depotsModel, Long currentDepotId) {+ super(id);++ this.depotsModel = depotsModel;+ this.currentDepotId = currentDepotId;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ WebMarkupContainer noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);++ TextField<String> searchField = new TextField<String>("search", Model.of(""));+ add(searchField);+ searchField.add(new InputChangeBehavior() {++ @Override+ protected void onInputChange(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ }++ });+ searchField.add(new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ Long id = params.getParameterValue("id").toLong();+ onSelect(target, GitPlex.getInstance(DepotManager.class).load(id));+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);++ String script = String.format("gitplex.depotSelector.init('%s', %s)",+ searchField.getMarkupId(true),+ getCallbackFunction(CallbackParameter.explicit("id")));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ });++ depotsContainer.add(depotsView = new ListView<Depot>("depots",+ new LoadableDetachableModel<List<Depot>>() {++ @Override+ protected List<Depot> load() {+ List<Depot> depots = new ArrayList<>();+ for (Depot depot: depotsModel.getObject()) {+ if (depot.matchesFQN(searchInput)) {+ depots.add(depot);+ }+ }+ depots.sort(Depot::compareLastVisit);+ return depots;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Depot> item) {+ Depot depot = item.getModelObject();+ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onSelect(target, item.getModelObject());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ PageParameters params = DepotFilePage.paramsOf(item.getModelObject());+ tag.put("href", urlFor(DepotFilePage.class, params).toString());+ }++ };+ if (depot.getId().equals(currentDepotId))+ link.add(AttributeAppender.append("class", " current"));+ link.add(new Label("name", depot.getFQN()));+ item.add(link);++ if (item.getIndex() == 0)+ item.add(AttributeAppender.append("class", "active"));+ item.add(AttributeAppender.append("data-id", depot.getId()));+ }++ });+ }++ @Override+ protected void onDetach() {+ depotsModel.detach();++ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new DepotSelectorResourceReference()));+ }++ protected abstract void onSelect(AjaxRequestTarget target, Depot depot);++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.javaindex 43e08124ca..3f3043e00a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java@@ -1,1220 +1,1220 @@-package com.gitplex.web.component.diff.blob.text;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.protocol.http.WebSession;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.revwalk.RevCommit;-import org.unbescape.html.HtmlEscape;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;-import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.CodeComment;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.PullRequest;-import com.gitplex.core.entity.support.CommentPos;-import com.gitplex.core.entity.support.TextRange;-import com.gitplex.core.manager.CodeCommentManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.search.hit.QueryHit;-import com.gitplex.web.Constants;-import com.gitplex.web.behavior.BlameMessageBehavior;-import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;-import com.gitplex.web.component.diff.blob.SourceAware;-import com.gitplex.web.component.diff.blob.text.MarkAwareDiffBlock.Type;-import com.gitplex.web.component.diff.diffstat.DiffStatBar;-import com.gitplex.web.component.diff.difftitle.BlobDiffTitle;-import com.gitplex.web.component.diff.revision.BlobCommentSupport;-import com.gitplex.web.component.diff.revision.DiffViewMode;-import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;-import com.gitplex.web.page.depot.commit.CommitDetailPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.file.RequestCompareInfo;-import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;-import com.gitplex.web.util.DateUtils;-import com.google.common.base.Preconditions;-import com.gitplex.commons.git.Blame;-import com.gitplex.commons.git.BlobChange;-import com.gitplex.commons.git.BriefCommit;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.command.BlameCommand;-import com.gitplex.commons.lang.diff.DiffBlock;-import com.gitplex.commons.lang.diff.DiffMatchPatch.Operation;-import com.gitplex.commons.lang.diff.DiffUtils;-import com.gitplex.commons.lang.diff.LineDiff;-import com.gitplex.commons.lang.tokenizers.CmToken;-import com.gitplex.commons.util.Range;-import com.gitplex.commons.util.RangeUtils;-import com.gitplex.commons.util.StringUtils;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;--@SuppressWarnings("serial")-public class TextDiffPanel extends Panel implements SourceAware {-- private final IModel<Depot> depotModel;-- private final IModel<PullRequest> requestModel;-- private final BlobChange change;-- private final Map<Integer, Integer> contextSizes = new HashMap<>();-- private final DiffViewMode diffMode;-- private final IModel<Boolean> blameModel;-- private final BlobCommentSupport markSupport;-- private Component symbolTooltip;-- private AbstractPostAjaxBehavior callbackBehavior;-- private BlameMessageBehavior blameMessageBehavior;-- private transient List<MarkAwareDiffBlock> diffBlocks;-- private BlameInfo blameInfo;-- public TextDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,- @Nullable BlobCommentSupport markSupport) {- super(id);-- this.depotModel = depotModel;- this.requestModel = requestModel;- this.change = change;- this.diffMode = diffMode;- this.markSupport = markSupport;- this.blameModel = blameModel;-- if (blameModel != null && blameModel.getObject()) {- blameInfo = getBlameInfo();- }- }-- private String getJson(CommentPos mark) {- try {- MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(markInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- }-- private BlameInfo getBlameInfo() {- blameInfo = new BlameInfo();- BlameCommand cmd = new BlameCommand(depotModel.getObject().getDirectory());- String oldPath = change.getOldBlobIdent().path;- if (oldPath != null) {- cmd.commitHash(getOldCommit().name()).file(oldPath);- for (Blame blame: cmd.call().values()) {- for (Range range: blame.getRanges()) {- for (int i=range.getFrom(); i<range.getTo(); i++)- blameInfo.oldBlame.put(i, blame.getCommit());- }- }- }- String newPath = change.getNewBlobIdent().path;- if (newPath != null) {- cmd.commitHash(getNewCommit().name()).file(newPath);- for (Blame blame: cmd.call().values()) {- for (Range range: blame.getRanges()) {- for (int i=range.getFrom(); i<range.getTo(); i++)- blameInfo.newBlame.put(i, blame.getCommit());- }- }- }- return blameInfo;- }-- private WebMarkupContainer newActions() {- WebMarkupContainer actions = new WebMarkupContainer("actions");-- actions.add(new AjaxLink<Void>("blameFile") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(blameModel != null);- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (blameInfo != null) {- blameInfo = null;- } else {- blameInfo = getBlameInfo();- }- target.add(TextDiffPanel.this);- blameModel.setObject(blameInfo != null);- }-- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return blameInfo!=null? "active": "";- }-- })).setOutputMarkupId(true));-- Depot depot = depotModel.getObject();- PullRequest request = requestModel.getObject();- CodeComment comment;- if (markSupport != null && markSupport.getOpenComment() != null) {- comment = markSupport.getOpenComment();- } else {- comment = null;- }- DepotFilePage.State viewState = new DepotFilePage.State();- if (comment != null)- viewState.commentId = comment.getId();- viewState.blobIdent = change.getBlobIdent();-- PageParameters params = DepotFilePage.paramsOf(depot, viewState);- actions.add(new BookmarkablePageLink<Void>("viewFile", DepotFilePage.class, params));-- if (change.getType() != ChangeType.DELETE) {- if (request != null- && request.getSource() != null- && request.getSource().getObjectName(false) != null- && SecurityUtils.canModify(request.getSourceDepot(), request.getSourceBranch(), change.getPath())) {- // we are in context of a pull request and pull request source branch exists, so we edit source branch instead- Link<Void> editLink = new Link<Void>("editFile") {-- @Override- public void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();- editState.blobIdent.revision = request.getSourceBranch();- editState.blobIdent.path = change.getPath();- editState.mode = Mode.EDIT;- editState.requestCompareInfo = new RequestCompareInfo();- editState.requestCompareInfo.requestId = request.getId();- RequestChangesPage page = (RequestChangesPage) getPage();- editState.requestCompareInfo.compareState = page.getState();- PageParameters params = DepotFilePage.paramsOf(depot, editState);- setResponsePage(DepotFilePage.class, params);- }-- };- editLink.add(AttributeAppender.append("title", "Edit on source branch"));- actions.add(editLink);- } else if (SecurityUtils.canModify(depot, change.getBlobIdent().revision, change.getPath())- && depot.getBranchRef(change.getBlobIdent().revision) != null) {- // we are on a branch- Link<Void> editLink = new Link<Void>("editFile") {-- @Override- public void onClick() {- DepotFilePage.State editState = new DepotFilePage.State();- editState.blobIdent = change.getBlobIdent();- editState.mode = Mode.EDIT;- PageParameters params = DepotFilePage.paramsOf(depot, editState);- setResponsePage(DepotFilePage.class, params);- }-- };- editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));- actions.add(editLink);- } else {- actions.add(new WebMarkupContainer("editFile").setVisible(false));- }- } else {- actions.add(new WebMarkupContainer("editFile").setVisible(false));- }-- return actions;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));- add(new BlobDiffTitle("title", change));-- add(newActions());-- add(new Label("diffLines", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return renderDiffs();- }-- }).setEscapeModelStrings(false));-- add(callbackBehavior = new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- switch (params.getParameterValue("action").toString()) {- case "expand":- if (blameInfo != null) {- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- }- int index = params.getParameterValue("param1").toInt();- Integer lastContextSize = contextSizes.get(index);- if (lastContextSize == null)- lastContextSize = Constants.DIFF_CONTEXT_SIZE;- int contextSize = lastContextSize + Constants.DIFF_EXPAND_SIZE;- contextSizes.put(index, contextSize);-- StringBuilder builder = new StringBuilder();- appendEquals(builder, index, lastContextSize, contextSize);-- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");- expanded = StringUtils.replace(expanded, "\n", "");- String script = String.format("gitplex.textdiff.expand('%s', %d, \"%s\");",- getMarkupId(), index, expanded);- target.appendJavaScript(script);- break;- case "openSelectionPopover":- String jsonOfPosition = String.format("{left: %d, top: %d}",- params.getParameterValue("param1").toInt(),- params.getParameterValue("param2").toInt());- CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");- script = String.format("gitplex.textdiff.openSelectionPopover('%s', %s, %s, '%s', %s);",- getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),- SecurityUtils.getAccount()!=null);- target.appendJavaScript(script);- break;- case "addComment":- Preconditions.checkNotNull(SecurityUtils.getAccount());-- mark = getMark(params, "param1", "param2", "param3", "param4", "param5");- markSupport.onAddComment(target, mark);- script = String.format("gitplex.textdiff.onAddComment($('#%s'), %s);",- getMarkupId(), getJson(mark));- target.appendJavaScript(script);- break;- case "openComment":- Long commentId = params.getParameterValue("param1").toLong();- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);- markSupport.onOpenComment(target, comment);- script = String.format("gitplex.textdiff.onOpenComment($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- break;- }- }-- });-- add(blameMessageBehavior = new BlameMessageBehavior() {-- @Override- protected Depot getDepot() {- return depotModel.getObject();- }- });-- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", depotModel) {-- @Override- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {- setResponsePage(DepotFilePage.class, getQueryHitParams(hit));- }-- @Override- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {- WebSession.get().setMetaData(DepotFilePage.SEARCH_RESULT_KEY, (ArrayList<QueryHit>)hits);- setResponsePage(DepotFilePage.class, getFindOccurrencesParams());- }-- @Override- protected String getBlobPath() {- if (getRevision().equals(change.getNewBlobIdent().revision))- return change.getNewBlobIdent().path;- else- return change.getOldBlobIdent().path;- }-- };- add(symbolTooltip);-- setOutputMarkupId(true);- }-- private CommentPos getMark(IRequestParameters params, String leftSideParam,- String beginLineParam, String beginCharParam,- String endLineParam, String endCharParam) {- boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();- int beginLine = params.getParameterValue(beginLineParam).toInt();- int beginChar = params.getParameterValue(beginCharParam).toInt();- int endLine = params.getParameterValue(endLineParam).toInt();- int endChar = params.getParameterValue(endCharParam).toInt();- String commit = leftSide?getOldCommit().name():getNewCommit().name();- return new CommentPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));- }-- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {- MarkAwareDiffBlock block = getDiffBlocks().get(index);- if (index == 0) {- int start = block.getLines().size()-contextSize;- if (start < 0)- start=0;- else if (start > 0)- appendExpander(builder, index, start);- for (int j=start; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else if (index == getDiffBlocks().size()-1) {- int end = block.getLines().size();- int skipped = 0;- if (end > contextSize) {- skipped = end-contextSize;- end = contextSize;- }- for (int j=lastContextSize; j<end; j++)- appendEqual(builder, block, j, lastContextSize);- if (skipped != 0)- appendExpander(builder, index, skipped);- } else if (2*contextSize < block.getLines().size()) {- for (int j=lastContextSize; j<contextSize; j++)- appendEqual(builder, block, j, lastContextSize);- appendExpander(builder, index, block.getLines().size() - 2*contextSize);- for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- } else {- for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)- appendEqual(builder, block, j, lastContextSize);- }- }-- private void appendMarkedEquals(StringBuilder builder, int index) {- MarkAwareDiffBlock block = getDiffBlocks().get(index);- for (int i=0; i<block.getLines().size(); i++)- appendEqual(builder, block, i, 0);- }-- private RevCommit getOldCommit() {- return depotModel.getObject().getRevCommit(change.getOldBlobIdent().revision);- }-- private RevCommit getNewCommit() {- return depotModel.getObject().getRevCommit(change.getNewBlobIdent().revision);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));-- String jsonOfOldCommentInfos;- String jsonOfNewCommentInfos;- String jsonOfMark;- String jsonOfCommentInfo;- String dirtyContainerId;- if (markSupport != null) {- String oldCommitHash = getOldCommit().name();- Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();- Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();- for (CodeComment comment: markSupport.getComments()) {- if (comment.getCommentPos().getRange() != null) {- int line = comment.getCommentPos().getRange().getBeginLine();- List<CommentInfo> commentInfosAtLine;- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = new MarkInfo(comment, oldCommitHash);- if (commentInfo.mark.leftSide) {- commentInfosAtLine = oldCommentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- oldCommentInfos.put(line, commentInfosAtLine);- }- } else {- commentInfosAtLine = newCommentInfos.get(line);- if (commentInfosAtLine == null) {- commentInfosAtLine = new ArrayList<>();- newCommentInfos.put(line, commentInfosAtLine);- }- }- commentInfosAtLine.add(commentInfo);- }- }- for (List<CommentInfo> value: oldCommentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }- for (List<CommentInfo> value: newCommentInfos.values()) {- value.sort((o1, o2)->(int)(o1.id-o2.id));- }-- ObjectMapper mapper = GitPlex.getInstance(ObjectMapper.class);- try {- jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);- jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }-- CommentPos mark = markSupport.getMark();- if (mark != null) {- jsonOfMark = getJson(mark);- } else {- jsonOfMark = "undefined";- }- CodeComment comment = markSupport.getOpenComment();- if (comment != null) {- jsonOfCommentInfo = getJsonOfComment(comment);- } else {- jsonOfCommentInfo = "undefined";- }- dirtyContainerId = "'" + markSupport.getDirtyContainer().getMarkupId() + "'";- } else {- jsonOfMark = "undefined";- jsonOfCommentInfo = "undefined";- jsonOfOldCommentInfos = "undefined";- jsonOfNewCommentInfos = "undefined";- dirtyContainerId = "undefined";- }-- CharSequence callback = callbackBehavior.getCallbackFunction(- explicit("action"), explicit("param1"), explicit("param2"),- explicit("param3"), explicit("param4"), explicit("param5"),- explicit("param6"), explicit("param7"), explicit("param8"));- String script = String.format("gitplex.textdiff.init('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, '%s');",- getMarkupId(), symbolTooltip.getMarkupId(),- change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,- RequestCycle.get().find(AjaxRequestTarget.class) == null,- callback, blameMessageBehavior.getCallback(),- markSupport!=null, jsonOfMark, jsonOfCommentInfo,- jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,- GitPlex.getInstance().getDocLink());- response.render(OnDomReadyHeaderItem.forScript(script));- }-- private String renderDiffs() {- StringBuilder builder = new StringBuilder();- if (blameInfo != null) {- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- }-- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='240'></col>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }- } else {- if (blameInfo != null) {- builder.append(""- + "<colgroup>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='70'></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- } else {- builder.append(""- + "<colgroup>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "<col width='60'></col>"- + "<col width='15'></col>"- + "<col></col>"- + "</colgroup>");- }- }- for (int i=0; i<getDiffBlocks().size(); i++) {- MarkAwareDiffBlock block = getDiffBlocks().get(i);- if (block.getType() == Type.EQUAL) {- Integer lastContextSize = contextSizes.get(i);- if (lastContextSize == null)- lastContextSize = Constants.DIFF_CONTEXT_SIZE;- appendEquals(builder, i, 0, lastContextSize);- } else if (block.getType() == Type.MARKED_EQUAL) {- appendMarkedEquals(builder, i);- } else if (block.getType () == Type.DELETE) {- if (i+1<getDiffBlocks().size()) {- MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);- if (nextBlock.getType() == Type.INSERT) {- LinkedHashMap<Integer, LineDiff> lineChanges =- DiffUtils.align(block.getLines(), nextBlock.getLines());- if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {- for (int j=0; j<block.getLines().size(); j++) {- LineDiff lineDiff = lineChanges.get(j);- if (lineDiff != null) {- appendDelete(builder, block, j, lineDiff.getTokenDiffs());- } else {- appendDelete(builder, block, j, null);- }- }- Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();- for (LineDiff diff: lineChanges.values()) {- lineChangesByInsert.put(diff.getCompareLine(), diff);- }- for (int j=0; j<nextBlock.getLines().size(); j++) {- LineDiff lineDiff = lineChangesByInsert.get(j);- if (lineDiff != null) {- appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());- } else {- appendInsert(builder, nextBlock, j, null);- }- }- } else {- int prevDeleteLineIndex = 0;- int prevInsertLineIndex = 0;- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {- int deleteLineIndex = entry.getKey();- LineDiff lineChange = entry.getValue();- int insertLineIndex = lineChange.getCompareLine();-- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,- prevInsertLineIndex, insertLineIndex);-- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex, lineChange.getTokenDiffs());-- prevDeleteLineIndex = deleteLineIndex+1;- prevInsertLineIndex = insertLineIndex+1;- }- appendDeletesAndInserts(builder, block, nextBlock,- prevDeleteLineIndex, block.getLines().size(),- prevInsertLineIndex, nextBlock.getLines().size());- }- i++;- } else {- for (int j=0; j<block.getLines().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getLines().size(); j++)- appendDelete(builder, block, j, null);- }- } else {- for (int j=0; j<block.getLines().size(); j++)- appendInsert(builder, block, j, null);- }- }- return builder.toString();- }-- private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,- int fromInsertLineIndex, int toInsertLineIndex) {- if (diffMode == DiffViewMode.UNIFIED) {- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)- appendDelete(builder, deleteBlock, i, null);- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)- appendInsert(builder, insertBlock, i, null);- } else {- int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;- int insertSize = toInsertLineIndex - fromInsertLineIndex;- if (deleteSize < insertSize) {- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)- appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);- for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)- appendInsert(builder, insertBlock, i, null);- } else {- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)- appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);- for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)- appendDelete(builder, deleteBlock, i, null);- }- }- }-- private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {- BriefCommit commit;- if (newLineNo != -1)- commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));- else- commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));- if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)- || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)- || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {- CommitDetailPage.State state = new CommitDetailPage.State();- state.revision = commit.getHash();- state.whitespaceOption = change.getWhitespaceOption();- PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), state);- String url = urlFor(CommitDetailPage.class, params).toString();- if (diffMode == DiffViewMode.UNIFIED) {- builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),- DateUtils.formatDate(commit.getCommitter().getWhen()),- HtmlEscape.escapeHtml5(commit.getAuthor().getName())));- } else {- builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));- }- } else {- if (diffMode == DiffViewMode.UNIFIED) {- builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");- } else {- builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");- }- }- blameInfo.lastCommitHash = commit.getHash();- if (newLineNo != -1)- blameInfo.lastNewCommitHash = commit.getHash();- if (oldLineNo != -1)- blameInfo.lastOldCommitHash = commit.getHash();- }-- private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {- if (lastContextSize != 0)- builder.append("<tr class='code expanded'>");- else- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- int newLineNo = block.getNewStart() + lineIndex;-- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, newLineNo);- }- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens) {- builder.append(token.toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- }- builder.append("</tr>");- }-- private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int newLineNo = block.getNewStart() + lineIndex;- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'> </td>");- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.DELETE)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- } else {- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- builder.append("<td class='blame noselect'> </td>");- }- builder.append("<td class='number noselect'> </td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content left'> </td>");- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- builder.append("</td>");- }- builder.append("</tr>");- }-- private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = block.getOldStart() + lineIndex;- if (diffMode == DiffViewMode.UNIFIED ) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old'> </td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");- if (tokenDiffs != null) {- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.INSERT)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- } else {- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- List<CmToken> tokens = block.getLines().get(lineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (int i=0; i<tokens.size(); i++)- builder.append(tokens.get(i).toHtml(Operation.EQUAL));- }- builder.append("</td>");- if (blameInfo != null) {- builder.append("<td class='blame noselect'> </td>");- }- builder.append("<td class='number noselect'> </td>");- builder.append("<td class='operation noselect'> </td>");- builder.append("<td class='content right'> </td>");- }- builder.append("</tr>");- }-- private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {- builder.append("<tr class='code original'>");-- int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- List<CmToken> tokens = deleteBlock.getLines().get(deleteLineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens)- builder.append(token.toHtml(Operation.EQUAL));- }- builder.append("</td>");-- int newLineNo = insertBlock.getNewStart()+insertLineIndex;- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- tokens = insertBlock.getLines().get(insertLineIndex);- if (tokens.isEmpty()) {- builder.append(" ");- } else {- for (CmToken token: tokens)- builder.append(token.toHtml(Operation.EQUAL));- }- builder.append("</td>");-- builder.append("</tr>");- }-- private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,- List<DiffBlock<CmToken>> tokenDiffs) {- builder.append("<tr class='code original'>");-- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;- int newLineNo = insertBlock.getNewStart() + insertLineIndex;- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, newLineNo);- }- builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect old new'>*</td>");- builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits())- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- builder.append("</td>");- } else {- if (blameInfo != null) {- appendBlame(builder, oldLineNo, -1);- }- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");- builder.append("<td class='operation noselect old'>-</td>");- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.INSERT)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- builder.append("</td>");-- if (blameInfo != null) {- appendBlame(builder, -1, newLineNo);- }- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");- builder.append("<td class='operation noselect new'>+</td>");- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");- if (tokenDiffs.isEmpty()) {- builder.append(" ");- } else {- for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {- for (CmToken token: tokenBlock.getUnits()) {- if (tokenBlock.getOperation() != Operation.DELETE)- builder.append(token.toHtml(tokenBlock.getOperation()));- }- }- }- builder.append("</td>");- }-- builder.append("</tr>");- }-- private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {- builder.append("<tr class='expander expander").append(blockIndex).append("'>");-- String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);- if (diffMode == DiffViewMode.UNIFIED) {- if (blameInfo != null) {- builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- } else {- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");- }- builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- } else {- if (blameInfo != null) {- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)- .append("\"><i class='fa fa-sort'></i></a></td>");- builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- blameInfo.lastCommitHash = null;- blameInfo.lastOldCommitHash = null;- blameInfo.lastNewCommitHash = null;- } else {- builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)- .append("\"><i class='fa fa-sort'></i></a></td>");- builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");- }- }- builder.append("</tr>");- }-- private List<MarkAwareDiffBlock> getDiffBlocks() {- if (diffBlocks == null) {- diffBlocks = new ArrayList<>();- List<Range> oldRanges = new ArrayList<>();- List<Range> newRanges = new ArrayList<>();- if (markSupport != null) {- List<CommentPos> marks = new ArrayList<>();- CommentPos mark = markSupport.getMark();- if (mark != null) {- marks.add(mark);- }- String oldCommitHash = getOldCommit().name();- for (CodeComment comment: markSupport.getComments()) {- mark = comment.getCommentPos();- marks.add(mark);- }- for (CommentPos each: marks) {- Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);- if (each.getCommit().equals(oldCommitHash)) {- oldRanges.add(range);- } else {- newRanges.add(range);- }- }- }-- for (DiffBlock<List<CmToken>> diffBlock: change.getDiffBlocks()) {- if (diffBlock.getOperation() == Operation.DELETE) {- diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),- diffBlock.getOldStart(), diffBlock.getNewStart()));- } else if (diffBlock.getOperation() == Operation.INSERT) {- diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),- diffBlock.getOldStart(), diffBlock.getNewStart()));- } else {- List<Range> ranges = new ArrayList<>();- for (Range range: oldRanges) {- ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));- }- for (Range range: newRanges) {- ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));- }- ranges = RangeUtils.merge(ranges);-- int lastIndex = 0;- for (Range range: ranges) {- int from = range.getFrom();- int to = range.getTo();- if (from < diffBlock.getUnits().size() && to > 0) {- if (from < lastIndex)- from = lastIndex;- if (to > diffBlock.getUnits().size())- to = diffBlock.getUnits().size();- if (lastIndex < from) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, from);- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));- }- if (from < to) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(from, to);- diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,- diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));- }- lastIndex = to;- }- }-- if (lastIndex < diffBlock.getUnits().size()) {- List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));- }- }- }- }- return diffBlocks;- }-- @Override- protected void onDetach() {- depotModel.detach();- requestModel.detach();-- if (blameModel != null)- blameModel.detach();-- super.onDetach();- }-- private String getJsonOfComment(CodeComment comment) {- CommentInfo commentInfo = new CommentInfo();- commentInfo.id = comment.getId();- commentInfo.mark = new MarkInfo(comment, getOldCommit().name());-- String jsonOfCommentInfo;- try {- jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- return jsonOfCommentInfo;- }-- @Override- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCommentDeleted($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- mark(target, null);- }-- @Override- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCloseComment($('#%s'));", getMarkupId());- target.appendJavaScript(script);- mark(target, null);- }-- @Override- public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {- String script = String.format("gitplex.textdiff.onCommentAdded($('#%s'), %s);",- getMarkupId(), getJsonOfComment(comment));- target.appendJavaScript(script);- }-- @Override- public void mark(AjaxRequestTarget target, CommentPos mark) {- String script;- if (mark != null) {- script = String.format(""- + "var $container = $('#%s');"- + "var mark = %s;"- + "gitplex.textdiff.scroll($container, mark);"- + "gitplex.textdiff.mark($container, mark);",- getMarkupId(), getJson(mark));- } else {- script = String.format(""- + "var $container = $('#%s');"- + "gitplex.textdiff.clearMark($container);"- + "$container.removeData('mark');",- getMarkupId());- }- target.appendJavaScript(script);- }-- @Override- public void onUnblame(AjaxRequestTarget target) {- blameInfo = null;- target.add(this);- }-- @SuppressWarnings("unused")- private static class CommentInfo {- long id;-- String title;-- MarkInfo mark;- }-- @SuppressWarnings("unused")- private static class MarkInfo extends TextRange {-- String path;-- boolean leftSide;-- public MarkInfo() {-- }-- public MarkInfo(CodeComment comment, String oldCommitHash) {- super(comment.getCommentPos().getRange());- path = comment.getCommentPos().getPath();- leftSide = comment.getCommentPos().getCommit().equals(oldCommitHash);- }-- public MarkInfo(CommentPos mark, String oldCommitHash) {- super(mark.getRange());- path = mark.getPath();- leftSide = mark.getCommit().equals(oldCommitHash);- }-- }-- private static class BlameInfo implements Serializable {-- Map<Integer, BriefCommit> oldBlame = new HashMap<>();-- Map<Integer, BriefCommit> newBlame = new HashMap<>();-- String lastCommitHash;-- String lastOldCommitHash;-- String lastNewCommitHash;-- }--}+package com.gitplex.web.component.diff.blob.text;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.protocol.http.WebSession;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.revwalk.RevCommit;+import org.unbescape.html.HtmlEscape;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.CodeComment;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.PullRequest;+import com.gitplex.core.entity.support.CommentPos;+import com.gitplex.core.entity.support.TextRange;+import com.gitplex.core.manager.CodeCommentManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.search.hit.QueryHit;+import com.gitplex.web.Constants;+import com.gitplex.web.behavior.blamemessage.BlameMessageBehavior;+import com.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;+import com.gitplex.web.component.diff.blob.SourceAware;+import com.gitplex.web.component.diff.blob.text.MarkAwareDiffBlock.Type;+import com.gitplex.web.component.diff.diffstat.DiffStatBar;+import com.gitplex.web.component.diff.difftitle.BlobDiffTitle;+import com.gitplex.web.component.diff.revision.BlobCommentSupport;+import com.gitplex.web.component.diff.revision.DiffViewMode;+import com.gitplex.web.component.symboltooltip.SymbolTooltipPanel;+import com.gitplex.web.page.depot.commit.CommitDetailPage;+import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.web.page.depot.file.RequestCompareInfo;+import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;+import com.gitplex.web.util.DateUtils;+import com.google.common.base.Preconditions;+import com.gitplex.commons.git.Blame;+import com.gitplex.commons.git.BlobChange;+import com.gitplex.commons.git.BriefCommit;+import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.command.BlameCommand;+import com.gitplex.commons.lang.diff.DiffBlock;+import com.gitplex.commons.lang.diff.DiffMatchPatch.Operation;+import com.gitplex.commons.lang.diff.DiffUtils;+import com.gitplex.commons.lang.diff.LineDiff;+import com.gitplex.commons.lang.tokenizers.CmToken;+import com.gitplex.commons.util.Range;+import com.gitplex.commons.util.RangeUtils;+import com.gitplex.commons.util.StringUtils;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;++@SuppressWarnings("serial")+public class TextDiffPanel extends Panel implements SourceAware {++ private final IModel<Depot> depotModel;++ private final IModel<PullRequest> requestModel;++ private final BlobChange change;++ private final Map<Integer, Integer> contextSizes = new HashMap<>();++ private final DiffViewMode diffMode;++ private final IModel<Boolean> blameModel;++ private final BlobCommentSupport markSupport;++ private Component symbolTooltip;++ private AbstractPostAjaxBehavior callbackBehavior;++ private BlameMessageBehavior blameMessageBehavior;++ private transient List<MarkAwareDiffBlock> diffBlocks;++ private BlameInfo blameInfo;++ public TextDiffPanel(String id, IModel<Depot> depotModel, IModel<PullRequest> requestModel,+ BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,+ @Nullable BlobCommentSupport markSupport) {+ super(id);++ this.depotModel = depotModel;+ this.requestModel = requestModel;+ this.change = change;+ this.diffMode = diffMode;+ this.markSupport = markSupport;+ this.blameModel = blameModel;++ if (blameModel != null && blameModel.getObject()) {+ blameInfo = getBlameInfo();+ }+ }++ private String getJson(CommentPos mark) {+ try {+ MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(markInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ private BlameInfo getBlameInfo() {+ blameInfo = new BlameInfo();+ BlameCommand cmd = new BlameCommand(depotModel.getObject().getDirectory());+ String oldPath = change.getOldBlobIdent().path;+ if (oldPath != null) {+ cmd.commitHash(getOldCommit().name()).file(oldPath);+ for (Blame blame: cmd.call().values()) {+ for (Range range: blame.getRanges()) {+ for (int i=range.getFrom(); i<range.getTo(); i++)+ blameInfo.oldBlame.put(i, blame.getCommit());+ }+ }+ }+ String newPath = change.getNewBlobIdent().path;+ if (newPath != null) {+ cmd.commitHash(getNewCommit().name()).file(newPath);+ for (Blame blame: cmd.call().values()) {+ for (Range range: blame.getRanges()) {+ for (int i=range.getFrom(); i<range.getTo(); i++)+ blameInfo.newBlame.put(i, blame.getCommit());+ }+ }+ }+ return blameInfo;+ }++ private WebMarkupContainer newActions() {+ WebMarkupContainer actions = new WebMarkupContainer("actions");++ actions.add(new AjaxLink<Void>("blameFile") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(blameModel != null);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (blameInfo != null) {+ blameInfo = null;+ } else {+ blameInfo = getBlameInfo();+ }+ target.add(TextDiffPanel.this);+ blameModel.setObject(blameInfo != null);+ }++ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return blameInfo!=null? "active": "";+ }++ })).setOutputMarkupId(true));++ Depot depot = depotModel.getObject();+ PullRequest request = requestModel.getObject();+ CodeComment comment;+ if (markSupport != null && markSupport.getOpenComment() != null) {+ comment = markSupport.getOpenComment();+ } else {+ comment = null;+ }+ DepotFilePage.State viewState = new DepotFilePage.State();+ if (comment != null)+ viewState.commentId = comment.getId();+ viewState.blobIdent = change.getBlobIdent();++ PageParameters params = DepotFilePage.paramsOf(depot, viewState);+ actions.add(new BookmarkablePageLink<Void>("viewFile", DepotFilePage.class, params));++ if (change.getType() != ChangeType.DELETE) {+ if (request != null+ && request.getSource() != null+ && request.getSource().getObjectName(false) != null+ && SecurityUtils.canModify(request.getSourceDepot(), request.getSourceBranch(), change.getPath())) {+ // we are in context of a pull request and pull request source branch exists, so we edit source branch instead+ Link<Void> editLink = new Link<Void>("editFile") {++ @Override+ public void onClick() {+ DepotFilePage.State editState = new DepotFilePage.State();+ editState.blobIdent.revision = request.getSourceBranch();+ editState.blobIdent.path = change.getPath();+ editState.mode = Mode.EDIT;+ editState.requestCompareInfo = new RequestCompareInfo();+ editState.requestCompareInfo.requestId = request.getId();+ RequestChangesPage page = (RequestChangesPage) getPage();+ editState.requestCompareInfo.compareState = page.getState();+ PageParameters params = DepotFilePage.paramsOf(depot, editState);+ setResponsePage(DepotFilePage.class, params);+ }++ };+ editLink.add(AttributeAppender.append("title", "Edit on source branch"));+ actions.add(editLink);+ } else if (SecurityUtils.canModify(depot, change.getBlobIdent().revision, change.getPath())+ && depot.getBranchRef(change.getBlobIdent().revision) != null) {+ // we are on a branch+ Link<Void> editLink = new Link<Void>("editFile") {++ @Override+ public void onClick() {+ DepotFilePage.State editState = new DepotFilePage.State();+ editState.blobIdent = change.getBlobIdent();+ editState.mode = Mode.EDIT;+ PageParameters params = DepotFilePage.paramsOf(depot, editState);+ setResponsePage(DepotFilePage.class, params);+ }++ };+ editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));+ actions.add(editLink);+ } else {+ actions.add(new WebMarkupContainer("editFile").setVisible(false));+ }+ } else {+ actions.add(new WebMarkupContainer("editFile").setVisible(false));+ }++ return actions;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));+ add(new BlobDiffTitle("title", change));++ add(newActions());++ add(new Label("diffLines", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return renderDiffs();+ }++ }).setEscapeModelStrings(false));++ add(callbackBehavior = new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ switch (params.getParameterValue("action").toString()) {+ case "expand":+ if (blameInfo != null) {+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ }+ int index = params.getParameterValue("param1").toInt();+ Integer lastContextSize = contextSizes.get(index);+ if (lastContextSize == null)+ lastContextSize = Constants.DIFF_CONTEXT_SIZE;+ int contextSize = lastContextSize + Constants.DIFF_EXPAND_SIZE;+ contextSizes.put(index, contextSize);++ StringBuilder builder = new StringBuilder();+ appendEquals(builder, index, lastContextSize, contextSize);++ String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");+ expanded = StringUtils.replace(expanded, "\n", "");+ String script = String.format("gitplex.textdiff.expand('%s', %d, \"%s\");",+ getMarkupId(), index, expanded);+ target.appendJavaScript(script);+ break;+ case "openSelectionPopover":+ String jsonOfPosition = String.format("{left: %d, top: %d}",+ params.getParameterValue("param1").toInt(),+ params.getParameterValue("param2").toInt());+ CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");+ script = String.format("gitplex.textdiff.openSelectionPopover('%s', %s, %s, '%s', %s);",+ getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),+ SecurityUtils.getAccount()!=null);+ target.appendJavaScript(script);+ break;+ case "addComment":+ Preconditions.checkNotNull(SecurityUtils.getAccount());++ mark = getMark(params, "param1", "param2", "param3", "param4", "param5");+ markSupport.onAddComment(target, mark);+ script = String.format("gitplex.textdiff.onAddComment($('#%s'), %s);",+ getMarkupId(), getJson(mark));+ target.appendJavaScript(script);+ break;+ case "openComment":+ Long commentId = params.getParameterValue("param1").toLong();+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);+ markSupport.onOpenComment(target, comment);+ script = String.format("gitplex.textdiff.onOpenComment($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ break;+ }+ }++ });++ add(blameMessageBehavior = new BlameMessageBehavior() {++ @Override+ protected Depot getDepot() {+ return depotModel.getObject();+ }+ });++ symbolTooltip = new SymbolTooltipPanel("symbolTooltip", depotModel) {++ @Override+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {+ setResponsePage(DepotFilePage.class, getQueryHitParams(hit));+ }++ @Override+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {+ WebSession.get().setMetaData(DepotFilePage.SEARCH_RESULT_KEY, (ArrayList<QueryHit>)hits);+ setResponsePage(DepotFilePage.class, getFindOccurrencesParams());+ }++ @Override+ protected String getBlobPath() {+ if (getRevision().equals(change.getNewBlobIdent().revision))+ return change.getNewBlobIdent().path;+ else+ return change.getOldBlobIdent().path;+ }++ };+ add(symbolTooltip);++ setOutputMarkupId(true);+ }++ private CommentPos getMark(IRequestParameters params, String leftSideParam,+ String beginLineParam, String beginCharParam,+ String endLineParam, String endCharParam) {+ boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();+ int beginLine = params.getParameterValue(beginLineParam).toInt();+ int beginChar = params.getParameterValue(beginCharParam).toInt();+ int endLine = params.getParameterValue(endLineParam).toInt();+ int endChar = params.getParameterValue(endCharParam).toInt();+ String commit = leftSide?getOldCommit().name():getNewCommit().name();+ return new CommentPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));+ }++ private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {+ MarkAwareDiffBlock block = getDiffBlocks().get(index);+ if (index == 0) {+ int start = block.getLines().size()-contextSize;+ if (start < 0)+ start=0;+ else if (start > 0)+ appendExpander(builder, index, start);+ for (int j=start; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else if (index == getDiffBlocks().size()-1) {+ int end = block.getLines().size();+ int skipped = 0;+ if (end > contextSize) {+ skipped = end-contextSize;+ end = contextSize;+ }+ for (int j=lastContextSize; j<end; j++)+ appendEqual(builder, block, j, lastContextSize);+ if (skipped != 0)+ appendExpander(builder, index, skipped);+ } else if (2*contextSize < block.getLines().size()) {+ for (int j=lastContextSize; j<contextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ appendExpander(builder, index, block.getLines().size() - 2*contextSize);+ for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ } else {+ for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)+ appendEqual(builder, block, j, lastContextSize);+ }+ }++ private void appendMarkedEquals(StringBuilder builder, int index) {+ MarkAwareDiffBlock block = getDiffBlocks().get(index);+ for (int i=0; i<block.getLines().size(); i++)+ appendEqual(builder, block, i, 0);+ }++ private RevCommit getOldCommit() {+ return depotModel.getObject().getRevCommit(change.getOldBlobIdent().revision);+ }++ private RevCommit getNewCommit() {+ return depotModel.getObject().getRevCommit(change.getNewBlobIdent().revision);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));++ String jsonOfOldCommentInfos;+ String jsonOfNewCommentInfos;+ String jsonOfMark;+ String jsonOfCommentInfo;+ String dirtyContainerId;+ if (markSupport != null) {+ String oldCommitHash = getOldCommit().name();+ Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();+ Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();+ for (CodeComment comment: markSupport.getComments()) {+ if (comment.getCommentPos().getRange() != null) {+ int line = comment.getCommentPos().getRange().getBeginLine();+ List<CommentInfo> commentInfosAtLine;+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = new MarkInfo(comment, oldCommitHash);+ if (commentInfo.mark.leftSide) {+ commentInfosAtLine = oldCommentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ oldCommentInfos.put(line, commentInfosAtLine);+ }+ } else {+ commentInfosAtLine = newCommentInfos.get(line);+ if (commentInfosAtLine == null) {+ commentInfosAtLine = new ArrayList<>();+ newCommentInfos.put(line, commentInfosAtLine);+ }+ }+ commentInfosAtLine.add(commentInfo);+ }+ }+ for (List<CommentInfo> value: oldCommentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }+ for (List<CommentInfo> value: newCommentInfos.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }++ ObjectMapper mapper = GitPlex.getInstance(ObjectMapper.class);+ try {+ jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);+ jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }++ CommentPos mark = markSupport.getMark();+ if (mark != null) {+ jsonOfMark = getJson(mark);+ } else {+ jsonOfMark = "undefined";+ }+ CodeComment comment = markSupport.getOpenComment();+ if (comment != null) {+ jsonOfCommentInfo = getJsonOfComment(comment);+ } else {+ jsonOfCommentInfo = "undefined";+ }+ dirtyContainerId = "'" + markSupport.getDirtyContainer().getMarkupId() + "'";+ } else {+ jsonOfMark = "undefined";+ jsonOfCommentInfo = "undefined";+ jsonOfOldCommentInfos = "undefined";+ jsonOfNewCommentInfos = "undefined";+ dirtyContainerId = "undefined";+ }++ CharSequence callback = callbackBehavior.getCallbackFunction(+ explicit("action"), explicit("param1"), explicit("param2"),+ explicit("param3"), explicit("param4"), explicit("param5"),+ explicit("param6"), explicit("param7"), explicit("param8"));+ String script = String.format("gitplex.textdiff.init('%s', '%s', '%s', '%s', %s, %s, %s, %s, %s, %s, %s, %s, %s, '%s');",+ getMarkupId(), symbolTooltip.getMarkupId(),+ change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,+ RequestCycle.get().find(AjaxRequestTarget.class) == null,+ callback, blameMessageBehavior.getCallback(),+ markSupport!=null, jsonOfMark, jsonOfCommentInfo,+ jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,+ GitPlex.getInstance().getDocLink());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ private String renderDiffs() {+ StringBuilder builder = new StringBuilder();+ if (blameInfo != null) {+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ }++ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ builder.append(""+ + "<colgroup>"+ + "<col width='240'></col>"+ + "<col width='60'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ } else {+ builder.append(""+ + "<colgroup>"+ + "<col width='60'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ }+ } else {+ if (blameInfo != null) {+ builder.append(""+ + "<colgroup>"+ + "<col width='70'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "<col width='70'></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ } else {+ builder.append(""+ + "<colgroup>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "<col width='60'></col>"+ + "<col width='15'></col>"+ + "<col></col>"+ + "</colgroup>");+ }+ }+ for (int i=0; i<getDiffBlocks().size(); i++) {+ MarkAwareDiffBlock block = getDiffBlocks().get(i);+ if (block.getType() == Type.EQUAL) {+ Integer lastContextSize = contextSizes.get(i);+ if (lastContextSize == null)+ lastContextSize = Constants.DIFF_CONTEXT_SIZE;+ appendEquals(builder, i, 0, lastContextSize);+ } else if (block.getType() == Type.MARKED_EQUAL) {+ appendMarkedEquals(builder, i);+ } else if (block.getType () == Type.DELETE) {+ if (i+1<getDiffBlocks().size()) {+ MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);+ if (nextBlock.getType() == Type.INSERT) {+ LinkedHashMap<Integer, LineDiff> lineChanges =+ DiffUtils.align(block.getLines(), nextBlock.getLines());+ if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {+ for (int j=0; j<block.getLines().size(); j++) {+ LineDiff lineDiff = lineChanges.get(j);+ if (lineDiff != null) {+ appendDelete(builder, block, j, lineDiff.getTokenDiffs());+ } else {+ appendDelete(builder, block, j, null);+ }+ }+ Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();+ for (LineDiff diff: lineChanges.values()) {+ lineChangesByInsert.put(diff.getCompareLine(), diff);+ }+ for (int j=0; j<nextBlock.getLines().size(); j++) {+ LineDiff lineDiff = lineChangesByInsert.get(j);+ if (lineDiff != null) {+ appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());+ } else {+ appendInsert(builder, nextBlock, j, null);+ }+ }+ } else {+ int prevDeleteLineIndex = 0;+ int prevInsertLineIndex = 0;+ for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {+ int deleteLineIndex = entry.getKey();+ LineDiff lineChange = entry.getValue();+ int insertLineIndex = lineChange.getCompareLine();++ appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,+ prevInsertLineIndex, insertLineIndex);++ appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex, lineChange.getTokenDiffs());++ prevDeleteLineIndex = deleteLineIndex+1;+ prevInsertLineIndex = insertLineIndex+1;+ }+ appendDeletesAndInserts(builder, block, nextBlock,+ prevDeleteLineIndex, block.getLines().size(),+ prevInsertLineIndex, nextBlock.getLines().size());+ }+ i++;+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendDelete(builder, block, j, null);+ }+ } else {+ for (int j=0; j<block.getLines().size(); j++)+ appendInsert(builder, block, j, null);+ }+ }+ return builder.toString();+ }++ private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,+ int fromInsertLineIndex, int toInsertLineIndex) {+ if (diffMode == DiffViewMode.UNIFIED) {+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)+ appendDelete(builder, deleteBlock, i, null);+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)+ appendInsert(builder, insertBlock, i, null);+ } else {+ int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;+ int insertSize = toInsertLineIndex - fromInsertLineIndex;+ if (deleteSize < insertSize) {+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)+ appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);+ for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)+ appendInsert(builder, insertBlock, i, null);+ } else {+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)+ appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);+ for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)+ appendDelete(builder, deleteBlock, i, null);+ }+ }+ }++ private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {+ BriefCommit commit;+ if (newLineNo != -1)+ commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));+ else+ commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));+ if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)+ || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)+ || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {+ CommitDetailPage.State state = new CommitDetailPage.State();+ state.revision = commit.getHash();+ state.whitespaceOption = change.getWhitespaceOption();+ PageParameters params = CommitDetailPage.paramsOf(depotModel.getObject(), state);+ String url = urlFor(CommitDetailPage.class, params).toString();+ if (diffMode == DiffViewMode.UNIFIED) {+ builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),+ DateUtils.formatDate(commit.getCommitter().getWhen()),+ HtmlEscape.escapeHtml5(commit.getAuthor().getName())));+ } else {+ builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));+ }+ } else {+ if (diffMode == DiffViewMode.UNIFIED) {+ builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");+ } else {+ builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");+ }+ }+ blameInfo.lastCommitHash = commit.getHash();+ if (newLineNo != -1)+ blameInfo.lastNewCommitHash = commit.getHash();+ if (oldLineNo != -1)+ blameInfo.lastOldCommitHash = commit.getHash();+ }++ private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {+ if (lastContextSize != 0)+ builder.append("<tr class='code expanded'>");+ else+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ int newLineNo = block.getNewStart() + lineIndex;++ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, newLineNo);+ }+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens) {+ builder.append(token.toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ }+ builder.append("</tr>");+ }++ private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int newLineNo = block.getNewStart() + lineIndex;+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'> </td>");+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.DELETE)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ } else {+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ builder.append("<td class='blame noselect'> </td>");+ }+ builder.append("<td class='number noselect'> </td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content left'> </td>");+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ builder.append("</td>");+ }+ builder.append("</tr>");+ }++ private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, @Nullable List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = block.getOldStart() + lineIndex;+ if (diffMode == DiffViewMode.UNIFIED ) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old'> </td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");+ if (tokenDiffs != null) {+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.INSERT)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ } else {+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ List<CmToken> tokens = block.getLines().get(lineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (int i=0; i<tokens.size(); i++)+ builder.append(tokens.get(i).toHtml(Operation.EQUAL));+ }+ builder.append("</td>");+ if (blameInfo != null) {+ builder.append("<td class='blame noselect'> </td>");+ }+ builder.append("<td class='number noselect'> </td>");+ builder.append("<td class='operation noselect'> </td>");+ builder.append("<td class='content right'> </td>");+ }+ builder.append("</tr>");+ }++ private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {+ builder.append("<tr class='code original'>");++ int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ List<CmToken> tokens = deleteBlock.getLines().get(deleteLineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens)+ builder.append(token.toHtml(Operation.EQUAL));+ }+ builder.append("</td>");++ int newLineNo = insertBlock.getNewStart()+insertLineIndex;+ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ tokens = insertBlock.getLines().get(insertLineIndex);+ if (tokens.isEmpty()) {+ builder.append(" ");+ } else {+ for (CmToken token: tokens)+ builder.append(token.toHtml(Operation.EQUAL));+ }+ builder.append("</td>");++ builder.append("</tr>");+ }++ private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,+ List<DiffBlock<CmToken>> tokenDiffs) {+ builder.append("<tr class='code original'>");++ int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;+ int newLineNo = insertBlock.getNewStart() + insertLineIndex;+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, newLineNo);+ }+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old new'>*</td>");+ builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits())+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ builder.append("</td>");+ } else {+ if (blameInfo != null) {+ appendBlame(builder, oldLineNo, -1);+ }+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");+ builder.append("<td class='operation noselect old'>-</td>");+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.INSERT)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ builder.append("</td>");++ if (blameInfo != null) {+ appendBlame(builder, -1, newLineNo);+ }+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");+ builder.append("<td class='operation noselect new'>+</td>");+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");+ if (tokenDiffs.isEmpty()) {+ builder.append(" ");+ } else {+ for (DiffBlock<CmToken> tokenBlock: tokenDiffs) {+ for (CmToken token: tokenBlock.getUnits()) {+ if (tokenBlock.getOperation() != Operation.DELETE)+ builder.append(token.toHtml(tokenBlock.getOperation()));+ }+ }+ }+ builder.append("</td>");+ }++ builder.append("</tr>");+ }++ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");++ String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);+ if (diffMode == DiffViewMode.UNIFIED) {+ if (blameInfo != null) {+ builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ } else {+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");+ }+ builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ } else {+ if (blameInfo != null) {+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)+ .append("\"><i class='fa fa-sort'></i></a></td>");+ builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ blameInfo.lastCommitHash = null;+ blameInfo.lastOldCommitHash = null;+ blameInfo.lastNewCommitHash = null;+ } else {+ builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)+ .append("\"><i class='fa fa-sort'></i></a></td>");+ builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");+ }+ }+ builder.append("</tr>");+ }++ private List<MarkAwareDiffBlock> getDiffBlocks() {+ if (diffBlocks == null) {+ diffBlocks = new ArrayList<>();+ List<Range> oldRanges = new ArrayList<>();+ List<Range> newRanges = new ArrayList<>();+ if (markSupport != null) {+ List<CommentPos> marks = new ArrayList<>();+ CommentPos mark = markSupport.getMark();+ if (mark != null) {+ marks.add(mark);+ }+ String oldCommitHash = getOldCommit().name();+ for (CodeComment comment: markSupport.getComments()) {+ mark = comment.getCommentPos();+ marks.add(mark);+ }+ for (CommentPos each: marks) {+ Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);+ if (each.getCommit().equals(oldCommitHash)) {+ oldRanges.add(range);+ } else {+ newRanges.add(range);+ }+ }+ }++ for (DiffBlock<List<CmToken>> diffBlock: change.getDiffBlocks()) {+ if (diffBlock.getOperation() == Operation.DELETE) {+ diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),+ diffBlock.getOldStart(), diffBlock.getNewStart()));+ } else if (diffBlock.getOperation() == Operation.INSERT) {+ diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),+ diffBlock.getOldStart(), diffBlock.getNewStart()));+ } else {+ List<Range> ranges = new ArrayList<>();+ for (Range range: oldRanges) {+ ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));+ }+ for (Range range: newRanges) {+ ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));+ }+ ranges = RangeUtils.merge(ranges);++ int lastIndex = 0;+ for (Range range: ranges) {+ int from = range.getFrom();+ int to = range.getTo();+ if (from < diffBlock.getUnits().size() && to > 0) {+ if (from < lastIndex)+ from = lastIndex;+ if (to > diffBlock.getUnits().size())+ to = diffBlock.getUnits().size();+ if (lastIndex < from) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, from);+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));+ }+ if (from < to) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(from, to);+ diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,+ diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));+ }+ lastIndex = to;+ }+ }++ if (lastIndex < diffBlock.getUnits().size()) {+ List<List<CmToken>> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));+ }+ }+ }+ }+ return diffBlocks;+ }++ @Override+ protected void onDetach() {+ depotModel.detach();+ requestModel.detach();++ if (blameModel != null)+ blameModel.detach();++ super.onDetach();+ }++ private String getJsonOfComment(CodeComment comment) {+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.mark = new MarkInfo(comment, getOldCommit().name());++ String jsonOfCommentInfo;+ try {+ jsonOfCommentInfo = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ return jsonOfCommentInfo;+ }++ @Override+ public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.textdiff.onCommentDeleted($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ mark(target, null);+ }++ @Override+ public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.textdiff.onCloseComment($('#%s'));", getMarkupId());+ target.appendJavaScript(script);+ mark(target, null);+ }++ @Override+ public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {+ String script = String.format("gitplex.textdiff.onCommentAdded($('#%s'), %s);",+ getMarkupId(), getJsonOfComment(comment));+ target.appendJavaScript(script);+ }++ @Override+ public void mark(AjaxRequestTarget target, CommentPos mark) {+ String script;+ if (mark != null) {+ script = String.format(""+ + "var $container = $('#%s');"+ + "var mark = %s;"+ + "gitplex.textdiff.scroll($container, mark);"+ + "gitplex.textdiff.mark($container, mark);",+ getMarkupId(), getJson(mark));+ } else {+ script = String.format(""+ + "var $container = $('#%s');"+ + "gitplex.textdiff.clearMark($container);"+ + "$container.removeData('mark');",+ getMarkupId());+ }+ target.appendJavaScript(script);+ }++ @Override+ public void onUnblame(AjaxRequestTarget target) {+ blameInfo = null;+ target.add(this);+ }++ @SuppressWarnings("unused")+ private static class CommentInfo {+ long id;++ String title;++ MarkInfo mark;+ }++ @SuppressWarnings("unused")+ private static class MarkInfo extends TextRange {++ String path;++ boolean leftSide;++ public MarkInfo() {++ }++ public MarkInfo(CodeComment comment, String oldCommitHash) {+ super(comment.getCommentPos().getRange());+ path = comment.getCommentPos().getPath();+ leftSide = comment.getCommentPos().getCommit().equals(oldCommitHash);+ }++ public MarkInfo(CommentPos mark, String oldCommitHash) {+ super(mark.getRange());+ path = mark.getPath();+ leftSide = mark.getCommit().equals(oldCommitHash);+ }++ }++ private static class BlameInfo implements Serializable {++ Map<Integer, BriefCommit> oldBlame = new HashMap<>();++ Map<Integer, BriefCommit> newBlame = new HashMap<>();++ String lastCommitHash;++ String lastOldCommitHash;++ String lastNewCommitHash;++ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.javaindex 977ef1213a..87afab050d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java@@ -1,489 +1,476 @@-package com.gitplex.web.component.revisionpicker;--import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;--import java.io.IOException;-import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.AttributeModifier;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.errors.AmbiguousObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Ref;-import org.unbescape.html.HtmlEscape;--import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.google.common.base.Preconditions;-import com.google.common.base.Throwables;-import com.gitplex.commons.git.GitUtils;-import com.gitplex.commons.git.RefInfo;-import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;-import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;-import com.gitplex.commons.wicket.behavior.InputChangeBehavior;-import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;-import com.gitplex.commons.wicket.component.modal.ModalPanel;-import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;-import com.gitplex.commons.wicket.component.tabbable.Tab;-import com.gitplex.commons.wicket.component.tabbable.Tabbable;--@SuppressWarnings("serial")-public abstract class RevisionSelector extends Panel {-- private static final int PAGE_SIZE = 25;-- private final IModel<Depot> depotModel;-- private static final String COMMIT_FLAG = "*";-- private static final String ADD_FLAG = "~";-- private final String revision;-- private final boolean canCreateBranch;-- private final boolean canCreateTag;-- private boolean branchesActive;-- private Label feedback;-- private String feedbackMessage;-- private TextField<String> revField;-- private WebMarkupContainer itemsContainer;-- private RepeatingView itemsView;-- private List<String> refs;-- private List<String> itemValues;-- private int page = 1;-- private List<String> findRefs() {- List<String> names = new ArrayList<>();-- if (branchesActive) {- for (RefInfo ref: depotModel.getObject().getBranches())- names.add(GitUtils.ref2branch(ref.getRef().getName()));- } else {- for (RefInfo ref: depotModel.getObject().getTags())- names.add(GitUtils.ref2tag(ref.getRef().getName()));- }- return names;- }-- private void onSelectTab(AjaxRequestTarget target) {- refs = findRefs();- page = 1;- itemValues = getItemValues(null);- revField.setModel(Model.of(""));- target.add(revField);- newItemsView(target);- String script = String.format("gitplex.revisionSelector.bindInputKeys('%s');", getMarkupId(true));- target.appendJavaScript(script);- target.focusComponent(revField);- }-- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision, boolean canCreateRef) {- super(id);-- Preconditions.checkArgument(revision!=null || !canCreateRef);-- this.depotModel = depotModel;- this.revision = revision;- if (canCreateRef) {- Depot depot = depotModel.getObject();- ObjectId commitId = depot.getRevCommit(revision);- canCreateBranch = SecurityUtils.canPushRef(depot, Constants.R_HEADS, ObjectId.zeroId(), commitId);- canCreateTag = SecurityUtils.canPushRef(depot, Constants.R_TAGS, ObjectId.zeroId(), commitId);- } else {- canCreateBranch = false;- canCreateTag = false;- }- if (revision != null) {- Ref ref = depotModel.getObject().getRef(revision);- branchesActive = ref == null || GitUtils.ref2tag(ref.getName()) == null;- } else {- branchesActive = true;- }-- refs = findRefs();- itemValues = getItemValues(null);- }-- public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision) {- this(id, depotModel, revision, false);- }-- public RevisionSelector(String id, IModel<Depot> depotModel) {- this(id, depotModel, null, false);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- revField = new TextField<String>("revision", Model.of(""));- revField.add(AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- if (branchesActive) {- if (canCreateBranch) {- return "Find or create branch";- } else {- return "Find branch";- }- } else {- if (canCreateTag) {- return "Find or create tag";- } else {- return "Find tag";- }- }- }-- }));- revField.setOutputMarkupId(true);- add(revField);-- feedback = new Label("feedback", new PropertyModel<String>(RevisionSelector.this, "feedbackMessage")) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(feedbackMessage != null);- }-- };- feedback.setOutputMarkupPlaceholderTag(true);- add(feedback);-- add(new AbstractPostAjaxBehavior() {-- @Override- protected void respond(AjaxRequestTarget target) {- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();- String key = params.getParameterValue("key").toString();-- if (key.equals("return")) {- String value = params.getParameterValue("value").toString();- if (StringUtils.isNotBlank(value)) {- if (value.startsWith(COMMIT_FLAG)) {- selectRevision(target, value.substring(COMMIT_FLAG.length()));- } else if (value.startsWith(ADD_FLAG)) {- value = value.substring(ADD_FLAG.length());- onCreateRef(target, value);- } else {- selectRevision(target, value);- }- } else if (StringUtils.isNotBlank(revField.getInput())) {- selectRevision(target, revField.getInput().trim());- }- } else if (key.equals("load")) {- page++;- List<String> itemValues = getItemValues(revField.getInput());- if (itemValues.size() > RevisionSelector.this.itemValues.size()) {- List<String> additionalItemValues =- itemValues.subList(RevisionSelector.this.itemValues.size(), itemValues.size());- for (String itemValue: additionalItemValues) {- Component item = newItem(itemsView.newChildId(), itemValue);- itemsView.add(item);- String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",- itemsContainer.getMarkupId(), item.getMarkupId());- target.prependJavaScript(script);- target.add(item);- }- RevisionSelector.this.itemValues = itemValues;- }-- } else {- throw new IllegalStateException("Unrecognized key: " + key);- }- }-- @Override- public void renderHead(Component component, IHeaderResponse response) {- super.renderHead(component, response);- String script = String.format("gitplex.revisionSelector.init('%s', %s);",- getMarkupId(true), getCallbackFunction(explicit("key"), explicit("value")));- response.render(OnDomReadyHeaderItem.forScript(script));- }-- });-- revField.add(new InputChangeBehavior() {-- @Override- protected void onInputChange(AjaxRequestTarget target) {- page = 1;- itemValues = getItemValues(revField.getInput());- newItemsView(target);- }-- });-- List<Tab> tabs = new ArrayList<>();- AjaxActionTab branchesTab;- tabs.add(branchesTab = new AjaxActionTab(Model.of("branches")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- branchesActive = true;- onSelectTab(target);- }-- });- AjaxActionTab tagsTab;- tabs.add(tagsTab = new AjaxActionTab(Model.of("tags")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- branchesActive = false;- onSelectTab(target);- }-- });- if (branchesActive)- branchesTab.setSelected(true);- else- tagsTab.setSelected(true);-- add(new Tabbable("tabs", tabs));-- itemsContainer = new WebMarkupContainer("items");- itemsContainer.setOutputMarkupId(true);- add(itemsContainer);- newItemsView(null);-- setOutputMarkupId(true);- }-- @Nullable- protected String getRevisionUrl(String revision) {- return null;- }-- private List<String> getItemValues(String revInput) {- List<String> itemValues = new ArrayList<>();- int count = page*PAGE_SIZE;- if (StringUtils.isNotBlank(revInput)) {- revInput = revInput.trim().toLowerCase();- boolean found = false;- for (String ref: refs) {- if (ref.equalsIgnoreCase(revInput))- found = true;- if (itemValues.size() < count && ref.toLowerCase().contains(revInput))- itemValues.add(ref);- }- if (itemValues.size() < count && !found) {- Depot depot = depotModel.getObject();- try {- if (depot.getRepository().resolve(revInput) != null) {- itemValues.add(COMMIT_FLAG + revInput);- } else if (branchesActive) {- if (canCreateBranch) {- String refName = Constants.R_HEADS + revInput;- if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {- itemValues.add(ADD_FLAG + revInput);- }- }- } else {- if (canCreateTag) {- String refName = Constants.R_TAGS + revInput;- if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {- itemValues.add(ADD_FLAG + revInput);- }- }- }- } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {- } catch (IOException e) {- throw new RuntimeException(e);- }- }- } else {- if (refs.size() > count)- itemValues.addAll(refs.subList(0, count));- else- itemValues.addAll(refs);- }- return itemValues;- }-- private void onCreateRef(AjaxRequestTarget target, final String refName) {- if (branchesActive) {- depotModel.getObject().createBranch(refName, revision);- selectRevision(target, refName);- } else {- ModalPanel modal = new ModalPanel(target) {-- @Override- protected Component newContent(String id) {- return new CreateTagPanel(id, depotModel, refName, revision) {-- @Override- protected void onCreate(AjaxRequestTarget target, String tagName) {- close(target);- onSelect(target, tagName);- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- close(target);- }-- };- }-- };- onModalOpened(target, modal);- }- }-- protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {-- }-- private Component newItem(String itemId, String itemValue) {- String ref;- if (itemValue.startsWith(COMMIT_FLAG))- ref = itemValue.substring(COMMIT_FLAG.length());- else if (itemValue.startsWith(ADD_FLAG))- ref = itemValue.substring(ADD_FLAG.length());- else- ref = itemValue;-- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (itemValue.startsWith(ADD_FLAG)) {- onCreateRef(target, ref);- } else {- selectRevision(target, ref);- }- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- if (!itemValue.startsWith(ADD_FLAG)) {- String url = getRevisionUrl(ref);- if (url != null)- tag.put("href", url);- }- }-- };- if (itemValue.startsWith(COMMIT_FLAG)) {- link.add(new Label("label", ref));- link.add(AttributeAppender.append("class", "icon commit"));- } else if (itemValue.startsWith(ADD_FLAG)) {- String label;- if (branchesActive)- label = "<div class='name'>Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";- else- label = "<div class='name'>Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";- label += "<div class='revision'>from " + HtmlEscape.escapeHtml5(revision) + "</div>";- link.add(new Label("label", label).setEscapeModelStrings(false));- link.add(AttributeAppender.append("class", "icon add"));- } else if (ref.equals(revision)) {- link.add(new Label("label", ref));- link.add(AttributeAppender.append("class", "icon current"));- } else {- link.add(new Label("label", ref));- }- WebMarkupContainer item = new WebMarkupContainer(itemId);- item.setOutputMarkupId(true);- item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));- item.add(link);-- return item;- }-- private void newItemsView(@Nullable AjaxRequestTarget target) {- itemsView = new RepeatingView("items");- for (int i=0; i<itemValues.size(); i++) {- Component item = newItem(itemsView.newChildId(), itemValues.get(i));- if (i == 0)- item.add(AttributeAppender.append("class", "active"));- itemsView.add(item);- }- if (target != null) {- itemsContainer.replace(itemsView);- target.add(itemsContainer);- String script = String.format("gitplex.revisionSelector.setupInfiniteScroll('%s');",- getMarkupId(true));- target.appendJavaScript(script);- } else {- itemsContainer.add(itemsView);- }- }-- private void selectRevision(AjaxRequestTarget target, String revision) {- try {- if (depotModel.getObject().getRevCommit(revision, false) != null) {- onSelect(target, revision);- } else {- feedbackMessage = "Can not find commit of revision " + revision + "";- target.add(feedback);- }- } catch (Exception e) {- feedbackMessage = Throwables.getRootCause(e).getMessage();- target.add(feedback);- }- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new RevisionSelectorResourceReference()));- }-- protected abstract void onSelect(AjaxRequestTarget target, String revision);-- @Override- protected void onDetach() {- depotModel.detach();-- super.onDetach();- }--}+package com.gitplex.web.component.revisionpicker;++import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.io.IOException;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.errors.AmbiguousObjectException;+import org.eclipse.jgit.errors.IncorrectObjectTypeException;+import org.eclipse.jgit.errors.RevisionSyntaxException;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.Ref;+import org.unbescape.html.HtmlEscape;++import com.gitplex.commons.git.GitUtils;+import com.gitplex.commons.git.RefInfo;+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;+import com.gitplex.commons.wicket.behavior.InputChangeBehavior;+import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;+import com.gitplex.commons.wicket.component.modal.ModalPanel;+import com.gitplex.commons.wicket.component.tabbable.AjaxActionTab;+import com.gitplex.commons.wicket.component.tabbable.Tab;+import com.gitplex.commons.wicket.component.tabbable.Tabbable;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.security.SecurityUtils;+import com.google.common.base.Preconditions;+import com.google.common.base.Throwables;++@SuppressWarnings("serial")+public abstract class RevisionSelector extends Panel {++ private static final int PAGE_SIZE = 25;++ private final IModel<Depot> depotModel;++ private static final String COMMIT_FLAG = "*";++ private static final String ADD_FLAG = "~";++ private final String revision;++ private final boolean canCreateBranch;++ private final boolean canCreateTag;++ private boolean branchesActive;++ private Label feedback;++ private String feedbackMessage;++ private TextField<String> revField;++ private String revInput;++ private List<String> refs;++ private List<String> findRefs() {+ List<String> names = new ArrayList<>();++ if (branchesActive) {+ for (RefInfo ref: depotModel.getObject().getBranches())+ names.add(GitUtils.ref2branch(ref.getRef().getName()));+ } else {+ for (RefInfo ref: depotModel.getObject().getTags())+ names.add(GitUtils.ref2tag(ref.getRef().getName()));+ }+ return names;+ }++ private void onSelectTab(AjaxRequestTarget target) {+ refs = findRefs();+ revField.setModel(Model.of(""));+ revInput = null;+ target.add(revField);+ newItemsView(target);+ String script = String.format("gitplex.revisionSelector.bindInputKeys('%s');", getMarkupId(true));+ target.appendJavaScript(script);+ target.focusComponent(revField);+ }++ public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision, boolean canCreateRef) {+ super(id);++ Preconditions.checkArgument(revision!=null || !canCreateRef);++ this.depotModel = depotModel;+ this.revision = revision;+ if (canCreateRef) {+ Depot depot = depotModel.getObject();+ ObjectId commitId = depot.getRevCommit(revision);+ canCreateBranch = SecurityUtils.canPushRef(depot, Constants.R_HEADS, ObjectId.zeroId(), commitId);+ canCreateTag = SecurityUtils.canPushRef(depot, Constants.R_TAGS, ObjectId.zeroId(), commitId);+ } else {+ canCreateBranch = false;+ canCreateTag = false;+ }+ if (revision != null) {+ Ref ref = depotModel.getObject().getRef(revision);+ branchesActive = ref == null || GitUtils.ref2tag(ref.getName()) == null;+ } else {+ branchesActive = true;+ }++ refs = findRefs();+ }++ public RevisionSelector(String id, IModel<Depot> depotModel, @Nullable String revision) {+ this(id, depotModel, revision, false);+ }++ public RevisionSelector(String id, IModel<Depot> depotModel) {+ this(id, depotModel, null, false);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ revField = new TextField<String>("revision", Model.of(""));+ revField.add(AttributeModifier.replace("placeholder", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (branchesActive) {+ if (canCreateBranch) {+ return "Find or create branch";+ } else {+ return "Find branch";+ }+ } else {+ if (canCreateTag) {+ return "Find or create tag";+ } else {+ return "Find tag";+ }+ }+ }++ }));+ revField.setOutputMarkupId(true);+ add(revField);++ feedback = new Label("feedback", new PropertyModel<String>(RevisionSelector.this, "feedbackMessage")) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(feedbackMessage != null);+ }++ };+ feedback.setOutputMarkupPlaceholderTag(true);+ add(feedback);++ add(new AbstractPostAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ String value = params.getParameterValue("value").toString();+ if (StringUtils.isNotBlank(value)) {+ if (value.startsWith(COMMIT_FLAG)) {+ selectRevision(target, value.substring(COMMIT_FLAG.length()));+ } else if (value.startsWith(ADD_FLAG)) {+ value = value.substring(ADD_FLAG.length());+ onCreateRef(target, value);+ } else {+ selectRevision(target, value);+ }+ } else if (StringUtils.isNotBlank(revInput)) {+ selectRevision(target, revInput.trim());+ }+ }++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ String script = String.format("gitplex.revisionSelector.init('%s', %s);",+ getMarkupId(true), getCallbackFunction(explicit("value")));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ });++ revField.add(new InputChangeBehavior() {++ @Override+ protected void onInputChange(AjaxRequestTarget target) {+ revInput = revField.getInput();+ newItemsView(target);+ }++ });++ List<Tab> tabs = new ArrayList<>();+ AjaxActionTab branchesTab;+ tabs.add(branchesTab = new AjaxActionTab(Model.of("branches")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ branchesActive = true;+ onSelectTab(target);+ }++ });+ AjaxActionTab tagsTab;+ tabs.add(tagsTab = new AjaxActionTab(Model.of("tags")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ branchesActive = false;+ onSelectTab(target);+ }++ });+ if (branchesActive)+ branchesTab.setSelected(true);+ else+ tagsTab.setSelected(true);++ add(new Tabbable("tabs", tabs));++ newItemsView(null);++ setOutputMarkupId(true);+ }++ @Nullable+ protected String getRevisionUrl(String revision) {+ return null;+ }++ private List<String> getItemValues(String revInput, int page) {+ List<String> itemValues = new ArrayList<>();+ int count = page*PAGE_SIZE;+ if (StringUtils.isNotBlank(revInput)) {+ revInput = revInput.trim().toLowerCase();+ boolean found = false;+ for (String ref: refs) {+ if (ref.equalsIgnoreCase(revInput))+ found = true;+ if (itemValues.size() < count && ref.toLowerCase().contains(revInput))+ itemValues.add(ref);+ }+ if (itemValues.size() < count && !found) {+ Depot depot = depotModel.getObject();+ try {+ if (depot.getRepository().resolve(revInput) != null) {+ itemValues.add(COMMIT_FLAG + revInput);+ } else if (branchesActive) {+ if (canCreateBranch) {+ String refName = Constants.R_HEADS + revInput;+ if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {+ itemValues.add(ADD_FLAG + revInput);+ }+ }+ } else {+ if (canCreateTag) {+ String refName = Constants.R_TAGS + revInput;+ if (SecurityUtils.canPushRef(depot, refName, ObjectId.zeroId(), depot.getRevCommit(revision))) {+ itemValues.add(ADD_FLAG + revInput);+ }+ }+ }+ } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } else {+ if (refs.size() > count)+ itemValues.addAll(refs.subList(0, count));+ else+ itemValues.addAll(refs);+ }+ return itemValues;+ }++ private void onCreateRef(AjaxRequestTarget target, final String refName) {+ if (branchesActive) {+ depotModel.getObject().createBranch(refName, revision);+ selectRevision(target, refName);+ } else {+ ModalPanel modal = new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new CreateTagPanel(id, depotModel, refName, revision) {++ @Override+ protected void onCreate(AjaxRequestTarget target, String tagName) {+ close(target);+ onSelect(target, tagName);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close(target);+ }++ };+ }++ };+ onModalOpened(target, modal);+ }+ }++ protected void onModalOpened(AjaxRequestTarget target, ModalPanel modal) {++ }++ private Component newItem(String itemId, String itemValue) {+ String ref;+ if (itemValue.startsWith(COMMIT_FLAG))+ ref = itemValue.substring(COMMIT_FLAG.length());+ else if (itemValue.startsWith(ADD_FLAG))+ ref = itemValue.substring(ADD_FLAG.length());+ else+ ref = itemValue;++ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("link") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (itemValue.startsWith(ADD_FLAG)) {+ onCreateRef(target, ref);+ } else {+ selectRevision(target, ref);+ }+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ if (!itemValue.startsWith(ADD_FLAG)) {+ String url = getRevisionUrl(ref);+ if (url != null)+ tag.put("href", url);+ }+ }++ };+ if (itemValue.startsWith(COMMIT_FLAG)) {+ link.add(new Label("label", ref));+ link.add(AttributeAppender.append("class", "icon commit"));+ } else if (itemValue.startsWith(ADD_FLAG)) {+ String label;+ if (branchesActive)+ label = "<div class='name'>Create branch <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";+ else+ label = "<div class='name'>Create tag <b>" + HtmlEscape.escapeHtml5(ref) + "</b></div>";+ label += "<div class='revision'>from " + HtmlEscape.escapeHtml5(revision) + "</div>";+ link.add(new Label("label", label).setEscapeModelStrings(false));+ link.add(AttributeAppender.append("class", "icon add"));+ } else if (ref.equals(revision)) {+ link.add(new Label("label", ref));+ link.add(AttributeAppender.append("class", "icon current"));+ } else {+ link.add(new Label("label", ref));+ }+ WebMarkupContainer item = new WebMarkupContainer(itemId);+ item.setOutputMarkupId(true);+ item.add(AttributeAppender.append("data-value", HtmlEscape.escapeHtml5(itemValue)));+ item.add(link);++ return item;+ }++ private void newItemsView(@Nullable AjaxRequestTarget target) {+ WebMarkupContainer itemsContainer = new WebMarkupContainer("items");+ itemsContainer.setOutputMarkupId(true);+ RepeatingView itemsView;+ itemsContainer.add(itemsView = new RepeatingView("items"));+ List<String> itemValues = getItemValues(revInput, 1);+ for (int i=0; i<itemValues.size(); i++) {+ Component item = newItem(itemsView.newChildId(), itemValues.get(i));+ if (i == 0)+ item.add(AttributeAppender.append("class", "active"));+ itemsView.add(item);+ }+ itemsContainer.add(new InfiniteScrollBehavior(PAGE_SIZE) {++ @Override+ protected void appendPage(AjaxRequestTarget target, int page) {+ List<String> itemValues = getItemValues(revInput, page);+ if (itemValues.size() > PAGE_SIZE*(page-1)) {+ List<String> newItemValues = itemValues.subList(PAGE_SIZE*(page-1), itemValues.size());+ for (String itemValue: newItemValues) {+ Component item = newItem(itemsView.newChildId(), itemValue);+ itemsView.add(item);+ String script = String.format("$('#%s').append('<li id=\"%s\"></li>');",+ itemsContainer.getMarkupId(), item.getMarkupId());+ target.prependJavaScript(script);+ target.add(item);+ }+ }+ }++ });++ if (target != null) {+ replace(itemsContainer);+ target.add(itemsContainer);+ } else {+ add(itemsContainer);+ }+ }++ private void selectRevision(AjaxRequestTarget target, String revision) {+ try {+ if (depotModel.getObject().getRevCommit(revision, false) != null) {+ onSelect(target, revision);+ } else {+ feedbackMessage = "Can not find commit of revision " + revision + "";+ target.add(feedback);+ }+ } catch (Exception e) {+ feedbackMessage = Throwables.getRootCause(e).getMessage();+ target.add(feedback);+ }+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new RevisionSelectorResourceReference()));+ }++ protected abstract void onSelect(AjaxRequestTarget target, String revision);++ @Override+ protected void onDetach() {+ depotModel.detach();++ super.onDetach();+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.cssindex 946e612a1a..0c6c14ea8a 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css@@ -1,64 +1,67 @@-div.revision-selector input.revision {- margin-bottom: 12px;- background: url(search.gif) no-repeat right 6px center;- padding-right: 26px;-}-div.revision-selector .nav-tabs {- margin-bottom: 8px;-}-div.revision-selector .nav-tabs>li>a {- padding: 2px 4px;- color: #666;- font-size: 12px;-}-div.revision-selector .nav-tabs>li.active>a {- color: #333;- font-weight: bold;-}-div.revision-selector {- padding: 12px;-}-div.revision-selector ul.items {- margin-bottom: 0;- /*- * Configure max height to make sure scroll bar appears if there are many refs as we initially only- * loads a page of items- */- max-height: 600px;-}-div.revision-selector ul.items>li {- position: relative;-}-div.revision-selector ul.items>li>a {- padding-left: 20px;-}-div.revision-selector .feedback {- color: #F94949;- margin-bottom: 12px;-}-div.revision-selector .feedback:before {- font-family: "FontAwesome";- content: "\f071";- margin-right: 4px;-}-div.revision-selector a.icon:before {- font-family: "FontAwesome";- margin-right: 4px;- position: absolute;- color: #333;- left: 4px;-}-div.revision-selector a.current:before {- content: "\f00c";-}-div.revision-selector a.commit:before {- content: "\f1da";-}-div.revision-selector a.add:before {- content: "\f067";-}-div.revision-selector ul.items>li>a .revision {- font-size: 13px;- margin-top: 2px;- color: #666;-}+div.revision-selector input.revision {+ margin-bottom: 12px;+ background: url(search.gif) no-repeat right 6px center;+ padding-right: 26px;+}+div.revision-selector .nav-tabs {+ margin-bottom: 8px;+}+div.revision-selector .nav-tabs>li>a {+ padding: 2px 4px;+ color: #666;+ font-size: 12px;+}+div.revision-selector .nav-tabs>li.active>a {+ color: #333;+ font-weight: bold;+}+div.revision-selector {+ padding: 12px;+}+div.revision-selector ul.items {+ margin-bottom: 0;+ /*+ * Configure max height to make sure scroll bar appears if there are many refs as we initially only+ * loads a page of items+ */+ max-height: 600px;+}+div.revision-selector ul.items>li {+ position: relative;+}+div.revision-selector ul.items>li>a {+ padding-left: 20px;+}+div.revision-selector ul.items>li.loading-indicator {+ padding-left: 20px;+}+div.revision-selector .feedback {+ color: #F94949;+ margin-bottom: 12px;+}+div.revision-selector .feedback:before {+ font-family: "FontAwesome";+ content: "\f071";+ margin-right: 4px;+}+div.revision-selector a.icon:before {+ font-family: "FontAwesome";+ margin-right: 4px;+ position: absolute;+ color: #333;+ left: 4px;+}+div.revision-selector a.current:before {+ content: "\f00c";+}+div.revision-selector a.commit:before {+ content: "\f1da";+}+div.revision-selector a.add:before {+ content: "\f067";+}+div.revision-selector ul.items>li>a .revision {+ font-size: 13px;+ margin-top: 2px;+ color: #666;+}diff --git a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.jsindex 000a326fc5..bddc8fc763 100644--- a/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js@@ -7,15 +7,6 @@ gitplex.revisionSelector = {$container.find("input").focus();});gitplex.revisionSelector.bindInputKeys(containerId);- gitplex.revisionSelector.setupInfiniteScroll(containerId);- },- setupInfiniteScroll: function(containerId) {- var $container = $("#" + containerId);- $container.find("ul.items").scroll(function() {- if($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight) {- $container.data("callback")("load");- }- });},bindInputKeys: function(containerId) {var $container = $("#" + containerId);@@ -24,14 +15,14 @@ gitplex.revisionSelector = {$input.bind("keydown", "return", function() {var $active = $container.find("ul.items li.active");if ($active.length != 0)- callback("return", $active.data("value"));+ callback($active.data("value"));else- callback("return");+ callback();});$input.bind("keydown", "up", function(e) {e.preventDefault();var $active = $container.find("ul.items li.active");- var $prev = $active.prev("li");+ var $prev = $active.prev("li:not(.loading-indicator)");if ($prev.length != 0) {$active.removeClass("active");$prev.addClass("active");@@ -41,7 +32,7 @@ gitplex.revisionSelector = {$input.bind("keydown", "down", function(e) {e.preventDefault();var $active = $container.find("ul.items li.active");- var $next = $active.next("li");+ var $next = $active.next("li:not(.loading-indicator)");if ($next.length != 0) {$active.removeClass("active");$next.addClass("active");diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.javaindex 1df7231c23..2ecd645e3f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java@@ -1,165 +1,168 @@-package com.gitplex.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class AccountCollaboratorListPage extends AccountLayoutPage {-- private PageableListView<Account> collaboratorsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer collaboratorsContainer;-- private WebMarkupContainer noCollaboratorsContainer;-- public AccountCollaboratorListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchCollaborators", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(collaboratorsContainer);- target.add(pagingNavigator);- target.add(noCollaboratorsContainer);- }-- });-- collaboratorsContainer = new WebMarkupContainer("collaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!collaboratorsView.getModelObject().isEmpty());- }-- };- collaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(collaboratorsContainer);-- collaboratorsContainer.add(collaboratorsView = new PageableListView<Account>("collaborators",- new LoadableDetachableModel<List<Account>>() {-- @Override- protected List<Account> load() {- Set<Account> setOfCollaborators = new HashSet<>();-- UserAuthorizationManager userAuthorizationManager =- GitPlex.getInstance(UserAuthorizationManager.class);- for (UserAuthorization authorization: userAuthorizationManager.findAll(getAccount())) {- if (authorization.getUser().matches(searchField.getInput())) {- setOfCollaborators.add(authorization.getUser());- }- }-- List<Account> listOfCollaborators = new ArrayList<>(setOfCollaborators);- Collections.sort(listOfCollaborators);- return listOfCollaborators;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account collaborator = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<>("avatarLink",- CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));- link.add(new Avatar("avatar", collaborator));- item.add(link);-- link = new BookmarkablePageLink<>("nameLink",- CollaboratorDepotListPage.class,- CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));- link.add(new Label("name", collaborator.getDisplayName()));- item.add(link);-- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", collaboratorsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(collaboratorsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noCollaboratorsContainer = new WebMarkupContainer("noCollaborators") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(collaboratorsView.getModelObject().isEmpty());- }-- };- noCollaboratorsContainer.setOutputMarkupPlaceholderTag(true);- add(noCollaboratorsContainer);- }-- /*- * Collaborators page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to- * normal users as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}+package com.gitplex.web.page.account.collaborators;++import java.util.ArrayList;+import java.util.Collections;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.UserAuthorization;+import com.gitplex.core.manager.UserAuthorizationManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.web.Constants;+import com.gitplex.web.component.avatar.Avatar;+import com.gitplex.web.page.account.AccountLayoutPage;+import com.gitplex.web.page.account.overview.AccountOverviewPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class AccountCollaboratorListPage extends AccountLayoutPage {++ private PageableListView<Account> collaboratorsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer collaboratorsContainer;++ private WebMarkupContainer noCollaboratorsContainer;++ private String searchInput;++ public AccountCollaboratorListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchCollaborators", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(collaboratorsContainer);+ target.add(pagingNavigator);+ target.add(noCollaboratorsContainer);+ }++ });++ collaboratorsContainer = new WebMarkupContainer("collaborators") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!collaboratorsView.getModelObject().isEmpty());+ }++ };+ collaboratorsContainer.setOutputMarkupPlaceholderTag(true);+ add(collaboratorsContainer);++ collaboratorsContainer.add(collaboratorsView = new PageableListView<Account>("collaborators",+ new LoadableDetachableModel<List<Account>>() {++ @Override+ protected List<Account> load() {+ Set<Account> setOfCollaborators = new HashSet<>();++ UserAuthorizationManager userAuthorizationManager =+ GitPlex.getInstance(UserAuthorizationManager.class);+ for (UserAuthorization authorization: userAuthorizationManager.findAll(getAccount())) {+ if (authorization.getUser().matches(searchInput)) {+ setOfCollaborators.add(authorization.getUser());+ }+ }++ List<Account> listOfCollaborators = new ArrayList<>(setOfCollaborators);+ Collections.sort(listOfCollaborators);+ return listOfCollaborators;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Account> item) {+ Account collaborator = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<>("avatarLink",+ CollaboratorDepotListPage.class,+ CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));+ link.add(new Avatar("avatar", collaborator));+ item.add(link);++ link = new BookmarkablePageLink<>("nameLink",+ CollaboratorDepotListPage.class,+ CollaboratorDepotListPage.paramsOf(getAccount(), collaborator));+ link.add(new Label("name", collaborator.getDisplayName()));+ item.add(link);++ item.setOutputMarkupId(true);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", collaboratorsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(collaboratorsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noCollaboratorsContainer = new WebMarkupContainer("noCollaborators") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(collaboratorsView.getModelObject().isEmpty());+ }++ };+ noCollaboratorsContainer.setOutputMarkupPlaceholderTag(true);+ add(noCollaboratorsContainer);+ }++ /*+ * Collaborators page is only visible to administrator as it contains repository+ * authorization information and we do not want to expose that information to+ * normal users as repository name might also be a secret+ */+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getAccount());+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Account account) {+ if (account.isOrganization())+ setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));+ else+ setResponsePage(AccountOverviewPage.class, paramsOf(account));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.javaindex d3a75f5851..12fdf60442 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java@@ -1,408 +1,406 @@-package com.gitplex.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.manager.UserAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class CollaboratorDepotListPage extends CollaboratorPage {-- private PageableListView<UserAuthorization> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private Set<Long> pendingRemovals = new HashSet<>();-- public CollaboratorDepotListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {-- @Override- public void query(String term, int page, Response<Depot> response) {- List<Depot> depots = new ArrayList<>();- term = term.toLowerCase();- for (Depot depot: getAccount().getDepots()) {- if (depot.getName().toLowerCase().contains(term)) {- boolean authorized = false;- for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {- if (authorization.getDepot().equals(depot)) {- authorized = true;- break;- }- }- if (!authorized)- depots.add(depot);- }- }-- Collections.sort(depots);-- new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add Repository...");- getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.depotChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot selection) {- UserAuthorization authorization = new UserAuthorization();- authorization.setUser(collaboratorModel.getObject());- authorization.setDepot(selection);- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<UserAuthorization> authorizations = new HashSet<>();- UserAuthorizationManager authorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<UserAuthorization>("depots",- new LoadableDetachableModel<List<UserAuthorization>>() {-- @Override- protected List<UserAuthorization> load() {- List<UserAuthorization> authorizations = new ArrayList<>();-- String searchInput = searchField.getInput();- if (searchInput != null)- searchInput = searchInput.toLowerCase().trim();- else- searchInput = "";-- for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {- Depot depot = authorization.getDepot();- if (depot.getAccount().equals(getAccount())- && depot.getName().toLowerCase().contains(searchInput)) {- if (authorization.getPrivilege() != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {- authorizations.add(authorization);- }- }- }-- authorizations.sort((authorization1, authorization2)- -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));- return authorizations;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<UserAuthorization> item) {- UserAuthorization authorization = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>(- "depotLink",- DepotCollaboratorListPage.class,- DepotCollaboratorListPage.paramsOf(authorization.getDepot()));- link.add(new Label("name", authorization.getDepot().getName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- UserAuthorization authorization = item.getModelObject();- DepotAccess depotAccess = new DepotAccess(authorization.getUser(), authorization.getDepot());- setVisible(SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege()));- }-- };-- greaterPrivileges.add(new BookmarkablePageLink<Void>("detail",- CollaboratorPrivilegeSourcePage.class,- CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));-- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- UserAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }--}+package com.gitplex.web.page.account.collaborators;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.UserAuthorization;+import com.gitplex.core.manager.UserAuthorizationManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;+import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;+import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.web.depotaccess.DepotAccess;+import com.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class CollaboratorDepotListPage extends CollaboratorPage {++ private PageableListView<UserAuthorization> depotsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private DepotPrivilege filterPrivilege;++ private String searchInput;++ private Set<Long> pendingRemovals = new HashSet<>();++ public CollaboratorDepotListPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchDepots", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();++ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterPrivilege == null)+ return "Filter by privilege";+ else+ return filterPrivilege.toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, false, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ filterPrivilege = privilege;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterPrivilege = null;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterPrivilege != null);+ }++ });++ add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Depot> response) {+ List<Depot> depots = new ArrayList<>();+ term = term.toLowerCase();+ for (Depot depot: getAccount().getDepots()) {+ if (depot.getName().toLowerCase().contains(term)) {+ boolean authorized = false;+ for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {+ if (authorization.getDepot().equals(depot)) {+ authorized = true;+ break;+ }+ }+ if (!authorized)+ depots.add(depot);+ }+ }++ Collections.sort(depots);++ new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add Repository...");+ getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.depotChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot selection) {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setUser(collaboratorModel.getObject());+ authorization.setDepot(selection);+ GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));+ }++ });++ AjaxLink<Void> confirmRemoveLink;+ add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<UserAuthorization> authorizations = new HashSet<>();+ UserAuthorizationManager authorizationManager = GitPlex.getInstance(UserAuthorizationManager.class);+ for (Long id: pendingRemovals) {+ authorizations.add(authorizationManager.load(id));+ }+ authorizationManager.delete(authorizations);+ pendingRemovals.clear();+ target.add(this);+ target.add(pagingNavigator);+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!pendingRemovals.isEmpty());+ }++ });+ confirmRemoveLink.setOutputMarkupPlaceholderTag(true);++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<UserAuthorization>("depots",+ new LoadableDetachableModel<List<UserAuthorization>>() {++ @Override+ protected List<UserAuthorization> load() {+ List<UserAuthorization> authorizations = new ArrayList<>();++ for (UserAuthorization authorization: collaboratorModel.getObject().getAuthorizedDepots()) {+ Depot depot = authorization.getDepot();+ if (depot.getAccount().equals(getAccount())+ && depot.matches(searchInput)) {+ if (authorization.getPrivilege() != DepotPrivilege.NONE+ && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {+ authorizations.add(authorization);+ }+ }+ }++ authorizations.sort((authorization1, authorization2)+ -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));+ return authorizations;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<UserAuthorization> item) {+ UserAuthorization authorization = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>(+ "depotLink",+ DepotCollaboratorListPage.class,+ DepotCollaboratorListPage.paramsOf(authorization.getDepot()));+ link.add(new Label("name", authorization.getDepot().getName()));+ item.add(link);++ WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ UserAuthorization authorization = item.getModelObject();+ DepotAccess depotAccess = new DepotAccess(authorization.getUser(), authorization.getDepot());+ setVisible(SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege()));+ }++ };++ greaterPrivileges.add(new BookmarkablePageLink<Void>("detail",+ CollaboratorPrivilegeSourcePage.class,+ CollaboratorPrivilegeSourcePage.paramsOf(authorization.getDepot(), authorization.getUser())));++ item.add(greaterPrivileges);+ item.add(new DropdownLink("privilege") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return item.getModelObject().getPrivilege().toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ UserAuthorization authorization = item.getModelObject();+ authorization.setPrivilege(privilege);+ GitPlex.getInstance(UserAuthorizationManager.class).save(authorization);+ target.add(pagingNavigator);+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ Session.get().success("Privilege updated");+ }++ };+ }++ });++ item.add(new AjaxLink<Void>("remove") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(!pendingRemovals.contains(item.getModelObject().getId()));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.add(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ });+ item.add(new WebMarkupContainer("pendingRemoval") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.add(new AjaxLink<Void>("undoRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.remove(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.setOutputMarkupId(true);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.javaindex ee47079dff..a64965bebc 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java@@ -1,242 +1,240 @@-package com.gitplex.web.page.account.collaborators;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {-- private PageableListView<DepotPermission> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- public CollaboratorEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",- new LoadableDetachableModel<List<DepotPermission>>() {-- @Override- protected List<DepotPermission> load() {- List<DepotPermission> permissions = new ArrayList<>();-- String searchInput = searchField.getInput();- if (searchInput != null)- searchInput = searchInput.toLowerCase().trim();- else- searchInput = "";-- Account user = collaboratorModel.getObject();- for (Depot depot: getAccount().getDepots()) {- if (depot.getName().toLowerCase().contains(searchInput)) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new DepotPermission(depot, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getDepot().compareTo(permission2.getDepot()));- return permissions;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new BookmarkablePageLink<Void>(- "privilegeLink",- CollaboratorPrivilegeSourcePage.class,- CollaboratorPrivilegeSourcePage.paramsOf(permission.getDepot(), collaboratorModel.getObject()));- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- private static class DepotPermission {-- private final Depot depot;-- private final DepotPrivilege privilege;-- public DepotPermission(Depot depot, DepotPrivilege privilege) {- this.depot = depot;- this.privilege = privilege;- }-- public Depot getDepot() {- return depot;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}+package com.gitplex.web.page.account.collaborators;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.web.depotaccess.DepotAccess;+import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class CollaboratorEffectivePrivilegePage extends CollaboratorPage {++ private PageableListView<DepotPermission> depotsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private DepotPrivilege filterPrivilege;++ private String searchInput;++ public CollaboratorEffectivePrivilegePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchDepots", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();++ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterPrivilege == null)+ return "Filter by privilege";+ else+ return filterPrivilege.toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ filterPrivilege = privilege;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterPrivilege = null;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterPrivilege != null);+ }++ });++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",+ new LoadableDetachableModel<List<DepotPermission>>() {++ @Override+ protected List<DepotPermission> load() {+ List<DepotPermission> permissions = new ArrayList<>();++ Account user = collaboratorModel.getObject();+ for (Depot depot: getAccount().getDepots()) {+ if (depot.matches(searchInput)) {+ DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();+ if (privilege != DepotPrivilege.NONE+ && (filterPrivilege == null || filterPrivilege == privilege)) {+ permissions.add(new DepotPermission(depot, privilege));+ }+ }+ }++ permissions.sort((permission1, permission2)+ -> permission1.getDepot().compareTo(permission2.getDepot()));+ return permissions;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<DepotPermission> item) {+ DepotPermission permission = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>(+ "depotLink",+ DepotEffectivePrivilegePage.class,+ DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));+ link.add(new Label("name", permission.getDepot().getName()));+ item.add(link);++ link = new BookmarkablePageLink<Void>(+ "privilegeLink",+ CollaboratorPrivilegeSourcePage.class,+ CollaboratorPrivilegeSourcePage.paramsOf(permission.getDepot(), collaboratorModel.getObject()));+ link.add(new Label("privilege", permission.getPrivilege().toString()));+ item.add(link);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getAccount());+ }++ private static class DepotPermission {++ private final Depot depot;++ private final DepotPrivilege privilege;++ public DepotPermission(Depot depot, DepotPrivilege privilege) {+ this.depot = depot;+ this.privilege = privilege;+ }++ public Depot getDepot() {+ return depot;+ }++ public DepotPrivilege getPrivilege() {+ return privilege;+ }++ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.javaindex a6eb9fe914..4419e4bf1d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java@@ -1,247 +1,245 @@-package com.gitplex.web.page.account.members;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class MemberEffectivePrivilegePage extends MemberPage {-- private PageableListView<DepotPermission> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- public MemberEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",- new LoadableDetachableModel<List<DepotPermission>>() {-- @Override- protected List<DepotPermission> load() {- List<DepotPermission> permissions = new ArrayList<>();-- String searchInput = searchField.getInput();- if (searchInput != null)- searchInput = searchInput.toLowerCase().trim();- else- searchInput = "";-- Account user = getMembership().getUser();- for (Depot depot: getAccount().getDepots()) {- if (depot.getName().toLowerCase().contains(searchInput)) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new DepotPermission(depot, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getDepot().compareTo(permission2.getDepot()));- return permissions;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<DepotPermission> item) {- DepotPermission permission = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>(- "depotLink",- DepotEffectivePrivilegePage.class,- DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));- link.add(new Label("name", permission.getDepot().getName()));- item.add(link);-- link = new BookmarkablePageLink<Void>(- "privilegeLink",- MemberPrivilegeSourcePage.class,- MemberPrivilegeSourcePage.paramsOf(getMembership(), permission.getDepot()));- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);- }-- /*- * Member effective privilege page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to ordinary members- * as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }-- private static class DepotPermission {-- private final Depot depot;-- private final DepotPrivilege privilege;-- public DepotPermission(Depot depot, DepotPrivilege privilege) {- this.depot = depot;- this.privilege = privilege;- }-- public Depot getDepot() {- return depot;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}+package com.gitplex.web.page.account.members;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.web.depotaccess.DepotAccess;+import com.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class MemberEffectivePrivilegePage extends MemberPage {++ private PageableListView<DepotPermission> depotsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private DepotPrivilege filterPrivilege;++ private String searchInput;++ public MemberEffectivePrivilegePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchDepots", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();++ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterPrivilege == null)+ return "Filter by privilege";+ else+ return filterPrivilege.toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ filterPrivilege = privilege;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterPrivilege = null;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterPrivilege != null);+ }++ });++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<DepotPermission>("depots",+ new LoadableDetachableModel<List<DepotPermission>>() {++ @Override+ protected List<DepotPermission> load() {+ List<DepotPermission> permissions = new ArrayList<>();++ Account user = getMembership().getUser();+ for (Depot depot: getAccount().getDepots()) {+ if (depot.matches(searchInput)) {+ DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();+ if (privilege != DepotPrivilege.NONE+ && (filterPrivilege == null || filterPrivilege == privilege)) {+ permissions.add(new DepotPermission(depot, privilege));+ }+ }+ }++ permissions.sort((permission1, permission2)+ -> permission1.getDepot().compareTo(permission2.getDepot()));+ return permissions;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<DepotPermission> item) {+ DepotPermission permission = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>(+ "depotLink",+ DepotEffectivePrivilegePage.class,+ DepotEffectivePrivilegePage.paramsOf(permission.getDepot()));+ link.add(new Label("name", permission.getDepot().getName()));+ item.add(link);++ link = new BookmarkablePageLink<Void>(+ "privilegeLink",+ MemberPrivilegeSourcePage.class,+ MemberPrivilegeSourcePage.paramsOf(getMembership(), permission.getDepot()));+ link.add(new Label("privilege", permission.getPrivilege().toString()));+ item.add(link);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);+ }++ /*+ * Member effective privilege page is only visible to administrator as it contains repository+ * authorization information and we do not want to expose that information to ordinary members+ * as repository name might also be a secret+ */+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getAccount());+ }++ private static class DepotPermission {++ private final Depot depot;++ private final DepotPrivilege privilege;++ public DepotPermission(Depot depot, DepotPrivilege privilege) {+ this.depot = depot;+ this.privilege = privilege;+ }++ public Depot getDepot() {+ return depot;+ }++ public DepotPrivilege getPrivilege() {+ return privilege;+ }++ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.javaindex 5d79a2ac27..6d75cbcdbd 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java@@ -1,443 +1,446 @@-package com.gitplex.web.page.account.members;--import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;-import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_MEMBER;--import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.roleselection.RoleSelectionPanel;-import com.gitplex.web.page.account.AccountLayoutPage;-import com.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class MemberListPage extends AccountLayoutPage {-- private PageableListView<OrganizationMembership> membersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer membersContainer;-- private WebMarkupContainer noMembersContainer;-- private String filterRole;-- private Set<Long> pendingRemovals = new HashSet<>();-- public MemberListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchMembers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterRole == null)- return "Filter by role";- else- return filterRole;- }-- }));- }-- @Override- protected Component newContent(String id) {- return new RoleSelectionPanel(id, filterRole) {-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- close();- filterRole = ROLE_ADMIN;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- close();- filterRole = ROLE_MEMBER;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterRole = null;- target.add(filterContainer);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterRole != null);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(NewMembersPage.class, NewMembersPage.paramsOf(getAccount()));- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Set<OrganizationMembership> organizationMemberships = new HashSet<>();- OrganizationMembershipManager organizationMembershipManager =- GitPlex.getInstance(OrganizationMembershipManager.class);- for (Long pendingRemoval: pendingRemovals) {- OrganizationMembership organizationMembership = organizationMembershipManager.load(pendingRemoval);- organizationMemberships.add(organizationMembership);- }- GitPlex.getInstance(OrganizationMembershipManager.class).delete(organizationMemberships);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- membersContainer = new WebMarkupContainer("members") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!membersView.getModelObject().isEmpty());- }-- };- membersContainer.setOutputMarkupPlaceholderTag(true);- add(membersContainer);-- membersContainer.add(membersView = new PageableListView<OrganizationMembership>("members",- new LoadableDetachableModel<List<OrganizationMembership>>() {-- @Override- protected List<OrganizationMembership> load() {- List<OrganizationMembership> memberships = new ArrayList<>();-- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- Account user = membership.getUser();- if (user.matches(searchField.getInput())) {- if (filterRole == null- || filterRole.equals(ROLE_ADMIN) && membership.isAdmin()- || filterRole.equals(ROLE_MEMBER) && !membership.isAdmin()) {- memberships.add(membership);- }- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().compareTo(membership2.getUser()));- return memberships;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<OrganizationMembership> item) {- OrganizationMembership membership = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<>("avatarLink", MemberTeamListPage.class,- MemberTeamListPage.paramsOf(membership));- link.add(new Avatar("avatar", membership.getUser()));- item.add(link);-- link = new BookmarkablePageLink<>("nameLink", MemberTeamListPage.class,- MemberTeamListPage.paramsOf(membership));- link.add(new Label("name", membership.getUser().getDisplayName()));- item.add(link);-- item.add(new DropdownLink("role") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return membership.isAdmin()?ROLE_ADMIN:ROLE_MEMBER;- }-- }));- Account user = item.getModelObject().getUser();- if (!SecurityUtils.canManage(getAccount()) || user.equals(getLoginUser()))- add(AttributeAppender.append("disabled", "disabled"));- }-- @Override- protected void onConfigure() {- super.onConfigure();- Account user = item.getModelObject().getUser();- setEnabled(SecurityUtils.canManage(getAccount()) && !user.equals(getLoginUser()));- }-- @Override- protected Component newContent(String id) {- return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {-- @Override- protected void onSelectOrdinary(AjaxRequestTarget target) {- close();- membership.setAdmin(false);- GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- Session.get().success("Role updated");- }-- @Override- protected void onSelectAdmin(AjaxRequestTarget target) {- close();- membership.setAdmin(true);- GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- Session.get().success("Role updated");- }-- };- }-- });- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- Account user = item.getModelObject().getUser();- setVisible(SecurityUtils.canManage(getAccount())- && !user.equals(getLoginUser())- && !pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noMembersContainer = new WebMarkupContainer("noMembers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getModelObject().isEmpty());- }-- };- noMembersContainer.setOutputMarkupPlaceholderTag(true);- add(noMembersContainer);-- add(new WebMarkupContainer("hasDefaultPrivilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new BookmarkablePageLink<Void>("organizationProfile",- ProfileEditPage.class, ProfileEditPage.paramsOf(getAccount())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(SecurityUtils.canManage(getAccount()));- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("defaultPrivilege", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return "the default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege";- }-- }).setEscapeModelStrings(false));- }-- });- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getAccount().getDefaultPrivilege() != DepotPrivilege.NONE);- }-- });- add(new WebMarkupContainer("noDefaultPrivilege") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getAccount().getDefaultPrivilege() == DepotPrivilege.NONE);- }-- });- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canAccess(getAccount());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Account account) {- if (account.isOrganization())- setResponsePage(MemberListPage.class, paramsOf(account));- else if (SecurityUtils.canManage(account))- setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));- else- setResponsePage(AccountOverviewPage.class, paramsOf(account));- }--}+package com.gitplex.web.page.account.members;++import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;+import static com.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_MEMBER;++import java.util.ArrayList;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.OrganizationMembership;+import com.gitplex.core.manager.OrganizationMembershipManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.avatar.Avatar;+import com.gitplex.web.component.roleselection.RoleSelectionPanel;+import com.gitplex.web.page.account.AccountLayoutPage;+import com.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;+import com.gitplex.web.page.account.overview.AccountOverviewPage;+import com.gitplex.web.page.account.setting.ProfileEditPage;+import com.google.common.base.Preconditions;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class MemberListPage extends AccountLayoutPage {++ private PageableListView<OrganizationMembership> membersView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer membersContainer;++ private WebMarkupContainer noMembersContainer;++ private String filterRole;++ private Set<Long> pendingRemovals = new HashSet<>();++ private String searchInput;++ public MemberListPage(PageParameters params) {+ super(params);++ Preconditions.checkState(getAccount().isOrganization());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchMembers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterRole == null)+ return "Filter by role";+ else+ return filterRole;+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new RoleSelectionPanel(id, filterRole) {++ @Override+ protected void onSelectAdmin(AjaxRequestTarget target) {+ close();+ filterRole = ROLE_ADMIN;+ target.add(filterContainer);+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ @Override+ protected void onSelectOrdinary(AjaxRequestTarget target) {+ close();+ filterRole = ROLE_MEMBER;+ target.add(filterContainer);+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterRole = null;+ target.add(filterContainer);+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterRole != null);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getAccount()));+ }++ @Override+ public void onClick() {+ setResponsePage(NewMembersPage.class, NewMembersPage.paramsOf(getAccount()));+ }++ });++ AjaxLink<Void> confirmRemoveLink;+ add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Set<OrganizationMembership> organizationMemberships = new HashSet<>();+ OrganizationMembershipManager organizationMembershipManager =+ GitPlex.getInstance(OrganizationMembershipManager.class);+ for (Long pendingRemoval: pendingRemovals) {+ OrganizationMembership organizationMembership = organizationMembershipManager.load(pendingRemoval);+ organizationMemberships.add(organizationMembership);+ }+ GitPlex.getInstance(OrganizationMembershipManager.class).delete(organizationMemberships);+ pendingRemovals.clear();+ target.add(this);+ target.add(pagingNavigator);+ target.add(membersContainer);+ target.add(noMembersContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!pendingRemovals.isEmpty());+ }++ });+ confirmRemoveLink.setOutputMarkupPlaceholderTag(true);++ membersContainer = new WebMarkupContainer("members") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!membersView.getModelObject().isEmpty());+ }++ };+ membersContainer.setOutputMarkupPlaceholderTag(true);+ add(membersContainer);++ membersContainer.add(membersView = new PageableListView<OrganizationMembership>("members",+ new LoadableDetachableModel<List<OrganizationMembership>>() {++ @Override+ protected List<OrganizationMembership> load() {+ List<OrganizationMembership> memberships = new ArrayList<>();++ for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {+ Account user = membership.getUser();+ if (user.matches(searchInput)) {+ if (filterRole == null+ || filterRole.equals(ROLE_ADMIN) && membership.isAdmin()+ || filterRole.equals(ROLE_MEMBER) && !membership.isAdmin()) {+ memberships.add(membership);+ }+ }+ }++ memberships.sort((membership1, membership2)+ -> membership1.getUser().compareTo(membership2.getUser()));+ return memberships;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<OrganizationMembership> item) {+ OrganizationMembership membership = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<>("avatarLink", MemberTeamListPage.class,+ MemberTeamListPage.paramsOf(membership));+ link.add(new Avatar("avatar", membership.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<>("nameLink", MemberTeamListPage.class,+ MemberTeamListPage.paramsOf(membership));+ link.add(new Label("name", membership.getUser().getDisplayName()));+ item.add(link);++ item.add(new DropdownLink("role") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return membership.isAdmin()?ROLE_ADMIN:ROLE_MEMBER;+ }++ }));+ Account user = item.getModelObject().getUser();+ if (!SecurityUtils.canManage(getAccount()) || user.equals(getLoginUser()))+ add(AttributeAppender.append("disabled", "disabled"));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ Account user = item.getModelObject().getUser();+ setEnabled(SecurityUtils.canManage(getAccount()) && !user.equals(getLoginUser()));+ }++ @Override+ protected Component newContent(String id) {+ return new RoleSelectionPanel(id, item.getModelObject().isAdmin()?ROLE_ADMIN:ROLE_MEMBER) {++ @Override+ protected void onSelectOrdinary(AjaxRequestTarget target) {+ close();+ membership.setAdmin(false);+ GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);+ target.add(pagingNavigator);+ target.add(membersContainer);+ target.add(noMembersContainer);+ Session.get().success("Role updated");+ }++ @Override+ protected void onSelectAdmin(AjaxRequestTarget target) {+ close();+ membership.setAdmin(true);+ GitPlex.getInstance(OrganizationMembershipManager.class).save(membership);+ target.add(pagingNavigator);+ target.add(membersContainer);+ target.add(noMembersContainer);+ Session.get().success("Role updated");+ }++ };+ }++ });+ item.add(new AjaxLink<Void>("remove") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ Account user = item.getModelObject().getUser();+ setVisible(SecurityUtils.canManage(getAccount())+ && !user.equals(getLoginUser())+ && !pendingRemovals.contains(item.getModelObject().getId()));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.add(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ });+ item.add(new WebMarkupContainer("pendingRemoval") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.add(new AjaxLink<Void>("undoRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.remove(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.setOutputMarkupId(true);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(membersView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noMembersContainer = new WebMarkupContainer("noMembers") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(membersView.getModelObject().isEmpty());+ }++ };+ noMembersContainer.setOutputMarkupPlaceholderTag(true);+ add(noMembersContainer);++ add(new WebMarkupContainer("hasDefaultPrivilege") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new BookmarkablePageLink<Void>("organizationProfile",+ ProfileEditPage.class, ProfileEditPage.paramsOf(getAccount())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(SecurityUtils.canManage(getAccount()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("defaultPrivilege", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "the default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege";+ }++ }).setEscapeModelStrings(false));+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getAccount().getDefaultPrivilege() != DepotPrivilege.NONE);+ }++ });+ add(new WebMarkupContainer("noDefaultPrivilege") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getAccount().getDefaultPrivilege() == DepotPrivilege.NONE);+ }++ });+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canAccess(getAccount());+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Account account) {+ if (account.isOrganization())+ setResponsePage(MemberListPage.class, paramsOf(account));+ else if (SecurityUtils.canManage(account))+ setResponsePage(AccountCollaboratorListPage.class, paramsOf(account));+ else+ setResponsePage(AccountOverviewPage.class, paramsOf(account));+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.javaindex 30b1f7c90e..6e48902a3d 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java@@ -1,170 +1,173 @@-package com.gitplex.web.page.account.overview;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.depot.setting.general.GeneralSettingPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;--@SuppressWarnings("serial")-public class DepotListPanel extends GenericPanel<Account> {-- private PageableListView<Depot> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- public DepotListPanel(String id, IModel<Account> accountModel) {- super(id, accountModel);- }-- private Account getAccount() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(noDepotsContainer);- target.add(pagingNavigator);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void onClick() {- setResponsePage(NewDepotPage.class, NewDepotPage.paramsOf(getAccount()));- }-- });-- depotsContainer = new WebMarkupContainer("depotsContainer") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- depotsContainer.add(depotsView = new PageableListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @Override- protected List<Depot> load() {- List<Depot> depots = new ArrayList<>();- for (Depot depot: GitPlex.getInstance(DepotManager.class)- .findAllAccessible(getAccount(), SecurityUtils.getAccount())) {- if (depot.matches(searchField.getInput())) {- depots.add(depot);- }- }-- Collections.sort(depots);- return depots;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(final ListItem<Depot> item) {- Depot depot = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<>("depotLink",- DepotFilePage.class, DepotFilePage.paramsOf(depot));- link.add(new Label("depotName", depot.getName()));- item.add(link);-- item.add(new Label("public", depot.isPublicRead()?"yes":"no"));-- item.add(new Link<Void>("setting") {-- @Override- public void onClick() {- PageParameters params = GeneralSettingPage.paramsOf(item.getModelObject());- setResponsePage(GeneralSettingPage.class, params);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(item.getModelObject()));- }-- });- }-- });-- add(pagingNavigator = new BootstrapPagingNavigator("depotsPageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);- }--}+package com.gitplex.web.page.account.overview;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.manager.DepotManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.web.Constants;+import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.web.page.depot.setting.general.GeneralSettingPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;++@SuppressWarnings("serial")+public class DepotListPanel extends GenericPanel<Account> {++ private PageableListView<Depot> depotsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private String searchInput;++ public DepotListPanel(String id, IModel<Account> accountModel) {+ super(id, accountModel);+ }++ private Account getAccount() {+ return getModelObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchDepots", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ target.add(pagingNavigator);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getAccount()));+ }++ @Override+ public void onClick() {+ setResponsePage(NewDepotPage.class, NewDepotPage.paramsOf(getAccount()));+ }++ });++ depotsContainer = new WebMarkupContainer("depotsContainer") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);++ depotsContainer.add(depotsView = new PageableListView<Depot>("depots",+ new LoadableDetachableModel<List<Depot>>() {++ @Override+ protected List<Depot> load() {+ List<Depot> depots = new ArrayList<>();+ for (Depot depot: GitPlex.getInstance(DepotManager.class)+ .findAllAccessible(getAccount(), SecurityUtils.getAccount())) {+ if (depot.matches(searchInput)) {+ depots.add(depot);+ }+ }++ Collections.sort(depots);+ return depots;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(final ListItem<Depot> item) {+ Depot depot = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<>("depotLink",+ DepotFilePage.class, DepotFilePage.paramsOf(depot));+ link.add(new Label("depotName", depot.getName()));+ item.add(link);++ item.add(new Label("public", depot.isPublicRead()?"yes":"no"));++ item.add(new Link<Void>("setting") {++ @Override+ public void onClick() {+ PageParameters params = GeneralSettingPage.paramsOf(item.getModelObject());+ setResponsePage(GeneralSettingPage.class, params);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(item.getModelObject()));+ }++ });+ }++ });++ add(pagingNavigator = new BootstrapPagingNavigator("depotsPageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.javaindex 3349ca238a..21f9eed117 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java@@ -1,448 +1,450 @@-package com.gitplex.web.page.account.teams;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.wicket.Component;-import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.Team;-import com.gitplex.core.entity.TeamAuthorization;-import com.gitplex.core.manager.TeamAuthorizationManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;-import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;-import com.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;-import com.google.common.base.Preconditions;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;-import com.gitplex.commons.wicket.component.modal.ModalLink;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class TeamDepotListPage extends TeamPage {-- private PageableListView<TeamAuthorization> depotsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- private DepotPrivilege filterPrivilege;-- private Set<Long> pendingRemovals = new HashSet<>();-- public TeamDepotListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchDepots", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, false, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- Collection<TeamAuthorization> authorizations = new HashSet<>();- TeamAuthorizationManager authorizationManager = GitPlex.getInstance(TeamAuthorizationManager.class);- for (Long id: pendingRemovals) {- authorizations.add(authorizationManager.load(id));- }- authorizationManager.delete(authorizations);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {-- @Override- public void query(String term, int page, Response<Depot> response) {- List<Depot> depots = new ArrayList<>();- for (Depot depot: getAccount().getDepots()) {- if (depot.matches(term)) {- boolean authorized = false;- for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {- if (authorization.getDepot().equals(depot)) {- authorized = true;- break;- }- }- if (!authorized)- depots.add(depot);- }- }-- Collections.sort(depots);-- new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add repository...");- getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.depotChoiceFormatter.escapeMarkup");- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot selection) {- TeamAuthorization authorization = new TeamAuthorization();- authorization.setDepot(selection);- authorization.setTeam(teamModel.getObject());- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(depotsContainer);- target.add(pagingNavigator);- target.add(noDepotsContainer);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<TeamAuthorization>("depots",- new LoadableDetachableModel<List<TeamAuthorization>>() {-- @Override- protected List<TeamAuthorization> load() {- List<TeamAuthorization> authorizations = new ArrayList<>();-- for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {- if (authorization.getDepot().matches(searchField.getInput())- && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {- authorizations.add(authorization);- }- }-- authorizations.sort((authorization1, authorization2)- -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));- return authorizations;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<TeamAuthorization> item) {- TeamAuthorization authorization = item.getModelObject();-- Link<Void> link = new BookmarkablePageLink<Void>("link", DepotTeamListPage.class,- DepotTeamListPage.paramsOf(authorization.getDepot()));- link.add(new Label("name", authorization.getDepot().getName()));- item.add(link);-- WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasGreaterPrivileges = false;- Team team = teamModel.getObject();- TeamAuthorization authorization = item.getModelObject();- for (Account user: team.getMembers()) {- DepotAccess depotAccess = new DepotAccess(user, authorization.getDepot());- if (SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege())) {- hasGreaterPrivileges = true;- break;- }- }- setVisible(hasGreaterPrivileges);- }-- };- greaterPrivileges.add(new ModalLink("detail") {-- @Override- protected Component newContent(String id) {- return new GreaterPrivilegesPanel(id, item.getModel()) {-- @Override- protected void onClose(AjaxRequestTarget target) {- close(target);- }-- };- }-- });- item.add(greaterPrivileges);- item.add(new DropdownLink("privilege") {-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return item.getModelObject().getPrivilege().toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- TeamAuthorization authorization = item.getModelObject();- authorization.setPrivilege(privilege);- GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);- target.add(pagingNavigator);- target.add(depotsContainer);- target.add(noDepotsContainer);- Session.get().success("Privilege updated");- }-- };- }-- });-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(!pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- };- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- add(noDepotsContainer);-- add(new Label("tip", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- StringBuilder builder = new StringBuilder("<i class='fa fa-info-circle'></i> ");- if (getAccount().getDefaultPrivilege() == DepotPrivilege.NONE) {- builder.append("Grant repository privileges here for the team");- } else {- builder.append("Grant extra repository privileges here for the team besides the "- + "default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege "- + "in organization setting");- }- return builder.toString();- }-- }).setEscapeModelStrings(false));-- }-- /*- * Team authorization page is only visible to administrator as it contains repository- * authorization information and we do not want to expose that information to ordinary members- * as repository name might also be a secret- */- @Override- protected boolean isPermitted() {- return SecurityUtils.canManage(getAccount());- }--}+package com.gitplex.web.page.account.teams;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.Team;+import com.gitplex.core.entity.TeamAuthorization;+import com.gitplex.core.manager.TeamAuthorizationManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;+import com.gitplex.web.component.depotchoice.DepotChoiceResourceReference;+import com.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;+import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.web.depotaccess.DepotAccess;+import com.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;+import com.google.common.base.Preconditions;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;+import com.gitplex.commons.wicket.component.modal.ModalLink;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class TeamDepotListPage extends TeamPage {++ private PageableListView<TeamAuthorization> depotsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private DepotPrivilege filterPrivilege;++ private Set<Long> pendingRemovals = new HashSet<>();++ private String searchInput;++ public TeamDepotListPage(PageParameters params) {+ super(params);+ Preconditions.checkState(getAccount().isOrganization());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchDepots", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterPrivilege == null)+ return "Filter by privilege";+ else+ return filterPrivilege.toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, false, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ filterPrivilege = privilege;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterPrivilege = null;+ target.add(filterContainer);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterPrivilege != null);+ }++ });++ AjaxLink<Void> confirmRemoveLink;+ add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ Collection<TeamAuthorization> authorizations = new HashSet<>();+ TeamAuthorizationManager authorizationManager = GitPlex.getInstance(TeamAuthorizationManager.class);+ for (Long id: pendingRemovals) {+ authorizations.add(authorizationManager.load(id));+ }+ authorizationManager.delete(authorizations);+ pendingRemovals.clear();+ target.add(this);+ target.add(pagingNavigator);+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!pendingRemovals.isEmpty());+ }++ });+ confirmRemoveLink.setOutputMarkupPlaceholderTag(true);++ add(new SelectToAddChoice<Depot>("addNew", new AbstractDepotChoiceProvider() {++ @Override+ public void query(String term, int page, Response<Depot> response) {+ List<Depot> depots = new ArrayList<>();+ for (Depot depot: getAccount().getDepots()) {+ if (depot.matches(term)) {+ boolean authorized = false;+ for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {+ if (authorization.getDepot().equals(depot)) {+ authorized = true;+ break;+ }+ }+ if (!authorized)+ depots.add(depot);+ }+ }++ Collections.sort(depots);++ new ResponseFiller<Depot>(response).fill(depots, page, Constants.DEFAULT_PAGE_SIZE);+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add repository...");+ getSettings().setFormatResult("gitplex.depotChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.depotChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.depotChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot selection) {+ TeamAuthorization authorization = new TeamAuthorization();+ authorization.setDepot(selection);+ authorization.setTeam(teamModel.getObject());+ GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);+ target.add(depotsContainer);+ target.add(pagingNavigator);+ target.add(noDepotsContainer);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new DepotChoiceResourceReference()));+ }++ });++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<TeamAuthorization>("depots",+ new LoadableDetachableModel<List<TeamAuthorization>>() {++ @Override+ protected List<TeamAuthorization> load() {+ List<TeamAuthorization> authorizations = new ArrayList<>();++ for (TeamAuthorization authorization: teamModel.getObject().getAuthorizations()) {+ if (authorization.getDepot().matches(searchInput)+ && (filterPrivilege == null || filterPrivilege == authorization.getPrivilege())) {+ authorizations.add(authorization);+ }+ }++ authorizations.sort((authorization1, authorization2)+ -> authorization1.getDepot().getName().compareTo(authorization2.getDepot().getName()));+ return authorizations;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<TeamAuthorization> item) {+ TeamAuthorization authorization = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>("link", DepotTeamListPage.class,+ DepotTeamListPage.paramsOf(authorization.getDepot()));+ link.add(new Label("name", authorization.getDepot().getName()));+ item.add(link);++ WebMarkupContainer greaterPrivileges = new WebMarkupContainer("greaterPrivileges") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ boolean hasGreaterPrivileges = false;+ Team team = teamModel.getObject();+ TeamAuthorization authorization = item.getModelObject();+ for (Account user: team.getMembers()) {+ DepotAccess depotAccess = new DepotAccess(user, authorization.getDepot());+ if (SecurityUtils.isGreater(depotAccess.getGreatestPrivilege(), authorization.getPrivilege())) {+ hasGreaterPrivileges = true;+ break;+ }+ }+ setVisible(hasGreaterPrivileges);+ }++ };+ greaterPrivileges.add(new ModalLink("detail") {++ @Override+ protected Component newContent(String id) {+ return new GreaterPrivilegesPanel(id, item.getModel()) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close(target);+ }++ };+ }++ });+ item.add(greaterPrivileges);+ item.add(new DropdownLink("privilege") {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return item.getModelObject().getPrivilege().toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, false, item.getModelObject().getPrivilege()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ TeamAuthorization authorization = item.getModelObject();+ authorization.setPrivilege(privilege);+ GitPlex.getInstance(TeamAuthorizationManager.class).save(authorization);+ target.add(pagingNavigator);+ target.add(depotsContainer);+ target.add(noDepotsContainer);+ Session.get().success("Privilege updated");+ }++ };+ }++ });++ item.add(new AjaxLink<Void>("remove") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(!pendingRemovals.contains(item.getModelObject().getId()));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.add(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ });+ item.add(new WebMarkupContainer("pendingRemoval") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.add(new AjaxLink<Void>("undoRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.remove(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.setOutputMarkupId(true);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ };+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ add(noDepotsContainer);++ add(new Label("tip", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ StringBuilder builder = new StringBuilder("<i class='fa fa-info-circle'></i> ");+ if (getAccount().getDefaultPrivilege() == DepotPrivilege.NONE) {+ builder.append("Grant repository privileges here for the team");+ } else {+ builder.append("Grant extra repository privileges here for the team besides the "+ + "default <b>" + getAccount().getDefaultPrivilege() + "</b> privilege "+ + "in organization setting");+ }+ return builder.toString();+ }++ }).setEscapeModelStrings(false));++ }++ /*+ * Team authorization page is only visible to administrator as it contains repository+ * authorization information and we do not want to expose that information to ordinary members+ * as repository name might also be a secret+ */+ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canManage(getAccount());+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.javaindex 717db64c00..aa49956a67 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java@@ -1,324 +1,327 @@-package com.gitplex.web.page.account.teams;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;-import java.util.Set;--import org.apache.commons.lang3.StringEscapeUtils;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.json.JSONException;-import org.json.JSONWriter;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.TeamMembership;-import com.gitplex.core.manager.OrganizationMembershipManager;-import com.gitplex.core.manager.TeamMembershipManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.avatar.AvatarManager;-import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.members.MemberListPage;-import com.gitplex.web.page.account.members.MemberTeamListPage;-import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.select2.ChoiceProvider;-import com.gitplex.commons.wicket.component.select2.Response;-import com.gitplex.commons.wicket.component.select2.ResponseFiller;-import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class TeamMemberListPage extends TeamPage {-- private PageableListView<TeamMembership> membersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer membersContainer;-- private WebMarkupContainer noMembersContainer;-- private Set<Long> pendingRemovals = new HashSet<>();-- public TeamMemberListPage(PageParameters params) {- super(params);-- Preconditions.checkState(getAccount().isOrganization());- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchMembers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- AjaxLink<Void> confirmRemoveLink;- add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- TeamMembershipManager teamMembershipManager = GitPlex.getInstance(TeamMembershipManager.class);- Collection<TeamMembership> memberships = new ArrayList<>();- for (Long id: pendingRemovals) {- memberships.add(teamMembershipManager.load(id));- }- GitPlex.getInstance(TeamMembershipManager.class).delete(memberships);- pendingRemovals.clear();- target.add(this);- target.add(pagingNavigator);- target.add(membersContainer);- target.add(noMembersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!pendingRemovals.isEmpty());- }-- });- confirmRemoveLink.setOutputMarkupPlaceholderTag(true);-- add(new SelectToAddChoice<OrganizationMembership>("addNew", new ChoiceProvider<OrganizationMembership>() {-- @Override- public void query(String term, int page, Response<OrganizationMembership> response) {- List<OrganizationMembership> memberships = new ArrayList<>();- term = term.toLowerCase();- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- Account user = membership.getUser();- if (user.matches(term) && !teamModel.getObject().getMembers().contains(user)) {- memberships.add(membership);- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().compareTo(membership2.getUser()));-- new ResponseFiller<OrganizationMembership>(response).fill(memberships, page, Constants.DEFAULT_PAGE_SIZE);- }-- @Override- public void toJson(OrganizationMembership choice, JSONWriter writer) throws JSONException {- String displayName = StringEscapeUtils.escapeHtml4(choice.getUser().getDisplayName());- writer.key("id").value(choice.getId()).key("name").value(displayName);- String avatarUrl = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(choice.getUser());- writer.key("avatar").value(avatarUrl);- }-- @Override- public Collection<OrganizationMembership> toChoices(Collection<String> ids) {- List<OrganizationMembership> memberships = Lists.newArrayList();- OrganizationMembershipManager membershipManager = GitPlex.getInstance(OrganizationMembershipManager.class);- for (String each : ids) {- Long id = Long.valueOf(each);- memberships.add(membershipManager.load(id));- }-- return memberships;- }-- }) {-- @Override- protected void onInitialize() {- super.onInitialize();-- getSettings().setPlaceholder("Add user to team...");- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);-- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));- }-- @Override- protected void onSelect(AjaxRequestTarget target, OrganizationMembership selection) {- TeamMembership membership = new TeamMembership();- membership.setTeam(teamModel.getObject());- membership.setUser(selection.getUser());- GitPlex.getInstance(TeamMembershipManager.class).save(membership);- target.add(membersContainer);- target.add(pagingNavigator);- target.add(noMembersContainer);- }-- });-- membersContainer = new WebMarkupContainer("members") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!membersView.getModelObject().isEmpty());- }-- };- membersContainer.setOutputMarkupPlaceholderTag(true);- add(membersContainer);-- membersContainer.add(membersView = new PageableListView<TeamMembership>("members",- new LoadableDetachableModel<List<TeamMembership>>() {-- @Override- protected List<TeamMembership> load() {- List<TeamMembership> memberships = new ArrayList<>();-- for (TeamMembership membership: teamModel.getObject().getMemberships()) {- if (membership.getUser().matches(searchField.getInput())) {- memberships.add(membership);- }- }-- memberships.sort((membership1, membership2)- -> membership1.getUser().getDisplayName().compareTo(membership2.getUser().getDisplayName()));- return memberships;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<TeamMembership> item) {- Account member = item.getModelObject().getUser();-- OrganizationMembership membership =- Preconditions.checkNotNull(getAccount().getOrganizationMembersMap().get(member));- PageParameters params = MemberTeamListPage.paramsOf(membership);- Link<Void> link = new BookmarkablePageLink<Void>("avatarLink",- MemberTeamListPage.class, params);- link.add(new Avatar("avatar", member));- item.add(link);-- link = new BookmarkablePageLink<Void>("nameLink",- MemberTeamListPage.class, params);- link.add(new Label("name", member.getDisplayName()));- item.add(link);-- item.add(new AjaxLink<Void>("remove") {-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canManage(getAccount())- && !pendingRemovals.contains(item.getModelObject().getId()));- }-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.add(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- });- item.add(new WebMarkupContainer("pendingRemoval") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.add(new AjaxLink<Void>("undoRemove") {-- @Override- public void onClick(AjaxRequestTarget target) {- pendingRemovals.remove(item.getModelObject().getId());- target.add(item);- target.add(confirmRemoveLink);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(pendingRemovals.contains(item.getModelObject().getId()));- }-- });- item.setOutputMarkupId(true);- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noMembersContainer = new WebMarkupContainer("noMembers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(membersView.getModelObject().isEmpty());- }-- };- noMembersContainer.setOutputMarkupPlaceholderTag(true);- add(noMembersContainer);-- add(new BookmarkablePageLink<Void>("organizationMembers",- MemberListPage.class, MemberListPage.paramsOf(getAccount())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getAccount()));- }-- });- }--}+package com.gitplex.web.page.account.teams;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.commons.lang3.StringEscapeUtils;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.json.JSONException;+import org.json.JSONWriter;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.OrganizationMembership;+import com.gitplex.core.entity.TeamMembership;+import com.gitplex.core.manager.OrganizationMembershipManager;+import com.gitplex.core.manager.TeamMembershipManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.web.Constants;+import com.gitplex.web.avatar.AvatarManager;+import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;+import com.gitplex.web.component.avatar.Avatar;+import com.gitplex.web.page.account.members.MemberListPage;+import com.gitplex.web.page.account.members.MemberTeamListPage;+import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;+import com.gitplex.commons.wicket.component.select2.Response;+import com.gitplex.commons.wicket.component.select2.ResponseFiller;+import com.gitplex.commons.wicket.component.select2.SelectToAddChoice;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class TeamMemberListPage extends TeamPage {++ private PageableListView<TeamMembership> membersView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer membersContainer;++ private WebMarkupContainer noMembersContainer;++ private Set<Long> pendingRemovals = new HashSet<>();++ private String searchInput;++ public TeamMemberListPage(PageParameters params) {+ super(params);++ Preconditions.checkState(getAccount().isOrganization());+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchMembers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ });++ AjaxLink<Void> confirmRemoveLink;+ add(confirmRemoveLink = new AjaxLink<Void>("confirmRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ TeamMembershipManager teamMembershipManager = GitPlex.getInstance(TeamMembershipManager.class);+ Collection<TeamMembership> memberships = new ArrayList<>();+ for (Long id: pendingRemovals) {+ memberships.add(teamMembershipManager.load(id));+ }+ GitPlex.getInstance(TeamMembershipManager.class).delete(memberships);+ pendingRemovals.clear();+ target.add(this);+ target.add(pagingNavigator);+ target.add(membersContainer);+ target.add(noMembersContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!pendingRemovals.isEmpty());+ }++ });+ confirmRemoveLink.setOutputMarkupPlaceholderTag(true);++ add(new SelectToAddChoice<OrganizationMembership>("addNew", new ChoiceProvider<OrganizationMembership>() {++ @Override+ public void query(String term, int page, Response<OrganizationMembership> response) {+ List<OrganizationMembership> memberships = new ArrayList<>();+ term = term.toLowerCase();+ for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {+ Account user = membership.getUser();+ if (user.matches(term) && !teamModel.getObject().getMembers().contains(user)) {+ memberships.add(membership);+ }+ }++ memberships.sort((membership1, membership2)+ -> membership1.getUser().compareTo(membership2.getUser()));++ new ResponseFiller<OrganizationMembership>(response).fill(memberships, page, Constants.DEFAULT_PAGE_SIZE);+ }++ @Override+ public void toJson(OrganizationMembership choice, JSONWriter writer) throws JSONException {+ String displayName = StringEscapeUtils.escapeHtml4(choice.getUser().getDisplayName());+ writer.key("id").value(choice.getId()).key("name").value(displayName);+ String avatarUrl = GitPlex.getInstance(AvatarManager.class).getAvatarUrl(choice.getUser());+ writer.key("avatar").value(avatarUrl);+ }++ @Override+ public Collection<OrganizationMembership> toChoices(Collection<String> ids) {+ List<OrganizationMembership> memberships = Lists.newArrayList();+ OrganizationMembershipManager membershipManager = GitPlex.getInstance(OrganizationMembershipManager.class);+ for (String each : ids) {+ Long id = Long.valueOf(each);+ memberships.add(membershipManager.load(id));+ }++ return memberships;+ }++ }) {++ @Override+ protected void onInitialize() {+ super.onInitialize();++ getSettings().setPlaceholder("Add user to team...");+ getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");+ getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");+ getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getAccount()));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, OrganizationMembership selection) {+ TeamMembership membership = new TeamMembership();+ membership.setTeam(teamModel.getObject());+ membership.setUser(selection.getUser());+ GitPlex.getInstance(TeamMembershipManager.class).save(membership);+ target.add(membersContainer);+ target.add(pagingNavigator);+ target.add(noMembersContainer);+ }++ });++ membersContainer = new WebMarkupContainer("members") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!membersView.getModelObject().isEmpty());+ }++ };+ membersContainer.setOutputMarkupPlaceholderTag(true);+ add(membersContainer);++ membersContainer.add(membersView = new PageableListView<TeamMembership>("members",+ new LoadableDetachableModel<List<TeamMembership>>() {++ @Override+ protected List<TeamMembership> load() {+ List<TeamMembership> memberships = new ArrayList<>();++ for (TeamMembership membership: teamModel.getObject().getMemberships()) {+ if (membership.getUser().matches(searchInput)) {+ memberships.add(membership);+ }+ }++ memberships.sort((membership1, membership2)+ -> membership1.getUser().getDisplayName().compareTo(membership2.getUser().getDisplayName()));+ return memberships;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<TeamMembership> item) {+ Account member = item.getModelObject().getUser();++ OrganizationMembership membership =+ Preconditions.checkNotNull(getAccount().getOrganizationMembersMap().get(member));+ PageParameters params = MemberTeamListPage.paramsOf(membership);+ Link<Void> link = new BookmarkablePageLink<Void>("avatarLink",+ MemberTeamListPage.class, params);+ link.add(new Avatar("avatar", member));+ item.add(link);++ link = new BookmarkablePageLink<Void>("nameLink",+ MemberTeamListPage.class, params);+ link.add(new Label("name", member.getDisplayName()));+ item.add(link);++ item.add(new AjaxLink<Void>("remove") {++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(SecurityUtils.canManage(getAccount())+ && !pendingRemovals.contains(item.getModelObject().getId()));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.add(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ });+ item.add(new WebMarkupContainer("pendingRemoval") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.add(new AjaxLink<Void>("undoRemove") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ pendingRemovals.remove(item.getModelObject().getId());+ target.add(item);+ target.add(confirmRemoveLink);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(pendingRemovals.contains(item.getModelObject().getId()));+ }++ });+ item.setOutputMarkupId(true);+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", membersView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(membersView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noMembersContainer = new WebMarkupContainer("noMembers") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(membersView.getModelObject().isEmpty());+ }++ };+ noMembersContainer.setOutputMarkupPlaceholderTag(true);+ add(noMembersContainer);++ add(new BookmarkablePageLink<Void>("organizationMembers",+ MemberListPage.class, MemberListPage.paramsOf(getAccount())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getAccount()));+ }++ });+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.javaindex 74e58bcb91..ebf3f8201f 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java@@ -1,180 +1,183 @@-package com.gitplex.web.page.admin.account;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.manager.AccountManager;-import com.gitplex.core.security.SecurityUtils;-import com.gitplex.web.Constants;-import com.gitplex.web.component.AccountLink;-import com.gitplex.web.component.avatar.AvatarLink;-import com.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;-import com.gitplex.web.page.account.AccountPage;-import com.gitplex.web.page.account.setting.ProfileEditPage;-import com.gitplex.web.page.admin.AdministrationPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class UserListPage extends AdministrationPage {-- private PageableListView<Account> accountsView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer accountsContainer;-- private WebMarkupContainer noAccountsContainer;-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("searchAccounts", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(accountsContainer);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- });-- add(new Link<Void>("addNew") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManageSystem());- }-- @Override- public void onClick() {- setResponsePage(NewUserPage.class);- }-- });-- accountsContainer = new WebMarkupContainer("accounts") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!accountsView.getModelObject().isEmpty());- }-- };- accountsContainer.setOutputMarkupPlaceholderTag(true);- add(accountsContainer);-- accountsContainer.add(accountsView = new PageableListView<Account>("accounts", new LoadableDetachableModel<List<Account>>() {-- @Override- protected List<Account> load() {- List<Account> accounts = new ArrayList<>();- for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {- if (account.matches(searchField.getInput()) && !account.isOrganization()) {- accounts.add(account);- }- }- accounts.sort((account1, account2) -> account1.getDisplayName().compareTo(account2.getDisplayName()));- return accounts;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account account = item.getModelObject();-- item.add(new AvatarLink("avatarLink", item.getModelObject(), null));- item.add(new AccountLink("nameLink", item.getModelObject()));- item.add(new Label("email", account.getEmail()));-- item.add(new Link<Void>("setting") {-- @Override- public void onClick() {- PageParameters params = AccountPage.paramsOf(item.getModelObject());- setResponsePage(ProfileEditPage.class, params);- }-- });-- Long accountId = account.getId();- item.add(new AjaxLink<Void>("delete") {-- @Override- public void onClick(AjaxRequestTarget target) {- new ConfirmDeleteAccountModal(target) {-- @Override- protected void onDeleted(AjaxRequestTarget target) {- target.add(accountsContainer);- target.add(pagingNavigator);- target.add(noAccountsContainer);- }-- @Override- protected Account getAccount() {- return GitPlex.getInstance(AccountManager.class).load(accountId);- }- };- }-- @Override- protected void onConfigure() {- super.onConfigure();-- Account account = item.getModelObject();- setVisible(SecurityUtils.canManage(account) && !account.equals(getLoginUser()));- }-- });- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- add(noAccountsContainer = new WebMarkupContainer("noAccounts") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accountsView.getModelObject().isEmpty());- }-- });- noAccountsContainer.setOutputMarkupPlaceholderTag(true);- }--}+package com.gitplex.web.page.admin.account;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.manager.AccountManager;+import com.gitplex.core.security.SecurityUtils;+import com.gitplex.web.Constants;+import com.gitplex.web.component.AccountLink;+import com.gitplex.web.component.avatar.AvatarLink;+import com.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;+import com.gitplex.web.page.account.AccountPage;+import com.gitplex.web.page.account.setting.ProfileEditPage;+import com.gitplex.web.page.admin.AdministrationPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class UserListPage extends AdministrationPage {++ private PageableListView<Account> accountsView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer accountsContainer;++ private WebMarkupContainer noAccountsContainer;++ private String searchInput;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("searchAccounts", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(accountsContainer);+ target.add(pagingNavigator);+ target.add(noAccountsContainer);+ }++ });++ add(new Link<Void>("addNew") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManageSystem());+ }++ @Override+ public void onClick() {+ setResponsePage(NewUserPage.class);+ }++ });++ accountsContainer = new WebMarkupContainer("accounts") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!accountsView.getModelObject().isEmpty());+ }++ };+ accountsContainer.setOutputMarkupPlaceholderTag(true);+ add(accountsContainer);++ accountsContainer.add(accountsView = new PageableListView<Account>("accounts", new LoadableDetachableModel<List<Account>>() {++ @Override+ protected List<Account> load() {+ List<Account> accounts = new ArrayList<>();+ for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {+ if (account.matches(searchInput) && !account.isOrganization()) {+ accounts.add(account);+ }+ }+ accounts.sort((account1, account2) -> account1.getDisplayName().compareTo(account2.getDisplayName()));+ return accounts;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Account> item) {+ Account account = item.getModelObject();++ item.add(new AvatarLink("avatarLink", item.getModelObject(), null));+ item.add(new AccountLink("nameLink", item.getModelObject()));+ item.add(new Label("email", account.getEmail()));++ item.add(new Link<Void>("setting") {++ @Override+ public void onClick() {+ PageParameters params = AccountPage.paramsOf(item.getModelObject());+ setResponsePage(ProfileEditPage.class, params);+ }++ });++ Long accountId = account.getId();+ item.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new ConfirmDeleteAccountModal(target) {++ @Override+ protected void onDeleted(AjaxRequestTarget target) {+ target.add(accountsContainer);+ target.add(pagingNavigator);+ target.add(noAccountsContainer);+ }++ @Override+ protected Account getAccount() {+ return GitPlex.getInstance(AccountManager.class).load(accountId);+ }+ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ Account account = item.getModelObject();+ setVisible(SecurityUtils.canManage(account) && !account.equals(getLoginUser()));+ }++ });+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accountsView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ add(noAccountsContainer = new WebMarkupContainer("noAccounts") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(accountsView.getModelObject().isEmpty());+ }++ });+ noAccountsContainer.setOutputMarkupPlaceholderTag(true);+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.javaindex e54efddd5f..57670befb2 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java@@ -1,292 +1,295 @@-package com.gitplex.web.page.depot.setting.authorization;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.entity.UserAuthorization;-import com.gitplex.core.security.privilege.DepotPrivilege;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;-import com.gitplex.web.depotaccess.DepotAccess;-import com.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;-import com.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;-import com.gitplex.web.page.account.members.MemberEffectivePrivilegePage;-import com.gitplex.web.page.account.members.MemberPrivilegeSourcePage;-import com.gitplex.web.page.depot.setting.DepotSettingPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;-import com.gitplex.commons.wicket.component.DropdownLink;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class DepotEffectivePrivilegePage extends DepotSettingPage {-- private PageableListView<UserPermission> usersView;-- private BootstrapPagingNavigator pagingNavigator;-- private WebMarkupContainer usersContainer;-- private WebMarkupContainer noUsersContainer;-- private DepotPrivilege filterPrivilege;-- public DepotEffectivePrivilegePage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;-- add(searchField = new TextField<String>("searchUsers", Model.of("")));- searchField.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- });-- WebMarkupContainer filterContainer = new WebMarkupContainer("filter");- filterContainer.setOutputMarkupId(true);- add(filterContainer);-- filterContainer.add(new DropdownLink("selection") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (filterPrivilege == null)- return "Filter by privilege";- else- return filterPrivilege.toString();- }-- }));- }-- @Override- protected Component newContent(String id) {- return new PrivilegeSelectionPanel(id, true, filterPrivilege) {-- @Override- protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {- close();- filterPrivilege = privilege;- target.add(filterContainer);- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- };- }- });- filterContainer.add(new AjaxLink<Void>("clear") {-- @Override- public void onClick(AjaxRequestTarget target) {- filterPrivilege = null;- target.add(filterContainer);- target.add(usersContainer);- target.add(pagingNavigator);- target.add(noUsersContainer);- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(filterPrivilege != null);- }-- });-- usersContainer = new WebMarkupContainer("users") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!usersView.getModelObject().isEmpty());- }-- };- usersContainer.setOutputMarkupPlaceholderTag(true);- add(usersContainer);-- usersContainer.add(usersView = new PageableListView<UserPermission>("users",- new LoadableDetachableModel<List<UserPermission>>() {-- @Override- protected List<UserPermission> load() {- List<UserPermission> permissions = new ArrayList<>();-- Depot depot = depotModel.getObject();- Collection<Account> users = new HashSet<>();- for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {- users.add(membership.getUser());- }- for (UserAuthorization authorization: depot.getAuthorizedUsers()) {- users.add(authorization.getUser());- }- for (Account user: users) {- if (user.matches(searchField.getInput())) {- DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();- if (privilege != DepotPrivilege.NONE- && (filterPrivilege == null || filterPrivilege == privilege)) {- permissions.add(new UserPermission(user, privilege));- }- }- }-- permissions.sort((permission1, permission2)- -> permission1.getUser().getDisplayName().compareTo(permission2.getUser().getDisplayName()));- return permissions;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<UserPermission> item) {- UserPermission permission = item.getModelObject();-- OrganizationMembership membership =- getAccount().getOrganizationMembersMap().get(permission.getUser());- if (membership != null) {- PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);- Link<Void> link = new BookmarkablePageLink<Void>(- "avatarLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new BookmarkablePageLink<Void>(- "nameLink",- MemberEffectivePrivilegePage.class,- params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());- link = new BookmarkablePageLink<Void>(- "privilegeLink",- MemberPrivilegeSourcePage.class,- params);- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- } else {- PageParameters params = CollaboratorDepotListPage.paramsOf(- getAccount(), permission.getUser());-- Link<Void> link = new BookmarkablePageLink<Void>(- "avatarLink",- CollaboratorDepotListPage.class,- params);- link.add(new Avatar("avatar", permission.getUser()));- item.add(link);-- link = new BookmarkablePageLink<Void>(- "nameLink",- CollaboratorDepotListPage.class,- params);- link.add(new Label("name", permission.getUser().getDisplayName()));- item.add(link);-- params = CollaboratorPrivilegeSourcePage.paramsOf(depotModel.getObject(), permission.getUser());- link = new BookmarkablePageLink<Void>(- "privilegeLink",- CollaboratorPrivilegeSourcePage.class,- params);- link.add(new Label("privilege", permission.getPrivilege().toString()));- item.add(link);- }- }-- });-- add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", usersView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(usersView.getPageCount() > 1);- }-- });- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- noUsersContainer = new WebMarkupContainer("noUsers") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(usersView.getModelObject().isEmpty());- }-- };- noUsersContainer.setOutputMarkupPlaceholderTag(true);- add(noUsersContainer);- }-- @Override- protected void onSelect(AjaxRequestTarget target, Depot depot) {- if (depot.getAccount().isOrganization())- setResponsePage(DepotEffectivePrivilegePage.class, DepotEffectivePrivilegePage.paramsOf(depot));- else- setResponsePage(DepotCollaboratorListPage.class, DepotCollaboratorListPage.paramsOf(depot));- }-- private static class UserPermission {-- private final Account user;-- private final DepotPrivilege privilege;-- public UserPermission(Account user, DepotPrivilege privilege) {- this.user = user;- this.privilege = privilege;- }-- public Account getUser() {- return user;- }-- public DepotPrivilege getPrivilege() {- return privilege;- }-- }--}+package com.gitplex.web.page.depot.setting.authorization;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.OrganizationMembership;+import com.gitplex.core.entity.UserAuthorization;+import com.gitplex.core.security.privilege.DepotPrivilege;+import com.gitplex.web.Constants;+import com.gitplex.web.component.avatar.Avatar;+import com.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;+import com.gitplex.web.depotaccess.DepotAccess;+import com.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;+import com.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;+import com.gitplex.web.page.account.members.MemberEffectivePrivilegePage;+import com.gitplex.web.page.account.members.MemberPrivilegeSourcePage;+import com.gitplex.web.page.depot.setting.DepotSettingPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;+import com.gitplex.commons.wicket.component.DropdownLink;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class DepotEffectivePrivilegePage extends DepotSettingPage {++ private PageableListView<UserPermission> usersView;++ private BootstrapPagingNavigator pagingNavigator;++ private WebMarkupContainer usersContainer;++ private WebMarkupContainer noUsersContainer;++ private DepotPrivilege filterPrivilege;++ private String searchInput;++ public DepotEffectivePrivilegePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;++ add(searchField = new TextField<String>("searchUsers", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(usersContainer);+ target.add(pagingNavigator);+ target.add(noUsersContainer);+ }++ });++ WebMarkupContainer filterContainer = new WebMarkupContainer("filter");+ filterContainer.setOutputMarkupId(true);+ add(filterContainer);++ filterContainer.add(new DropdownLink("selection") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (filterPrivilege == null)+ return "Filter by privilege";+ else+ return filterPrivilege.toString();+ }++ }));+ }++ @Override+ protected Component newContent(String id) {+ return new PrivilegeSelectionPanel(id, true, filterPrivilege) {++ @Override+ protected void onSelect(AjaxRequestTarget target, DepotPrivilege privilege) {+ close();+ filterPrivilege = privilege;+ target.add(filterContainer);+ target.add(usersContainer);+ target.add(pagingNavigator);+ target.add(noUsersContainer);+ }++ };+ }+ });+ filterContainer.add(new AjaxLink<Void>("clear") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ filterPrivilege = null;+ target.add(filterContainer);+ target.add(usersContainer);+ target.add(pagingNavigator);+ target.add(noUsersContainer);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(filterPrivilege != null);+ }++ });++ usersContainer = new WebMarkupContainer("users") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!usersView.getModelObject().isEmpty());+ }++ };+ usersContainer.setOutputMarkupPlaceholderTag(true);+ add(usersContainer);++ usersContainer.add(usersView = new PageableListView<UserPermission>("users",+ new LoadableDetachableModel<List<UserPermission>>() {++ @Override+ protected List<UserPermission> load() {+ List<UserPermission> permissions = new ArrayList<>();++ Depot depot = depotModel.getObject();+ Collection<Account> users = new HashSet<>();+ for (OrganizationMembership membership: getAccount().getOrganizationMembers()) {+ users.add(membership.getUser());+ }+ for (UserAuthorization authorization: depot.getAuthorizedUsers()) {+ users.add(authorization.getUser());+ }+ for (Account user: users) {+ if (user.matches(searchInput)) {+ DepotPrivilege privilege = new DepotAccess(user, depot).getGreatestPrivilege();+ if (privilege != DepotPrivilege.NONE+ && (filterPrivilege == null || filterPrivilege == privilege)) {+ permissions.add(new UserPermission(user, privilege));+ }+ }+ }++ permissions.sort((permission1, permission2)+ -> permission1.getUser().getDisplayName().compareTo(permission2.getUser().getDisplayName()));+ return permissions;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<UserPermission> item) {+ UserPermission permission = item.getModelObject();++ OrganizationMembership membership =+ getAccount().getOrganizationMembersMap().get(permission.getUser());+ if (membership != null) {+ PageParameters params = MemberEffectivePrivilegePage.paramsOf(membership);+ Link<Void> link = new BookmarkablePageLink<Void>(+ "avatarLink",+ MemberEffectivePrivilegePage.class,+ params);+ link.add(new Avatar("avatar", permission.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<Void>(+ "nameLink",+ MemberEffectivePrivilegePage.class,+ params);+ link.add(new Label("name", permission.getUser().getDisplayName()));+ item.add(link);++ params = MemberPrivilegeSourcePage.paramsOf(membership, depotModel.getObject());+ link = new BookmarkablePageLink<Void>(+ "privilegeLink",+ MemberPrivilegeSourcePage.class,+ params);+ link.add(new Label("privilege", permission.getPrivilege().toString()));+ item.add(link);+ } else {+ PageParameters params = CollaboratorDepotListPage.paramsOf(+ getAccount(), permission.getUser());++ Link<Void> link = new BookmarkablePageLink<Void>(+ "avatarLink",+ CollaboratorDepotListPage.class,+ params);+ link.add(new Avatar("avatar", permission.getUser()));+ item.add(link);++ link = new BookmarkablePageLink<Void>(+ "nameLink",+ CollaboratorDepotListPage.class,+ params);+ link.add(new Label("name", permission.getUser().getDisplayName()));+ item.add(link);++ params = CollaboratorPrivilegeSourcePage.paramsOf(depotModel.getObject(), permission.getUser());+ link = new BookmarkablePageLink<Void>(+ "privilegeLink",+ CollaboratorPrivilegeSourcePage.class,+ params);+ link.add(new Label("privilege", permission.getPrivilege().toString()));+ item.add(link);+ }+ }++ });++ add(pagingNavigator = new BootstrapAjaxPagingNavigator("pageNav", usersView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(usersView.getPageCount() > 1);+ }++ });+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ noUsersContainer = new WebMarkupContainer("noUsers") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(usersView.getModelObject().isEmpty());+ }++ };+ noUsersContainer.setOutputMarkupPlaceholderTag(true);+ add(noUsersContainer);+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Depot depot) {+ if (depot.getAccount().isOrganization())+ setResponsePage(DepotEffectivePrivilegePage.class, DepotEffectivePrivilegePage.paramsOf(depot));+ else+ setResponsePage(DepotCollaboratorListPage.class, DepotCollaboratorListPage.paramsOf(depot));+ }++ private static class UserPermission {++ private final Account user;++ private final DepotPrivilege privilege;++ public UserPermission(Account user, DepotPrivilege privilege) {+ this.user = user;+ this.privilege = privilege;+ }++ public Account getUser() {+ return user;+ }++ public DepotPrivilege getPrivilege() {+ return privilege;+ }++ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.htmlindex 6f1f3782f4..088c0dc16e 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html+++ b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html@@ -5,7 +5,7 @@<td class="repositories"><div class="title">Accessible Repositories</div><div class="search">- <input wicket:id="searchDepots" class="form-control focusable" placeholder="Search..."></input>+ <input wicket:id="search" class="form-control focusable" placeholder="Search..."></input></div><ul wicket:id="depots" class="list-unstyled"><li wicket:id="depots">diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.javaindex 3813496477..476c715119 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java+++ b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java@@ -1,214 +1,217 @@-package com.gitplex.web.page.home;--import java.util.ArrayList;-import java.util.Collections;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;--import com.gitplex.core.GitPlex;-import com.gitplex.core.entity.Account;-import com.gitplex.core.entity.Depot;-import com.gitplex.core.entity.OrganizationMembership;-import com.gitplex.core.manager.DepotManager;-import com.gitplex.web.Constants;-import com.gitplex.web.component.avatar.Avatar;-import com.gitplex.web.page.account.overview.AccountOverviewPage;-import com.gitplex.web.page.depot.file.DepotFilePage;-import com.gitplex.web.page.layout.LayoutPage;-import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;--@SuppressWarnings("serial")-public class DashboardPage extends LayoutPage {-- private ListView<Account> organizationsView;-- private WebMarkupContainer organizationsContainer;-- private WebMarkupContainer noOrganizationsContainer;-- private PageableListView<Depot> depotsView;-- private BootstrapPagingNavigator depotsPageNav;-- private WebMarkupContainer depotsContainer;-- private WebMarkupContainer noDepotsContainer;-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new WebMarkupContainer("organizations") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- organizationsContainer = new WebMarkupContainer("organizations") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!organizationsView.getModelObject().isEmpty());- }-- };- organizationsContainer.setOutputMarkupPlaceholderTag(true);- add(organizationsContainer);-- organizationsContainer.add(organizationsView = new ListView<Account>("organizations",- new LoadableDetachableModel<List<Account>>() {-- @Override- protected List<Account> load() {- List<Account> organizations = new ArrayList<>();-- Account loginUser = getLoginUser();- if (loginUser != null) {- for (OrganizationMembership membership: loginUser.getOrganizations()) {- organizations.add(membership.getOrganization());- }- Collections.sort(organizations);- }- return organizations;- }-- }) {-- @Override- protected void populateItem(ListItem<Account> item) {- Account organization = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link",- AccountOverviewPage.class, AccountOverviewPage.paramsOf(organization));- link.add(new Avatar("avatar", organization));- link.add(new Label("name", organization.getDisplayName()));- item.add(link);- }-- });- add(noOrganizationsContainer = new WebMarkupContainer("noOrganizations") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(organizationsView.getModelObject().isEmpty());- }-- });- noOrganizationsContainer.setOutputMarkupPlaceholderTag(true);- }-- });-- TextField<String> searchDepots;- add(searchDepots = new TextField<String>("searchDepots", Model.of("")));- searchDepots.add(new OnTypingDoneBehavior(100) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- target.add(depotsContainer);- target.add(depotsPageNav);- target.add(noDepotsContainer);- }-- });-- depotsContainer = new WebMarkupContainer("depots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!depotsView.getModelObject().isEmpty());- }-- };- depotsContainer.setOutputMarkupPlaceholderTag(true);- add(depotsContainer);-- depotsContainer.add(depotsView = new PageableListView<Depot>("depots",- new LoadableDetachableModel<List<Depot>>() {-- @Override- protected List<Depot> load() {- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);- List<Depot> depots = new ArrayList<>();- for (Depot depot: depotManager.findAllAccessible(null, getLoginUser())) {- if (depot.matchesFQN(searchDepots.getInput())) {- depots.add(depot);- }- }- depots.sort(Depot::compareLastVisit);- return depots;- }-- }, Constants.DEFAULT_PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<Depot> item) {- Depot depot = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link",- DepotFilePage.class, DepotFilePage.paramsOf(depot));- link.add(new Label("name", depot.getFQN()));- item.add(link);- }-- });-- add(depotsPageNav = new BootstrapAjaxPagingNavigator("depotsPageNav", depotsView) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getPageCount() > 1);- }-- });- depotsPageNav.setOutputMarkupPlaceholderTag(true);-- add(noDepotsContainer = new WebMarkupContainer("noDepots") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(depotsView.getModelObject().isEmpty());- }-- });- noDepotsContainer.setOutputMarkupPlaceholderTag(true);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new DashboardResourceReference()));- }-- @Override- protected Component newContextHead(String componentId) {- return new Label(componentId, "Dashboard");- }--}+package com.gitplex.web.page.home;++import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import com.gitplex.core.GitPlex;+import com.gitplex.core.entity.Account;+import com.gitplex.core.entity.Depot;+import com.gitplex.core.entity.OrganizationMembership;+import com.gitplex.core.manager.DepotManager;+import com.gitplex.web.Constants;+import com.gitplex.web.component.avatar.Avatar;+import com.gitplex.web.page.account.overview.AccountOverviewPage;+import com.gitplex.web.page.depot.file.DepotFilePage;+import com.gitplex.web.page.layout.LayoutPage;+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class DashboardPage extends LayoutPage {++ private ListView<Account> organizationsView;++ private WebMarkupContainer organizationsContainer;++ private WebMarkupContainer noOrganizationsContainer;++ private PageableListView<Depot> depotsView;++ private BootstrapPagingNavigator depotsPageNav;++ private WebMarkupContainer depotsContainer;++ private WebMarkupContainer noDepotsContainer;++ private String searchInput;++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WebMarkupContainer("organizations") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ organizationsContainer = new WebMarkupContainer("organizations") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!organizationsView.getModelObject().isEmpty());+ }++ };+ organizationsContainer.setOutputMarkupPlaceholderTag(true);+ add(organizationsContainer);++ organizationsContainer.add(organizationsView = new ListView<Account>("organizations",+ new LoadableDetachableModel<List<Account>>() {++ @Override+ protected List<Account> load() {+ List<Account> organizations = new ArrayList<>();++ Account loginUser = getLoginUser();+ if (loginUser != null) {+ for (OrganizationMembership membership: loginUser.getOrganizations()) {+ organizations.add(membership.getOrganization());+ }+ Collections.sort(organizations);+ }+ return organizations;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Account> item) {+ Account organization = item.getModelObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ AccountOverviewPage.class, AccountOverviewPage.paramsOf(organization));+ link.add(new Avatar("avatar", organization));+ link.add(new Label("name", organization.getDisplayName()));+ item.add(link);+ }++ });+ add(noOrganizationsContainer = new WebMarkupContainer("noOrganizations") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(organizationsView.getModelObject().isEmpty());+ }++ });+ noOrganizationsContainer.setOutputMarkupPlaceholderTag(true);+ }++ });++ TextField<String> searchField;+ add(searchField = new TextField<String>("search", Model.of("")));+ searchField.add(new OnTypingDoneBehavior(100) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ searchInput = searchField.getInput();+ target.add(depotsContainer);+ target.add(depotsPageNav);+ target.add(noDepotsContainer);+ }++ });++ depotsContainer = new WebMarkupContainer("depots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!depotsView.getModelObject().isEmpty());+ }++ };+ depotsContainer.setOutputMarkupPlaceholderTag(true);+ add(depotsContainer);++ depotsContainer.add(depotsView = new PageableListView<Depot>("depots",+ new LoadableDetachableModel<List<Depot>>() {++ @Override+ protected List<Depot> load() {+ DepotManager depotManager = GitPlex.getInstance(DepotManager.class);+ List<Depot> depots = new ArrayList<>();+ for (Depot depot: depotManager.findAllAccessible(null, getLoginUser())) {+ if (depot.matchesFQN(searchInput)) {+ depots.add(depot);+ }+ }+ depots.sort(Depot::compareLastVisit);+ return depots;+ }++ }, Constants.DEFAULT_PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<Depot> item) {+ Depot depot = item.getModelObject();+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ DepotFilePage.class, DepotFilePage.paramsOf(depot));+ link.add(new Label("name", depot.getFQN()));+ item.add(link);+ }++ });++ add(depotsPageNav = new BootstrapAjaxPagingNavigator("depotsPageNav", depotsView) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getPageCount() > 1);+ }++ });+ depotsPageNav.setOutputMarkupPlaceholderTag(true);++ add(noDepotsContainer = new WebMarkupContainer("noDepots") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(depotsView.getModelObject().isEmpty());+ }++ });+ noDepotsContainer.setOutputMarkupPlaceholderTag(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DashboardResourceReference()));+ }++ @Override+ protected Component newContextHead(String componentId) {+ return new Label(componentId, "Dashboard");+ }++}diff --git a/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.htmlindex f738c19c33..b9a4415e8c 100644--- a/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html+++ b/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html@@ -1,6 +1,19 @@-<wicket:extend>-<pre>- 1111- WWWW-</pre>+<wicket:extend>+ <ul style="overflow: scroll; height: 100px; padding: 50px;">+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ <li>1</li>+ </ul>+ <script type="text/javascript">+ console.log($("ul>li").last().offset().top);+ </script></wicket:extend>\ No newline at end of file