Skip to content

The Unified and Autonomous Development Platform

Add button to display orphan projects for cleanup

robin shenf5a78e24d8e3
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
index 3f2f5b2b6e..f49d1cbfb0 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java
@@ -1,6 +1,7 @@
package com.gitplex.server.manager.impl;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -178,6 +179,24 @@ public class DefaultCacheManager implements CacheManager {
} finally {
projectsLock.writeLock().unlock();
}
+ userAuthorizationsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getProjectId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ userAuthorizationsLock.writeLock().unlock();
+ }
+ groupAuthorizationsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getProjectId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ groupAuthorizationsLock.writeLock().unlock();
+ }
} else if (event.getEntity() instanceof User) {
usersLock.writeLock().lock();
try {
@@ -187,6 +206,24 @@ public class DefaultCacheManager implements CacheManager {
} finally {
usersLock.writeLock().unlock();
}
+ userAuthorizationsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getUserId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ userAuthorizationsLock.writeLock().unlock();
+ }
+ membershipsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getUserId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ membershipsLock.writeLock().unlock();
+ }
} else if (event.getEntity() instanceof Group) {
groupsLock.writeLock().lock();
try {
@@ -194,6 +231,24 @@ public class DefaultCacheManager implements CacheManager {
} finally {
groupsLock.writeLock().unlock();
}
+ groupAuthorizationsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getGroupId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ groupAuthorizationsLock.writeLock().unlock();
+ }
+ membershipsLock.writeLock().lock();
+ try {
+ for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().getUserId().equals(event.getEntity().getId()))
+ it.remove();
+ }
+ } finally {
+ membershipsLock.writeLock().unlock();
+ }
} else if (event.getEntity() instanceof Membership) {
membershipsLock.writeLock().lock();
try {
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
index 60f15cc6d5..63af102ecc 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultProjectManager.java
@@ -116,7 +116,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
dao.persist(project);
- if (isNew && !SecurityUtils.isAdministrator()) {
+ if (isNew) {
UserAuthorization authorization = new UserAuthorization();
authorization.setPrivilege(ProjectPrivilege.ADMIN);
authorization.setProject(project);
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
index 06174f3adb..c31d5575bd 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.html
@@ -7,8 +7,14 @@
<div class="pull-left">
<a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create Project</a>
</div>
+ <div class="pull-left">
+ <a wicket:id="showOrphanProjects" class="btn btn-default"><i class="fa fa-ext fa-repo"></i> Orphan Projects</a>
+ </div>
</div>
<div class="body">
+ <div wicket:id="orphanProjectsNote" class="alert alert-warning">Orphan projects are those without explicit administrators. For instance,
+ project forked/created by some user will become orphan if that user account is deleted. You may delete orphan projects
+ to save resource or assign someone else as explicit project administrator if it is still useful.</div>
<table wicket:id="projects" class="projects table"></table>
</div>
</div>
diff --git a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
index 06acf5b5b7..805582ab8d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/home/DashboardPage.java
@@ -5,9 +5,11 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -18,6 +20,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToo
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
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.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -25,6 +28,7 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -36,6 +40,7 @@ import com.gitplex.server.manager.CacheManager;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.model.User;
+import com.gitplex.server.security.ProjectPrivilege;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.facade.GroupAuthorizationFacade;
import com.gitplex.server.util.facade.MembershipFacade;
@@ -45,11 +50,11 @@ import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.component.avatar.AvatarLink;
import com.gitplex.server.web.component.link.UserLink;
-import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.layout.LayoutPage;
import com.gitplex.server.web.page.layout.NewProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
+import com.gitplex.server.web.page.project.setting.general.GeneralSettingPage;
import com.gitplex.server.web.util.DateUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;
@@ -57,6 +62,37 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.Bootstra
@SuppressWarnings("serial")
public class DashboardPage extends LayoutPage {
+ private boolean showOrphanProjects;
+
+ private final IModel<List<ProjectFacade>> orphanProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {
+
+ @Override
+ protected List<ProjectFacade> load() {
+ CacheManager cacheManager = GitPlex.getInstance(CacheManager.class);
+ List<ProjectFacade> projects = new ArrayList<>();
+
+ Set<Long> projectIdsWithExplicitAdministrators = new HashSet<>();
+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
+ if (authorization.getPrivilege() == ProjectPrivilege.ADMIN)
+ projectIdsWithExplicitAdministrators.add(authorization.getProjectId());
+ }
+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
+ if (authorization.getPrivilege() == ProjectPrivilege.ADMIN)
+ projectIdsWithExplicitAdministrators.add(authorization.getProjectId());
+ }
+
+ for (ProjectFacade project: cacheManager.getProjects().values()) {
+ if (!projectIdsWithExplicitAdministrators.contains(project.getId())
+ && project.matchesQuery(searchInput)) {
+ projects.add(project);
+ }
+ }
+ projects.sort(ProjectFacade::compareLastVisit);
+ return projects;
+ }
+
+ };
+
private final IModel<List<ProjectFacade>> projectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {
@Override
@@ -127,6 +163,51 @@ public class DashboardPage extends LayoutPage {
}
});
+
+ WebMarkupContainer orphanProjectsNote = new WebMarkupContainer("orphanProjectsNote") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(showOrphanProjects);
+ }
+
+ };
+ orphanProjectsNote.setOutputMarkupPlaceholderTag(true);
+ add(orphanProjectsNote);
+
+ add(new AjaxLink<Void>("showOrphanProjects") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return showOrphanProjects?"active":"";
+ }
+
+ }));
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ showOrphanProjects = !showOrphanProjects;
+ target.add(this);
+ target.add(projectsTable);
+ target.add(orphanProjectsNote);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.isAdministrator() && !orphanProjectsModel.getObject().isEmpty());
+ }
+
+ });
List<IColumn<ProjectFacade, Void>> columns = new ArrayList<>();
@@ -137,8 +218,14 @@ public class DashboardPage extends LayoutPage {
IModel<ProjectFacade> rowModel) {
Fragment fragment = new Fragment(componentId, "projectFrag", DashboardPage.this);
Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());
- Link<Void> link = new ViewStateAwarePageLink<Void>("link",
- ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
+ Link<Void> link;
+ if (showOrphanProjects) {
+ link = new BookmarkablePageLink<Void>("link", GeneralSettingPage.class,
+ GeneralSettingPage.paramsOf(project));
+ } else {
+ link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class,
+ ProjectBlobPage.paramsOf(project));
+ }
link.add(new Label("name", project.getName()));
fragment.add(link);
cellItem.add(fragment);
@@ -206,7 +293,11 @@ public class DashboardPage extends LayoutPage {
@Override
public Iterator<? extends ProjectFacade> iterator(long first, long count) {
- List<ProjectFacade> projects = projectsModel.getObject();
+ List<ProjectFacade> projects;
+ if (showOrphanProjects)
+ projects = orphanProjectsModel.getObject();
+ else
+ projects = projectsModel.getObject();
if (first + count <= projects.size())
return projects.subList((int)first, (int)(first+count)).iterator();
else
@@ -215,7 +306,10 @@ public class DashboardPage extends LayoutPage {
@Override
public long size() {
- return projectsModel.getObject().size();
+ if (showOrphanProjects)
+ return orphanProjectsModel.getObject().size();
+ else
+ return projectsModel.getObject().size();
}
@Override
@@ -240,6 +334,7 @@ public class DashboardPage extends LayoutPage {
@Override
protected void onDetach() {
+ orphanProjectsModel.detach();
projectsModel.detach();
super.onDetach();
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.java
index b849c7c689..6ff04c2f7d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/MoreInfoPanel.java
@@ -180,7 +180,7 @@ public abstract class MoreInfoPanel extends Panel {
};
}
- }.setVisible(SecurityUtils.getUser() != null));
+ }.setVisible(SecurityUtils.canCreateProjects()));
}
private Project getProject() {
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
index 07c6c4df12..f9560a6493 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java
@@ -400,7 +400,9 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {
}
}));
- if (rowModel.getObject().equals(SecurityUtils.getUser().getId())) {
+
+ Long userId = rowModel.getObject();
+ if (userId.equals(SecurityUtils.getUser().getId()) && !isPrivilegeFromOtherSources(userId)) {
dropdown.add(AttributeAppender.append("disabled", "true"));
dropdown.setEnabled(false);
}