The Unified and Autonomous Development Platform
feat: Update ProjectWikiPage to include submodule link and improve action visibility
Robin Shenbaac5382df96
diff --git a/AGENTS.md b/AGENTS.mdindex 996d417f1a..6964bdc468 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -10,6 +10,9 @@ files and files under`server-core/src/main/java/io/onedev/server/web/translation/`. Translationfiles are generated automatically.+Do not add tests for trivial or minor changes unless the user explicitly asks+for them.+For local development, start the OneDev server with `./dev.sh run` from therepository root. The server can hot-load changed classes. Use `./dev.sh build`to compile them; the first run performs a full compile, while subsequent runsdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.htmlindex 4b2467a5a7..f19678f943 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html@@ -17,12 +17,15 @@<div wicket:id="subtitle" class="text-muted ml-2"><wicket:t>in</wicket:t> <span wicket:id="folder"></span></div></div></div>- <div wicket:id="actions" class="py-2 d-flex align-items-center ml-3">- <div class="btn-group">- <a wicket:id="history" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Page history"><wicket:svg href="clock" class="icon"></wicket:svg></a>- <a wicket:id="edit" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Edit page"><wicket:svg href="edit" class="icon"></wicket:svg></a>- <a wicket:id="add" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Add page or upload files"><wicket:svg href="plus" class="icon"></wicket:svg></a>- <a wicket:id="delete" class="btn btn-light btn-hover-danger btn-sm btn-icon" t:data-tippy-content="Delete page"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <div class="py-2 d-flex align-items-center ml-3">+ <div wicket:id="actions" class="d-flex align-items-center">+ <div class="btn-group">+ <a wicket:id="history" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Page history"><wicket:svg href="clock" class="icon"></wicket:svg></a>+ <a wicket:id="edit" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Edit page"><wicket:svg href="edit" class="icon"></wicket:svg></a>+ <a wicket:id="add" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="Add page or upload files"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ <a wicket:id="delete" class="btn btn-light btn-hover-danger btn-sm btn-icon" t:data-tippy-content="Delete page"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <a wicket:id="submodule" class="btn btn-light btn-hover-primary btn-sm btn-icon" t:data-tippy-content="This wiki is linked as a submodule. Click to visit wiki in the target project" t:aria-label="Open target wiki home page"><wicket:svg href="folder-embed" class="icon"></wicket:svg></a>+ </div></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.javaindex 4672291898..72c37d60c6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java@@ -540,7 +540,8 @@ public class ProjectWikiPage extends ProjectPage {private WebMarkupContainer newActions(String path, String content) {actions = new WebMarkupContainer("actions");actions.setOutputMarkupPlaceholderTag(true);- actions.setVisible(!editing && !creating && content != null);+ actions.setVisible(!editing && !creating+ && (content != null || submodule && wikiProjectId != null && commitId != null));actions.add(new MenuLink("add") {@Override@@ -615,10 +616,22 @@ public class ProjectWikiPage extends ProjectPage {showDeleteConfirm(target, page, null);}}.setVisible(canEdit(path) && content != null));+ actions.add(newSubmoduleLink());return actions;}+ private Component newSubmoduleLink() {+ var link = new BookmarkablePageLink<Void>("submodule", ProjectWikiPage.class,+ getSubmoduleParams());+ return link.setVisible(submodule && wikiProjectId != null && commitId != null)+ .setOutputMarkupPlaceholderTag(true);+ }++ private PageParameters getSubmoduleParams() {+ return paramsOf(getWikiProject(), commitId != null ? commitId.name() : null, "Home");+ }+private Component newSidebarEdit() {var sidebarEdit = link("sidebarEdit", "_Sidebar", true, false);sidebarEdit.add(new Label("label", _T("Customize")));