The Unified and Autonomous Development Platform
feat: move workspace dropdowns to side panels
Chief Work Horseaf880987bf4e
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 0ca6fa69df..8ca3be3ea7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -3,7 +3,6 @@<a wicket:id="state" class="state mr-3"><span wicket:id="name"></span></a>- <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this issue" class="workspace mr-3 btn btn-outline-secondary btn-sm flex-shrink-0">Workspaces <wicket:svg href="arrow" class="icon rotate-90"/></a><a wicket:id="newIssue" class="new-issue btn btn-primary btn-sm btn-icon ml-auto" t:data-tippy-content="Create new issue"><wicket:svg href="plus" class="icon"/></a></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 3cf610f04d..8654764814 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -13,7 +13,6 @@ import com.google.common.collect.Lists;import io.onedev.server.model.Issue;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.component.issue.IssueStateBadge;-import io.onedev.server.web.component.issue.workspaces.IssueWorkspacesLink;import io.onedev.server.web.page.project.issues.create.NewIssuePage;public abstract class IssueOperationsPanel extends Panel {@@ -34,15 +33,6 @@ public abstract class IssueOperationsPanel extends Panel {};addOrReplace(transitionMenuLink);- addOrReplace(new IssueWorkspacesLink("workspaces") {-- @Override- protected Issue getIssue() {- return IssueOperationsPanel.this.getIssue();- }-- });-transitionMenuLink.add(new IssueStateBadge("name", new LoadableDetachableModel<>() {@Overrideprotected Issue load() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex 60900ab2d1..0725a663a8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -61,6 +61,11 @@<a wicket:id="vote" class="btn btn-outline-secondary btn-sm vote"><wicket:svg href="thumb-up" class="icon mr-2"></wicket:svg> <span wicket:id="label"></span></a></div></div>+ <wicket:enclosure child="workspaces">+ <div class="workspaces">+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces on this issue" class="btn btn-outline-secondary btn-sm"><wicket:t>Workspaces</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>+ </div>+ </wicket:enclosure><div wicket:id="watches" class="watches"></div><div wicket:id="externalParticipants" class="external-participants"><div class="head"><wicket:t>External Participants</wicket:t></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 8a28ec42c6..d8deaf8dd6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -78,6 +78,7 @@ import io.onedev.server.web.component.entity.reference.EntityReferencePanel;import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.issue.statestats.StateStatsBar;+import io.onedev.server.web.component.issue.workspaces.IssueWorkspacesLink;import io.onedev.server.web.component.iteration.IterationStatusLabel;import io.onedev.server.web.component.iteration.choice.AbstractIterationChoiceProvider;import io.onedev.server.web.component.iteration.choice.IterationChoiceResourceReference;@@ -115,6 +116,14 @@ public abstract class IssueSidePanel extends Panel {addOrReplace(newIterationsContainer());addOrReplace(newBranchContainer());addOrReplace(newVotesContainer());+ addOrReplace(new IssueWorkspacesLink("workspaces") {++ @Override+ protected Issue getIssue() {+ return IssueSidePanel.this.getIssue();+ }++ });addOrReplace(watchesContainer = new EntityWatchesPanel("watches") {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 cf5e1d76c9..f690c33325 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@@ -22,7 +22,6 @@<div class="main flex-grow-1"><div wicket:id="statusBar" class="status-bar d-flex mb-4"><div wicket:id="status" class="badge status mr-3"></div>- <a wicket:id="workspaces" t:data-tippy-content="Workspaces on source branch" class="btn btn-outline-secondary btn-sm mr-3">Workspaces <wicket:svg href="arrow" class="icon rotate-90"/></a><a wicket:id="clone" t:data-tippy-content="Check out to local directory" class="btn btn-outline-secondary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a><a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" t:data-tippy-content="Open new pull request"><wicket:svg href="plus" class="icon"/></a></div>@@ -167,6 +166,11 @@<div wicket:id="reviewerHelp" class="font-size-sm text-muted form-text"><wicket:t>Pull request can only be merged after getting approvals from all reviewers</wicket:t></div></div></wicket:enclosure>+ <wicket:enclosure child="workspaces">+ <div class="workspaces">+ <a wicket:id="workspaces" t:data-tippy-content="Workspaces on source branch" class="btn btn-outline-secondary btn-sm"><wicket:t>Workspaces</wicket:t> <wicket:svg href="arrow" class="icon rotate-90"/></a>+ </div>+ </wicket:enclosure><wicket:enclosure child="jobs"><div class="jobs"><div class="head">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 ec8323de7a..f30b90dc28 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@@ -1069,6 +1069,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}});+ fragment.add(newWorkspacesLink());fragment.add(new PullRequestJobsPanel("jobs") {@Override@@ -1667,7 +1668,44 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- statusBarContainer.add(new DropdownLink("workspaces") {+ statusBarContainer.add(new DropdownLink("clone") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "cloneFrag", PullRequestDetailPage.this);+ fragment.add(new Label("headRef", getPullRequest().getHeadRef()));+ fragment.add(new Label("mergeRef", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getPullRequest().getMergeRef();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().checkMergePreview() != null+ && getPullRequest().checkMergePreview().getMergeCommitHash() != null);+ }++ });+ return fragment;+ }++ });++ statusBarContainer.add(new BookmarkablePageLink<Void>(+ "newPullRequest",+ NewPullRequestPage.class,+ NewPullRequestPage.paramsOf(getProject())));++ return statusBarContainer;+ }++ private Component newWorkspacesLink() {+ return new DropdownLink("workspaces") {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {@@ -1713,42 +1751,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR&& SecurityUtils.canCreateWorkspaces(request.getProject()));}- });-- statusBarContainer.add(new DropdownLink("clone") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "cloneFrag", PullRequestDetailPage.this);- fragment.add(new Label("headRef", getPullRequest().getHeadRef()));- fragment.add(new Label("mergeRef", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return getPullRequest().getMergeRef();- }-- }) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().checkMergePreview() != null- && getPullRequest().checkMergePreview().getMergeCommitHash() != null);- }-- });- return fragment;- }-- });-- statusBarContainer.add(new BookmarkablePageLink<Void>(- "newPullRequest",- NewPullRequestPage.class,- NewPullRequestPage.paramsOf(getProject())));-- return statusBarContainer;+ };}private WebMarkupContainer newDescriptionContainer() {