The Unified and Autonomous Development Platform
feat: dock side info trigger with sticky tabs
Robin Shen53164bb26257
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.jsindex 52723e4773..754fd4b4fe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js+++ b/server-core/src/main/java/io/onedev/server/web/component/sideinfo/side-info.js@@ -10,6 +10,28 @@ onedev.server.sideInfo = {$("body").toggleClass("side-info-visible", !$container.hasClass("closed"));},+ dockMoreInfoWithStickyTabs: function(options) {+ var $root = $(options.root);+ var sentinel = $root.find(options.stickySentinel)[0];+ var $row = $root.find(options.stickyRow);+ if (!$root.length || !sentinel || !$row.length)+ return;++ var oldObserver = $row.data("moreInfoDockObserver");+ if (oldObserver)+ oldObserver.disconnect();++ var scrollRoot = $row.closest(".autofit")[0] || null;+ var intersectionObserver = new IntersectionObserver(function(entries) {+ var entry = entries[0];+ var aboveScrollport = entry.rootBounds+ && entry.boundingClientRect.bottom <= entry.rootBounds.top;+ $row.toggleClass("is-docked", !entry.isIntersecting && aboveScrollport);+ }, {root: scrollRoot, threshold: 0});+ intersectionObserver.observe(sentinel);+ $row.data("moreInfoDockObserver", intersectionObserver);+ },+close: function($container) {$container.addClass("closed");onedev.server.sideInfo.syncTrigger($container);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.cssindex 4e78fcfb81..3bb49a6868 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@@ -684,6 +684,45 @@ html:has(.revision-diff) .nav-tabs-line.nav-tabs-sticky {position: static;}+.sticky-tabs-sentinel {+ height: 1px;+ margin-bottom: -1px;+ flex-shrink: 0;+}+.sticky-tabs-row {+ position: sticky;+ top: 0;+ z-index: 990;+ border-bottom: 1px solid var(--secondary);+ background: rgba(255, 255, 255, 0.88);+ -webkit-backdrop-filter: blur(8px);+ backdrop-filter: blur(8px);+}+.sticky-tabs-row>.nav-tabs-line {+ min-width: 0;+ flex-wrap: wrap;+ border-bottom: 0;+}+.dark-mode .sticky-tabs-row {+ border-bottom-color: var(--dark-mode-lighter-dark);+ background: rgba(35, 35, 45, 0.88);+}+.sticky-tabs-row>.more-info-dock {+ display: none;+}+.sticky-tabs-row.is-docked>.more-info-dock {+ display: inline-flex;+}+.side-info-visible .sticky-tabs-row.is-docked>.more-info-dock {+ display: none;+}+html:has(.revision-diff) .sticky-tabs-row {+ position: static;+}+html:has(.revision-diff) .sticky-tabs-row.is-docked>.more-info-dock {+ display: none;+}+tr.ui-sortable-helper {box-shadow: 2px 2px 6px 2px rgba(0, 0, 0, 0.3);border: none !important;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex 68af01c59f..6f9fc7ff20 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -30,7 +30,11 @@<wicket:t>Most probably there are import errors in the <a wicket:id="buildSpec">build spec</a></wicket:t></div><div wicket:id="description" class="border border-dashed border-primary rounded p-3 mb-3"></div>- <ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-tabs-sticky nav-bold mb-5 flex-shrink-0"></ul>+ <div class="sticky-tabs-sentinel"></div>+ <div class="sticky-tabs-row d-flex align-items-center flex-shrink-0 mb-5">+ <ul wicket:id="buildTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold flex-grow-1 mb-0"></ul>+ <a wicket:id="moreInfoDock" class="more-info side-info more-info-dock flex-shrink-0 ml-3" t:data-tippy-content="More info"><wicket:svg href="ellipsis" class="icon"/></a>+ </div><wicket:child></wicket:child></div><div wicket:id="side" class="more-info"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 29c8cbcca2..49c3f9ddef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -25,6 +25,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;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;@@ -458,6 +459,7 @@ public abstract class BuildDetailPage extends ProjectPage});add(new SideInfoLink("moreInfo"));+ add(new SideInfoLink("moreInfoDock"));add(new WebMarkupContainer("buildSpecNotFound") {@@ -678,6 +680,7 @@ public abstract class BuildDetailPage extends ProjectPagepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new BuildDetailResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.buildDetail.onDomReady();"));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.jsindex ad5d0ecf99..499a045e8e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.js@@ -1,4 +1,11 @@onedev.server.buildDetail = {+ onDomReady: function() {+ onedev.server.sideInfo.dockMoreInfoWithStickyTabs({+ root: ".build-detail",+ stickySentinel: ".sticky-tabs-sentinel",+ stickyRow: ".sticky-tabs-row"+ });+ },openTerminal: function(terminalUrl) {var width = 900;var height = 600;@@ -6,4 +13,4 @@ onedev.server.buildDetail = {var top = (screen.height - height) / 4;window.open(terminalUrl, "_blank", "left=" + left + ",top=" + top + ",width=" + width + ",height=" + height + ",resizable=yes");}-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex 99f986e296..f4cae064c4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -8,7 +8,11 @@<div class="main flex-grow-1"><div wicket:id="operations" class="mb-5"></div><div wicket:id="primary" class="mb-5"></div>- <ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-tabs-sticky nav-bold mb-5"></ul>+ <div class="sticky-tabs-sentinel"></div>+ <div class="sticky-tabs-row d-flex align-items-center mb-5">+ <ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold flex-grow-1 mb-0"></ul>+ <a wicket:id="moreInfoDock" class="more-info side-info more-info-dock flex-shrink-0 ml-3" t:data-tippy-content="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>+ </div><wicket:child></wicket:child></div><div wicket:id="side"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 2161acc6a5..8be17a1d34 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -151,6 +151,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input});add(new SideInfoLink("moreInfo"));+ add(new SideInfoLink("moreInfoDock"));Component operationsPanel;add(operationsPanel = new IssueOperationsPanel("operations") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.jsindex 00115911bc..2639cbe8bd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js@@ -5,5 +5,10 @@ onedev.server.issueDetail = {$(".issue-detail").closest(".autofit").scrollTop(parseInt(scrollTop));localStorage.removeItem(scrollTopKey);}+ onedev.server.sideInfo.dockMoreInfoWithStickyTabs({+ root: ".issue-detail",+ stickySentinel: ".sticky-tabs-sentinel",+ stickyRow: ".sticky-tabs-row"+ });}-};\ No newline at end of file+};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 562598252d..b65939ae2f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -128,7 +128,11 @@<a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary"><wicket:t>Delete Source Branch</wicket:t></a><a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary btn-hover-primary"><wicket:t>Restore Source Branch</wicket:t></a></div>- <ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-tabs-sticky nav-bold mb-5 mt-3 align-items-center"></ul>+ <div class="sticky-tabs-sentinel mt-3"></div>+ <div class="sticky-tabs-row d-flex align-items-center mb-5">+ <ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold flex-grow-1 mb-0 align-items-center"></ul>+ <a wicket:id="moreInfoDock" class="more-info side-info more-info-dock flex-shrink-0 ml-3" t:data-tippy-content="More info"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>+ </div><wicket:child></wicket:child></div><div wicket:id="moreInfo" class="more-info"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 51b6c18621..92faf70cfd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -973,6 +973,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));+ add(new SideInfoLink("moreInfoDock"));RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.jsindex 5cd4a3e4b6..7e032f6a3f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js@@ -5,10 +5,15 @@ onedev.server.pullRequestDetail = {$(".pull-request-detail").closest(".autofit").scrollTop(parseInt(scrollTop));localStorage.removeItem(scrollTopKey);}+ onedev.server.sideInfo.dockMoreInfoWithStickyTabs({+ root: ".pull-request-detail",+ stickySentinel: ".sticky-tabs-sentinel",+ stickyRow: ".sticky-tabs-row"+ });},onSummaryDomReady: function() {$(".pull-request-detail .card-body .main .more-info").click(function() {$(".pull-request-detail .card-header .side-info").click();});}-}\ No newline at end of file+}