The Unified and Autonomous Development Platform
feat: Add package size in list and detail (OD-1916)
Robin Shenae73498ff4e5
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.javaindex 062f202c13..2ce0674730 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PackManager.java@@ -16,7 +16,8 @@ import java.util.Map;public interface PackManager extends EntityManager<Pack> {- List<Pack> query(@Nullable Project project, EntityQuery<Pack> packQuery, int firstResult, int maxResults);+ List<Pack> query(@Nullable Project project, EntityQuery<Pack> packQuery,+ boolean loadBlobs, int firstResult, int maxResults);int count(@Nullable Project project, Criteria<Pack> packCriteria);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.javaindex fcfe0c44f6..da65abd2e5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackManager.java@@ -91,12 +91,31 @@ public class DefaultPackManager extends BaseEntityManager<Pack>@Sessional@Override- public List<Pack> query(Project project, EntityQuery<Pack> packQuery, int firstResult, int maxResults) {+ public List<Pack> query(Project project, EntityQuery<Pack> packQuery, boolean loadBlobs,+ int firstResult, int maxResults) {CriteriaQuery<Pack> criteriaQuery = buildCriteriaQuery(project, getSession(), packQuery);Query<Pack> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);query.setMaxResults(maxResults);- return query.getResultList();+ List<Pack> packs = query.getResultList();++ var builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Object[]> referenceAndBlobQuery = builder.createQuery(Object[].class);+ Root<PackBlobReference> referenceRoot = referenceAndBlobQuery.from(PackBlobReference.class);+ Join<PackBlob, PackBlob> blobJoin = referenceRoot.join(PackBlobReference.PROP_PACK_BLOB, JoinType.INNER);+ referenceAndBlobQuery.multiselect(referenceRoot, blobJoin);+ referenceAndBlobQuery.where(referenceRoot.get(PackBlobReference.PROP_PACK).in(packs));++ for (var pack: packs)+ pack.setBlobReferences(new ArrayList<>());++ for (Object[] referenceAndBlob: getSession().createQuery(referenceAndBlobQuery).getResultList()) {+ PackBlobReference reference = (PackBlobReference) referenceAndBlob[0];+ PackBlob blob = (PackBlob) referenceAndBlob[1];+ reference.setPackBlob(blob);+ reference.getPack().getBlobReferences().add(reference);+ }+ return packs;}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/model/Pack.java b/server-core/src/main/java/io/onedev/server/model/Pack.javaindex 4beec4f598..60254d66cd 100644--- a/server-core/src/main/java/io/onedev/server/model/Pack.java+++ b/server-core/src/main/java/io/onedev/server/model/Pack.java@@ -10,6 +10,7 @@ import javax.annotation.Nullable;import javax.persistence.*;import java.io.Serializable;import java.util.*;+import java.util.stream.Collectors;import static io.onedev.server.model.Pack.*;@@ -203,4 +204,8 @@ public class Pack extends AbstractEntity implements LabelSupport<PackLabel> {return support;}+ public long getSize() {+ return getBlobReferences().stream().map(it -> it.getPackBlob().getSize()).mapToLong(it -> it).sum();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.javaindex cab61aca14..0d9cb33cbd 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java@@ -83,7 +83,7 @@ public class PackResource {throw new InvalidParamException("Error parsing query", e);}- return packManager.query(null, parsedQuery, offset, count);+ return packManager.query(null, parsedQuery, false, offset, count);}@Api(order=700)diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.javaindex 5e1e4ba76a..83f8d86ec9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java@@ -37,6 +37,7 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;+import org.apache.commons.io.FileUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -457,7 +458,7 @@ public abstract class PackListPanel extends Panel {@Overridepublic Iterator<? extends Pack> iterator(long first, long count) {try {- return getPackManager().query(getProject(), queryModel.getObject(),+ return getPackManager().query(getProject(), queryModel.getObject(), true,(int) first, (int) count).iterator();} catch (ExplicitException e) {error(e.getMessage());@@ -571,8 +572,22 @@ public abstract class PackListPanel extends Panel {public void populateItem(Item<ICellPopulator<Pack>> cellItem, String componentId, IModel<Pack> rowModel) {cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getPublishDate())));}- });-+ });++ columns.add(new AbstractColumn<>(Model.of("Total Size")) {++ @Override+ public String getCssClass() {+ return "size d-none d-lg-table-cell";+ }++ @Override+ public void populateItem(Item<ICellPopulator<Pack>> cellItem, String componentId, IModel<Pack> rowModel) {+ cellItem.add(new Label(componentId, FileUtils.byteCountToDisplaySize(rowModel.getObject().getSize())));+ }++ });+body.add(packsTable = new DefaultDataTable<>("packs", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.htmlindex a98e75f3c6..f5c78631dd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.html@@ -13,6 +13,12 @@<span wicket:id="publishDate"></span></div></div>+ <div>+ <div class="name">Total Size</div>+ <div class="value">+ <span wicket:id="totalSize"></span>+ </div>+ </div></div><wicket:enclosure child="fixedIssuesSince"><div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.javaindex 80fba7c018..3e88116c4f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java@@ -29,6 +29,7 @@ import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPimport io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.editbean.LabelsBean;+import org.apache.commons.io.FileUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;@@ -97,6 +98,13 @@ public abstract class PackSidePanel extends Panel {}));+ add(new Label("totalSize", new LoadableDetachableModel<String>() {+ @Override+ protected String load() {+ return FileUtils.byteCountToDisplaySize(getPack().getSize());+ }+ }));+if (build != null) {var choiceProvider = new PackChoiceProvider() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.javaindex 04147cafa4..bdac46d143 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/packs/detail/PackDetailPage.java@@ -137,7 +137,7 @@ public class PackDetailPage extends ProjectPage {@Overrideprotected List<Pack> query(EntityQuery<Pack> query, int offset, int count, ProjectScope projectScope) {- return getPackManager().query(projectScope!=null?projectScope.getProject():null, query, offset, count);+ return getPackManager().query(projectScope!=null?projectScope.getProject():null, query, false, offset, count);}@Override