Kobi Ianko has posted comments on this change. Change subject: webadmin: Adding Quota column to the Disk tab ......................................................................
Patch Set 10: (11 comments) http://gerrit.ovirt.org/#/c/25068/10/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java File frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java: Line 60: if (object.getDiskStorageType() == DiskStorageType.IMAGE) { Line 61: DiskImage diskImage = (DiskImage) object; Line 62: ArrayList<String> quotaNamesArr = diskImage.getQuotaNames(); Line 63: if (quotaNamesArr != null) { Line 64: value = StringHelper.join(", ", quotaNamesArr.toArray());//$NON-NLS-1$ > shouldn't it be a single space after the comma? Done Line 65: } Line 66: } Line 67: return value; Line 68: } http://gerrit.ovirt.org/#/c/25068/10/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java: Line 436: Line 437: SystemTreeItemModel dataCenterItem = new SystemTreeItemModel(); Line 438: dataCenterItem.setType(SystemTreeItemType.DataCenter); Line 439: dataCenterItem.setApplicationMode(ApplicationMode.VirtOnly); Line 440: StoragePool storagePool = getDataCenters().get(count); > ignore 2. meant to remove it, after I saw the rest of the patch. Done Line 441: dataCenterItem.setTitle(storagePool.getName()); Line 442: dataCenterItem.setEntity(storagePool); Line 443: dataCentersItem.addChild(dataCenterItem); Line 444: treeItemById.put(storagePool.getId(), dataCenterItem); Line 436: Line 437: SystemTreeItemModel dataCenterItem = new SystemTreeItemModel(); Line 438: dataCenterItem.setType(SystemTreeItemType.DataCenter); Line 439: dataCenterItem.setApplicationMode(ApplicationMode.VirtOnly); Line 440: StoragePool storagePool = getDataCenters().get(count); > 1) I prefer calling it dataCenter in the UI Done Line 441: dataCenterItem.setTitle(storagePool.getName()); Line 442: dataCenterItem.setEntity(storagePool); Line 443: dataCentersItem.addChild(dataCenterItem); Line 444: treeItemById.put(storagePool.getId(), dataCenterItem); Line 440: StoragePool storagePool = getDataCenters().get(count); Line 441: dataCenterItem.setTitle(storagePool.getName()); Line 442: dataCenterItem.setEntity(storagePool); Line 443: dataCentersItem.addChild(dataCenterItem); Line 444: treeItemById.put(storagePool.getId(), dataCenterItem); > most changes in this file can be resolved in a different context and extrac I have added only the changes relavant to the Quota patch here, there is another patch (http://gerrit.ovirt.org/#/c/25135/) for handling the general problem here( adding all element to the treeItemById map) Line 445: Line 446: SystemTreeItemModel storagesItem = new SystemTreeItemModel(); Line 447: storagesItem.setType(SystemTreeItemType.Storages); Line 448: storagesItem.setApplicationMode(ApplicationMode.VirtOnly); http://gerrit.ovirt.org/#/c/25068/10/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java: Line 772: } else { Line 773: // Update the Quota at the corresponding DC object at the system tree. Line 774: // The DC Quota value from the tree is used at MainTabDiskView. Line 775: SystemTreeItemModel itemModel = CommonModel.getInstance().getSystemTree().getItemById(dataCenter.getId()); Line 776: itemModel.setEntity(dataCenter); > please verify the scenario where dc is remove but still exists in the tree. Done Line 777: Line 778: // Otherwise use async action in order to close dialog immediately. Line 779: Frontend.getInstance().runMultipleAction(VdcActionType.UpdateStoragePool, Line 780: new ArrayList<VdcActionParametersBase>(Arrays.asList( http://gerrit.ovirt.org/#/c/25068/10/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabDiskPresenter.java File frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabDiskPresenter.java: Line 43: Line 44: public interface ViewDef extends AbstractMainTabWithDetailsPresenter.ViewDef<Disk> { Line 45: Line 46: IEventListener getDiskTypeChangedEventListener(); Line 47: void handleQuotaColumnVisibility(); > formatter Done Line 48: Line 49: } Line 50: Line 51: final IEventListener systemTreeListener = new IEventListener() { Line 47: void handleQuotaColumnVisibility(); Line 48: Line 49: } Line 50: Line 51: final IEventListener systemTreeListener = new IEventListener() { > private? Done Line 52: @Override Line 53: public void eventRaised(Event ev, Object sender, EventArgs args) { Line 54: getView().handleQuotaColumnVisibility(); Line 55: } Line 83: if (!entityChangedEvent.getListeners().contains(getView().getDiskTypeChangedEventListener())) { Line 84: entityChangedEvent.addListener(getView().getDiskTypeChangedEventListener()); Line 85: } Line 86: Line 87: Event systemTreeSelectedItemChangedEvent = > instead of using a listener try overriding 'handlePlaceTransition' method t What am I gaining? Line 88: CommonModel.getInstance().getSystemTree().getSelectedItemChangedEvent(); Line 89: systemTreeSelectedItemChangedEvent.addListener(systemTreeListener); Line 90: Line 91: super.onReveal(); Line 97: super.onHide(); Line 98: Event systemTreeSelectedItemChangedEvent = Line 99: CommonModel.getInstance().getSystemTree().getSelectedItemChangedEvent(); Line 100: systemTreeSelectedItemChangedEvent.removeListener(systemTreeListener); Line 101: } > this code looks suspicious... :) http://gerrit.ovirt.org/#/c/25068/10/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java File frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java: Line 92: if (QuotaEnforcementTypeEnum.DISABLED != storagePool.getQuotaEnforcementType()) { Line 93: isQuotaVisible = true; Line 94: } Line 95: } Line 96: onDiskViewTypeChanged(); > also this one. not sure it's the right place for it. Since it's a simple logic I decide to keep it close to the onDiskViewTypeChanged(), If I'l move it from this classI need the onDiskViewTypeChanged() method to be public Line 97: } Line 98: Line 99: void onDiskViewTypeChanged() { Line 100: boolean all = disksViewRadioGroup.getAllButton().getValue(); Line 167: DisksViewColumns.lunProductIdColumn, constants.productIdSanStorage(), luns, Line 168: "100px"); //$NON-NLS-1$ Line 169: Line 170: getTable().ensureColumnPresent( Line 171: DisksViewColumns.qoutaColumn, constants.quotaDisk(), (all || images || luns) && isQuotaVisible, "120px"); //$NON-NLS-1$ > I guess it should be visible only for images.. Done Line 172: Line 173: getTable().ensureColumnPresent( Line 174: DisksViewColumns.descriptionColumn, constants.descriptionDisk(), all || images || luns, Line 175: "90px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/25068 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2332da722396a16aca9545b9ef0532ebc84d8d5e Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kobi Ianko <[email protected]> Gerrit-Reviewer: Daniel Erez <[email protected]> Gerrit-Reviewer: Doron Fediuck <[email protected]> Gerrit-Reviewer: Gilad Chaplik <[email protected]> Gerrit-Reviewer: Kobi Ianko <[email protected]> Gerrit-Reviewer: Lior Vernia <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
