The Unified and Autonomous Development Platform
Fix issue #675 - Able to show child configurations from project list as well as project breadcrumb
Robin Shenf5569932b61a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 67260499ea..4abfef90d6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -15,6 +15,7 @@ import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.facade.ProjectFacade;public interface ProjectManager extends EntityManager<Project> {@@ -70,6 +71,8 @@ public interface ProjectManager extends EntityManager<Project> {Predicate getTreePredicate(CriteriaBuilder builder, Path<Project> jpaPath, Project project);+ List<ProjectFacade> getChildren(Long projectId);+void move(Collection<Project> projects, @Nullable Project parent);void delete(Collection<Project> projects);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 932a10e215..257f20fd30 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -6,6 +6,8 @@ import java.io.InputStream;import java.nio.charset.Charset;import java.util.ArrayList;import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;import java.util.Date;import java.util.HashMap;import java.util.HashSet;@@ -926,5 +928,28 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}return null;}++ @Override+ public List<ProjectFacade> getChildren(Long projectId) {+ cacheLock.readLock().lock();+ try {+ List<ProjectFacade> children = new ArrayList<>();+ for (ProjectFacade facade: cache.values()) {+ if (projectId.equals(facade.getParentId()))+ children.add(facade);+ }+ Collections.sort(children, new Comparator<ProjectFacade>() {++ @Override+ public int compare(ProjectFacade o1, ProjectFacade o2) {+ return o1.getName().compareTo(o2.getName());+ }++ });+ return children;+ } finally {+ cacheLock.readLock().unlock();+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.javaindex e55cc2f688..c703948867 100644--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java@@ -1,6 +1,7 @@package io.onedev.server.web;import java.util.Map;+import java.util.Set;import java.util.concurrent.ConcurrentHashMap;import javax.annotation.Nullable;@@ -11,6 +12,7 @@ import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.subject.Subject;import org.apache.wicket.protocol.http.WicketServlet;import org.apache.wicket.request.Request;+import org.apache.wicket.util.collections.ConcurrentHashSet;import io.onedev.server.OneDev;import io.onedev.server.web.util.Cursor;@@ -27,6 +29,8 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {private Map<Class<?>, String> redirectUrlsAfterDelete = new ConcurrentHashMap<>();+ private Set<Long> expandedProjectIds = new ConcurrentHashSet<>();+public WebSession(Request request) {super(request);}@@ -87,6 +91,10 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {public void setRedirectUrlAfterDelete(Class<?> clazz, String redirectUrlAfterDelete) {redirectUrlsAfterDelete.put(clazz, redirectUrlAfterDelete);}++ public Set<Long> getExpandedProjectIds() {+ return expandedProjectIds;+ }public static WebSession from(HttpSession session) {String attributeName = "wicket:" + OneDev.getInstance(WicketServlet.class).getServletName() + ":session";diff --git a/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/DropdownTriangleIndicatorCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/DropdownTriangleIndicatorCssResourceReference.javanew file mode 100644index 0000000000..3037bf4b40--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/DropdownTriangleIndicatorCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.asset.dropdowntriangleindicator;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class DropdownTriangleIndicatorCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public DropdownTriangleIndicatorCssResourceReference() {+ super(DropdownTriangleIndicatorCssResourceReference.class, "dropdown-triangle-indicator.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/dropdown-triangle-indicator.css b/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/dropdown-triangle-indicator.cssnew file mode 100644index 0000000000..a1ae5d3070--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/dropdowntriangleindicator/dropdown-triangle-indicator.css@@ -0,0 +1,31 @@+.dropdown-triangle-indicator {+ width: 16px;+ height: 16px;+ background: white;+ border-radius: 2px;+}+.dark-mode .dropdown-triangle-indicator {+ background: var(--dark-mode-dark);+}++.dropdown-triangle-indicator>span {+ display: block;+ width: 0;+ height: 0;+ border-top: 4px solid transparent;+ border-bottom: 4px solid transparent;+ border-left: 4px solid var(--gray-dark);+}+.dark-mode .dropdown-triangle-indicator>span {+ border-left-color: var(--dark-mode-gray);+}++.dropdown-triangle-indicator:hover, .dropdown-triangle-indicator.dropdown-open {+ background: var(--primary);+ padding-top: 6px;+}+.dropdown-triangle-indicator:hover>span, .dropdown-triangle-indicator.dropdown-open>span {+ border-left: 4px solid transparent;+ border-right: 4px solid transparent;+ border-top: 4px solid white;+}diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.javaindex 2cbb3610b5..9e9fef2252 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/AvatarManager.java@@ -15,7 +15,7 @@ public interface AvatarManager {String getAvatarUrl(PersonIdent personIdent);- String getAvatarUrl(Project project);+ String getAvatarUrl(Long projectId);void useAvatar(User user, @Nullable String avatarData);@@ -23,7 +23,7 @@ public interface AvatarManager {File getUploaded(User user);- File getUploaded(Project project);+ File getUploaded(Long projectId);void copyAvatar(Project from, Project to);diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javaindex 290ee6c195..89bb7ba21d 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java@@ -147,10 +147,10 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public String getAvatarUrl(Project project) {- File avatarFile = getUploaded(project);+ public String getAvatarUrl(Long projectId) {+ File avatarFile = getUploaded(projectId);if (avatarFile.exists())- return AVATARS_BASE_URL + "uploaded/projects/" + project.getId() + ".jpg?version=" + avatarFile.lastModified();+ return AVATARS_BASE_URL + "uploaded/projects/" + projectId + ".jpg?version=" + avatarFile.lastModified();elsereturn AVATARS_BASE_URL + "project.png";}@@ -160,7 +160,7 @@ public class DefaultAvatarManager implements AvatarManager {Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + project.getId());avatarLock.lock();try {- File avatarFile = getUploaded(project);+ File avatarFile = getUploaded(project.getId());FileUtils.createDir(avatarFile.getParentFile());AvatarUploadField.writeToFile(avatarFile, avatarData);} finally {@@ -169,8 +169,8 @@ public class DefaultAvatarManager implements AvatarManager {}@Override- public File getUploaded(Project project) {- return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + project.getId() + ".jpg");+ public File getUploaded(Long projectId) {+ return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + projectId + ".jpg");}@Override@@ -178,9 +178,9 @@ public class DefaultAvatarManager implements AvatarManager {Lock avatarLock = LockUtils.getLock("uploaded-project-avatar:" + from.getId());avatarLock.lock();try {- File uploaded = getUploaded(from);+ File uploaded = getUploaded(from.getId());if (uploaded.exists()) {- FileUtils.copyFile(uploaded, getUploaded(to));+ FileUtils.copyFile(uploaded, getUploaded(to.getId()));}} catch (IOException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.javaindex 68901baa98..2e89721885 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatar.java@@ -4,7 +4,6 @@ import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.WebComponent;import io.onedev.server.OneDev;-import io.onedev.server.model.Project;import io.onedev.server.web.avatar.AvatarManager;@SuppressWarnings("serial")@@ -12,10 +11,10 @@ public class ProjectAvatar extends WebComponent {private String url;- public ProjectAvatar(String id, Project project) {+ public ProjectAvatar(String id, Long projectId) {super(id);- url = getAvatarManager().getAvatarUrl(project);+ url = getAvatarManager().getAvatarUrl(projectId);}private AvatarManager getAvatarManager() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.javaindex 5248387ad1..bb96900d23 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/avatar/ProjectAvatarLink.java@@ -26,7 +26,7 @@ public class ProjectAvatarLink extends ViewStateAwarePageLink<Void> {AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);params = ProjectPage.paramsOf(project);- url = avatarManager.getAvatarUrl(project);+ url = avatarManager.getAvatarUrl(project.getId());tooltip = project.getPath();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.htmlnew file mode 100644index 0000000000..99f1924448--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.html@@ -0,0 +1,5 @@+<wicket:panel>+ <a wicket:id="link">+ <img wicket:id="avatar"> <span wicket:id="name"></span>+ </a>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.javanew file mode 100644index 0000000000..87a86d91fa--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java@@ -0,0 +1,32 @@+package io.onedev.server.web.component.project.childrentree;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;++@SuppressWarnings("serial")+class ChildLinkPanel extends Panel {++ private final ProjectFacade child;++ public ChildLinkPanel(String componentId, ProjectFacade child) {+ super(componentId);+ this.child = child;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ Link<?> link = new ViewStateAwarePageLink<Void>("link", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(child.getId()));+ link.add(new ProjectAvatar("avatar", child.getId()));+ link.add(new Label("name", child.getName()));+ add(link);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.javanew file mode 100644index 0000000000..39967db6c8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java@@ -0,0 +1,103 @@+package io.onedev.server.web.component.project.childrentree;++import java.util.HashSet;+import java.util.Iterator;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.facade.ProjectFacade;++@SuppressWarnings("serial")+public class ProjectChildrenTree extends NestedTree<ProjectFacade> {++ private final Set<Long> expandedProjectIds = new HashSet<>();++ public ProjectChildrenTree(String id, Long projectId) {+ super(id, new ITreeProvider<ProjectFacade>() {++ @Override+ public void detach() {+ }++ @Override+ public Iterator<? extends ProjectFacade> getRoots() {+ return getProjectManager().getChildren(projectId).iterator();+ }++ @Override+ public boolean hasChildren(ProjectFacade node) {+ return !getProjectManager().getChildren(node.getId()).isEmpty();+ }++ @Override+ public Iterator<? extends ProjectFacade> getChildren(ProjectFacade node) {+ return getProjectManager().getChildren(node.getId()).iterator();+ }++ @Override+ public IModel<ProjectFacade> model(ProjectFacade object) {+ return Model.of(object);+ }++ });+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new HumanTheme());+ add(AttributeAppender.append("class", "child-projects"));+ }++ @Override+ public void expand(ProjectFacade t) {+ super.expand(t);+ getExpandedProjectIds().add(t.getId());+ }++ @Override+ public void collapse(ProjectFacade t) {+ super.collapse(t);+ getExpandedProjectIds().remove(t.getId());+ }++ @Override+ public State getState(ProjectFacade t) {+ if (getExpandedProjectIds().contains(t.getId()))+ return State.EXPANDED;+ else+ return State.COLLAPSED;+ }++ @Override+ protected Component newContentComponent(String id, IModel<ProjectFacade> model) {+ ProjectFacade child = model.getObject();+ return new ChildLinkPanel(id, child);+ }++ protected Set<Long> getExpandedProjectIds() {+ return expandedProjectIds;+ }++ private static ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectChildrenTreeCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTreeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTreeCssResourceReference.javanew file mode 100644index 0000000000..d380a63302--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTreeCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.project.childrentree;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectChildrenTreeCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectChildrenTreeCssResourceReference() {+ super(ProjectChildrenTreeCssResourceReference.class, "project-children-tree.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/project-children-tree.css b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/project-children-tree.cssnew file mode 100644index 0000000000..e7c8fefbab--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/project-children-tree.css@@ -0,0 +1,9 @@+.floating>.child-projects.tree-theme-human {+ padding: 1rem 1rem 1rem 0.5rem;+}+.child-projects.tree-theme-human .tree-node {+ padding-top: 6px;+}+.child-projects.tree-theme-human>div>div:first-child>.tree-node {+ padding-top: 0;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.javaindex 9bed0dba79..4de9f8d263 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java@@ -22,7 +22,7 @@ public abstract class AbstractProjectChoiceProvider extends ChoiceProvider<Projewriter.key("id").value(choice.getId());writer.key("path");writer.value(HtmlEscape.escapeHtml5(choice.getPath()));- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice);+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(choice.getId());writer.key("avatar").value(avatarUrl);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.htmlindex 2214c97287..3c0d0fb83d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html@@ -2,10 +2,10 @@<div class="project-info p-4"><div class="d-flex align-items-center justify-content-between"><div class="mr-4">- <h5 wicket:id="path" class="mb-0"></h5>+ <a wicket:id="path" class="mb-0 h5"></a><wicket:enclosure child="forkedFrom"><div class="text-muted">- Forked from <span wicket:id="forkedFrom"></span>+ Forked from <a wicket:id="forkedFrom"></a></div></wicket:enclosure></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.javaindex 15fe97d383..585315968f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java@@ -10,7 +10,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -26,8 +25,8 @@ import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.project.path.ProjectPathPanel;import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class ProjectInfoPanel extends Panel {@@ -43,7 +42,15 @@ public abstract class ProjectInfoPanel extends Panel {protected void onInitialize() {super.onInitialize();- add(new ProjectPathPanel("path", projectModel));+ add(new BookmarkablePageLink<Void>("path", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(getProject())) {++ @Override+ public IModel<?> getBody() {+ return Model.of(getProject().getPath());+ }++ });WebMarkupContainer forkInfo = new WebMarkupContainer("forkInfo");forkInfo.setVisible(getProject().isCodeManagement());@@ -132,19 +139,17 @@ public abstract class ProjectInfoPanel extends Panel {add(new WebMarkupContainer("description").setVisible(false));if (getProject().getForkedFrom() != null) {- add(new ProjectPathPanel("forkedFrom", new AbstractReadOnlyModel<Project>() {+ add(new BookmarkablePageLink<Void>("forkedFrom", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(getProject().getForkedFrom())) {@Override- public Project getObject() {- return getProject().getForkedFrom();+ public IModel<?> getBody() {+ return Model.of(getProject().getForkedFrom().getPath());}- }));+ });} else {- WebMarkupContainer forkedFromLink = new WebMarkupContainer("forkedFrom");- forkedFromLink.add(new Label("label"));- forkedFromLink.setVisible(false);- add(forkedFromLink);+ add(new WebMarkupContainer("forkedFrom").setVisible(false));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.htmlindex cca14c1600..a04b66b56b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html@@ -48,6 +48,7 @@<div wicket:id="issueInfo" class="issue-info mt-2 d-flex align-items-center flex-wrap mr-3"></div><div wicket:id="buildInfo" class="build-info mt-2 d-flex align-items-center flex-wrap"></div></div>+ <div wicket:id="children" class="project-summary"></div></wicket:fragment><wicket:fragment wicket:id="codeInfoFrag"><wicket:svg href="files" class="icon mr-2"></wicket:svg>@@ -76,4 +77,18 @@<a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a></wicket:container></wicket:fragment>+ <wicket:fragment wicket:id="childrenFrag">+ <div class="d-flex flex-nowrap align-items-center mt-2">+ <wicket:svg href="project" class="icon mr-1"/>+ <a wicket:id="toggle" class="toggle-children mr-1"><wicket:svg href="arrow" class="icon"/></a>+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </div>+ <div wicket:id="tree" class="child-projects mt-2"></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="childFrag">+ <a wicket:id="link">+ <img wicket:id="avatar">+ <span wicket:id="name"></span>+ </a>+ </wicket:fragment></wicket:panel>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.javaindex 58c012160b..e8ade07f46 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@@ -8,6 +8,7 @@ import java.util.Collections;import java.util.Comparator;import java.util.Iterator;import java.util.List;+import java.util.Set;import javax.annotation.Nullable;@@ -79,6 +80,7 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectIssueStats;import io.onedev.server.util.ProjectPullRequestStats;+import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.WebConstants;import io.onedev.server.web.WebSession;import io.onedev.server.web.behavior.ProjectQueryBehavior;@@ -92,12 +94,14 @@ import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.project.avatar.ProjectAvatar;+import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.children.ProjectChildrenPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.imports.ProjectImportPage;@@ -1035,7 +1039,9 @@ public class ProjectListPanel extends Panel {Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);Project project = rowModel.getObject();- ActionablePageLink pathLink = new ActionablePageLink("path",+ Long projectId = project.getId();++ ActionablePageLink projectLink = new ActionablePageLink("path",ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project)) {@Override@@ -1047,12 +1053,12 @@ public class ProjectListPanel extends Panel {};- pathLink.add(new ProjectAvatar("avatar", project));+ projectLink.add(new ProjectAvatar("avatar", projectId));if (getParentProject() != null)- pathLink.add(new Label("label", project.getPath().substring(getParentProject().getPath().length()+1)));+ projectLink.add(new Label("label", project.getPath().substring(getParentProject().getPath().length()+1)));else- pathLink.add(new Label("label", project.getPath()));- fragment.add(pathLink);+ projectLink.add(new Label("label", project.getPath()));+ fragment.add(projectLink);fragment.add(new Label("lastUpdate", "Updated " + DateUtils.formatAge(project.getUpdateDate())));@@ -1093,7 +1099,7 @@ public class ProjectListPanel extends Panel {protected Integer load() {int totalCount = 0;for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId()))+ if (stats.getProjectId().equals(projectId))totalCount += stats.getStatusCount();}return totalCount;@@ -1130,7 +1136,7 @@ public class ProjectListPanel extends Panel {protected List<ProjectPullRequestStats> load() {List<ProjectPullRequestStats> listOfPullRequestStats = new ArrayList<>();for (ProjectPullRequestStats stats: pullRequestStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId()))+ if (stats.getProjectId().equals(projectId))listOfPullRequestStats.add(stats);}return listOfPullRequestStats;@@ -1179,7 +1185,7 @@ public class ProjectListPanel extends Panel {protected Integer load() {int totalCount = 0;for (ProjectIssueStats stats: issueStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId()))+ if (stats.getProjectId().equals(projectId))totalCount += stats.getStateCount();}return totalCount;@@ -1217,7 +1223,7 @@ public class ProjectListPanel extends Panel {protected List<ProjectIssueStats> load() {List<ProjectIssueStats> listOfIssueStats = new ArrayList<>();for (ProjectIssueStats stats: issueStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId())+ if (stats.getProjectId().equals(projectId)&& stats.getStateOrdinal() < issueSetting.getStateSpecs().size()) {listOfIssueStats.add(stats);}@@ -1254,7 +1260,7 @@ public class ProjectListPanel extends Panel {protected Integer load() {int totalCount = 0;for (ProjectBuildStats stats: buildStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId()))+ if (stats.getProjectId().equals(projectId))totalCount += stats.getStatusCount();}return totalCount;@@ -1291,7 +1297,7 @@ public class ProjectListPanel extends Panel {protected List<ProjectBuildStats> load() {List<ProjectBuildStats> listOfBuildStats = new ArrayList<>();for (ProjectBuildStats stats: buildStatsModel.getObject()) {- if (stats.getProjectId().equals(rowModel.getObject().getId()))+ if (stats.getProjectId().equals(projectId))listOfBuildStats.add(stats);}return listOfBuildStats;@@ -1332,6 +1338,61 @@ public class ProjectListPanel extends Panel {fragment.add(new WebMarkupContainer("buildInfo").setVisible(false));}+ List<ProjectFacade> children = getProjectManager().getChildren(projectId);+ if (!children.isEmpty()) {+ Fragment childrenFrag = new Fragment("children", "childrenFrag", ProjectListPanel.this);+ childrenFrag.add(new AjaxLink<Void>("toggle") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (WebSession.get().getExpandedProjectIds().contains(projectId))+ WebSession.get().getExpandedProjectIds().remove(projectId);+ else+ WebSession.get().getExpandedProjectIds().add(projectId);+ target.add(childrenFrag);+ }++ }.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return WebSession.get().getExpandedProjectIds().contains(projectId)? "expanded": "collapsed";+ }++ })));++ childrenFrag.add(new BookmarkablePageLink<Void>("link", ProjectChildrenPage.class,+ ProjectChildrenPage.paramsOf(projectId)) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", children.size() + " child projects"));+ }++ });++ childrenFrag.add(new ProjectChildrenTree("tree", projectId) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(WebSession.get().getExpandedProjectIds().contains(projectId));+ }++ @Override+ protected Set<Long> getExpandedProjectIds() {+ return WebSession.get().getExpandedProjectIds();+ }++ });++ childrenFrag.setOutputMarkupId(true);+ fragment.add(childrenFrag);+ } else {+ fragment.add(new WebMarkupContainer("children").setVisible(false));+ }+cellItem.add(fragment);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex 5892617e22..8a9b1a3c10 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -7,6 +7,12 @@.project-list .project-summary {margin-left: 2px;}+.project-list .toggle-children.expanded .icon {+ transform: rotate(90deg);+}+.project-list .tree-theme-human {+ margin-left: 40px;+}.project-list .issue-info a:hover {filter: brightness(125%);}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.htmldeleted file mode 100644index c3fee71a7b..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.html+++ /dev/null@@ -1,9 +0,0 @@-<wicket:panel>- <span class="project-path d-inline-flex align-items-center">- <wicket:container wicket:id="parents">- <a wicket:id="link"><span wicket:id="label"></span></a>- <span wicket:id="separator"></span>- </wicket:container>- <a wicket:id="link"><span wicket:id="label"></span></a>- </span>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.javadeleted file mode 100644index 948179a196..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/project/path/ProjectPathPanel.java+++ /dev/null@@ -1,91 +0,0 @@-package io.onedev.server.web.component.project.path;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;--@SuppressWarnings("serial")-public class ProjectPathPanel extends GenericPanel<Project> {-- public ProjectPathPanel(String id, IModel<Project> model) {- super(id, model);- }-- private Project getProject() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new ListView<Project>("parents", new LoadableDetachableModel<List<Project>>() {-- @Override- protected List<Project> load() {- List<Project> ancestors = new ArrayList<>();- Project parent = getProject().getParent();- while (parent != null) {- ancestors.add(parent);- parent = parent.getParent();- }- Collections.reverse(ancestors);- return ancestors;- }-- }) {-- @Override- protected void populateItem(ListItem<Project> item) {- Project parent = item.getModelObject();- if (SecurityUtils.canAccess(parent)) {- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(parent));- link.add(new Label("label", parent.getName()));- item.add(link);- } else {- WebMarkupContainer link = new WebMarkupContainer("link") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- };- link.add(new Label("label", parent.getName()));- item.add(link);- }- item.add(newSeparator("separator"));- }-- });-- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(getProject()));- link.add(new Label("label", getProject().getName()));- add(link);- }-- protected Component newSeparator(String componentId) {- return new Label(componentId, "/").add(AttributeAppender.append("class", "mx-1"));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex dfcbafb259..779632af5e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -154,7 +154,7 @@ public abstract class ProjectSelector extends Panel {};if (project.equals(getCurrent()))link.add(AttributeAppender.append("class", " current"));- link.add(new ProjectAvatar("avatar", project));+ link.add(new ProjectAvatar("avatar", project.getId()));link.add(new Label("path", project.getPath()));item.add(link);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 e2c5180fd5..fff4959c1c 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@@ -474,6 +474,10 @@ a.disabled:not(.btn), a[disabled]:not(.btn) {flex-grow: 0;flex-shrink: 0;}+.tree-theme-human .tree-node>.tree-content {+ flex-grow: 1;+ flex-shrink: 1;+}.tree-theme-human .tree-junction-collapsed {width: 0 !important;height: 0 !important;@@ -521,15 +525,6 @@ a.disabled:not(.btn), a[disabled]:not(.btn) {color: var(--primary) !important;}-.subtree-dropdown-trigger>span {- display: block;- width: 0;- height: 0;- border-top: 4px solid transparent;- border-bottom: 4px solid transparent;- border-left: 4px solid var(--gray-dark);-}-.ps.ps-scroll.overflow-auto {overflow: auto !important;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.htmlindex 2267f1d7cf..8d2346db96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html@@ -9,8 +9,19 @@<wicket:fragment wicket:id="topbarTitleFrag"><a wicket:id="projects" class="d-none d-sm-inline">Projects</a><span class="dot d-none d-sm-inline"></span>- <span wicket:id="projectPath" class="text-truncate"></span>- <span class="dot"></span>- <wicket:container wicket:id="projectTitle"></wicket:container>+ <span class="project-path d-inline-flex align-items-center text-truncate">+ <wicket:container wicket:id="pathSegments">+ <a wicket:id="link" class="text-truncate"><span wicket:id="label"></span></a>+ <a wicket:id="children" class="dropdown-triangle-indicator mx-1 d-inline-flex flex-shrink-0 align-items-center justify-content-center"><span></span></a>+ <span wicket:id="dot" class="flex-shrink-0"></span>+ </wicket:container>+ </span>+ <span wicket:id="projectTitle"></span>+ </wicket:fragment>+ <wicket:fragment wicket:id="childFrag">+ <a wicket:id="link">+ <img wicket:id="avatar">+ <span wicket:id="name"></span>+ </a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 34ac62ac60..f3d25b0c73 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -11,8 +11,15 @@ import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;+import 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.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+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.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;@@ -21,6 +28,7 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;@@ -28,10 +36,14 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndicatorCssResourceReference;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.info.ProjectInfoPanel;-import io.onedev.server.web.component.project.path.ProjectPathPanel;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.layout.SidebarMenu;@@ -46,6 +58,7 @@ import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;@@ -86,12 +99,16 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {private transient Map<ObjectId, Collection<Build>> buildsCache;- public static PageParameters paramsOf(Project project) {+ public static PageParameters paramsOf(Long projectId) {PageParameters params = new PageParameters();- params.add(PARAM_PROJECT, project.getId());+ params.add(PARAM_PROJECT, projectId);return params;}+ public static PageParameters paramsOf(Project project) {+ return paramsOf(project.getId());+ }+public ProjectPage(PageParameters params) {super(params);@@ -257,7 +274,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {menuItems.add(new SidebarMenuItem.SubMenu("sliders", "Settings", settingMenuItems));}- String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(getProject());+ String avatarUrl = OneDev.getInstance(AvatarManager.class).getAvatarUrl(getProject().getId());SidebarMenu.Header menuHeader = new SidebarMenu.Header(avatarUrl, getProject().getName()) {@Override@@ -291,12 +308,64 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {protected Component newTopbarTitle(String componentId) {Fragment fragment = new Fragment(componentId, "topbarTitleFrag", this);fragment.add(new BookmarkablePageLink<Void>("projects", ProjectListPage.class));-- fragment.add(new ProjectPathPanel("projectPath", projectModel) {++ fragment.add(new ListView<Project>("pathSegments", new LoadableDetachableModel<List<Project>>() {@Override- protected Component newSeparator(String componentId) {- return new Label(componentId).add(AttributeAppender.append("class", "dot"));+ protected List<Project> load() {+ List<Project> projects = new ArrayList<>();+ Project project = getProject();+ do {+ projects.add(project);+ project = project.getParent();+ } while (project != null);++ Collections.reverse(projects);+ return projects;+ }++ }) {++ @Override+ protected void populateItem(ListItem<Project> item) {+ Project project = item.getModelObject();+ if (SecurityUtils.canAccess(project)) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("link",+ ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getName()));+ item.add(link);++ List<ProjectFacade> children = getProjectManager().getChildren(project.getId());+ if (!children.isEmpty()) {+ Long projectId = project.getId();+ item.add(new DropdownLink("children") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectChildrenTree(id, projectId);+ }++ });+ item.add(new WebMarkupContainer("dot").setVisible(false));+ } else {+ item.add(new WebMarkupContainer("children").setVisible(false));+ item.add(new Label("dot").add(AttributeAppender.append("class", "dot")));+ }+ } else {+ WebMarkupContainer link = new WebMarkupContainer("link") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ };+ link.add(new Label("label", project.getName()));+ item.add(link);+ item.add(new WebMarkupContainer("children").setVisible(false));+ item.add(new Label("dot").add(AttributeAppender.append("class", "dot")));+ }}});@@ -305,11 +374,21 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {return fragment;}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DropdownTriangleIndicatorCssResourceReference()));+ }+@Overrideprotected String getPageTitle() {return getProject().getPath();}+ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }+protected abstract Component newProjectTitle(String componentId);protected Collection<Build> getBuilds(ObjectId commitId) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.htmlindex 14e75c4060..0986a34935 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html@@ -4,7 +4,7 @@<a wicket:id="link" class="mr-1"><span wicket:id="label"></span></a><!-- below separator makes slash appearing in path when the path is copied --><span style="position:absolute; top: -10000px;">/</span>- <a wicket:id="subtreeDropdownTrigger" class="subtree-dropdown-trigger d-flex align-items-center justify-content-center"><span></span></a>+ <a wicket:id="subtreeDropdownTrigger" class="dropdown-triangle-indicator d-flex align-items-center justify-content-center"><span></span></a></div><div wicket:id="lastSegment" class="float-left last-segment"></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.javaindex 4f5e2b20b8..6a8a52a4ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java@@ -44,6 +44,7 @@ import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitUtils;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.TrackViewStateListener;+import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndicatorCssResourceReference;import io.onedev.server.web.behavior.CtrlAwareOnClickAjaxBehavior;import io.onedev.server.web.component.blob.BlobIcon;import io.onedev.server.web.component.floating.AlignPlacement;@@ -313,6 +314,7 @@ public class BlobNavigator extends Panel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);+ response.render(CssHeaderItem.forReference(new DropdownTriangleIndicatorCssResourceReference()));response.render(CssHeaderItem.forReference(new BlobNavigatorResourceReference()));if (context.getBlobIdent().isTree()) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.cssindex 2281ad7c17..d8e49a40f9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css@@ -1,34 +1,3 @@-.subtree-dropdown-trigger {- width: 16px;- height: 16px;- background: white;- border-radius: 2px;-}-.dark-mode .subtree-dropdown-trigger {- background: var(--dark-mode-dark);-}--.subtree-dropdown-trigger>span {- display: block;- width: 0;- height: 0;- border-top: 4px solid transparent;- border-bottom: 4px solid transparent;- border-left: 4px solid var(--gray-dark);-}-.dark-mode .subtree-dropdown-trigger>span {- border-left-color: var(--dark-mode-gray);-}--.subtree-dropdown-trigger:hover, .subtree-dropdown-trigger.dropdown-open {- background: var(--primary);- padding-top: 6px;-}-.subtree-dropdown-trigger:hover>span, .subtree-dropdown-trigger.dropdown-open>span {- border-left: 4px solid transparent;- border-right: 4px solid transparent;- border-top: 4px solid white;-}.subtree-dropdown {padding: 1rem;max-width: 800px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.javaindex 0cad9affbe..4b6f677964 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.setting.avatar;import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Button;@@ -33,14 +34,14 @@ public class AvatarEditPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();- add(new ProjectAvatar("avatar", getProject()));+ add(new ProjectAvatar("avatar", getProject().getId()));add(new Link<Void>("useDefault") {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getAvatarManager().getUploaded(getProject()).exists());+ setVisible(getAvatarManager().getUploaded(getProject().getId()).exists());}@Override@@ -84,7 +85,7 @@ public class AvatarEditPage extends ProjectSettingPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Edit Avatar");+ return new Label(componentId, "Edit Avatar").add(AttributeAppender.replace("class", "text-truncate"));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.javaindex 64daa72276..532ecd3966 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralProjectSettingPage.java@@ -12,6 +12,7 @@ import org.apache.wicket.Component;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;+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.model.IModel;@@ -175,7 +176,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "<span class='text-truncate'>General Setting</span>").setEscapeModelStrings(false);+ return new Label(componentId, "General Setting").add(AttributeAppender.replace("class", "text-truncate"));}}