Skip to content

Commit d561800

Browse files
committed
WIP - Browse AIP details
1 parent 6f48d93 commit d561800

File tree

16 files changed

+977
-149
lines changed

16 files changed

+977
-149
lines changed

roda-common/roda-common-data/src/main/java/org/roda/core/data/v2/generics/UpdatePermissionsRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.fasterxml.jackson.annotation.JsonIgnore;
77
import org.roda.core.data.utils.SelectedItemsUtils;
88
import org.roda.core.data.v2.generics.select.SelectedItemsRequest;
9-
import org.roda.core.data.v2.index.IsIndexed;
109
import org.roda.core.data.v2.index.select.SelectedItems;
1110
import org.roda.core.data.v2.ip.Permissions;
1211

roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.roda.wui.client.common.actions.widgets.ActionableWidgetBuilder;
5050
import org.roda.wui.client.common.cards.AIPDisseminationCardList;
5151
import org.roda.wui.client.common.cards.AIPRepresentationCardList;
52+
import org.roda.wui.client.common.labels.Header;
5253
import org.roda.wui.client.common.lists.utils.AsyncTableCellOptions;
5354
import org.roda.wui.client.common.lists.utils.ConfigurableAsyncTableCell;
5455
import org.roda.wui.client.common.lists.utils.ListBuilder;
@@ -131,14 +132,17 @@ public class BrowseAIP extends Composite {
131132
@UiField
132133
BrowseAIPTabs browseTab;
133134

134-
// DESCRIPTIVE METADATA
135135
// AIP CHILDREN
136136
@UiField
137-
SimplePanel aipChildrenCard;
137+
FlowPanel lowerContent;
138+
@UiField
139+
Header aipChildrenTitle;
138140
@UiField
139-
SimplePanel addChildAip;
141+
SimplePanel aipChildrenCard;
140142
@UiField
141143
FlowPanel center;
144+
145+
// SIDEBAR
142146
@UiField
143147
FlowPanel representationCards;
144148
@UiField
@@ -192,6 +196,9 @@ public void onSuccess(Actionable.ActionImpact impact) {
192196
updateSectionDescriptiveMetadata(response.getDescriptiveMetadataInfos());
193197

194198
// AIP CHILDREN
199+
aipChildrenTitle.setHeaderText(messages.sublevels());
200+
aipChildrenTitle.setIcon("cmi cmi-accountTree");
201+
aipChildrenTitle.setLevel(5);
195202
if (PermissionClientUtils.hasPermissions(RodaConstants.PERMISSION_METHOD_FIND_AIP)) {
196203
ListBuilder<IndexedAIP> aipChildrenListBuilder;
197204
if (aip.getState().equals(AIPState.DESTROYED) || aip.isOnHold() || aip.getDisposalConfirmationId() != null) {
@@ -262,15 +269,9 @@ public void onSuccess(Actionable.ActionImpact impact) {
262269
if (aip.getState().equals(AIPState.ACTIVE)) {
263270
if (response.getChildAipsCount().getResult() > 0) {
264271
LastSelectedItemsSingleton.getInstance().setSelectedJustActive(justActive);
265-
} else {
266-
if (!aip.isOnHold() && aip.getDisposalConfirmationId() == null) {
267-
addChildAip.setWidget(
268-
new ActionableWidgetBuilder<>(aipActions).buildListWithObjects(new ActionableObject<>(IndexedAIP.class),
269-
Collections.singletonList(AipActions.AipAction.NEW_CHILD_AIP_BELOW)));
270-
}
271272
}
272273

273-
addChildAip.setVisible(response.getRepresentationCount().getResult() == 0);
274+
lowerContent.setVisible(response.getChildAipsCount().getResult() > 0);
274275
}
275276

276277
// Side panel representations

roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.ui.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
33
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"
44
xmlns:common="urn:import:org.roda.wui.client.common" xmlns:commoncards="urn:import:org.roda.wui.client.common.cards"
5-
xmlns:tabs="urn:import:org.roda.wui.client.browse.tabs">
5+
xmlns:tabs="urn:import:org.roda.wui.client.browse.tabs" xmlns:labels="urn:import:org.roda.wui.client.common.labels">
66

77
<ui:with field='messages' type='config.i18n.client.ClientMessages' />
88

@@ -23,15 +23,10 @@
2323
<!-- DESCRIPTIVE METADATA -->
2424
<tabs:BrowseAIPTabs ui:field="browseTab" />
2525
</g:FlowPanel>
26-
<g:FlowPanel addStyleNames="lowerContent">
27-
<g:HTML>
28-
<h3 text="{messages.sublevels}"/>
29-
</g:HTML>
26+
<g:FlowPanel addStyleNames="lowerContent" ui:field="lowerContent">
3027
<!-- AIP CHILDREN -->
28+
<labels:Header ui:field="aipChildrenTitle" />
3129
<g:SimplePanel ui:field="aipChildrenCard" addStyleNames="card aipChildrenCard" />
32-
33-
<!-- ADD NEW -->
34-
<g:SimplePanel ui:field="addChildAip" addStyleNames="ActionableStyleButtons" />
3530
</g:FlowPanel>
3631
</g:FlowPanel>
3732
</g:FlowPanel>

0 commit comments

Comments
 (0)