Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.roda.core.data.utils;

import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.v2.index.sort.SortParameter;
import org.roda.core.data.v2.index.sort.Sorter;

/**
*
* @author Eduardo Teixeira <eteixeira@keep.pt>
*/
public class SorterUtils {
public static Sorter dipsDefault(){
return new Sorter(new SortParameter(RodaConstants.DIP_ID, false));
}

public static Sorter representationDefault(){
return new Sorter(new SortParameter(RodaConstants.REPRESENTATION_ID, false));
}

public static Sorter filesDefault(){
return new Sorter(new SortParameter(RodaConstants.FILE_ORIGINALNAME, false));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
import java.util.Map;
import java.util.concurrent.CompletableFuture;


import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.exceptions.AuthorizationDeniedException;
import org.roda.core.data.exceptions.NotFoundException;
import org.roda.core.data.utils.SorterUtils;
import org.roda.core.data.v2.generics.LongResponse;
import org.roda.core.data.v2.index.CountRequest;
import org.roda.core.data.v2.index.FindRequest;
Expand Down Expand Up @@ -235,7 +237,7 @@ public void onSuccess(Actionable.ActionImpact impact) {

if (response.getDipCount().getResult() > 0) {
showSidePanel = true;
this.disseminationCards.add(new AIPDisseminationCardList(aipId));
this.disseminationCards.add(new AIPDisseminationCardList(aipId, SorterUtils.dipsDefault(), response.getDipCount().getResult().intValue()));
}

this.sidePanel.setVisible(showSidePanel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.concurrent.CompletableFuture;

import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.utils.SorterUtils;
import org.roda.core.data.v2.generics.LongResponse;
import org.roda.core.data.v2.index.CountRequest;
import org.roda.core.data.v2.index.IndexedFileRequest;
Expand Down Expand Up @@ -278,7 +279,7 @@ public BrowseFile(Viewers viewers, final BrowseFileResponse response, IndexedFil
} else {
if (longResponse.getResult() > 0) {
this.disseminationCards.add(new FileDisseminationCardList(response.getIndexedAIP().getId(),
response.getIndexedRepresentation().getId(), indexedFile.getId(), indexedFile.getUUID()));
response.getIndexedRepresentation().getId(), indexedFile.getId(), indexedFile.getUUID(), SorterUtils.dipsDefault(),longResponse.getResult().intValue()));
} else {
this.sidePanel.setVisible(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,17 @@

import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.exceptions.AuthorizationDeniedException;
import org.roda.core.data.utils.SorterUtils;
import org.roda.core.data.v2.generics.LongResponse;
import org.roda.core.data.v2.index.CountRequest;
import org.roda.core.data.v2.index.IndexedRepresentationRequest;
import org.roda.core.data.v2.index.filter.AndFiltersParameters;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
import org.roda.core.data.v2.ip.AIPState;
import org.roda.core.data.v2.ip.IndexedAIP;
import org.roda.core.data.v2.ip.IndexedDIP;
import org.roda.core.data.v2.ip.IndexedRepresentation;
import org.roda.core.data.v2.ip.metadata.DescriptiveMetadataInfos;
import org.roda.core.data.v2.ip.metadata.IndexedPreservationEvent;
import org.roda.core.data.v2.risks.RiskIncidence;
import org.roda.wui.client.browse.tabs.BrowseRepresentationTabs;
import org.roda.wui.client.common.BrowseRepresentationActionsToolbar;
import org.roda.wui.client.common.LastSelectedItemsSingleton;
Expand Down Expand Up @@ -195,7 +193,7 @@ public BrowseRepresentation(BrowseRepresentationResponse response) {

// CARDS
if (dipCounterResponse.getResult() > 0) {
this.disseminationCards.add(new RepresentationDisseminationCardList(aipId, repId));
this.disseminationCards.add(new RepresentationDisseminationCardList(aipId, repId, SorterUtils.representationDefault(), dipCounterResponse.getResult().intValue()));
} else {
this.sidePanel.setVisible(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import java.util.List;
import java.util.Map;

import com.google.gwt.core.client.GWT;
import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
import org.roda.core.data.v2.index.sort.Sorter;
import org.roda.core.data.v2.ip.IndexedDIP;
import org.roda.wui.client.browse.BrowseDIP;
import org.roda.wui.client.common.cards.utils.CardBuilder;
Expand All @@ -35,7 +35,7 @@
* @author Alexandre Flores <aflores@keep.pt>
*/
public class AIPDisseminationCardList extends ThumbnailCardList<IndexedDIP> {
public AIPDisseminationCardList(String aipId) {
public AIPDisseminationCardList(String aipId, Sorter sorter, int cardsTotal) {
super(messages.someOfAObject(IndexedDIP.class.getName()),
ConfigurationManager.getString(RodaConstants.UI_ICONS_CLASS, IndexedDIP.class.getSimpleName()), IndexedDIP.class,
new Filter(new SimpleFilterParameter(RodaConstants.DIP_ALL_AIP_UUIDS, aipId)), new CardBuilder<IndexedDIP>() {
Expand Down Expand Up @@ -66,6 +66,9 @@ public ThumbnailCard constructCard(ClientMessages messages, IndexedDIP dip) {

return new ThumbnailCard(title, iconThumbnailHTML, tags, attributes, thumbnailClickHandler);
}
});
}, sorter);
withPagination(5, cardsTotal);
// Initialize
refresh();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,7 @@ public ThumbnailCard constructCard(ClientMessages messages, IndexedRepresentatio
return new ThumbnailCard(title, iconThumbnailHTML, tags, attributes, thumbnailClickHandler);
}
});
// Initialize
refresh();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
import org.roda.core.data.v2.index.sort.Sorter;
import org.roda.core.data.v2.ip.IndexedDIP;
import org.roda.wui.client.browse.BrowseDIP;
import org.roda.wui.client.common.cards.utils.CardBuilder;
Expand All @@ -34,7 +35,7 @@
* @author Alexandre Flores <aflores@keep.pt>
*/
public class FileDisseminationCardList extends ThumbnailCardList<IndexedDIP> {
public FileDisseminationCardList(String aipId, String representationId, String fileId, String fileUUID) {
public FileDisseminationCardList(String aipId, String representationId, String fileId, String fileUUID, Sorter sorter, int cardsTotal) {
super(messages.someOfAObject(IndexedDIP.class.getName()),
ConfigurationManager.getString(RodaConstants.UI_ICONS_CLASS, IndexedDIP.class.getSimpleName()), IndexedDIP.class,
new Filter(new SimpleFilterParameter(RodaConstants.DIP_FILE_UUIDS, fileUUID)), new CardBuilder<IndexedDIP>() {
Expand Down Expand Up @@ -65,6 +66,9 @@ public ThumbnailCard constructCard(ClientMessages messages, IndexedDIP dip) {

return new ThumbnailCard(title, iconThumbnailHTML, tags, attributes, thumbnailClickHandler);
}
});
}, sorter);
withPagination(5, cardsTotal);
// Initialize
refresh();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.roda.core.data.common.RodaConstants;
import org.roda.core.data.v2.index.filter.Filter;
import org.roda.core.data.v2.index.filter.SimpleFilterParameter;
import org.roda.core.data.v2.index.sort.Sorter;
import org.roda.core.data.v2.ip.IndexedDIP;
import org.roda.wui.client.browse.BrowseDIP;
import org.roda.wui.client.common.cards.utils.CardBuilder;
Expand All @@ -34,7 +35,7 @@
* @author Alexandre Flores <aflores@keep.pt>
*/
public class RepresentationDisseminationCardList extends ThumbnailCardList<IndexedDIP> {
public RepresentationDisseminationCardList(String aipId, String representationId) {
public RepresentationDisseminationCardList(String aipId, String representationId, Sorter sorter, int cardsTotal) {
super(messages.someOfAObject(IndexedDIP.class.getName()),
ConfigurationManager.getString(RodaConstants.UI_ICONS_CLASS, IndexedDIP.class.getSimpleName()), IndexedDIP.class,
new Filter(new SimpleFilterParameter(RodaConstants.DIP_REPRESENTATION_IDS, representationId)),
Expand Down Expand Up @@ -66,6 +67,8 @@ public ThumbnailCard constructCard(ClientMessages messages, IndexedDIP dip) {

return new ThumbnailCard(title, iconThumbnailHTML, tags, attributes, thumbnailClickHandler);
}
});
}, sorter);
// Initialize
refresh();
}
}
Loading
Loading