The Unified and Autonomous Development Platform
Add recent accessed projects in dashboard page
robin shen250e03c78679
diff --git a/core/src/main/java/com/gitplex/server/manager/CacheManager.java b/core/src/main/java/com/gitplex/server/manager/CacheManager.javaindex 02f514b93c..031b1c3b2b 100644--- a/core/src/main/java/com/gitplex/server/manager/CacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/CacheManager.java@@ -49,6 +49,8 @@ public interface CacheManager {@NullableLong getUserIdByEmail(String email);+ Map<String, Long> getProjectIds();+@NullableLong getProjectIdByName(String name);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.javaindex 7101476aa6..af0a2b8ee4 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@@ -393,6 +393,16 @@ public class DefaultCacheManager implements CacheManager {}}+ @Override+ public Map<String, Long> getProjectIds() {+ projectsLock.readLock().lock();+ try {+ return new HashMap<>(projectIdsByName);+ } finally {+ projectsLock.readLock().unlock();+ }+ }+@Overridepublic Long getGroupIdByName(String name) {groupsLock.readLock().lock();diff --git a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.javaindex c7966effbd..14cc427b89 100644--- a/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java+++ b/core/src/main/java/com/gitplex/server/util/facade/ProjectFacade.java@@ -66,5 +66,5 @@ public class ProjectFacade extends EntityFacade {return project1.compareTo(project2);}}-+}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.html b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.htmlnew file mode 100644index 0000000000..1ef29943e0--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.html@@ -0,0 +1,12 @@+<wicket:panel>+ <table wicket:id="projects" class="table project-list"></table>+ <wicket:fragment wicket:id="projectFrag">+ <i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="authorFrag">+ <a wicket:id="avatar"></a> <a wicket:id="name"></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="commitMessageFrag">+ <a wicket:id="link"><span wicket:id="message"></span></a>+ </wicket:fragment>+</wicket:panel>diff --git a/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.java b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.javanew file mode 100644index 0000000000..a246032788--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListPanel.java@@ -0,0 +1,180 @@+package com.gitplex.server.web.component.projectlist;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++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;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+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.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+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.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.revwalk.RevCommit;++import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.ProjectManager;+import com.gitplex.server.model.Project;+import com.gitplex.server.util.facade.ProjectFacade;+import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.link.UserLink;+import com.gitplex.server.web.page.project.blob.ProjectBlobPage;+import com.gitplex.server.web.page.project.commit.CommitDetailPage;+import com.gitplex.server.web.util.DateUtils;++import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.BootstrapAjaxPagingNavigator;++@SuppressWarnings("serial")+public class ProjectListPanel extends Panel {++ private final IModel<List<ProjectFacade>> projectsModel;++ public ProjectListPanel(String id, IModel<List<ProjectFacade>> projectsModel) {+ super(id);+ this.projectsModel = projectsModel;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<ProjectFacade, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this);+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class,+ ProjectBlobPage.paramsOf(project));+ link.add(new Label("name", project.getName()));+ fragment.add(link);+ cellItem.add(fragment);+ cellItem.add(AttributeAppender.append("class", "project"));+ }+ });++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Author")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPanel.this);+ fragment.add(new AvatarLink("avatar", lastCommit.getAuthorIdent()));+ fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ cellItem.add(AttributeAppender.append("class", "author"));+ }+ });++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Message")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ Fragment fragment = new Fragment(componentId, "commitMessageFrag", ProjectListPanel.this);+ PageParameters params = CommitDetailPage.paramsOf(project, lastCommit.name());+ Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class, params);+ link.add(new Label("message", lastCommit.getShortMessage()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ cellItem.add(AttributeAppender.append("class", "commit-message"));+ }+ });++ columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Date")) {++ @Override+ public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,+ IModel<ProjectFacade> rowModel) {+ Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());+ RevCommit lastCommit = project.getLastCommit();+ if (lastCommit != null) {+ cellItem.add(new Label(componentId, DateUtils.formatAge(lastCommit.getCommitterIdent().getWhen())));+ } else {+ cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));+ }+ cellItem.add(AttributeAppender.append("class", "commit-date"));+ }+ });++ SortableDataProvider<ProjectFacade, Void> dataProvider = new SortableDataProvider<ProjectFacade, Void>() {++ @Override+ public Iterator<? extends ProjectFacade> iterator(long first, long count) {+ List<ProjectFacade> projects;+ projects = projectsModel.getObject();+ if (first + count <= projects.size())+ return projects.subList((int)first, (int)(first+count)).iterator();+ else+ return projects.subList((int)first, projects.size()).iterator();+ }++ @Override+ public long size() {+ return projectsModel.getObject().size();+ }++ @Override+ public IModel<ProjectFacade> model(ProjectFacade object) {+ return Model.of(object);+ }+ };++ DataTable<ProjectFacade, Void> projectsTable =+ new DataTable<ProjectFacade, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);+ projectsTable.addBottomToolbar(new AjaxNavigationToolbar(projectsTable) {++ @Override+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {+ return new BootstrapAjaxPagingNavigator(navigatorId, table);+ }++ });+ projectsTable.addBottomToolbar(new NoRecordsToolbar(projectsTable, Model.of("No Projects Found")));+ projectsTable.setOutputMarkupId(true);+ add(projectsTable);+ }++ @Override+ protected void onDetach() {+ projectsModel.detach();+ super.onDetach();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectListResourceReference()));+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListResourceReference.javanew file mode 100644index 0000000000..7af0a01639--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectlist/ProjectListResourceReference.java@@ -0,0 +1,13 @@+package com.gitplex.server.web.component.projectlist;++import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;++public class ProjectListResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ProjectListResourceReference() {+ super(ProjectListResourceReference.class, "project-list.css");+ }++}diff --git a/web/src/main/java/com/gitplex/server/web/component/projectlist/project-list.css b/web/src/main/java/com/gitplex/server/web/component/projectlist/project-list.cssnew file mode 100644index 0000000000..87e9faa4a8--- /dev/null+++ b/web/src/main/java/com/gitplex/server/web/component/projectlist/project-list.css@@ -0,0 +1,17 @@+table.project-list {+ font-size: 13px;+}+table.project-list td.project {+ font-size: 14px;+}++table.project-list a {+ color: #444;+}+table.project-list td.author img.avatar {+ width: 20px;+ height: 20px;+}+table.project-list td.author span, table.project-list td.commit-date {+ color: #888;+}diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.htmlindex 87c9582ffa..2695c8a872 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.html@@ -2,13 +2,20 @@<div id="dashboard"><div class="summary"><a wicket:id="projects"><i class="fa fa-ext fa-fw fa-repo"></i> <span wicket:id="count"></span> projects</a> <a wicket:id="addProject"><i class="fa fa-plus"></i> add new</a>- <div class="help-block">A project in GitPlex represents a git repository. Only those visible to current user will be counted and listed.</div>+ <div class="help-block">A project in GitPlex represents a git repository. Only those visible to current user will be counted.</div>+ <wicket:enclosure child="recentVisitedProjects">+ <div class="title">Recent Visited</div>+ <div wicket:id="recentVisitedProjects"></div>+ </wicket:enclosure>+ <wicket:enclosure child="recentAddedProjects">+ <div class="title">Recent Added</div>+ <div wicket:id="recentAddedProjects"></div>+ </wicket:enclosure></div><wicket:enclosure child="users"><div class="summary"><a wicket:id="users"><i class="fa fa-user fa-fw"></i> <span wicket:id="count"></span> users</a> <a wicket:id="addUser"><i class="fa fa-plus"></i> add new</a>- <div class="help-block">User profiles in GitPlex are publicly accessible for better collaboration. Users can be granted with project permissions- separately, or they can be added to groups to gain access to projects authorized to the groups</div>+ <div class="help-block">Users can be granted with project permissions separately, or they can be added to groups to gain access to projects authorized to the groups</div></div></wicket:enclosure><wicket:enclosure child="groups">diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.javaindex 04d4824fbe..f351780a7a 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/DashboardPage.java@@ -1,6 +1,9 @@package com.gitplex.server.web.page.dashboard;+import java.util.ArrayList;+import java.util.Comparator;import java.util.List;+import java.util.Map;import org.apache.wicket.Component;import org.apache.wicket.markup.head.CssHeaderItem;@@ -8,13 +11,18 @@ import org.apache.wicket.markup.head.IHeaderResponse;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.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import com.gitplex.server.GitPlex;+import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.GroupManager;import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.UserManager;import com.gitplex.server.security.SecurityUtils;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.web.ComponentRenderer;+import com.gitplex.server.web.component.projectlist.ProjectListPanel;import com.gitplex.server.web.page.admin.systemsetting.SystemSettingPage;import com.gitplex.server.web.page.group.GroupListPage;import com.gitplex.server.web.page.group.NewGroupPage;@@ -28,6 +36,8 @@ import com.google.common.collect.Lists;@SuppressWarnings("serial")public class DashboardPage extends LayoutPage {+ private static final int MAX_RECENT_PROJECTS = 10;+@Overrideprotected void onInitialize() {super.onInitialize();@@ -47,6 +57,70 @@ public class DashboardPage extends LayoutPage {});+ IModel<List<ProjectFacade>> recentVisitedProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {++ @Override+ protected List<ProjectFacade> load() {+ List<ProjectFacade> projects = new ArrayList<>(GitPlex.getInstance(ProjectManager.class)+ .getAccessibleProjects(getLoginUser()));+ projects.sort(ProjectFacade::compareLastVisit);+ if (projects.size() > MAX_RECENT_PROJECTS)+ return projects.subList(0, MAX_RECENT_PROJECTS);+ else+ return projects;+ }++ };++ add(new ProjectListPanel("recentVisitedProjects", recentVisitedProjectsModel) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() != null && !recentVisitedProjectsModel.getObject().isEmpty());+ }++ });++ IModel<List<ProjectFacade>> recentAddedProjectsModel = new LoadableDetachableModel<List<ProjectFacade>>() {++ @Override+ protected List<ProjectFacade> load() {+ List<ProjectFacade> projects = new ArrayList<>(GitPlex.getInstance(ProjectManager.class)+ .getAccessibleProjects(getLoginUser()));+ Map<String, Long> projectIds = GitPlex.getInstance(CacheManager.class).getProjectIds();+ projects.sort(new Comparator<ProjectFacade>() {++ @Override+ public int compare(ProjectFacade o1, ProjectFacade o2) {+ Long id1 = projectIds.get(o1.getName());+ Long id2 = projectIds.get(o2.getName());+ if (id1 == null)+ id1 = 0L;+ if (id2 == null)+ id2 = 0L;+ return (int)(id2 - id1);+ }++ });+ if (projects.size() > MAX_RECENT_PROJECTS)+ return projects.subList(0, MAX_RECENT_PROJECTS);+ else+ return projects;+ }++ };++ add(new ProjectListPanel("recentAddedProjects", recentAddedProjectsModel) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getLoginUser() == null && !recentAddedProjectsModel.getObject().isEmpty());+ }++ });+link = new BookmarkablePageLink<Void>("users", UserListPage.class) {@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.cssindex af824e2fc1..b1cb888d56 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css@@ -4,17 +4,31 @@#dashboard .summary {margin-bottom: 20px;- border-bottom: 1px solid #DDD;+ border: 1px solid #DDD;+ border-radius: 4px;+ padding: 20px;}#dashboard .summary .help-block {- margin-bottom: 20px;margin-left: 4px;}-#dashboard .summary a {+#dashboard .summary>a {color: #444;font-size: 20px;margin-right: 20px;}-#dashboard .summary a .fa-ext {+#dashboard .summary>a .fa-ext {font-size: 20px;}++#dashboard .summary .title {+ font-size: 16px;+ margin: 20px 0 8px 4px;+}++#dashboard .summary table {+ margin-bottom: 0;+}++#dashboard .summary table td {+ border-top: 1px dotted #BBB !important;+}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.htmlindex cbb6bdae31..9ac6a0dcc6 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.html@@ -15,16 +15,7 @@<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 projectsto save resource or assign someone else as explicit project administrator if it is still useful.</div>- <table wicket:id="projects" class="table"></table>+ <div wicket:id="projects"></div></div></div>- <wicket:fragment wicket:id="projectFrag">- <i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a>- </wicket:fragment>- <wicket:fragment wicket:id="authorFrag">- <a wicket:id="avatar"></a> <a wicket:id="name"></a>- </wicket:fragment>- <wicket:fragment wicket:id="commitMessageFrag">- <a wicket:id="link"><span wicket:id="message"></span></a>- </wicket:fragment></wicket:extend>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.javaindex 13edd6e0df..8f72f7f8e9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java@@ -1,6 +1,7 @@package com.gitplex.server.web.page.project;import java.util.ArrayList;+import java.util.Comparator;import java.util.HashSet;import java.util.Iterator;import java.util.List;@@ -10,52 +11,29 @@ 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;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-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;-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;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.revwalk.RevCommit;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.ProjectManager;-import com.gitplex.server.model.Project;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.ProjectFacade;import com.gitplex.server.util.facade.UserAuthorizationFacade;import com.gitplex.server.web.ComponentRenderer;-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.component.projectlist.ProjectListPanel;import com.gitplex.server.web.page.layout.LayoutPage;-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;@SuppressWarnings("serial")public class ProjectListPage extends LayoutPage {@@ -85,7 +63,7 @@ public class ProjectListPage extends LayoutPage {projects.add(project);}}- projects.sort(ProjectFacade::compareLastVisit);+ projects.sort(Comparator.comparing(ProjectFacade::getName));return projects;}@@ -101,13 +79,13 @@ public class ProjectListPage extends LayoutPage {if (!it.next().matchesQuery(searchInput))it.remove();}- projects.sort(ProjectFacade::compareLastVisit);+ projects.sort(Comparator.comparing(ProjectFacade::getName));return projects;}};- private DataTable<ProjectFacade, Void> projectsTable;+ private ProjectListPanel projectList;private String searchInput;@@ -122,7 +100,7 @@ public class ProjectListPage extends LayoutPage {@Overrideprotected void onTypingDone(AjaxRequestTarget target) {searchInput = searchField.getInput();- target.add(projectsTable);+ target.add(projectList);}});@@ -169,7 +147,7 @@ public class ProjectListPage extends LayoutPage {public void onClick(AjaxRequestTarget target) {showOrphanProjects = !showOrphanProjects;target.add(this);- target.add(projectsTable);+ target.add(projectList);target.add(orphanProjectsNote);}@@ -181,127 +159,17 @@ public class ProjectListPage extends LayoutPage {});- List<IColumn<ProjectFacade, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Project")) {+ add(projectList = new ProjectListPanel("projects", new AbstractReadOnlyModel<List<ProjectFacade>>() {@Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {- Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPage.this);- Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- 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);- cellItem.add(AttributeAppender.append("class", "project"));- }- });-- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Author")) {-- @Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {- Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- RevCommit lastCommit = project.getLastCommit();- if (lastCommit != null) {- Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPage.this);- fragment.add(new AvatarLink("avatar", lastCommit.getAuthorIdent()));- fragment.add(new UserLink("name", lastCommit.getAuthorIdent()));- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));- }- cellItem.add(AttributeAppender.append("class", "author"));- }- });-- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Message")) {-- @Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {- Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- RevCommit lastCommit = project.getLastCommit();- if (lastCommit != null) {- Fragment fragment = new Fragment(componentId, "commitMessageFrag", ProjectListPage.this);- PageParameters params = CommitDetailPage.paramsOf(project, lastCommit.name());- Link<Void> link = new BookmarkablePageLink<Void>("link", CommitDetailPage.class, params);- link.add(new Label("message", lastCommit.getShortMessage()));- fragment.add(link);- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));- }- cellItem.add(AttributeAppender.append("class", "commit-message"));- }- });-- columns.add(new AbstractColumn<ProjectFacade, Void>(Model.of("Last Commit Date")) {-- @Override- public void populateItem(Item<ICellPopulator<ProjectFacade>> cellItem, String componentId,- IModel<ProjectFacade> rowModel) {- Project project = GitPlex.getInstance(ProjectManager.class).load(rowModel.getObject().getId());- RevCommit lastCommit = project.getLastCommit();- if (lastCommit != null) {- cellItem.add(new Label(componentId, DateUtils.formatAge(lastCommit.getCommitterIdent().getWhen())));- } else {- cellItem.add(new Label(componentId, "<i>N/A</i>").setEscapeModelStrings(false));- }- cellItem.add(AttributeAppender.append("class", "commit-date"));- }- });-- SortableDataProvider<ProjectFacade, Void> dataProvider = new SortableDataProvider<ProjectFacade, Void>() {-- @Override- public Iterator<? extends ProjectFacade> iterator(long first, long count) {- 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- return projects.subList((int)first, projects.size()).iterator();- }-- @Override- public long size() {+ public List<ProjectFacade> getObject() {if (showOrphanProjects)- return orphanProjectsModel.getObject().size();+ return orphanProjectsModel.getObject();else- return projectsModel.getObject().size();- }-- @Override- public IModel<ProjectFacade> model(ProjectFacade object) {- return Model.of(object);- }- };-- projectsTable = new DataTable<ProjectFacade, Void>("projects", columns, dataProvider, WebConstants.PAGE_SIZE);- projectsTable.addBottomToolbar(new AjaxNavigationToolbar(projectsTable) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new BootstrapAjaxPagingNavigator(navigatorId, table);+ return projectsModel.getObject();}- });- projectsTable.addBottomToolbar(new NoRecordsToolbar(projectsTable, Model.of("No Projects Found")));- projectsTable.setOutputMarkupId(true);- add(projectsTable);+ }));}@Overridediff --git a/web/src/main/java/com/gitplex/server/web/page/project/project.css b/web/src/main/java/com/gitplex/server/web/page/project/project.cssindex 7d314c5d46..5801bd852e 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/project.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/project.css@@ -51,23 +51,6 @@.project.list, .new-project {padding: 20px;}-.project.list table {- font-size: 13px;-}-.project.list table td.project {- font-size: 14px;-}--.project.list table a {- color: #444;-}-.project.list table td.author img.avatar {- width: 20px;- height: 20px;-}-.project.list table td.author span, .project.list table td.commit-date {- color: #888;-}.no-commits>.head {font-size: 20px;