The Unified and Autonomous Development Platform
Add logic to collapse saved queries column
Robin Shen05d350971e47
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex 8ba429945e..be98917e5e 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -9,7 +9,7 @@</span></div></form>- <div class="others clearfix">+ <div wicket:id="others" class="others clearfix"><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a><div wicket:id="pageInfo" class="page-info pull-right"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex b3ea24f1ba..642ce0d94b 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -21,6 +21,7 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvidimport org.apache.wicket.markup.ComponentTag;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.Form;import org.apache.wicket.markup.html.form.TextField;@@ -55,6 +56,7 @@ import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.Requimport io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import io.onedev.server.web.util.VisibleVisitor;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -101,8 +103,20 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {protected void onInitialize() {super.onInitialize();+ WebMarkupContainer others = new WebMarkupContainer("others") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);+ }++ };++ add(others);+Component querySave;- add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(querySave = new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -300,7 +314,7 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {}});- add(new NavigatorLabel("pageInfo", commentsTable) {+ others.add(new NavigatorLabel("pageInfo", commentsTable) {@Overrideprotected void onConfigure() {diff --git a/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js b/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.jsindex 4026f177d7..2e1dd378ca 100644--- a/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js+++ b/core/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js@@ -1,10 +1,10 @@-onedev.server.commitgraph = {+onedev.server.commitGraph = {render: function(containerId, commits) {var $container = $("#" + containerId);$container.prepend("<svg class='commit-graph'></svg>");var $graph = $container.children("svg");- onedev.server.commitgraph.populateData($graph, commits);- onedev.server.commitgraph.drawGraph($graph);+ onedev.server.commitGraph.populateData($graph, commits);+ onedev.server.commitGraph.drawGraph($graph);var paper = Snap($graph[0]);function getCommitDot(e) {@@ -429,7 +429,7 @@ $(function() {return;e.stopPropagation();$(".commit-graph").each(function() {- onedev.server.commitgraph.drawGraph($(this));+ onedev.server.commitGraph.drawGraph($(this));});});});diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.htmlindex 8a279fc80a..a7d2ea0c34 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html@@ -10,7 +10,7 @@</div></form><a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a>- <div class="others clearfix">+ <div wicket:id="others" class="others clearfix"><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a><a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a><a wicket:id="batchEditAll" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit All</a>diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex b0766451a2..1239824908 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -21,6 +21,7 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvidimport org.apache.wicket.markup.ComponentTag;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.Form;import org.apache.wicket.markup.html.form.TextField;@@ -67,6 +68,7 @@ import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;+import io.onedev.server.web.util.VisibleVisitor;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -140,8 +142,19 @@ public abstract class IssueListPanel extends GenericPanel<String> {protected void onInitialize() {super.onInitialize();+ WebMarkupContainer others = new WebMarkupContainer("others") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);+ }++ };+ add(others);+Component querySave;- add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(querySave = new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -200,7 +213,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {});add(form);- add(new ModalLink("displayFields") {+ others.add(new ModalLink("displayFields") {@Overrideprotected Component newContent(String id, ModalPanel modal) {@@ -277,7 +290,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {});- add(batchEditSelected = new ModalLink("batchEditSelected") {+ others.add(batchEditSelected = new ModalLink("batchEditSelected") {@Overrideprotected Component newContent(String id, ModalPanel modal) {@@ -330,7 +343,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {batchEditSelected.setOutputMarkupPlaceholderTag(true);- add(new ModalLink("batchEditAll") {+ others.add(new ModalLink("batchEditAll") {@Overrideprotected Component newContent(String id, ModalPanel modal) {@@ -613,7 +626,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});- add(new NavigatorLabel("pageInfo", issuesTable) {+ others.add(new NavigatorLabel("pageInfo", issuesTable) {@Overrideprotected void onConfigure() {diff --git a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.cssindex 24074f3ee3..f74d196359 100644--- a/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css+++ b/core/src/main/java/io/onedev/server/web/component/subscriptionstatus/subscription-status.css@@ -2,6 +2,10 @@font-family: "Glyphicons Halflings";font-size: 14px;}+.subscription-status {+ padding-top: 8px;+ padding-bottom: 2px;+}.subscription-status.subscribed:BEFORE {content: "\e038";}diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.javaindex ffe443fa76..12b21523d4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java@@ -6,8 +6,6 @@ import javax.annotation.Nullable;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.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.PropertyModel;@@ -191,12 +189,6 @@ public class ProjectCodeCommentsPage extends ProjectPage {});}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new ProjectCodeCommentsResourceReference()));- }-public static PageParameters paramsOf(Project project, @Nullable String query) {PageParameters params = paramsOf(project);if (query != null)diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.javadeleted file mode 100644index b935255cbd..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.comments;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class ProjectCodeCommentsResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public ProjectCodeCommentsResourceReference() {- super(ProjectCodeCommentsResourceReference.class, "project-code-comments.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/project-code-comments.css b/core/src/main/java/io/onedev/server/web/page/project/comments/project-code-comments.cssdeleted file mode 100644index c425d61c30..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/comments/project-code-comments.css+++ /dev/null@@ -1,17 +0,0 @@-#project-code-comments {- display: table;- width: 100%;-}-#project-code-comments>div {- display: table-cell;-}-#project-code-comments>.side {- width: 240px;- border: 1px solid #E0E0E0;- padding: 20px;- border-radius: 4px;-}-#project-code-comments>.main {- padding-left: 20px;- vertical-align: top;-}diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.htmlindex 16778ed0aa..0595a581d4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html@@ -11,12 +11,12 @@</span></div></form>- <div class="others clearfix">+ <div wicket:id="others" class="others clearfix"><a wicket:id="saveQuery" class="save-query pull-left"><i class="fa fa-save"></i> Save Query</a></div>- <div wicket:id="feedback"></div></div><div wicket:id="body" class="body">+ <div wicket:id="feedback"></div><ul class="list list-unstyled"><li wicket:id="commits"></li></ul>diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex a2de56a99d..157bdc3fb2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -80,6 +80,7 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;+import io.onedev.server.web.util.VisibleVisitor;import io.onedev.server.web.util.ajaxlistener.ShowGlobalLoadingIndicatorImmediatelyListener;import io.onedev.server.web.util.model.CommitRefsModel;import io.onedev.utils.StringUtils;@@ -249,8 +250,19 @@ public class ProjectCommitsPage extends ProjectPage {});+ WebMarkupContainer others = new WebMarkupContainer("others") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);+ }++ };+ add(others);+Component querySave;- add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(querySave = new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -369,10 +381,11 @@ public class ProjectCommitsPage extends ProjectPage {queryForm.setOutputMarkupId(true);add(queryForm);- add(feedback = new NotificationPanel("feedback", queryForm));+ feedback = new NotificationPanel("feedback", queryForm);feedback.setOutputMarkupPlaceholderTag(true);body = new WebMarkupContainer("body");+ body.add(feedback);body.setOutputMarkupId(true);add(body);body.add(commitsView = newCommitsView());@@ -435,7 +448,7 @@ public class ProjectCommitsPage extends ProjectPage {addCommitClass(item, commitIndex++);commitsView.add(item);target.add(item);- builder.append(String.format("$('#project-commits>.body>.list').append(\"<li id='%s'></li>\");",+ builder.append(String.format("$('#project-commits>.main>.body>.list').append(\"<li id='%s'></li>\");",item.getMarkupId()));}target.prependJavaScript(builder);@@ -653,7 +666,7 @@ public class ProjectCommitsPage extends ProjectPage {private String renderCommitGraph() {String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject().current);- return String.format("onedev.server.commitgraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits);+ return String.format("onedev.server.commitGraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.cssindex 21ff13ae31..7c50a93f9f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css@@ -1,7 +1,7 @@#project-commits>.main {position: relative;}-#project-commits>.main>.head>.query {+#project-commits>.main>.head>* {margin-bottom: 20px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex b61c14e099..0231a34b12 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -6,8 +6,6 @@ import javax.annotation.Nullable;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.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.PropertyModel;@@ -185,12 +183,6 @@ public class IssueListPage extends IssuesPage {}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new IssueListResourceReference()));- }-public static PageParameters paramsOf(Project project, @Nullable String query) {PageParameters params = paramsOf(project);if (query != null)diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.javadeleted file mode 100644index 04963528b8..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.issues.issuelist;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class IssueListResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public IssueListResourceReference() {- super(IssueListResourceReference.class, "issue-list.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssdeleted file mode 100644index e69de29bb2..0000000000diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.htmlindex 76ee4f3ed4..7990280ed4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html@@ -12,7 +12,7 @@</div></form><a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>- <div class="others clearfix">+ <div wicket:id="others" class="others clearfix"><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a><div wicket:id="pageInfo" class="page-info pull-right"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex eb7561ee37..ff82021053 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -21,6 +21,7 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvidimport org.apache.wicket.markup.ComponentTag;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.Form;import org.apache.wicket.markup.html.form.TextField;@@ -66,6 +67,7 @@ import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;+import io.onedev.server.web.util.VisibleVisitor;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -164,8 +166,20 @@ public class RequestListPage extends ProjectPage {});+ WebMarkupContainer others = new WebMarkupContainer("others") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);+ }++ };++ add(others);+Component querySave;- add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(querySave = new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -446,7 +460,7 @@ public class RequestListPage extends ProjectPage {}});- add(new NavigatorLabel("pageInfo", requestsTable) {+ others.add(new NavigatorLabel("pageInfo", requestsTable) {@Overrideprotected void onConfigure() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.cssindex 87afd46a53..26d6cee82d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css@@ -1,21 +1,3 @@-#request-list {- display: table;- width: 100%;-}-#request-list>div {- display: table-cell;-}-#request-list>.side {- width: 240px;- border: 1px solid #E0E0E0;- padding: 20px;- border-radius: 4px;-}-#request-list>.main {- padding-left: 20px;- vertical-align: top;-}-#request-list>.main>.head {position: relative;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.htmlindex 3d402d63b7..51a34430e2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html@@ -1,36 +1,42 @@<wicket:panel>- <div class="saved-queries">- <div class="head clearfix">- <h4 class="pull-left title">Saved Queries</h4>- <div class="pull-left actions">- <a wicket:id="edit" title="Edit saved queries"><i class="fa fa-pencil"></i></a>+ <div wicket:id="content" class="saved-queries"></div>+ <wicket:fragment wicket:id="expandedFrag">+ <div class="expanded">+ <div class="head">+ <h4 class="title">Saved Queries</h4>+ <div class="actions">+ <a wicket:id="edit" title="Edit saved queries"><i class="fa fa-pencil"></i></a>+ <a wicket:id="collapse" class="collapse" title="Collapse"><i class="fa fa-arrow-left"></i></a>+ </div></div>- </div>- <hr>- <div class="body">- <wicket:enclosure child="userQueries">- <div wicket:id="userQueries">- <span class="btn-group">- <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>- <a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a>- <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>- </span>- </div>- <hr/>- </wicket:enclosure>- <div wicket:id="projectQueries">- <span class="btn-group">- <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>- <a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a>- <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>- </span>- </div>- <div wicket:id="watchHint" class="help-block">- <b><i class="fa fa-lightbulb-o"></i> Tips:</b> You may watch/unwatch specified queries above.- The first matching query will take effect+ <hr>+ <div class="body">+ <wicket:enclosure child="userQueries">+ <div wicket:id="userQueries">+ <span class="btn-group">+ <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a><a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a><a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>+ </span>+ </div>+ <hr/>+ </wicket:enclosure>+ <div wicket:id="projectQueries">+ <span class="btn-group">+ <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a><a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a><a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>+ </span>+ </div>+ <div wicket:id="watchHint" class="help-block">+ <b><i class="fa fa-lightbulb-o"></i> Tips:</b> You may watch/unwatch specified queries above.+ The first matching query will take effect+ </div></div></div>- </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="collapsedFrag">+ <div class="collapsed">+ <a wicket:id="expand" title="Expand"><i class="fa fa-arrow-right"></i></a>+ <h4>Saved Queries</h4>+ </div>+ </wicket:fragment><wicket:fragment wicket:id="editSavedQueriesFrag"><div class="modal-header"><button wicket:id="close" type="button" class="close">×</button>diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex f27a42c2c8..3b548c453a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -6,6 +6,7 @@ import java.util.List;import java.util.Set;import javax.annotation.Nullable;+import javax.servlet.http.Cookie;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -24,6 +25,9 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.http.WebResponse;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.model.Project;@@ -45,6 +49,10 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {+ private static final String CONTENT_ID = "content";++ private static final String COOKIE_PREFIX = "savedQueries.collapsed.";+public SavedQueriesPanel(String id) {super(id);}@@ -100,11 +108,40 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {response.render(CssHeaderItem.forReference(new SavedQueriesCssResourceReference()));}+ private String getCookieName() {+ return COOKIE_PREFIX + getPage().getClass().getSimpleName();+ }+@Overrideprotected void onInitialize() {super.onInitialize();- add(new ModalLink("edit") {+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(getCookieName());+ if (cookie != null && "yes".equals(cookie.getValue()))+ add(newCollapsed());+ else+ add(newExpanded());+ }++ private Component newExpanded() {+ Fragment fragment = new Fragment(CONTENT_ID, "expandedFrag", this);+ fragment.add(new AjaxLink<Void>("collapse") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie = new Cookie(getCookieName(), "yes");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ Component content = newCollapsed();+ SavedQueriesPanel.this.replace(content);+ target.add(content);+ }++ });++ fragment.add(new ModalLink("edit") {private static final String TAB_PANEL_ID = "tabPanel";@@ -225,7 +262,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});- add(new ListView<T>("userQueries", new LoadableDetachableModel<List<T>>() {+ fragment.add(new ListView<T>("userQueries", new LoadableDetachableModel<List<T>>() {@Overrideprotected List<T> load() {@@ -303,7 +340,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});- add(new ListView<T>("projectQueries", new LoadableDetachableModel<List<T>>() {+ fragment.add(new ListView<T>("projectQueries", new LoadableDetachableModel<List<T>>() {@Overrideprotected List<T> load() {@@ -388,7 +425,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});- add(new WebMarkupContainer("watchHint") {+ fragment.add(new WebMarkupContainer("watchHint") {@Overrideprotected void onConfigure() {@@ -397,7 +434,30 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {}});- setOutputMarkupId(true);++ fragment.setOutputMarkupId(true);++ return fragment;+ }++ private Component newCollapsed() {+ Fragment fragment = new Fragment(CONTENT_ID, "collapsedFrag", this);+ fragment.add(new AjaxLink<Void>("expand") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie = new Cookie(getCookieName(), "no");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ Component content = newExpanded();+ SavedQueriesPanel.this.replace(content);+ target.add(content);+ }++ });+ fragment.setOutputMarkupId(true);+ return fragment;}private abstract class NamedQueriesEditor extends Fragment {diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.cssindex 96c604d877..85c2620be5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css@@ -1,27 +1,63 @@-.saved-queries>.head>.actions {+.saved-queries>.expanded>.head {+ white-space: nowrap;+}+.saved-queries>.expanded>.head>* {+ display: inline-block;+}+.saved-queries>.expanded>.head>.actions {margin: 8px 0 0 12px;}-.saved-queries>.head>.actions>a {+.saved-queries>.expanded>.head>.actions>a {color: #444;margin-right: 8px;font-size: 16px;}-.saved-queries>.head>.actions>a[disabled] {+.saved-queries>.expanded>.head>.actions>a[disabled] {color: #AAA;cursor: default;}-.saved-queries>.body>* {+.saved-queries>.expanded>.head>.actions .collapse {+ display: inline-block;+}++.saved-queries>.expanded>.body>* {margin-bottom: 20px;}-.saved-queries>.body>:last-child {+.saved-queries>.expanded>.body>:last-child {margin-bottom: 0;}-.saved-queries>.body .watch-status:after, .saved-queries>.body .subscription-status:after {+.saved-queries>.expanded>.body .btn-group {+ white-space: nowrap;+}+.saved-queries>.expanded>.body .btn-group .btn {+ float: none;+ display: inline-block;+}+.saved-queries>.expanded>.body .watch-status:after,+.saved-queries>.expanded>.body .subscription-status:after {display: none;}-.saved-queries>.body .watch-status:before, .saved-queries>.body .subscription-status:before {+.saved-queries>.expanded>.body .watch-status:before,+.saved-queries>.expanded>.body .subscription-status:before {line-height: 12px;}+.saved-queries>.collapsed {+ width: 12px;+ min-height: 250px;+}+.saved-queries>.collapsed>a {+ display: block;+ color: #444;+ font-size: 16px;+ padding-bottom: 10px;+}+.saved-queries>.collapsed>h4 {+ transform: rotate(90deg);+ transform-origin: left top 0;+ letter-spacing: 8px;+ white-space: nowrap;+ margin-left: 16px;+}.edit-saved-queries th {font-weight: bold !important;@@ -41,10 +77,10 @@display: table-cell;}.query-save-support>.side {- width: 240px;border: 1px solid #E0E0E0;padding: 20px;border-radius: 4px;+ width: 1%;}.query-save-support>.main {padding-left: 20px;diff --git a/core/src/main/java/io/onedev/server/web/util/VisibleVisitor.java b/core/src/main/java/io/onedev/server/web/util/VisibleVisitor.javanew file mode 100644index 0000000000..e39eaef7f4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/util/VisibleVisitor.java@@ -0,0 +1,18 @@+package io.onedev.server.web.util;++import org.apache.wicket.Component;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;++public class VisibleVisitor implements IVisitor<Component, Component> {++ @Override+ public void component(Component component, IVisit<Component> visit) {+ component.configure();+ if (component.isVisible())+ visit.stop(component);+ else+ visit.dontGoDeeper();+ }++}