Skip to content

The Unified and Autonomous Development Platform

feat: Saved queries side bar improvements

Robin Shend7d458322122
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/issue.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/issue.svg
new file mode 100644
index 0000000000..b9215dcef2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/issue.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1786746941369" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1746" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512.861624 331.265706c-98.66309 0-178.967044 80.299861-178.967045 178.967044 0 98.657974 80.304977 178.957835 178.967045 178.957835 98.657974 0 178.957835-80.299861 178.957834-178.957835-0.001023-98.667184-80.300884-178.967044-178.957834-178.967044z m0 294.091038c-63.446008 0-115.123994-51.67287-115.123994-115.123994s51.677986-115.123994 115.123994-115.123994c63.440891 0 115.118877 51.67287 115.118877 115.123994s-51.677986 115.123994-115.118877 115.123994z m412.889725-146.05547h-13.341867c-3.288906-43.325761-13.505595-85.382623-30.450522-125.492133-20.250206-47.87845-49.180096-90.782609-86.089727-127.682007-36.909631-36.914748-79.803557-65.844637-127.692241-86.089727-39.854707-16.84976-81.642438-27.040866-124.69293-30.392194V96.042403c0-17.86181-14.464433-32.321126-32.321126-32.321126s-32.321126 14.46034-32.321127 32.321126V109.742427c-42.627866 3.446495-84.012416 13.602809-123.495662 30.29498-47.883567 20.24509-90.777493 49.174979-127.69224 86.089727-36.909631 36.899398-65.839521 79.803557-86.089728 127.682007-16.943904 40.10951-27.161616 82.166371-30.450522 125.492133h-14.538111c-17.856693 0-32.321126 14.464433-32.321126 32.326243s14.464433 32.321126 32.321126 32.321126h14.763238c3.508917 42.346457 13.644765 83.455737 30.226419 122.706693 20.250206 47.87845 49.180096 90.762143 86.089727 127.682007 36.914748 36.904515 79.80765 65.834404 127.692241 86.089727 39.47199 16.675798 80.906681 26.838252 123.495662 30.290887v14.494109c0 17.856693 14.465456 32.326243 32.321126 32.326243s32.321126-14.46955 32.321126-32.326243V910.827451c43.050492-3.329838 84.838224-13.462616 124.69293-30.297027 47.888683-20.255323 90.782609-49.180096 127.692241-86.09996 36.909631-36.909631 65.839521-79.793324 86.089727-127.692241 16.582677-39.238676 26.718525-80.413448 30.227442-122.790603h13.564947c17.856693 0 32.321126-14.46034 32.321126-32.321127-0.001023-17.859763-14.465456-32.32522-32.322149-32.325219z m-88.979544 64.648392h11.227715c-7.602142 77.565587-41.46539 149.44773-97.322559 205.300806-56.305377 56.301284-128.904859 90.249467-207.191876 97.485265v-10.501168c0-17.851577-14.464433-32.321126-32.321126-32.321126s-32.321126 14.46955-32.321126 32.321126v10.398838c-77.8296-7.470135-149.977803-41.3692-205.995631-97.381912-55.856146-55.852052-89.720418-127.734196-97.32256-205.300806h10.035564c17.856693 0 32.317033-14.46034 32.317033-32.321126 0-17.86181-14.46034-32.326243-32.317033-32.326243h-10.257621c7.098675-78.550007 41.070394-151.417595 97.543593-207.887724 56.017828-56.021921 128.166031-89.920986 205.995631-97.392144v10.999518c0 17.86181 14.465456 32.321126 32.321127 32.321127s32.321126-14.46034 32.321126-32.321127V173.924191c78.287017 7.254218 150.887522 41.273009 207.191876 97.491405 56.474222 56.469106 90.444918 129.337717 97.543593 207.887724H836.771805c-17.86181 0-32.321126 14.464433-32.321127 32.326243-0.001023 17.859763 14.459317 32.320103 32.321127 32.320103z" p-id="1747"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index ca09b6d82c..aa588844f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -102,6 +102,7 @@ import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.revision.RevisionSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
@@ -237,7 +238,7 @@ public abstract class BuildListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -250,7 +251,7 @@ public abstract class BuildListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index d03957dbe1..7ed3559ed8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -82,6 +82,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.svg.SpriteImage;
@@ -159,7 +160,7 @@ public abstract class CodeCommentListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -172,7 +173,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index d848fa2014..5840d9165a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -82,6 +82,7 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;
@@ -299,7 +300,7 @@ public abstract class CommitListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -312,7 +313,7 @@ public abstract class CommitListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index cb783e1446..d9609928ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -138,6 +138,7 @@ import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
@@ -273,7 +274,7 @@ public abstract class IssueListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -286,7 +287,7 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index d3c2f2ed73..af11bd052b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -74,6 +74,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.svg.SpriteImage;
@@ -201,7 +202,7 @@ public abstract class PackListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -214,7 +215,7 @@ public abstract class PackListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index d20e6a0365..4ebcfeef77 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -107,6 +107,7 @@ import io.onedev.server.web.component.project.stats.pack.PackStatsPanel;
import io.onedev.server.web.component.project.stats.pullrequest.PullRequestStatsPanel;
import io.onedev.server.web.component.project.stats.workspace.WorkspaceStatsPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.page.base.BasePage;
@@ -295,7 +296,7 @@ public class ProjectListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -307,7 +308,7 @@ public class ProjectListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 901f8f79bc..7b20e94ba1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -104,6 +104,7 @@ import io.onedev.server.web.component.pullrequest.RequestStatusBadge;
import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;
import io.onedev.server.web.component.pullrequest.review.ReviewerAvatar;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
@@ -238,7 +239,7 @@ public abstract class PullRequestListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -251,7 +252,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesDropdownListener.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesDropdownListener.java
new file mode 100644
index 0000000000..ea155fd255
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesDropdownListener.java
@@ -0,0 +1,67 @@
+package io.onedev.server.web.component.savedquery;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.attributes.IAjaxCallListener;
+
+class SavedQueriesDropdownListener implements IAjaxCallListener {
+
+ private final String action;
+
+ private SavedQueriesDropdownListener(String action) {
+ this.action = action;
+ }
+
+ static SavedQueriesDropdownListener show() {
+ return new SavedQueriesDropdownListener("show");
+ }
+
+ static SavedQueriesDropdownListener close() {
+ return new SavedQueriesDropdownListener("close");
+ }
+
+ @Override
+ public CharSequence getPrecondition(Component component) {
+ return String.format("return onedev.server.savedQueries.%sDropdown(this);", action);
+ }
+
+ @Override
+ public CharSequence getBeforeHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getBeforeSendHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getAfterHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getSuccessHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getFailureHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getCompleteHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getInitHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getDoneHandler(Component component) {
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesLink.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesLink.java
new file mode 100644
index 0000000000..5ad00872f2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesLink.java
@@ -0,0 +1,18 @@
+package io.onedev.server.web.component.savedquery;
+
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+
+public abstract class SavedQueriesLink extends AjaxLink<Void> {
+
+ public SavedQueriesLink(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(SavedQueriesDropdownListener.show());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index 564efc16b7..ee04477a95 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -20,6 +20,8 @@ import org.apache.wicket.event.IEvent;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.link.Link;
@@ -27,6 +29,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -85,6 +88,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(CssHeaderItem.forReference(new SavedQueriesCssResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new SavedQueriesResourceReference()));
}
@Override
@@ -100,7 +104,10 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!closed);
+ }
+
+ public boolean isOpen() {
+ return !closed;
}
private void toggle(IPartialPageRequestHandler handler) {
@@ -128,6 +135,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
add(new AjaxLink<Void>("close") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(SavedQueriesDropdownListener.close());
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
toggle(target);
@@ -140,6 +153,14 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
add(new ModalLink("edit") {
private static final String TAB_PANEL_ID = "tabPanel";
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ target.appendJavaScript(String.format(
+ "onedev.server.savedQueries.closeDropdown(document.getElementById('%s'));",
+ getMarkupId(true)));
+ }
@Override
protected void onConfigure() {
@@ -449,6 +470,14 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return closed ? "saved-queries-panel saved-queries-closed" : "saved-queries-panel";
+ }
+
+ }));
setOutputMarkupPlaceholderTag(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesResourceReference.java
new file mode 100644
index 0000000000..67e5e3717e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesResourceReference.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.component.savedquery;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import io.onedev.server.web.component.floating.FloatingResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class SavedQueriesResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public SavedQueriesResourceReference() {
+ super(SavedQueriesResourceReference.class, "saved-queries.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ var dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new FloatingResourceReference()));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
index c3ac9571e0..1112a499be 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
@@ -6,3 +6,40 @@
margin: -1.75rem;
margin-top: 0;
}
+.saved-queries > .card-header {
+ flex-wrap: nowrap;
+}
+.saved-queries > .card-header > .card-title {
+ white-space: nowrap;
+}
+.saved-queries > .card-header > .card-toolbar {
+ flex-shrink: 0;
+}
+
+.side-main > .saved-queries-panel.saved-queries-closed {
+ display: none;
+}
+
+.saved-queries-dropdown {
+ width: min(300px, calc(100vw - 2rem));
+ min-width: min(300px, calc(100vw - 2rem));
+ max-height: calc(100vh - 2rem);
+ overflow: auto;
+}
+.saved-queries-dropdown > .saved-queries-panel {
+ display: block;
+ margin: 0;
+ max-width: none;
+}
+
+@media (min-width: 992px) {
+ .side-main:has(> .saved-queries-panel:not(.saved-queries-closed)) .show-saved-queries {
+ display: none !important;
+ }
+}
+
+@media (max-width: 991px) {
+ .side-main > .saved-queries-panel {
+ display: none;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js
new file mode 100644
index 0000000000..a2e9a11f05
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.js
@@ -0,0 +1,62 @@
+onedev.server.savedQueries = {
+ breakpoint: 992,
+
+ showDropdown: function(link) {
+ if (window.innerWidth >= this.breakpoint)
+ return true;
+
+ var $link = $(link);
+ var $floating = $(".saved-queries-dropdown").filter(function() {
+ return $(this).data("trigger") && $(this).data("trigger")[0] === link;
+ });
+ if ($floating.length) {
+ onedev.server.floating.close($floating.attr("id"));
+ return false;
+ }
+
+ var $panel = $link.closest(".side-main").children(".saved-queries-panel");
+ if (!$panel.length)
+ return true;
+
+ var floatingId = "saved-queries-dropdown-" + Date.now();
+ var $placeholder = $("<span class='saved-queries-placeholder'></span>");
+ $panel.before($placeholder);
+ $floating = $("<div class='floating saved-queries-dropdown'></div>")
+ .attr("id", floatingId)
+ .appendTo(document.body)
+ .append($panel);
+ $floating.data("trigger", $link);
+ $floating.on("close", function() {
+ var $currentPanel = $(this).children(".saved-queries-panel");
+ if ($currentPanel.length)
+ $placeholder.before($currentPanel);
+ $placeholder.remove();
+ });
+
+ var alignment = {
+ target: {element: link},
+ placement: {x: 0, y: 0, targetX: 0, targetY: 100, offset: 4}
+ };
+ onedev.server.floating.init(floatingId, alignment, false, false, undefined,
+ function() { onedev.server.floating.close(floatingId); });
+ $(document).trigger("afterElementReplace");
+ return false;
+ },
+
+ closeDropdown: function(link) {
+ var $floating = $(link).closest(".saved-queries-dropdown");
+ if ($floating.length && window.innerWidth < this.breakpoint) {
+ onedev.server.floating.close($floating.attr("id"));
+ return false;
+ }
+ return true;
+ }
+};
+
+$(window).on("resize", function() {
+ if (window.innerWidth >= onedev.server.savedQueries.breakpoint) {
+ $(".saved-queries-dropdown").each(function() {
+ onedev.server.floating.close(this.id);
+ });
+ }
+});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
index 843596257c..865a0d6864 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceListPanel.java
@@ -72,6 +72,7 @@ import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
@@ -186,7 +187,7 @@ public abstract class WorkspaceListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -199,7 +200,7 @@ public abstract class WorkspaceListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
index 6e9c3867f7..cb7805b237 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
@@ -4,8 +4,8 @@
<wicket:t>Agents can be used to execute jobs on remote machines. Once started it will update itself
from server automatically when necessary</wicket:t>
</div>
- <div class="side-main side-main-wrap">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="agents" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
index 4ba0130311..bafca8c116 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
@@ -172,7 +172,7 @@ public class AgentListPage extends AdministrationPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index e33c86849a..79d19e1433 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -66,6 +66,7 @@ import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
@@ -161,7 +162,7 @@ class AgentListPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new AjaxLink<Void>("showSavedQueries") {
+ add(new SavedQueriesLink("showSavedQueries") {
@Override
public void onEvent(IEvent<?> event) {
@@ -173,7 +174,7 @@ class AgentListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ setVisible(getQuerySaveSupport() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 65fb5cf848..3532583f19 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -634,25 +634,21 @@ pre>.actions>a {
margin-right: 0.5rem;
flex: 0 0 auto;
max-width: 300px;
+ align-self: stretch;
+}
+.side-main>.side>* {
+ position: sticky;
+ top: 0.5rem;
+ height: fit-content;
+}
+.side-main>.side.card>.card {
+ background-color: transparent;
+ box-shadow: none;
}
.side-main>.main {
flex: 1 1 0;
}
-@media(max-width: 991px) {
- .side-main.side-main-wrap {
- flex-wrap: wrap;
- }
- .side-main.side-main-wrap>* {
- flex: 0 0 100%;
- max-width: inherit;
- }
- .side-main.side-main-wrap>.side {
- margin-right: 0;
- margin-bottom: 2rem;
- }
-}
-
.card-body .card-body {
padding: 0;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
index e0e3ce4691..ef566ce5eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="builds" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index 0bbfbde1f5..c7bd3dc589 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -203,7 +203,7 @@ public class BuildListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
index b140b1dca6..b1a40c7d41 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.html
@@ -1,9 +1,9 @@
<wicket:extend>
<div class="p-2 p-sm-5">
<div wicket:id="workflowChangeAlert" class="mb-5"></div>
- <div class="side-main side-main-wrap">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="issues" class="main"></div>
</div>
</div>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index 653715de7f..9099930001 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -215,7 +215,7 @@ public class IssueListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.html b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.html
index 6ee31e2cb8..59c91f9414 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="packs" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
index 3d3b8c2faa..79cc587224 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/packs/PackListPage.java
@@ -203,7 +203,7 @@ public class PackListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
index b4f40493c1..5a036ecf36 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="projects" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index 9b81daa2d4..fa88cd60a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -202,7 +202,7 @@ public class ProjectListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
index e0e3ce4691..ef566ce5eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="builds" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 46f4384b9d..fe4ec3b6f5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -227,7 +227,7 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
index 96fc0f5885..cb3726a134 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="comments" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index 867e10efd9..46e7049a43 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -203,7 +203,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index 572e8a1831..b2cd198551 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="commits" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 49fa787a61..fc800363e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -194,7 +194,7 @@ public class ProjectCommitsPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
@@ -266,4 +266,4 @@ public class ProjectCommitsPage extends ProjectPage {
return new ViewStateAwarePageLink<Void>(componentId, ProjectOverviewPage.class, ProjectOverviewPage.paramsOf(project.getId()));
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
index f09870728d..0936fa49bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html
@@ -4,8 +4,8 @@
<div wicket:id="content" class="card-body"></div>
</div>
</div>
- <div class="side-main side-main-wrap">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="issues" class="main"></div>
</div>
<wicket:fragment wicket:id="pinnedIssueFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index f743534105..90b25588bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -504,7 +504,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.html
index 6ee31e2cb8..59c91f9414 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="packs" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
index dbc92ecf34..5cf16dd945 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/ProjectPacksPage.java
@@ -231,7 +231,7 @@ public class ProjectPacksPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
index a587805663..b6569fa7aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="pullRequests" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 9cbc8c56f6..ed31b2e8ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -230,7 +230,7 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.html
index 4fceb8da82..fafc5054e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="workspaces" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java
index 5f607175f9..cf2b364557 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/ProjectWorkspacesPage.java
@@ -234,7 +234,7 @@ public class ProjectWorkspacesPage extends ProjectPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
index a587805663..b6569fa7aa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="pullRequests" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
index 655d13cf54..9794f3b073 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
@@ -205,7 +205,7 @@ public class PullRequestListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.html b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.html
index 00da1181ab..63c90fd206 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
- <div class="side-main side-main-wrap p-2 p-sm-5">
- <div wicket:id="savedQueries" class="side"></div>
+ <div class="side-main p-2 p-sm-5">
+ <div wicket:id="savedQueries" class="side card"></div>
<div wicket:id="sessions" class="main"></div>
</div>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java
index 6d35f73fa7..4ba20600c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/workspaces/WorkspaceListPage.java
@@ -206,7 +206,7 @@ public class WorkspaceListPage extends LayoutPage {
@Override
public boolean isSavedQueriesVisible() {
savedQueries.configure();
- return savedQueries.isVisible();
+ return savedQueries.isOpen();
}
};