Gilad Chaplik has uploaded a new change for review.
Change subject: webadmin: 'No No Alerts' shown in 0 alerts + cleanup
......................................................................
webadmin: 'No No Alerts' shown in 0 alerts + cleanup
AlertListModel updates wrongfully its title.
did a little bit of clean-up, because since the fix
there is no longer need for some of the items, the
rest are very old.
Change-Id: I0b4b4502e949343c10ae3cc3abef337b4c8378df
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java
3 files changed, 6 insertions(+), 210 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/11457/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java
index c97cbd5..fec0a32 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/events/AlertListModel.java
@@ -1,103 +1,24 @@
package org.ovirt.engine.ui.uicommonweb.models.events;
+import java.util.ArrayList;
+
import org.ovirt.engine.core.common.businessentities.AuditLog;
-import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.compat.Event;
-import org.ovirt.engine.core.compat.EventArgs;
-import org.ovirt.engine.core.compat.EventDefinition;
-import org.ovirt.engine.core.compat.IProvideCollectionChangedEvent;
-import org.ovirt.engine.core.compat.NGuid;
-import org.ovirt.engine.core.compat.NotifyCollectionChangedAction;
-import org.ovirt.engine.core.compat.NotifyCollectionChangedEventArgs;
-import org.ovirt.engine.core.compat.ObservableCollection;
-import org.ovirt.engine.core.compat.PropertyChangedEventArgs;
-import org.ovirt.engine.core.compat.ProvideCollectionChangedEvent;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.Frontend;
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
-import org.ovirt.engine.ui.uicommonweb.Linq;
import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
-
-import java.util.ArrayList;
-import java.util.List;
@SuppressWarnings("unused")
public class AlertListModel extends SearchableListModel
{
- private ObservableCollection<IVdcQueryable> items;
-
- // public event EventHandler NewAlert = delegate { };
-
- public static EventDefinition NewAlertEventDefinition;
- private Event privateNewAlertEvent;
-
- public Event getNewAlertEvent()
- {
- return privateNewAlertEvent;
- }
-
- private void setNewAlertEvent(Event value)
- {
- privateNewAlertEvent = value;
- }
-
- @Override
- public List getItems()
- {
- return (List) super.getItems();
- }
-
- public void setItems(List value)
- {
- super.setItems(value);
- }
-
- private boolean hasAlerts;
-
- public boolean getHasAlerts()
- {
- return hasAlerts;
- }
-
- private void setHasAlerts(boolean value)
- {
- if (hasAlerts != value)
- {
- hasAlerts = value;
- OnPropertyChanged(new PropertyChangedEventArgs("HasAlerts"));
//$NON-NLS-1$
- }
- }
-
- private AuditLog lastAlert;
-
- public AuditLog getLastAlert()
- {
- return lastAlert;
- }
-
- private void setLastAlert(AuditLog value)
- {
- if (lastAlert != value)
- {
- lastAlert = value;
- OnPropertyChanged(new PropertyChangedEventArgs("LastAlert"));
//$NON-NLS-1$
- }
- }
-
- static
- {
- NewAlertEventDefinition = new EventDefinition("NewAlert",
AlertListModel.class); //$NON-NLS-1$
- }
-
public AlertListModel()
{
- setNewAlertEvent(new Event(NewAlertEventDefinition));
-
+ setTitle(ConstantsManager.getInstance().getConstants().alertsTitle());
setIsTimerDisabled(false);
setDefaultSearchString("Events: severity=alert"); //$NON-NLS-1$
@@ -106,24 +27,6 @@
getSearchNextPageCommand().setIsAvailable(true);
getSearchPreviousPageCommand().setIsAvailable(true);
- UpdateTitle();
- }
-
- @Override
- protected void AsyncSearch()
- {
- super.AsyncSearch();
-
- setItems(new ObservableCollection<IVdcQueryable>());
-
- setAsyncResult(Frontend.RegisterSearch(getSearchString(),
SearchType.AuditLog, getSearchPageSize()));
- items = getAsyncResult().getData();
-
- IProvideCollectionChangedEvent notifier = ((items instanceof
IProvideCollectionChangedEvent) ? items : null);
- if (notifier != null)
- {
- notifier.getCollectionChangedEvent().addListener(this);
- }
}
@Override
@@ -148,113 +51,6 @@
SearchParameters searchParameters = tempVar;
Frontend.RunQuery(VdcQueryType.Search, searchParameters, _asyncQuery);
- }
-
- @Override
- public void EnsureAsyncSearchStopped()
- {
- super.EnsureAsyncSearchStopped();
-
- if (getAsyncResult() != null &&
!getAsyncResult().getId().equals(NGuid.Empty))
- {
- IProvideCollectionChangedEvent notifier =
- ((items instanceof IProvideCollectionChangedEvent) ? items
: null);
- if (notifier != null)
- {
- notifier.getCollectionChangedEvent().removeListener(this);
- }
- }
- }
-
- @Override
- public void eventRaised(Event ev, Object sender, EventArgs args)
- {
- super.eventRaised(ev, sender, args);
-
- if (ev.equals(ProvideCollectionChangedEvent.Definition))
- {
- items_CollectionChanged(sender, (NotifyCollectionChangedEventArgs)
args);
- }
- }
-
- private void items_CollectionChanged(Object sender,
NotifyCollectionChangedEventArgs e)
- {
- super.ItemsCollectionChanged(sender, e);
-
- if (e.Action == NotifyCollectionChangedAction.Remove)
- {
- ArrayList<AuditLog> items = Linq.<AuditLog> Cast(getItems());
-
- // var itemsToRemove =
- // e.OldItems
- // .Cast<AuditLog>()
- // .Select(a => items.FirstOrDefault(b => b.audit_log_id ==
a.audit_log_id))
- // .ToList();
- ArrayList<AuditLog> itemsToRemove = new ArrayList<AuditLog>();
- for (Object item : e.OldItems)
- {
- AuditLog a = (AuditLog) item;
- long i = 0;
- for (AuditLog b : items)
- {
- if (b.getaudit_log_id() == a.getaudit_log_id())
- {
- i = b.getaudit_log_id();
- break;
- }
- }
-
- if (a.getaudit_log_id() == i)
- {
- itemsToRemove.add(a);
- }
- }
-
- // itemsToRemove.Each(a => Items.Remove(a));
- for (AuditLog a : itemsToRemove)
- {
- getItems().remove(a);
- }
- }
-
- if (e.Action == NotifyCollectionChangedAction.Add)
- {
- for (Object item : e.NewItems)
- {
- AuditLog a = (AuditLog) item;
- if (getItems().size() == 100)
- {
- getItems().remove(getItems().size() - 1);
- }
-
- // var lastItem = Items.Count > 0 ? Items[Items.Count - 1] as
AuditLog : null;
- AuditLog lastItem = getItems().size() > 0 ? (AuditLog)
getItems().get(getItems().size() - 1) : null;
- if (lastItem != null && lastItem.getaudit_log_id() <
a.getaudit_log_id())
- {
- getItems().add(0, a);
- // NewAlert(this, EventArgs.Empty);
- getNewAlertEvent().raise(this, EventArgs.Empty);
- }
- else
- {
- getItems().add(a);
- }
- }
-
- setLastAlert(getItems().size() > 0 ? (AuditLog) getItems().get(0)
: null);
- }
-
- UpdateTitle();
- }
-
- private void UpdateTitle()
- {
- setTitle(ConstantsManager.getInstance()
- .getMessages()
- .alertsTitle((getItems() == null || getItems().isEmpty()) ?
ConstantsManager.getInstance()
- .getConstants()
- .noAlerts() : String.valueOf(getItems().size())));
- setHasAlerts(getItems() != null && getItems().size() > 0);
}
@Override
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
index f94e5b1..b2edb67 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
@@ -1705,4 +1705,7 @@
@DefaultStringValue("Updating 'Port Mirroring' on a running virtual
machine while the NIC is plugged is not supported")
String hotPortMirroringUpdateNotSupported();
+
+ @DefaultStringValue("Alerts")
+ String alertsTitle();
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java
index 1129585..d4ad477 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java
@@ -5,9 +5,6 @@
public interface Messages extends com.google.gwt.i18n.client.Messages {
- @DefaultMessage("{0} Alerts")
- String alertsTitle(String num);
-
@DefaultMessage("One of the parameters isn''t supported (available
parameter(s): {0})")
String customPropertyOneOfTheParamsIsntSupported(String parameters);
--
To view, visit http://gerrit.ovirt.org/11457
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b4b4502e949343c10ae3cc3abef337b4c8378df
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
