Alexander Wels has uploaded a new change for review. Change subject: webadmin: Event tab sorting ......................................................................
webadmin: Event tab sorting - Implemented sorting for Events main tab - Not implemented for event id, cluster. Change-Id: I027d5cd5aa83610384659b873703787a7472f713 Signed-off-by: Alexander Wels <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java 2 files changed, 46 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/28422/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java index a0fa586..d67d2d8 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java @@ -14,6 +14,13 @@ public static final String CORRELATION_ID = "CORRELATION_ID"; public static final String ORIGIN = "ORIGIN"; public static final String CUSTOM_EVENT_ID = "CUSTOM_EVENT_ID"; + public static final String USER_NAME = "USRNAME"; + public static final String EVENT_HOST = "EVENT_HOST"; + public static final String EVENT_VM = "EVENT_VM"; + public static final String EVENT_TEMPLATE = "EVENT_TEMPLATE"; + public static final String EVENT_STORAGE = "EVENT_STORAGE"; + public static final String EVENT_DATACENTER = "EVENT_DATACENTER"; + public static final String EVENT_VOLUME = "EVENT_VOLUME"; public AuditLogConditionFieldAutoCompleter() { super(); @@ -22,13 +29,13 @@ mVerbs.add(SEVERITY); mVerbs.add(MESSAGE); mVerbs.add(TIME); - mVerbs.add("USRNAME"); - mVerbs.add("EVENT_HOST"); - mVerbs.add("EVENT_VM"); - mVerbs.add("EVENT_TEMPLATE"); - mVerbs.add("EVENT_STORAGE"); - mVerbs.add("EVENT_DATACENTER"); - mVerbs.add("EVENT_VOLUME"); + mVerbs.add(USER_NAME); + mVerbs.add(EVENT_HOST); + mVerbs.add(EVENT_VM); + mVerbs.add(EVENT_TEMPLATE); + mVerbs.add(EVENT_STORAGE); + mVerbs.add(EVENT_DATACENTER); + mVerbs.add(EVENT_VOLUME); mVerbs.add(CORRELATION_ID); mVerbs.add(ORIGIN); mVerbs.add(CUSTOM_EVENT_ID); @@ -49,12 +56,12 @@ getTypeDictionary().put(SEVERITY, AuditLogSeverity.class); getTypeDictionary().put(MESSAGE, String.class); getTypeDictionary().put(TIME, Date.class); - getTypeDictionary().put("USRNAME", String.class); - getTypeDictionary().put("EVENT_HOST", String.class); - getTypeDictionary().put("EVENT_VM", String.class); - getTypeDictionary().put("EVENT_TEMPLATE", String.class); - getTypeDictionary().put("EVENT_STORAGE", String.class); - getTypeDictionary().put("EVENT_DATACENTER", String.class); + getTypeDictionary().put(USER_NAME, String.class); + getTypeDictionary().put(EVENT_HOST, String.class); + getTypeDictionary().put(EVENT_VM, String.class); + getTypeDictionary().put(EVENT_TEMPLATE, String.class); + getTypeDictionary().put(EVENT_STORAGE, String.class); + getTypeDictionary().put(EVENT_DATACENTER, String.class); getTypeDictionary().put("USRID", String.class); getTypeDictionary().put("_EVENT_HOST_ID", String.class); getTypeDictionary().put("_EVENT_VM_ID", String.class); @@ -62,7 +69,7 @@ getTypeDictionary().put("_EVENT_STORAGE_ID", String.class); getTypeDictionary().put("_EVENT_DATACENTER_ID", String.class); getTypeDictionary().put("_EVENT_QUOTA_ID", String.class); - getTypeDictionary().put("EVENT_VOLUME", String.class); + getTypeDictionary().put(EVENT_VOLUME, String.class); getTypeDictionary().put("_EVENT_VOLUME_ID", String.class); getTypeDictionary().put(CORRELATION_ID, String.class); getTypeDictionary().put(ORIGIN, String.class); @@ -73,20 +80,20 @@ columnNameDict.put(SEVERITY, "severity"); columnNameDict.put(MESSAGE, "message"); columnNameDict.put(TIME, "log_time"); - columnNameDict.put("USRNAME", "user_name"); + columnNameDict.put(USER_NAME, "user_name"); columnNameDict.put("USRID", "user_id::varchar"); - columnNameDict.put("EVENT_HOST", "vds_name"); + columnNameDict.put(EVENT_HOST, "vds_name"); columnNameDict.put("_EVENT_HOST_ID", "vds_id::varchar"); - columnNameDict.put("EVENT_VM", "vm_name"); + columnNameDict.put(EVENT_VM, "vm_name"); columnNameDict.put("_EVENT_VM_ID", "vm_id::varchar"); - columnNameDict.put("EVENT_TEMPLATE", "vm_template_name"); + columnNameDict.put(EVENT_TEMPLATE, "vm_template_name"); columnNameDict.put("_EVENT_TEMPLATE_ID", "vm_template_id::varchar"); - columnNameDict.put("EVENT_STORAGE", "storage_domain_name"); + columnNameDict.put(EVENT_STORAGE, "storage_domain_name"); columnNameDict.put("_EVENT_STORAGE_ID", "storage_domain_id::varchar"); - columnNameDict.put("EVENT_DATACENTER", "storage_pool_name"); + columnNameDict.put(EVENT_DATACENTER, "storage_pool_name"); columnNameDict.put("_EVENT_DATACENTER_ID", "storage_pool_id::varchar"); columnNameDict.put("_EVENT_QUOTA_ID", "quota_id::varchar"); - columnNameDict.put("EVENT_VOLUME", "gluster_volume_name"); + columnNameDict.put(EVENT_VOLUME, "gluster_volume_name"); columnNameDict.put("_EVENT_VOLUME_ID", "gluster_volume_id::varchar"); columnNameDict.put(CORRELATION_ID, "correlation_id::varchar"); columnNameDict.put(ORIGIN, "origin::varchar"); @@ -106,14 +113,14 @@ return TimeConditionRelationAutoCompleter.INSTANCE; } else if (TYPE.equals(fieldName) || MESSAGE.equals(fieldName) - || "USRNAME".equals(fieldName) || "EVENT_HOST".equals(fieldName) + || USER_NAME.equals(fieldName) || EVENT_HOST.equals(fieldName) || "_EVENT_HOST_ID".equals(fieldName) - || "EVENT_VM".equals(fieldName) || "_EVENT_VM_ID".equals(fieldName) - || "EVENT_TEMPLATE".equals(fieldName) || "_EVENT_TEMPLATE_ID".equals(fieldName) - || "EVENT_STORAGE".equals(fieldName) || "EVENT_DATACENTER".equals(fieldName) + || EVENT_VM.equals(fieldName) || "_EVENT_VM_ID".equals(fieldName) + || EVENT_TEMPLATE.equals(fieldName) || "_EVENT_TEMPLATE_ID".equals(fieldName) + || EVENT_STORAGE.equals(fieldName) || EVENT_DATACENTER.equals(fieldName) || "_EVENT_DATACENTER_ID".equals(fieldName) || "_EVENT_QUOTA_ID".equals(fieldName) - || "EVENT_VOLUME".equals(fieldName) || "_EVENT_VOLUME_ID".equals(fieldName) || + || EVENT_VOLUME.equals(fieldName) || "_EVENT_VOLUME_ID".equals(fieldName) || CORRELATION_ID.equals(fieldName) || ORIGIN.equals(fieldName) || CUSTOM_EVENT_ID.equals(fieldName) || "DELETED".equals(fieldName)) { return StringConditionRelationAutoCompleter.INSTANCE; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java index a7b5f26..d0ad79c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabEventView.java @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.AuditLog; import org.ovirt.engine.core.common.mode.ApplicationMode; +import org.ovirt.engine.core.searchbackend.AuditLogConditionFieldAutoCompleter; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.widget.action.CommandLocation; import org.ovirt.engine.ui.common.widget.table.column.AuditLogSeverityColumn; @@ -70,36 +71,46 @@ getTable().ensureColumnPresent(AdvancedViewColumns.logTypeColumn, constants.eventIdEvent(), advancedViewEnabled, "80px"); //$NON-NLS-1$ + AdvancedViewColumns.userColumn.makeSortable(AuditLogConditionFieldAutoCompleter.USER_NAME); getTable().ensureColumnPresent(AdvancedViewColumns.userColumn, constants.userEvent(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + AdvancedViewColumns.hostColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_HOST); getTable().ensureColumnPresent(AdvancedViewColumns.hostColumn, constants.hostEvent(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + AdvancedViewColumns.virtualMachineColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_VM); getTable().ensureColumnPresent(AdvancedViewColumns.virtualMachineColumn, constants.vmEvent(), advancedViewEnabled && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly), "100px"); //$NON-NLS-1$ + AdvancedViewColumns.templateColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_TEMPLATE); getTable().ensureColumnPresent(AdvancedViewColumns.templateColumn, constants.templateEvent(), advancedViewEnabled && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly), "100px"); //$NON-NLS-1$ + AdvancedViewColumns.dataCenterColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_DATACENTER); getTable().ensureColumnPresent(AdvancedViewColumns.dataCenterColumn, constants.dcEvent(), advancedViewEnabled && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly), "100px"); //$NON-NLS-1$ + AdvancedViewColumns.storageColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_STORAGE); getTable().ensureColumnPresent(AdvancedViewColumns.storageColumn, constants.storageEvent(), advancedViewEnabled && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly), "100px"); //$NON-NLS-1$ getTable().ensureColumnPresent(AdvancedViewColumns.clusterColumn, constants.clusterEvent(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + AdvancedViewColumns.volumeColumn.makeSortable(AuditLogConditionFieldAutoCompleter.EVENT_VOLUME); getTable().ensureColumnPresent(AdvancedViewColumns.volumeColumn, constants.volumeEvent(), advancedViewEnabled && ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly), "120px"); //$NON-NLS-1$ + AdvancedViewColumns.corrIdColumn.makeSortable(AuditLogConditionFieldAutoCompleter.CORRELATION_ID); getTable().ensureColumnPresent(AdvancedViewColumns.corrIdColumn, constants.eventCorrelationId(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + AdvancedViewColumns.originColumn.makeSortable(AuditLogConditionFieldAutoCompleter.ORIGIN); getTable().ensureColumnPresent(AdvancedViewColumns.originColumn, constants.eventOrigin(), advancedViewEnabled, "100px"); //$NON-NLS-1$ + AdvancedViewColumns.customEventIdColumn.makeSortable(AuditLogConditionFieldAutoCompleter.CUSTOM_EVENT_ID); getTable().ensureColumnPresent(AdvancedViewColumns.customEventIdColumn, constants.eventCustomEventId(), advancedViewEnabled, "100px"); //$NON-NLS-1$ @@ -116,6 +127,7 @@ return object.getlog_time(); } }; + logTimeColumn.makeSortable(AuditLogConditionFieldAutoCompleter.TIME); getTable().addColumn(logTimeColumn, constants.timeEvent(), "150px"); //$NON-NLS-1$ TextColumnWithTooltip<AuditLog> messageColumn = new TextColumnWithTooltip<AuditLog>() { @@ -124,6 +136,7 @@ return object.getmessage(); } }; + messageColumn.makeSortable(AuditLogConditionFieldAutoCompleter.MESSAGE); getTable().addColumn(messageColumn, constants.messageEvent(), "150px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<AuditLog>(constants.details(), -- To view, visit http://gerrit.ovirt.org/28422 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I027d5cd5aa83610384659b873703787a7472f713 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
