Vered Volansky has uploaded a new change for review. Change subject: webadmin: Size info in GB along side % (2) ......................................................................
webadmin: Size info in GB along side % (2) In Edit Storage Domain popup view tab, there's a percentage threshold. Add to it the information in GB, out of the storage's total size. Change-Id: Ib3c3e0108086ae528cc856d6e4183177ef6d2cb4 Bug-Url: https://bugzilla.redhat.com/1213134 Signed-off-by: Vered Volansky <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml 5 files changed, 87 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/41936/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index ca3d3e7..b2e86a6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -347,6 +347,9 @@ model.setIsChangeable(isStorageNameEditable || isStoragePropertiesEditable); model.getWarningLowSpaceIndicator().setEntity(storage.getWarningLowSpaceIndicator()); + model.getWarningLowSpaceSize().setEntity( + ConstantsManager.getInstance().getMessages().bracketsWithGB(storage.getWarningLowSpaceSize())); + model.getWarningLowSpaceSize().setIsAvailable(true); model.getCriticalSpaceActionBlocker().setEntity(storage.getCriticalSpaceActionBlocker()); boolean isPathEditable = isPathEditable(storage); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java index 1c1301c..6698686 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java @@ -178,6 +178,16 @@ this.warningLowSpaceIndicator = warningLowSpaceIndicator; } + private EntityModel<String> warningLowSpaceSize; + + public EntityModel<String> getWarningLowSpaceSize() { + return warningLowSpaceSize; + } + + public void setWarningLowSpaceSize(EntityModel<String> warningLowSpaceSize) { + this.warningLowSpaceSize = warningLowSpaceSize; + } + private EntityModel<Integer> criticalSpaceActionBlocker; public EntityModel<Integer> getCriticalSpaceActionBlocker() { @@ -227,6 +237,8 @@ setWarningLowSpaceIndicator(new EntityModel<Integer>()); getWarningLowSpaceIndicator().setEntity(getWarningLowSpaceIndicatorValue()); + setWarningLowSpaceSize(new EntityModel<String>()); + getWarningLowSpaceSize().setIsAvailable(false); setCriticalSpaceActionBlocker(new EntityModel<Integer>()); getCriticalSpaceActionBlocker().setEntity(getCriticalSpaceThresholdValue()); setActivateDomain(new EntityModel<Boolean>(true)); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index 5206f65..ec314f9 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -540,4 +540,8 @@ String positiveTimezoneOffset(String name, String hours, String minutes); @DefaultMessage("{0} (UTC-{1}:{2})") - String negativeTimezoneOffset(String name, String hours, String minutes);} + String negativeTimezoneOffset(String name, String hours, String minutes); + + @DefaultMessage("({0} GB)") + String bracketsWithGB(int value); +} \ No newline at end of file diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java index fe3b8b9..e817254 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java @@ -1,6 +1,10 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.storage; -import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.event.dom.client.HasKeyUpHandlers; +import com.google.gwt.event.dom.client.KeyUpEvent; +import com.google.gwt.event.dom.client.KeyUpHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StorageFormatType; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -25,10 +29,12 @@ import org.ovirt.engine.ui.common.widget.uicommon.storage.IscsiStorageView; import org.ovirt.engine.ui.uicommonweb.models.storage.IStorageModel; import org.ovirt.engine.ui.uicommonweb.models.storage.StorageModel; +import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationMessages; import org.ovirt.engine.ui.webadmin.gin.AssetProvider; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.storage.StoragePopupPresenterWidget; @@ -41,10 +47,17 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; import com.google.inject.Inject; public class StoragePopupView extends AbstractModelBoundPopupView<StorageModel> - implements StoragePopupPresenterWidget.ViewDef { + implements StoragePopupPresenterWidget.ViewDef, HasKeyUpHandlers { + + @Override + public void fireEvent(GwtEvent<?> gwtEvent) { + + } interface Driver extends SimpleBeanEditorDriver<StorageModel, StoragePopupView> { } @@ -106,6 +119,11 @@ IntegerEntityModelTextBoxEditor warningLowSpaceIndicatorEditor; @UiField + @Path(value = "warningLowSpaceSize.entity") + @WithElementId("warningLowSpaceSizeLabel") + Label warningLowSpaceSizeLabel; + + @UiField @Path(value = "criticalSpaceActionBlocker.entity") @WithElementId("criticalSpaceActionBlockerEditor") IntegerEntityModelTextBoxEditor criticalSpaceActionBlockerEditor; @@ -138,6 +156,7 @@ private final Driver driver = GWT.create(Driver.class); private final static ApplicationConstants constants = AssetProvider.getConstants(); + private final static ApplicationMessages messages = AssetProvider.getMessages(); @Inject public StoragePopupView(EventBus eventBus) { @@ -217,8 +236,8 @@ formatListEditor.addContentWidgetContainerStyleName(style.formatContentWidget()); activateDomainEditor.addContentWidgetContainerStyleName(style.activateDomainEditor()); advancedParametersExpanderContent.setStyleName(style.advancedParametersExpanderContent()); - warningLowSpaceIndicatorEditor.addContentWidgetStyleName(style.storageTextBoxEditor()); - criticalSpaceActionBlockerEditor.addContentWidgetStyleName(style.storageTextBoxEditor()); + warningLowSpaceIndicatorEditor.addContentWidgetContainerStyleName(style.warningTextBoxEditor()); + criticalSpaceActionBlockerEditor.addContentWidgetStyleName(style.blockerTextBoxEditor()); } void localize() { @@ -255,6 +274,19 @@ datacenterAlertIcon.setTitle(storageModel.getDataCenterAlert().getEntity()); } }); + + addKeyUpHandler(new KeyUpHandler() { + @Override + public void onKeyUp(KeyUpEvent event) { + storageModel.getWarningLowSpaceSize().setEntity( + ConstantsManager.getInstance().getMessages().bracketsWithGB(getWarningLowSpaceSize(storageModel))); + } + }); + } + + private Integer getWarningLowSpaceSize(StorageModel storageModel) { + Integer percentageValue = warningLowSpaceIndicatorEditor.asValueBox().getValue(); + return percentageValue == null ? 0 : storageModel.getStorage().getTotalDiskSize() * percentageValue / 100; } private void initAdvancedParametersExpander() { @@ -330,6 +362,11 @@ return storageView.isSubViewFocused(); } + + public HandlerRegistration addKeyUpHandler(KeyUpHandler handler) { + return warningLowSpaceIndicatorEditor.addKeyUpHandler(handler); + } + interface WidgetStyle extends CssResource { String formatContentWidget(); @@ -345,7 +382,9 @@ String advancedParametersExpanderContent(); - String storageTextBoxEditor(); + String warningTextBoxEditor(); + + String blockerTextBoxEditor(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml index e6578b4..8c38521 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.ui.xml @@ -35,11 +35,18 @@ } .wipeAfterDeleteEditor { - width: 437px; + width: 481px; } - .storageTextBoxEditor { - width: 20%; + .warningTextBoxEditor { + width: 23%; + line-height: 26px !important; + } + + .blockerTextBoxEditor { + width: 60px; + margin-left: 6px; + line-height: 26px !important; } .nameEditor, @@ -98,6 +105,14 @@ margin-top: 10px; } + .warningLowSpaceIndicatorEditor { + width: 320px; + } + + .warningLowSpaceSizeLabel { + line-height: 26px; + } + </ui:style> <d:SimpleDialogPanel width="760px" height="665px"> @@ -121,8 +136,11 @@ <g:FlowPanel ui:field="specificStorageTypePanel" addStyleNames="{style.specificStorageTypePanel}"></g:FlowPanel> <d:AdvancedParametersExpander ui:field="advancedParametersExpander"/> <g:VerticalPanel ui:field="advancedParametersExpanderContent"> - <ge:IntegerEntityModelTextBoxEditor ui:field="warningLowSpaceIndicatorEditor" addStyleNames="table_contentWidget_pfly_fix"/> - <ge:IntegerEntityModelTextBoxEditor ui:field="criticalSpaceActionBlockerEditor" /> + <g:HorizontalPanel> + <ge:IntegerEntityModelTextBoxEditor ui:field="warningLowSpaceIndicatorEditor" addStyleNames="table_contentWidget_pfly_fix {style.warningLowSpaceIndicatorEditor}"/> + <g:Label ui:field="warningLowSpaceSizeLabel" addStyleNames="{style.warningLowSpaceSizeLabel}"/> + </g:HorizontalPanel> + <ge:IntegerEntityModelTextBoxEditor ui:field="criticalSpaceActionBlockerEditor"/> <ge:EntityModelCheckBoxEditor ui:field="wipeAfterDeleteEditor" addStyleNames="{style.wipeAfterDeleteEditor}"/> </g:VerticalPanel> </g:FlowPanel> -- To view, visit https://gerrit.ovirt.org/41936 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3c3e0108086ae528cc856d6e4183177ef6d2cb4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
