Skip to content

Commit 51bbb3c

Browse files
SugaryLumpSugaryLump
committed
WIP - Fix messages and sticky positioning of sidebars
1 parent 42a9fa3 commit 51bbb3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+229
-532
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.roda.wui.client.common.dialogs.Dialogs;
3333
import org.roda.wui.client.common.utils.AsyncCallbackUtils;
3434
import org.roda.wui.client.common.utils.FormUtilities;
35-
import org.roda.wui.client.common.utils.JavascriptUtils;
3635
import org.roda.wui.client.process.InternalProcess;
3736
import org.roda.wui.client.services.Services;
3837
import org.roda.wui.common.client.HistoryResolver;
@@ -307,12 +306,6 @@ protected static void initTitle(String aipId, TitlePanel title) {
307306
}));
308307
}
309308

310-
@Override
311-
protected void onLoad() {
312-
super.onLoad();
313-
JavascriptUtils.stickSidebar();
314-
}
315-
316309
private void createForm() {
317310
formOrXML.clear();
318311
FormUtilities.create(formOrXML, values, true);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,6 @@ public void onChange(ChangeEvent event) {
226226

227227
}
228228

229-
@Override
230-
protected void onLoad() {
231-
super.onLoad();
232-
JavascriptUtils.stickSidebar();
233-
}
234-
235229
private void init() {
236230
// sort
237231
List<ResourceVersion> versionList = new ArrayList<>(descriptiveMetadataVersions.getVersions());

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

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.roda.wui.client.common.dialogs.Dialogs;
3636
import org.roda.wui.client.common.utils.AsyncCallbackUtils;
3737
import org.roda.wui.client.common.utils.FormUtilities;
38-
import org.roda.wui.client.common.utils.JavascriptUtils;
3938
import org.roda.wui.client.common.utils.PermissionClientUtils;
4039
import org.roda.wui.client.services.Services;
4140
import org.roda.wui.common.client.HistoryResolver;
@@ -236,23 +235,24 @@ public EditDescriptiveMetadata(final String aipId, final String representationId
236235
.thenCompose(result -> service
237236
.aipResource(s -> s.isAIPMetadataSimilar(aipId, metadataId, new SelectedType(value, result.getValue())))
238237
.whenComplete((similar, error) -> {
239-
if (error == null) {
240-
isSimilar = similar;
241-
values = result.getValue();
242-
updateFormOrXML();
243-
}
238+
if (error == null) {
239+
isSimilar = similar;
240+
values = result.getValue();
241+
updateFormOrXML();
242+
}
244243
}));
245244
} else {
246-
service.aipResource(s -> s.retrieveRepresentationSupportedMetadata(aipId, representationId, value,
247-
LocaleInfo.getCurrentLocale().getLocaleName()))
245+
service
246+
.aipResource(s -> s.retrieveRepresentationSupportedMetadata(aipId, representationId, value,
247+
LocaleInfo.getCurrentLocale().getLocaleName()))
248248
.thenCompose(result -> service.aipResource(s -> s.isRepresentationMetadataSimilar(aipId, representationId,
249249
metadataId, new SelectedType(value, result.getValue()))).whenComplete((similar, error) -> {
250-
if (error == null) {
251-
isSimilar = similar;
252-
values = result.getValue();
253-
updateFormOrXML();
254-
}
255-
}));
250+
if (error == null) {
251+
isSimilar = similar;
252+
values = result.getValue();
253+
updateFormOrXML();
254+
}
255+
}));
256256
}
257257
});
258258

@@ -297,12 +297,6 @@ protected void onDetach() {
297297
super.onDetach();
298298
}
299299

300-
@Override
301-
protected void onLoad() {
302-
super.onLoad();
303-
JavascriptUtils.stickSidebar();
304-
}
305-
306300
private void createForm() {
307301
formOrXML.clear();
308302
FormUtilities.create(formOrXML, values, true);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.roda.wui.client.common.dialogs.Dialogs;
4343
import org.roda.wui.client.common.dialogs.MemberSelectDialog;
4444
import org.roda.wui.client.common.lists.utils.ClientSelectedItemsUtils;
45-
import org.roda.wui.client.common.utils.JavascriptUtils;
4645
import org.roda.wui.client.ingest.process.ShowJob;
4746
import org.roda.wui.client.services.Services;
4847
import org.roda.wui.common.client.HistoryResolver;
@@ -130,12 +129,6 @@ public EditPermissions(String objectClass, SelectedItems<? extends HasPermission
130129
createPermissionPanelList();
131130
}
132131

133-
@Override
134-
protected void onLoad() {
135-
super.onLoad();
136-
JavascriptUtils.stickSidebar();
137-
}
138-
139132
private void createPermissionPanelList() {
140133
Map<String, Set<PermissionType>> userPermissionsToShow = new HashMap<>();
141134
Map<String, Set<PermissionType>> groupPermissionsToShow = new HashMap<>();

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.roda.wui.client.common.ActionsToolbar;
2626
import org.roda.wui.client.common.labels.Header;
2727
import org.roda.wui.client.common.labels.Tag;
28-
import org.roda.wui.client.common.utils.JavascriptUtils;
2928
import org.roda.wui.common.client.widgets.HTMLWidgetWrapper;
3029

3130
import com.google.gwt.core.client.GWT;
@@ -102,12 +101,6 @@ public EditPermissionsTab(String objectClass, SelectedItems<? extends HasPermiss
102101
createPermissionPanelList();
103102
}
104103

105-
@Override
106-
protected void onLoad() {
107-
super.onLoad();
108-
JavascriptUtils.stickSidebar();
109-
}
110-
111104
private void initLabels() {
112105
title.setHeaderText(messages.archivalPackagePermissionsTitle());
113106
title.setLevel(3);

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.roda.wui.client.common.actions.model.ActionableObject;
3333
import org.roda.wui.client.common.actions.widgets.ActionableWidgetBuilder;
3434
import org.roda.wui.client.common.utils.AsyncCallbackUtils;
35-
import org.roda.wui.client.common.utils.JavascriptUtils;
3635
import org.roda.wui.client.common.utils.SidebarUtils;
3736
import org.roda.wui.client.ingest.transfer.IngestTransfer;
3837
import org.roda.wui.client.planning.ShowPreservationAgent;
@@ -157,8 +156,9 @@ public ShowPreservationEvent(final String eventId) {
157156

158157
Services services = new Services("Retrieve preservation event", "get");
159158

160-
161-
services.rodaEntityRestService(s -> s.findByUuid(eventId, LocaleInfo.getCurrentLocale().getLocaleName()), IndexedPreservationEvent.class)
159+
services
160+
.rodaEntityRestService(s -> s.findByUuid(eventId, LocaleInfo.getCurrentLocale().getLocaleName()),
161+
IndexedPreservationEvent.class)
162162
.thenCompose(event -> services.preservationEventsResource(s -> s.getPreservationAgents(event.getId()))
163163
.thenCompose(indexedPreservationAgents -> services
164164
.preservationEventsResource(s -> s.getLinkingIdentifierObjects(event.getId()))
@@ -183,12 +183,6 @@ public static final List<String> getViewItemHistoryToken(String id) {
183183
return ListUtils.concat(RESOLVER.getHistoryPath(), id);
184184
}
185185

186-
@Override
187-
protected void onLoad() {
188-
super.onLoad();
189-
JavascriptUtils.stickSidebar();
190-
}
191-
192186
public void viewAction() {
193187
eventIdValue.setText(preservationEvent.getId());
194188
eventTypeLabel.setText(preservationEvent.getEventType());

‎roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/resources/main.gss‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2553,6 +2553,8 @@ td.datePickerMonth, td.datePickerYear {
25532553

25542554
.sidebar .sticky-flow {
25552555
min-width: 220px;
2556+
position: sticky;
2557+
top: 64px;
25562558
}
25572559

25582560
.sidebar .sticky-padding {
@@ -4225,15 +4227,15 @@ td.datePickerMonth, td.datePickerYear {
42254227
.searchWrapper {
42264228
display: flex;
42274229
align-items: start;
4228-
gap: 16px;
42294230
}
42304231

42314232
.searchWrapperSearchPanel {
42324233
flex: 1;
42334234
}
42344235

4235-
.searchWrapperSidePanel {
4236-
max-width: 250px;
4236+
.searchWrapperSidePanel .my-asyncdatagrid-side-panel {
4237+
padding: 0;
4238+
width: 266px;
42374239
}
42384240

42394241
.searchWrapper .objectToolbar {
@@ -4242,7 +4244,8 @@ td.datePickerMonth, td.datePickerYear {
42424244
background-color: transparent;
42434245
flex-direction: column;
42444246
align-items: stretch;
4245-
padding: 8px 0;
4247+
padding: 8px 0px 8px 16px;
4248+
margin-left: 16px;
42464249
}
42474250

42484251
.searchWrapper .objectToolbar .objectToolbarLabel {
@@ -4282,6 +4285,11 @@ td.datePickerMonth, td.datePickerYear {
42824285
display: none;
42834286
}
42844287

4288+
.searchWrapper .my-asyncdatagrid-facets-panel {
4289+
margin-left: 16px;
4290+
padding: 0px 0px 0px 16px;
4291+
}
4292+
42854293
.searchPanelContainer {
42864294
margin-bottom: 16px;
42874295
}
@@ -7913,6 +7921,7 @@ span.code {
79137921
display: flex;
79147922
flex-direction: row;
79157923
justify-content: space-evenly;
7924+
gap: 4px;
79167925
}
79177926

79187927
.card + .ActionableStyleButtons, .ActionableStyleButtons + .ActionableStyleButtons {

‎roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/search/Dropdown.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ public class Dropdown extends Composite implements HasValueChangeHandlers<String
4444
private Map<String, String> popupIcons;
4545

4646
public Dropdown() {
47+
this(false);
48+
}
49+
50+
public Dropdown(boolean disableOnSingleItem) {
4751
focusPanel = new FocusPanel();
4852
panel = new SimplePanel();
4953
iconAndLabelPanel = new FlowPanel();

‎roda-ui/roda-wui/src/main/java/org/roda/wui/client/disposal/confirmations/ShowDisposalConfirmation.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,7 @@ public void onError(Request request, Throwable throwable) {
134134
}
135135
}
136136

137-
@Override
138-
protected void onLoad() {
139-
super.onLoad();
140-
JavascriptUtils.stickSidebar();
141-
}
137+
142138

143139
interface MyUiBinder extends UiBinder<Widget, ShowDisposalConfirmation> {
144140
}

‎roda-ui/roda-wui/src/main/java/org/roda/wui/client/disposal/hold/CreateDisposalHold.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.roda.core.data.v2.disposal.hold.DisposalHold;
1313
import org.roda.wui.client.common.UserLogin;
1414
import org.roda.wui.client.common.utils.AsyncCallbackUtils;
15-
import org.roda.wui.client.common.utils.JavascriptUtils;
1615
import org.roda.wui.client.disposal.policy.DisposalPolicy;
1716
import org.roda.wui.client.services.Services;
1817
import org.roda.wui.common.client.HistoryResolver;
@@ -75,12 +74,6 @@ public CreateDisposalHold(DisposalHold disposalHold) {
7574
initWidget(uiBinder.createAndBindUi(this));
7675
}
7776

78-
@Override
79-
protected void onLoad() {
80-
super.onLoad();
81-
JavascriptUtils.stickSidebar();
82-
}
83-
8477
@UiHandler("buttonApply")
8578
void buttonApplyHandler(ClickEvent e) {
8679
if (disposalHoldDataPanel.isValid()) {

0 commit comments

Comments
 (0)