Skip to content

The Unified and Autonomous Development Platform

Fix issue #907 - Sorting of projects page

Robin Shen896cc0a8f195
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index c4977cdb69..4075c0adf7 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -92,7 +92,7 @@ public class Import implements Serializable, Validatable {
ProjectCache cache = projectManager.cloneCache();
- List<String> choices = projects.stream().map(it->cache.getPath(it.getId())).collect(Collectors.toList());
+ List<String> choices = projects.stream().map(it->cache.get(it.getId()).getPath()).collect(Collectors.toList());
Collections.sort(choices);
return choices;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index effcc46088..772a6108ea 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -63,7 +63,7 @@ public class ProjectDependency implements Serializable {
ProjectCache cache = projectManager.cloneCache();
for (Project project: projectManager.getPermittedProjects(new AccessProject())) {
if (!project.equals(currentProject))
- choices.add(cache.getPath(project.getId()));
+ choices.add(cache.get(project.getId()).getPath());
}
Collections.sort(choices);
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.java
index 302aa0d704..8852464dc5 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,8 +15,8 @@ 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;
import io.onedev.server.util.facade.ProjectCache;
+import io.onedev.server.util.facade.ProjectFacade;
public interface ProjectManager extends EntityManager<Project> {
@@ -33,21 +33,6 @@ public interface ProjectManager extends EntityManager<Project> {
void fork(Project from, Project to);
- /**
- * Save specified project. Note that oldName and oldUserId should not be
- * specified together, meaning that you should not rename and transfer
- * a project in a single call
- *
- * @param project
- * project to save
- * @param oldName
- * in case of rename, this parameter should hold the original name
- * when above project object is initially loaded to ensure database
- * integrity. Use <tt>null</tt> if original name does not exist,
- * or the name is not changed
- */
- void save(Project project, @Nullable String oldName);
-
void create(Project project);
void onDeleteBranch(Project project, String branchName);
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.java
index a3e844c61b..00ba141173 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
@@ -102,8 +102,8 @@ import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.ProjectCache;
+import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
@@ -209,12 +209,15 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
public void save(Project project) {
- save(project, null);
- }
-
- @Transactional
- @Override
- public void save(Project project, String oldPath) {
+ String oldPath = project.getPath();
+ String newPath = project.calcPath();
+ if (!newPath.equals(oldPath)) {
+ project.setPath(newPath);
+ for (Project descendant: project.getDescendants()) {
+ descendant.setPath(descendant.calcPath());
+ dao.persist(descendant);
+ }
+ }
dao.persist(project);
if (oldPath != null && !oldPath.equals(project.getPath())) {
Collection<Milestone> milestones = new ArrayList<>();
@@ -248,6 +251,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
Project parent = project.getParent();
if (parent != null && parent.isNew())
create(parent);
+ project.setPath(project.calcPath());
dao.persist(project);
checkSanity(project);
UserAuthorization authorization = new UserAuthorization();
@@ -284,7 +288,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Listen
public void on(EntityPersisted event) {
if (event.getEntity() instanceof Project) {
- ProjectFacade facade = ((Project) event.getEntity()).getFacade();
+ ProjectFacade facade = ((Project)event.getEntity()).getFacade();
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -653,6 +657,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
cacheLock.writeLock().lock();
try {
for (Project project: query()) {
+ String path = project.getPath();
+ if (!path.equals(project.calcPath())) {
+ System.out.println("shit");
+ project.setPath(path);
+ }
cache.put(project.getId(), project.getFacade());
checkSanity(project);
}
@@ -835,7 +844,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
if (orders.isEmpty())
- orders.add(builder.desc(ProjectQuery.getPath(root, Project.PROP_UPDATE_DATE)));
+ orders.add(builder.asc(ProjectQuery.getPath(root, Project.PROP_PATH)));
query.orderBy(orders);
return query;
@@ -946,9 +955,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Override
public void move(Collection<Project> projects, Project parent) {
for (Project project: projects) {
- String oldPath = project.getPath();
project.setParent(parent);
- save(project, oldPath);
+ save(project);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 5605feea50..e1acf5e2c2 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -4333,4 +4333,45 @@ public class DataMigrator {
private void migrate98(File dataDir, Stack<Integer> versions) {
}
+ private void migrate99(File dataDir, Stack<Integer> versions) {
+ Map<String, String> names = new HashMap<>();
+ Map<String, String> parentIds = new HashMap<>();
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String id = element.elementText("id").trim();
+ String name = element.elementText("name").trim();
+ String parentId;
+ Element parentElement = element.element("parent");
+ if (parentElement != null)
+ parentId = parentElement.getText().trim();
+ else
+ parentId = null;
+ names.put(id, name);
+ parentIds.put(id, parentId);
+ }
+ }
+ }
+
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String id = element.elementText("id").trim();
+ List<String> pathSegments = new ArrayList<>();
+
+ do {
+ pathSegments.add(names.get(id));
+ id = parentIds.get(id);
+ } while (id != null);
+
+ Collections.reverse(pathSegments);
+ element.addElement("path").setText(StringUtils.join(pathSegments, "/"));
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index a56aee77b3..e93960766c 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -193,6 +193,8 @@ public class Project extends AbstractEntity {
public static final String NAME_PATH = "Path";
+ public static final String PROP_PATH = "path";
+
public static final String NAME_UPDATE_DATE = "Update Date";
public static final String PROP_UPDATE_DATE = "updateDate";
@@ -223,6 +225,7 @@ public class Project extends AbstractEntity {
Lists.newArrayList(NAME_NAME, NAME_PATH, NAME_SERVICE_DESK_NAME, NAME_DESCRIPTION, NAME_UPDATE_DATE);
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
+ NAME_PATH, PROP_PATH,
NAME_NAME, PROP_NAME,
NAME_SERVICE_DESK_NAME, PROP_SERVICE_DESK_NAME,
NAME_UPDATE_DATE, PROP_UPDATE_DATE);
@@ -263,6 +266,9 @@ public class Project extends AbstractEntity {
@Column(nullable=false)
private String name;
+ @Column(nullable=false)
+ private String path;
+
@Column(length=MAX_DESCRIPTION_LEN)
private String description;
@@ -424,6 +430,14 @@ public class Project extends AbstractEntity {
this.name = name;
}
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
@Editable(order=200)
@Markdown
public String getDescription() {
@@ -699,8 +713,8 @@ public class Project extends AbstractEntity {
}
public ProjectFacade getFacade() {
- return new ProjectFacade(getId(), getName(), getServiceDeskName(), isIssueManagement(),
- Role.idOf(getDefaultRole()), Project.idOf(getParent()));
+ return new ProjectFacade(getId(), getName(), getPath(), getServiceDeskName(),
+ isIssueManagement(), Role.idOf(getDefaultRole()), Project.idOf(getParent()));
}
/**
@@ -1879,9 +1893,9 @@ public class Project extends AbstractEntity {
return blob.getMediaType();
}
- public String getPath() {
+ public String calcPath() {
if (getParent() != null)
- return getParent().getPath() + "/" + getName();
+ return getParent().calcPath() + "/" + getName();
else
return getName();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index bd7b2713a8..2f4a4d67c7 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -275,10 +275,7 @@ public class ProjectResource {
} else if (!SecurityUtils.canManage(project)) {
throw new UnauthorizedException();
} else {
- String oldPath = customData;
- if (oldPath.contains(":"))
- oldPath = StringUtils.substringAfter(oldPath, ":");
- projectManager.save(project, oldPath);
+ projectManager.save(project);
}
return project.getId();
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
index 9b16157ef1..9e64f1d62b 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectCache.java
@@ -37,30 +37,11 @@ public class ProjectCache extends HashMap<Long, ProjectFacade> {
}
}
- @Nullable
- public String getPath(Long id) {
- ProjectFacade project = get(id);
- if (project != null) {
- if (project.getParentId() != null) {
- String parentPath = getPath(project.getParentId());
- if (parentPath != null)
- return parentPath + "/" + project.getName();
- else
- return null;
- } else {
- return project.getName();
- }
- } else {
- return null;
- }
- }
-
public Collection<Long> getMatchingIds(String pathPattern) {
Collection<Long> ids = new HashSet<>();
- for (Long id: keySet()) {
- String path = getPath(id);
- if (path != null && WildcardUtils.matchPath(pathPattern, path))
- ids.add(id);
+ for (ProjectFacade project: values()) {
+ if (WildcardUtils.matchPath(pathPattern, project.getPath()))
+ ids.add(project.getId());
}
return ids;
}
@@ -119,7 +100,7 @@ public class ProjectCache extends HashMap<Long, ProjectFacade> {
}
public double getSimilarScore(Project project, @Nullable String term) {
- String path = getPath(project.getId());
+ String path = get(project.getId()).getPath();
return Similarities.getSimilarScore(path, term);
}
@@ -133,7 +114,7 @@ public class ProjectCache extends HashMap<Long, ProjectFacade> {
@Override
public int compare(Project o1, Project o2) {
- return getPath(o1.getId()).compareTo(getPath(o2.getId()));
+ return get(o1.getId()).getPath().compareTo(get(o2.getId()).getPath());
}
};
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
index 227e08f5bd..b15327a15f 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java
@@ -8,6 +8,8 @@ public class ProjectFacade extends EntityFacade {
private final String name;
+ private final String path;
+
private final String serviceDeskName;
private final boolean issueManagement;
@@ -16,10 +18,12 @@ public class ProjectFacade extends EntityFacade {
private final Long parentId;
- public ProjectFacade(Long id, String name, @Nullable String serviceDeskName,
- boolean issueManagement, @Nullable Long roleId, @Nullable Long parentId) {
+ public ProjectFacade(Long id, String name, String path,
+ @Nullable String serviceDeskName, boolean issueManagement,
+ @Nullable Long roleId, @Nullable Long parentId) {
super(id);
this.name = name;
+ this.path = path;
this.serviceDeskName = serviceDeskName;
this.issueManagement = issueManagement;
this.roleId = roleId;
@@ -30,6 +34,11 @@ public class ProjectFacade extends EntityFacade {
return name;
}
+ @Nullable
+ public String getPath() {
+ return path;
+ }
+
public boolean isIssueManagement() {
return issueManagement;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
index 83ca2fb59c..44a7b1016b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/parentchoice/ParentChoiceEditor.java
@@ -47,7 +47,7 @@ public class ParentChoiceEditor extends PropertyEditor<String> {
ProjectCache cache = projectManager.cloneCache();
for (Project project: projectManager.getPermittedProjects(new CreateChildren())) {
if (currentProject == null || !cache.isSelfOrAncestorOf(currentProject.getId(), project.getId())) {
- String projectPath = cache.getPath(project.getId());
+ String projectPath = cache.get(project.getId()).getPath();
listOfProjectPath.add(projectPath);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
index 53954de10a..b9131fb8a3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionsPage.java
@@ -51,14 +51,14 @@ public class BranchProtectionsPage extends ProjectSettingPage {
@Override
protected void onDelete(AjaxRequestTarget target) {
getProject().getBranchProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
target.add(container);
}
@Override
protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
getProject().getBranchProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
}
});
@@ -73,7 +73,7 @@ public class BranchProtectionsPage extends ProjectSettingPage {
List<BranchProtection> protections = getProject().getBranchProtections();
BranchProtection protection = protections.get(from.getItemIndex());
protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
target.add(container);
}
@@ -96,7 +96,7 @@ public class BranchProtectionsPage extends ProjectSettingPage {
@Override
protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
getProject().getBranchProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
container.replace(newAddNewFrag());
target.add(container);
}
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.java
index 532ecd3966..863c312253 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
@@ -38,8 +38,6 @@ import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
public class GeneralProjectSettingPage extends ProjectSettingPage {
- private String oldPath;
-
private BeanEditor editor;
public GeneralProjectSettingPage(PageParameters params) {
@@ -73,8 +71,6 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
@Override
public void setObject(Serializable object) {
- // check contract of projectManager.save on why we assign oldPath here
- oldPath = getProject().getPath();
editor.getDescriptor().copyProperties(object, getProject());
}
@@ -129,7 +125,7 @@ public class GeneralProjectSettingPage extends ProjectSettingPage {
"This name has already been used by another project");
} else {
project.setDefaultRole(defaultRoleBean.getRole());
- getProjectManager().save(project, oldPath);
+ getProjectManager().save(project);
Session.get().success("General setting has been updated");
setResponsePage(GeneralProjectSettingPage.class, paramsOf(project));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
index 17896eb96d..28b0ee0529 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionsPage.java
@@ -51,14 +51,14 @@ public class TagProtectionsPage extends ProjectSettingPage {
@Override
protected void onDelete(AjaxRequestTarget target) {
getProject().getTagProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
target.add(container);
}
@Override
protected void onSave(AjaxRequestTarget target, TagProtection protection) {
getProject().getTagProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
}
});
@@ -73,7 +73,7 @@ public class TagProtectionsPage extends ProjectSettingPage {
List<TagProtection> protections = getProject().getTagProtections();
TagProtection protection = protections.get(from.getItemIndex());
protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
target.add(container);
}
@@ -96,7 +96,7 @@ public class TagProtectionsPage extends ProjectSettingPage {
@Override
protected void onSave(AjaxRequestTarget target, TagProtection protection) {
getProject().getTagProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
container.replace(newAddNewFrag());
target.add(container);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index e72f825ef6..6a9829955e 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -163,7 +163,7 @@ public class SuggestionUtils {
ProjectCache cache = getProjectManager().cloneCache();
List<String> projectPaths = projects.stream()
- .map(it->cache.getPath(it.getId()))
+ .map(it->cache.get(it.getId()).getPath())
.sorted()
.collect(Collectors.toList());
return suggest(projectPaths, matchWith);
@@ -399,7 +399,7 @@ public class SuggestionUtils {
List<InputSuggestion> suggestions = new ArrayList<>();
ProjectCache cache = getProjectManager().cloneCache();
List<String> projectPaths = getProjectManager().getPermittedProjects(new AccessProject()).stream()
- .map(it->cache.getPath(it.getId()))
+ .map(it->cache.get(it.getId()).getPath())
.collect(Collectors.toList());
Collections.sort(projectPaths);