[rhq] modules/core
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 707b1c8f9241f80520ed74f69f383fb21c52e724
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Mar 11 09:07:35 2011 -0500
Take ancestry out of the CLI summary fields, it's an encoded value.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 8dbb707..d58abfa 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -909,7 +909,6 @@ public class Resource implements Comparable<Resource>, Serializable {
private String name;
@Column(name = "ANCESTRY", nullable = true)
- @Summary(index = 5)
private String ancestry;
@Column(name = "INVENTORY_STATUS")
13 years, 3 months
- 1
- 0
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 41 ++++++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 3
2 files changed, 44 insertions(+)
New commits:
commit 8dd5282285f83d50ddd7ca78ca81411d9f5a6c87
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 17:56:25 2011 -0500
show when a cluster node represents less than the full group size
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 9853c7f..dde5984 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -32,9 +32,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.gwt.i18n.client.NumberFormat;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.tree.Tree;
@@ -149,6 +152,17 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
treeGrid.setLeaveScrollbarGap(false);
treeGrid.setOpenerImage("resources/dir.png");
treeGrid.setOpenerIconSize(16);
+ treeGrid.setCanHover(true);
+ treeGrid.setShowHover(true);
+ treeGrid.setHoverWidth(250);
+ treeGrid.setHoverWrap(true);
+ treeGrid.setHoverCustomizer(new HoverCustomizer() {
+ @Override
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String tooltip = record.getAttribute(ResourceGroupEnhancedTreeNode.TOOLTIP_KEY);
+ return tooltip;
+ }
+ });
addMember(this.treeGrid);
@@ -506,6 +520,24 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
node.setClusterKey(key);
node.setResourceType(type);
node.setIsFolder(!child.getChildren().isEmpty());
+
+ int memberCount = child.getMembers();
+ int clusterSize = child.getClusterSize();
+
+ if (memberCount < clusterSize) {
+ // it appears one or more individual group members doesn't have a resource with the given cluster key
+ // label the tree node so the user knows this cluster node is not representative of the entire group membership
+ double percentage = (double) memberCount / (double) clusterSize;
+ String percentageStr = NumberFormat.getFormat("0%").format(percentage);
+ String title = child.getName() + " <span style=\"color: red; font-style: italic\">(" + percentageStr
+ + ")</span>";
+ node.setTitle(title);
+
+ // "1 out of 2 group members have "foo" child resources"
+ node.setTooltip(MSG.group_tree_partialClusterTooltip(String.valueOf(memberCount), String
+ .valueOf(clusterSize), child.getName()));
+ }
+
return node;
}
@@ -561,6 +593,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
class ResourceGroupEnhancedTreeNode extends EnhancedTreeNode {
+ private static final String TOOLTIP_KEY = "tooltip";
private static final String CLUSTER_KEY = "key";
private static final String RESOURCE_TYPE = "resourceType";
@@ -568,6 +601,14 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
super(name);
}
+ public String getTooltip() {
+ return getAttribute(TOOLTIP_KEY);
+ }
+
+ public void setTooltip(String tooltip) {
+ setAttribute(TOOLTIP_KEY, tooltip);
+ }
+
public ClusterKey getClusterKey() {
return (ClusterKey) getAttributeAsObject(CLUSTER_KEY);
}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index fd3e290..dad5c7b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1409,6 +1409,9 @@ view_type_typeTreeLoadFailure = Failed to load resource type tree data
view_tabs_invalidSubTab = Invalid subtab: {0}
view_tabs_invalidTab = Invalid tab: {0}~
+# Group Tree
+group_tree_partialClusterTooltip = {0} out of {1} group members have ''{2}'' resources
+
#=================== Dashboard =====================
view_dashboard_favorites_error1 = Failed to load favorite Resources.
view_dashboardManager_error = Failed to save dashboard to server
13 years, 3 months
- 1
- 0
[rhq] 7 commits - modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 53 +++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 58 +++-------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 39 +++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 9 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 1
6 files changed, 104 insertions(+), 60 deletions(-)
New commits:
commit a34e6bd43d4f7613b02b0112eadfb99a3adf322a
Merge: 67a558f 057e6b1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 17:02:18 2011 -0500
Merge branch 'group-fixes'
commit 057e6b1c5b011affd525da40cb27cc76115acea9
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 16:41:36 2011 -0500
do not allow user to sort on cpu/memory/swap columns.. though it would be nice, the way the data is collected and stored client side means we have some work to get sorting to properly function
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index ac24e68..a58c909 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -28,7 +28,6 @@ import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -61,6 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
* @author Greg Hinkle
*/
public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet {
+
public static final ViewName VIEW_ID = new ViewName("CpuAndMemoryUtilization", MSG.view_reports_platforms());
// A non-displayed, persisted identifier for the portlet
@@ -68,6 +68,10 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
// A default displayed, persisted name for the portlet
public static final String NAME = MSG.view_portlet_defaultName_platformSummary();
+ private static final String FIELD_CPU = "cpu";
+ private static final String FIELD_MEMORY = "memory";
+ private static final String FIELD_SWAP = "swap";
+
private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService();
private ResourceTypeGWTServiceAsync typeService = GWTServiceLookup.getResourceTypeGWTService();
@@ -123,12 +127,21 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
+ "</a>";
}
});
- nameField.setWidth("25%");
+ nameField.setWidth("20%");
setFields(nameField);
- getField("cpu").setWidth("25%");
- getField("memory").setWidth("25%");
- getField("swap").setWidth("25%");
+ ListGridField cpuField = getField(FIELD_CPU);
+ ListGridField memoryField = getField(FIELD_MEMORY);
+ ListGridField swapField = getField(FIELD_SWAP);
+
+ cpuField.setWidth("20%");
+ memoryField.setWidth("20%");
+ swapField.setWidth("20%");
+
+ // the way the field data is calculated, we can't sort on the graph columns
+ cpuField.setCanSort(false);
+ memoryField.setCanSort(false);
+ swapField.setCanSort(false);
hideField("id");
hideField(ResourceDataSourceField.TYPE.propertyName()); // we could show this, do we want to indicate the kind of platform?
@@ -146,9 +159,9 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
new AsyncCallback<Set<MeasurementData>>() {
public void onFailure(Throwable caught) {
// this can happen if the agent is down, don't crash out of the entire portlet
- record.setAttribute("cpu", MSG.common_val_na());
- record.setAttribute("memory", MSG.common_val_na());
- record.setAttribute("swap", MSG.common_val_na());
+ record.setAttribute(FIELD_CPU, MSG.common_val_na());
+ record.setAttribute(FIELD_MEMORY, MSG.common_val_na());
+ record.setAttribute(FIELD_SWAP, MSG.common_val_na());
setSortField(1);
refreshFields();
@@ -210,17 +223,13 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
return new HTMLFlow(MSG.view_portlet_help_platformSummary());
}
- public DynamicForm getCustomSettingsForm() {
- return null; // TODO: Implement this method.
- }
-
@Override
protected Canvas createRecordComponent(ListGridRecord listGridRecord, Integer colNum) {
String fieldName = this.getFieldName(colNum);
try {
- if (fieldName.equals("cpu")) {
+ if (fieldName.equals(FIELD_CPU)) {
if (listGridRecord.getAttribute(CPUMetric.Idle.property) != null) {
HLayout bar = new HLayout();
bar.setHeight(18);
@@ -247,7 +256,7 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
return bar;
}
- } else if (fieldName.equals("memory")) {
+ } else if (fieldName.equals(FIELD_MEMORY)) {
if (listGridRecord.getAttribute(MemoryMetric.Total.property) != null) {
HLayout bar = new HLayout();
bar.setHeight(18);
@@ -274,7 +283,7 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
return bar;
}
- } else if (fieldName.equals("swap")) {
+ } else if (fieldName.equals(FIELD_SWAP)) {
if (listGridRecord.getAttribute(SwapMetric.Total.property) != null) {
HLayout bar = new HLayout();
bar.setHeight(18);
commit 657a356a0ebc1e1c65fc7be3c1880302fa776178
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 16:07:54 2011 -0500
this field is hidden, avoid NPE by not setting cell formatter
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index 4b28abc..ac24e68 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -126,27 +126,6 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet
nameField.setWidth("25%");
setFields(nameField);
- // even though we hide this by default, a user could unhide it, so at least i18n in that case
- getField(ResourceDataSourceField.CATEGORY.propertyName()).setCellFormatter(new CellFormatter() {
- @Override
- public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
- String catStr = record.getAttribute(ResourceDataSourceField.CATEGORY.propertyName());
- if (catStr == null) {
- return "?";
- }
- ResourceCategory cat = ResourceCategory.valueOf(catStr);
- switch (cat) {
- case PLATFORM:
- return MSG.common_title_platform();
- case SERVER:
- return MSG.common_title_server();
- case SERVICE:
- return MSG.common_title_service();
- }
- return "???";
- }
- });
-
getField("cpu").setWidth("25%");
getField("memory").setWidth("25%");
getField("swap").setWidth("25%");
commit 0b07e0b15b701710e7fee4a4e83703f3f09acb96
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 15:55:43 2011 -0500
fix problem that has to do with copying criteria. need to be careful when criteria includes primitive attribute types as well as Object
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index ce0754e..93d31d7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -20,6 +20,8 @@ package org.rhq.enterprise.gui.coregui.client.components.table;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -554,7 +556,9 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
*/
protected void refresh(Criteria criteria) {
if (null != this.listGrid) {
- this.listGrid.setCriteria(criteria);
+ if (criteria != null) {
+ this.listGrid.setCriteria(criteria);
+ }
this.listGrid.invalidateCache();
this.listGrid.markForRedraw();
}
@@ -576,17 +580,9 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
} else {
// there is both initial criteria and filters. We need criteria that combines both.
Criteria fullCriteria = new Criteria();
- String[] criteriaAttribs = this.criteria.getAttributes(); // the initial criteria attributes
- for (String attribName : criteriaAttribs) {
- Object attribValue = this.criteria.getAttributeAsObject(attribName);
- fullCriteria.setAttribute(attribName, attribValue);
- }
+ addCriteria(fullCriteria, this.criteria);
if (filterFormCriteria != null) {
- criteriaAttribs = filterFormCriteria.getAttributes(); // the filter form criteria attributes (like the search bar)
- for (String attribName : criteriaAttribs) {
- Object attribValue = filterFormCriteria.getAttributeAsObject(attribName);
- fullCriteria.setAttribute(attribName, attribValue);
- }
+ addCriteria(fullCriteria, filterFormCriteria);
}
refresh(fullCriteria);
}
@@ -599,6 +595,41 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
}
}
+ // Smartgwt 2.4's version of Criteria.addCriteria for some reason doesn't have else clauses for the array types
+ // and it doesn't handle Object types properly (seeing odd behavior because of this), so this method explicitly
+ // supports adding array types and Objects.
+ // This method takes the src criteria and adds it to the dest criteria.
+ @SuppressWarnings("unchecked")
+ private static void addCriteria(Criteria dest, Criteria src) {
+ Map otherMap = src.getValues();
+ Set otherKeys = otherMap.keySet();
+ for (Iterator i = otherKeys.iterator(); i.hasNext();) {
+ String field = (String) i.next();
+ Object value = otherMap.get(field);
+
+ if (value instanceof Integer) {
+ dest.addCriteria(field, (Integer) value);
+ } else if (value instanceof Float) {
+ dest.addCriteria(field, (Float) value);
+ } else if (value instanceof String) {
+ dest.addCriteria(field, (String) value);
+ } else if (value instanceof Date) {
+ dest.addCriteria(field, (Date) value);
+ } else if (value instanceof Boolean) {
+ dest.addCriteria(field, (Boolean) value);
+ } else if (value instanceof Integer[]) {
+ dest.addCriteria(field, (Integer[]) value);
+ } else if (value instanceof Double[]) {
+ dest.addCriteria(field, (Double[]) value);
+ } else if (value instanceof String[]) {
+ dest.addCriteria(field, (String[]) value);
+ } else {
+ // this is the magic piece - we need to get attrib as an object and set that value
+ dest.setAttribute(field, src.getAttributeAsObject(field));
+ }
+ }
+ }
+
public void setTableTitle(String titleString) {
if (titleString == null) {
titleString = "";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
index 0ad0278..442fefd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java
@@ -91,7 +91,6 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
private void showResourceList(Criteria criteria) {
hideResourceList();
resourceList = new ResourceSearchView(extendLocatorId("resourceList"), criteria);
- resourceList.setHideSearchBar(true); // we don't want to enable search - the contents of this table are very specific
addMember(resourceList);
markForRedraw();
}
commit c6cce83caf754d82fc7b1576a2227d45162e7ca7
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 15:18:29 2011 -0500
double clicking row now goes to the resource alert def page
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index 4a736e1..5d05431 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -55,6 +55,13 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
public void onDoubleClick(DoubleClickEvent event) {
ListGrid lg = (ListGrid) event.getSource();
ListGridRecord selected = lg.getSelectedRecord();
+ if (selected != null) {
+ AlertDefinition alertDef = getDataSource().copyValues(selected);
+ int resourceId = alertDef.getResource().getId();
+ int alertDefId = alertDef.getId();
+ String link = LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId);
+ CoreGUI.goToView(link);
+ }
}
});
}
commit d54f3e5c808fc472dc532996dea83ecf3045cd0a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 15:06:19 2011 -0500
forgot to remove this debug statement
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index 6396acd..4a736e1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -8,7 +8,6 @@ import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
@@ -56,7 +55,6 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
public void onDoubleClick(DoubleClickEvent event) {
ListGrid lg = (ListGrid) event.getSource();
ListGridRecord selected = lg.getSelectedRecord();
- SC.say(selected.getAttribute("name")); // TODO deleteme
}
});
}
commit 7abc32d2dbe65f5fb2cdf6c0174ae5860b2ebf84
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 14:26:35 2011 -0500
ignore right mouse clicks on nodes that don't have a context menu
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
index 2ef1ecf..27cf7d6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
@@ -23,7 +23,6 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.resource.group.ClusterKey;
@@ -31,6 +30,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupTreeView.ResourceGroupEnhancedTreeNode;
/**
* @author Greg Hinkle
@@ -41,7 +41,7 @@ public class ResourceGroupTreeContextMenu extends ResourceGroupContextMenu {
super(locatorId);
}
- public void showContextMenu(TreeNode node) {
+ public void showContextMenu(ResourceGroupEnhancedTreeNode node) {
final ClusterKey clusterKey = (ClusterKey) node.getAttributeAsObject("key");
if (clusterKey != null) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index d65d400..9853c7f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -55,6 +55,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
@@ -65,8 +66,24 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
+ * This is the view that renders the left hand tree for groups.
+ * There are three main types of nodes in the group tree:
+ * 1. Cluster Node - This represents a single aggregate resource that is of a specific resource type.
+ * If a group has members with one or more resources with an identical resource key and type,
+ * those identical resources are represented with one cluster node. Each cluster node
+ * is associated with a resource type and an unique cluster key.
+ * 2. Auto Type Group Node - This is a folder node whose children are all of a specific resource type.
+ * The children are typically cluster nodes. An example of this kind of node is
+ * "WARs", where there can be many different WARs deployed on an individual member resource
+ * but a WAR can be clustered (copied) across many member resources. Each auto type group node
+ * is associated with a resource type but they do not have cluster keys.
+ * 3. Subcategory Node these are simply nodes that group other kinds of nodes. Plugin developers define subcategories
+ * in plugin descriptors to organize resource types. Subcategories are not associated with any
+ * particular resource type and do not have cluster keys.
+ *
* @author Greg Hinkle
* @author Ian Springer
+ * @author John Mazzitelli
*/
public class ResourceGroupTreeView extends LocatableVLayout implements BookmarkableView {
@@ -142,6 +159,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
@Override
public void onSelectionChanged(SelectionEvent selectionEvent) {
if (!selectionEvent.isRightButtonDown() && selectionEvent.getState()) {
+ selectedNodeId = null; // if user selected a valid node, we'll set this later
ResourceGroupEnhancedTreeNode selectedNode = (ResourceGroupEnhancedTreeNode) selectionEvent
.getRecord();
com.allen_sauer.gwt.log.client.Log.info("Node selected in tree: " + selectedNode);
@@ -160,11 +178,8 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
selectedNodeId = selectedNode.getID();
String groupId = selectedNodeId;
com.allen_sauer.gwt.log.client.Log.debug("Selecting group [" + groupId + "]...");
- String viewPath = ResourceGroupTopView.VIEW_ID + "/" + groupId;
- String currentViewPath = History.getToken();
- if (!currentViewPath.startsWith(viewPath)) {
- CoreGUI.goToView(viewPath);
- }
+ String viewPath = LinkManager.getResourceGroupLink(Integer.parseInt(groupId));
+ CoreGUI.goToView(viewPath, true);
} else {
// the user selected a auto type group node; we have got nothing to show, so cancel the selection of this node
treeGrid.deselectRecord(selectedNode);
@@ -185,12 +200,18 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
event.cancel();
// don't select the node on a right click, since we're not navigating to it
- treeGrid.deselectRecord(event.getNode());
+ ResourceGroupEnhancedTreeNode node = (ResourceGroupEnhancedTreeNode) event.getNode();
+ treeGrid.deselectRecord(node);
if (null != selectedNodeId) {
- treeGrid.selectRecord(treeGrid.getTree().findById(SeleniumUtility.getSafeId(selectedNodeId)));
+ treeGrid.selectRecord(treeGrid.getTree().findById(selectedNodeId));
}
- contextMenu.showContextMenu(event.getNode());
+ // only show the context menu for cluster nodes and our top root node
+ ResourceType type = node.getResourceType();
+ ClusterKey key = node.getClusterKey();
+ if (type != null && (key != null || node.getParentID().equals(FAKE_ROOT_ID))) {
+ contextMenu.showContextMenu(node);
+ }
}
});
@@ -264,7 +285,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
} else {
// TODO not sure when this else would happen, why would a group's cluster key be null?
selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().findById(
- SeleniumUtility.getSafeId(String.valueOf(this.selectedGroup.getId())));
+ String.valueOf(this.selectedGroup.getId()));
}
if (selectedNode != null) {
13 years, 3 months
- 1
- 0
[rhq] modules/enterprise
by Simeon Pinder
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 24 +++++++---
1 file changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 67a558f849f8f95067f89c230bb0c430053bc63d
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Mar 10 14:06:47 2011 -0500
BZ-682755: change code to eliminate race condition during ldap reg & case insensitive logins
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
index 3c5cc9e..5d8ea27 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
@@ -107,7 +107,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
@EJB
@IgnoreDependency
private RepoManagerLocal repoManager;
-
+
private SessionManager sessionManager = SessionManager.getInstance();
/**
@@ -369,7 +369,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
Properties config = systemManager.getSystemConfiguration(getOverlord());
_checkAuthentication(username, password);
-
+
// User is authenticated!
Subject subject = getSubjectByName(username);
@@ -423,12 +423,12 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
public Subject checkAuthentication(String username, String password) {
try {
_checkAuthentication(username, password);
- return getSubjectByName(username);
+ return getSubjectByName(username);
} catch (LoginException e) {
return null;
}
}
-
+
private void _checkAuthentication(String username, String password) throws LoginException {
try {
UsernamePasswordHandler handler = new UsernamePasswordHandler(username, password.toCharArray());
@@ -442,7 +442,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
throw new LoginException(e.getMessage());
}
}
-
+
/**This method is applied to Subject instances that may require LDAP auth/authz processing.
* Called from both SLSB and SubjectGWTServiceImpl and:
* -if Subject passed in has Principal(not LDAP account) then we immediately return Subject as no processing needed.
@@ -474,7 +474,17 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
if (ldapConfigured) {//we can proceed with LDAP checking
//check that session is valid. RHQ auth has already occurred. Security check required to initiate following
- if (!isValidSessionId(subject.getSessionId(), subject.getName(), subject.getId())) {
+ //spinder BZ:682755: 3/10/11: can't use isValidSessionId() as it also compares subject.id which is changing during case insensitive
+ // and new registration. This worked before because HTTP get took longer to invalidate sessions.
+ Subject sessionSubject = null;
+ try {
+ sessionSubject = sessionManager.getSubject(subject.getSessionId());
+ } catch (SessionNotFoundException e) {
+ throw new LoginException("User session not valid. Login to proceed.");
+ } catch (SessionTimeoutException e) {
+ throw new LoginException("User session not valid. Login to proceed.");
+ }
+ if (!subject.getName().equals(sessionSubject.getName())) {
throw new LoginException("User session not valid. Login to proceed.");
}
@@ -760,7 +770,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
alertNotificationManager.cleanseAlertNotificationBySubject(doomedSubject.getId());
repoManager.removeOwnershipOfSubject(doomedSubject.getId());
-
+
entityManager.remove(doomedSubject);
return;
13 years, 3 months
- 1
- 0
[rhq] 13 commits - modules/core modules/enterprise
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java | 1
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java | 92 ++-
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java | 73 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 269 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java | 128 +++-
8 files changed, 479 insertions(+), 137 deletions(-)
New commits:
commit f19c23ee512882e27b46852ef9a48bc719632413
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 13:58:23 2011 -0500
do not allow user to select non-cluster nodes in group tree
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 3371e84..d65d400 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -70,6 +70,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class ResourceGroupTreeView extends LocatableVLayout implements BookmarkableView {
+ private static final String FAKE_ROOT_ID = "__fakeRoot__"; // id of the parent node of our real root node
+
private TreeGrid treeGrid;
private ViewId currentViewId;
@@ -142,27 +144,38 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
if (!selectionEvent.isRightButtonDown() && selectionEvent.getState()) {
ResourceGroupEnhancedTreeNode selectedNode = (ResourceGroupEnhancedTreeNode) selectionEvent
.getRecord();
- selectedNodeId = selectedNode.getID();
com.allen_sauer.gwt.log.client.Log.info("Node selected in tree: " + selectedNode);
+
ResourceType type = selectedNode.getResourceType();
+ ClusterKey key = selectedNode.getClusterKey();
if (type != null) {
- // It's a cluster group node, not a subcategory node or an autoTypeGroup node.
- ClusterKey key = selectedNode.getClusterKey();
- if (key == null) {
- // The root group was selected.
- String groupId = selectedNode.getID();
- com.allen_sauer.gwt.log.client.Log.debug("Selecting group [" + groupId + "]...");
- String viewPath = ResourceGroupTopView.VIEW_ID + "/" + groupId;
- String currentViewPath = History.getToken();
- if (!currentViewPath.startsWith(viewPath)) {
- CoreGUI.goToView(viewPath);
- }
- } else {
+ if (key != null) {
+ // the user selected a cluster node - let's switch to that cluster group view
com.allen_sauer.gwt.log.client.Log.debug("Selecting cluster group [" + key + "]...");
+ selectedNodeId = selectedNode.getID();
selectClusterGroup(key);
+ } else {
+ if (selectedNode.getParentID().equals(FAKE_ROOT_ID)) {
+ // the user selected the top group node
+ selectedNodeId = selectedNode.getID();
+ String groupId = selectedNodeId;
+ com.allen_sauer.gwt.log.client.Log.debug("Selecting group [" + groupId + "]...");
+ String viewPath = ResourceGroupTopView.VIEW_ID + "/" + groupId;
+ String currentViewPath = History.getToken();
+ if (!currentViewPath.startsWith(viewPath)) {
+ CoreGUI.goToView(viewPath);
+ }
+ } else {
+ // the user selected a auto type group node; we have got nothing to show, so cancel the selection of this node
+ treeGrid.deselectRecord(selectedNode);
+ }
}
+ } else {
+ // the user selected a subcategory; we have got nothing to show, so cancel the selection of this node
+ treeGrid.deselectRecord(selectedNode);
}
}
+ return;
}
});
@@ -217,7 +230,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
String icon = ImageManager.getGroupIcon(GroupCategory.MIXED);
rootNode.setIcon(icon);
rootNode.setID(String.valueOf(rootResourceGroup.getId()));
- fakeRoot.setID("__fakeRoot__");
+ fakeRoot.setID(FAKE_ROOT_ID);
rootNode.setParentID(fakeRoot.getID());
fakeRoot.setChildren(new ResourceGroupEnhancedTreeNode[] { rootNode });
Tree tree = new Tree();
@@ -316,7 +329,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
private void loadTree(ClusterFlyweight root) {
ClusterKey rootKey = new ClusterKey(root.getGroupId());
ResourceGroupEnhancedTreeNode fakeRoot = new ResourceGroupEnhancedTreeNode("fakeRootNode");
- fakeRoot.setID("__fakeRoot__");
+ fakeRoot.setID(FAKE_ROOT_ID);
ResourceGroupEnhancedTreeNode rootNode = new ResourceGroupEnhancedTreeNode(rootResourceGroup.getName());
rootNode.setID(rootKey.getKey());
commit ab5b6acc39b165fdcdd66451b06847040928a8e1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 13:31:57 2011 -0500
clean up the tree - sort it better, provide different icons for subcats and auto-type groups, make the expand/collapse icons be the same as that of the individual resource tree
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java
index 7743b09..15e13fa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/EnhancedTreeNode.java
@@ -67,6 +67,15 @@ public class EnhancedTreeNode extends TreeNode {
return getAttribute(Attributes.PARENT_ID);
}
+ public boolean isFolderNode() {
+ Boolean isFolder = getAttributeAsBoolean(Attributes.IS_FOLDER);
+ if (isFolder == null) {
+ Object children = getAttributeAsBoolean(Attributes.CHILDREN);
+ isFolder = Boolean.valueOf(children != null);
+ }
+ return isFolder.booleanValue();
+ }
+
@Override
public String toString() {
StringBuilder buffer = new StringBuilder();
@@ -95,6 +104,8 @@ public class EnhancedTreeNode extends TreeNode {
public static final String PARENT_ID = "parentId";
public static final String NAME = "name";
public static final String DESCRIPTION = "description";
+ public static final String IS_FOLDER = "isFolder";
+ public static final String CHILDREN = "children";
private Attributes() {
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java
deleted file mode 100644
index ebcc9e7..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.gui.coregui.client.components.tree;
-
-import java.util.Comparator;
-
-import com.smartgwt.client.widgets.tree.TreeNode;
-
-/**
- * Compares two tree nodes - first compares the title but if that is null, compares the name.
- *
- * @author John Mazzitelli
- */
-public class TreeNodeComparator implements Comparator<TreeNode> {
-
- @Override
- public int compare(TreeNode o1, TreeNode o2) {
- String s1 = getStringToCompare(o1);
- String s2 = getStringToCompare(o2);
- return s1.compareTo(s2);
- }
-
- private String getStringToCompare(TreeNode node) {
- // this method will never return null
- if (node.getTitle() != null) {
- return node.getTitle();
- } else if (node.getName() != null) {
- return node.getName();
- } else {
- // last ditch effort; if this node has an ID attribute, use it to compare
- Object id = node.getAttributeAsObject("id");
- if (id != null) {
- return id.toString();
- } else {
- return "";
- }
- }
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java
new file mode 100644
index 0000000..5e4ff6f
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java
@@ -0,0 +1,73 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
+
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.group.ClusterKey;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
+
+/**
+ * Tree grid used to render the left hand group tree.
+ *
+ * @author John Mazzitelli
+ */
+public class CustomResourceGroupTreeGrid extends LocatableTreeGrid {
+
+ public CustomResourceGroupTreeGrid(String locatorId) {
+ super(locatorId);
+ }
+
+ @Override
+ protected String getIcon(Record record, boolean defaultState) {
+
+ if (record instanceof ResourceGroupTreeView.ResourceGroupEnhancedTreeNode) {
+ ResourceGroupTreeView.ResourceGroupEnhancedTreeNode node = (ResourceGroupTreeView.ResourceGroupEnhancedTreeNode) record;
+
+ // allow the nodes to tell us what icon they want
+ if (node.getIcon() != null) {
+ return node.getIcon();
+ }
+
+ // if this node is associated with a resource type AND a cluster key, it is a cluster node
+ // if this node is associated only with a resource type, it is a auto type group node.
+ // if this node is not associated with either a resource type or cluster key, it is a subcategory node (which uses the default icon)
+ ResourceType resourceType = node.getResourceType();
+ if (resourceType != null) {
+ ClusterKey clusterKey = node.getClusterKey();
+ if (clusterKey != null) {
+ String icon = ImageManager.getClusteredResourceIcon(resourceType.getCategory());
+ return icon;
+ } else {
+ boolean open = getTree().isOpen((TreeNode) record);
+ return "resources/folder_group_" + (open ? "opened" : "closed") + ".png";
+ }
+ }
+
+ // use the default image - which is typically for subcategory nodes
+ boolean open = getTree().isOpen((TreeNode) record);
+ return "resources/folder_" + (open ? "opened" : "closed") + ".png";
+ }
+
+ return null; // should never happen
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 7ab8eb6..3371e84 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -24,6 +24,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -57,7 +58,6 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
-import org.rhq.enterprise.gui.coregui.client.components.tree.TreeNodeComparator;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -83,6 +83,30 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
private Map<Integer, ResourceType> typeMap;
private ResourceGroup selectedGroup;
+ private Comparator<ResourceGroupEnhancedTreeNode> treeNodeComparator = new Comparator<ResourceGroupEnhancedTreeNode>() {
+ @Override
+ public int compare(ResourceGroupEnhancedTreeNode o1, ResourceGroupEnhancedTreeNode o2) {
+ // folders always come before leaf nodes
+ boolean o1IsFolder = o1.isFolderNode();
+ boolean o2IsFolder = o2.isFolderNode();
+ if (o1IsFolder != o2IsFolder) {
+ return o1IsFolder ? -1 : 1;
+ } else if (o1IsFolder) {
+ // subcategory and autoTypeGroup nodes (i.e. "folder icons") come before cluster type group nodes
+ boolean o1IsClusterNode = o1.getClusterKey() != null;
+ boolean o2IsClusterNode = o2.getClusterKey() != null;
+ if (o1IsClusterNode != o2IsClusterNode) {
+ return !o1IsClusterNode ? -1 : 1;
+ }
+ }
+
+ // the two nodes are either both leaves or both folders; sort by name
+ String s1 = o1.getName();
+ String s2 = o2.getName();
+ return s1.compareToIgnoreCase(s2);
+ }
+ };
+
public ResourceGroupTreeView(String locatorId) {
super(locatorId);
@@ -96,16 +120,16 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
protected void onInit() {
super.onInit();
- treeGrid = new TreeGrid();
+ treeGrid = new CustomResourceGroupTreeGrid(extendLocatorId("groupTree"));
treeGrid.setWidth100();
treeGrid.setHeight100();
treeGrid.setAnimateFolders(false);
treeGrid.setSelectionType(SelectionStyle.SINGLE);
treeGrid.setShowRollOver(false);
- treeGrid.setSortField(EnhancedTreeNode.Attributes.NAME);
- treeGrid.setSortFoldersBeforeLeaves(true);
- treeGrid.setSeparateFolders(true);
treeGrid.setShowHeader(false);
+ treeGrid.setLeaveScrollbarGap(false);
+ treeGrid.setOpenerImage("resources/dir.png");
+ treeGrid.setOpenerIconSize(16);
addMember(this.treeGrid);
@@ -371,9 +395,10 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
ResourceGroupEnhancedTreeNode currentSubcategoryNode = subCategoryNodesByName
.get(currentSubCategory.getName());
if (currentSubcategoryNode == null) {
+ // This node represents a subcategory. It is not associated with any specific resource type
+ // or cluster key - it is merely a way plugin developers organize different resource types into groups.
currentSubcategoryNode = new ResourceGroupEnhancedTreeNode(currentSubCategory.getName());
- // Note, subcategory names are typically already plural, so there's no need to pluralize them.
- currentSubcategoryNode.setTitle(currentSubCategory.getDisplayName());
+ currentSubcategoryNode.setTitle(currentSubCategory.getDisplayName()); // subcategory names are normally plural already, no need to pluralize them
currentSubcategoryNode.setIsFolder(true);
currentSubcategoryNode.setID("cat" + currentSubCategory.getName());
currentSubcategoryNode.setParentID(parentKey.getKey());
@@ -427,18 +452,19 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
private ResourceGroupEnhancedTreeNode[] createSortedArray(List<ResourceGroupEnhancedTreeNode> list) {
- Collections.sort(list, new TreeNodeComparator());
+ Collections.sort(list, this.treeNodeComparator);
return list.toArray(new ResourceGroupEnhancedTreeNode[list.size()]);
}
private ResourceGroupEnhancedTreeNode createClusterGroupNode(ClusterKey parentKey, ResourceType type,
ClusterFlyweight child) {
+ // This node represents one type of resource that has 1 or more individual resources as members in the group.
+ // It will be associated with both a resource type and a cluster key.
ResourceGroupEnhancedTreeNode node = new ResourceGroupEnhancedTreeNode(child.getName());
ClusterKeyFlyweight keyFlyweight = child.getClusterKey();
ClusterKey key = new ClusterKey(parentKey, keyFlyweight.getResourceTypeId(), keyFlyweight.getResourceKey());
- String icon = ImageManager.getClusteredResourceIcon(type.getCategory());
String id = key.getKey();
String parentId = parentKey.getKey();
node.setID(id);
@@ -446,18 +472,24 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
node.setClusterKey(key);
node.setResourceType(type);
node.setIsFolder(!child.getChildren().isEmpty());
- node.setIcon(icon);
return node;
}
private ResourceGroupEnhancedTreeNode createAutoTypeGroupNode(ClusterKey parentKey, ResourceType type,
List<ResourceGroupEnhancedTreeNode> memberNodes) {
+
+ // This node represents a group of resources all of the same type but have different resource keys -
+ // in other words, individual members of the group have multiple resources of this type (for example,
+ // an auto type group node of type WAR means our group members each have multiple WARs deployed to them,
+ // so this node represents the parent to all the different WARs cluster nodes).
+ // This node will be associated with only a resource type (not a cluster key)
String name = StringUtility.pluralize(type.getName());
ResourceGroupEnhancedTreeNode autoTypeGroupNode = new ResourceGroupEnhancedTreeNode(name);
String parentId = parentKey.getKey();
String autoTypeGroupNodeId = "rt" + String.valueOf(type.getId());
autoTypeGroupNode.setID(autoTypeGroupNodeId);
autoTypeGroupNode.setParentID(parentId);
+ autoTypeGroupNode.setResourceType(type); // notice this node has a resource type, but not a cluster key
autoTypeGroupNode.setIsFolder(true);
for (ResourceGroupEnhancedTreeNode memberNode : memberNodes) {
memberNode.setParentID(autoTypeGroupNodeId);
@@ -494,7 +526,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
}
- private class ResourceGroupEnhancedTreeNode extends EnhancedTreeNode {
+ class ResourceGroupEnhancedTreeNode extends EnhancedTreeNode {
private static final String CLUSTER_KEY = "key";
private static final String RESOURCE_TYPE = "resourceType";
commit 0cc6f6959c7b96b04baa335e1fcf1ca653094d6e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 10:56:49 2011 -0500
make sure to sort the tree leaves
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 6e71494..7ab8eb6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -23,6 +23,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -56,6 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
+import org.rhq.enterprise.gui.coregui.client.components.tree.TreeNodeComparator;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -307,7 +309,6 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
loadTree(rootNode, root, rootKey);
Tree tree = new Tree();
-
tree.setRoot(fakeRoot);
org.rhq.enterprise.gui.coregui.client.util.TreeUtility.printTree(tree);
@@ -417,14 +418,19 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
for (ResourceGroupEnhancedTreeNode subcatChild : subcategoryChildren) {
subcatChild.setParentID(subcategoryNode.getID());
}
- subcategoryNode.setChildren(subcategoryChildren
- .toArray(new ResourceGroupEnhancedTreeNode[subcategoryChildren.size()]));
+ createSortedArray(subcategoryChildren);
+ subcategoryNode.setChildren(createSortedArray(subcategoryChildren));
}
- parentNode.setChildren(childNodes.toArray(new ResourceGroupEnhancedTreeNode[childNodes.size()]));
+ parentNode.setChildren(createSortedArray(childNodes));
}
}
+ private ResourceGroupEnhancedTreeNode[] createSortedArray(List<ResourceGroupEnhancedTreeNode> list) {
+ Collections.sort(list, new TreeNodeComparator());
+ return list.toArray(new ResourceGroupEnhancedTreeNode[list.size()]);
+ }
+
private ResourceGroupEnhancedTreeNode createClusterGroupNode(ClusterKey parentKey, ResourceType type,
ClusterFlyweight child) {
@@ -456,7 +462,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
for (ResourceGroupEnhancedTreeNode memberNode : memberNodes) {
memberNode.setParentID(autoTypeGroupNodeId);
}
- autoTypeGroupNode.setChildren(memberNodes.toArray(new ResourceGroupEnhancedTreeNode[memberNodes.size()]));
+ autoTypeGroupNode.setChildren(createSortedArray(memberNodes));
return autoTypeGroupNode;
}
commit 88f507c359df6e801da8434a595d5841f35db4c2
Merge: a0b8adc... 60684c2...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 09:59:38 2011 -0500
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq.git into group-fixes
diff --cc modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 1b7f43a,efcd6d7..6e71494
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@@ -218,17 -211,14 +218,16 @@@ public class ResourceGroupTreeView exte
if (groupId == this.rootGroupId) {
// Still looking at the same compat-recursive tree
- TreeNode selectedNode;
+ ResourceGroupEnhancedTreeNode selectedNode;
if (this.selectedGroup.getClusterKey() != null) {
- //selectedNode = treeGrid.getTree().findById(this.selectedGroup.getClusterKey());
- selectedNode = treeGrid.getTree().find("key", this.selectedGroup.getClusterKey());
+ selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().find(
+ ResourceGroupEnhancedTreeNode.CLUSTER_KEY, this.selectedGroup.getClusterKey());
} else {
- selectedNode = treeGrid.getTree().findById(String.valueOf(this.selectedGroup.getId()));
+ // TODO not sure when this else would happen, why would a group's cluster key be null?
+ selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().findById(
+ SeleniumUtility.getSafeId(String.valueOf(this.selectedGroup.getId())));
}
- // TODO reselect tree to selected node
if (selectedNode != null) {
TreeNode[] parents = treeGrid.getTree().getParents(selectedNode);
treeGrid.getTree().openFolders(parents);
commit a0b8adc1ee99ac2291d7ce5fc84d4aa8cd0b50f3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 09:59:18 2011 -0500
get cluster tree nodes' ID and parentID fields set appropriately
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 11d8748..1b7f43a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -23,7 +23,6 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -33,7 +32,6 @@ import java.util.Set;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
@@ -58,7 +56,6 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
-import org.rhq.enterprise.gui.coregui.client.components.tree.TreeNodeComparator;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -97,13 +94,15 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
protected void onInit() {
super.onInit();
- this.treeGrid = new TreeGrid();
- this.treeGrid.setWidth100();
- this.treeGrid.setHeight100();
+ treeGrid = new TreeGrid();
+ treeGrid.setWidth100();
+ treeGrid.setHeight100();
treeGrid.setAnimateFolders(false);
treeGrid.setSelectionType(SelectionStyle.SINGLE);
treeGrid.setShowRollOver(false);
- treeGrid.setSortField("name");
+ treeGrid.setSortField(EnhancedTreeNode.Attributes.NAME);
+ treeGrid.setSortFoldersBeforeLeaves(true);
+ treeGrid.setSeparateFolders(true);
treeGrid.setShowHeader(false);
addMember(this.treeGrid);
@@ -115,16 +114,17 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
@Override
public void onSelectionChanged(SelectionEvent selectionEvent) {
if (!selectionEvent.isRightButtonDown() && selectionEvent.getState()) {
- Record selectedNode = selectionEvent.getRecord();
- selectedNodeId = selectedNode.getAttribute("id");
+ ResourceGroupEnhancedTreeNode selectedNode = (ResourceGroupEnhancedTreeNode) selectionEvent
+ .getRecord();
+ selectedNodeId = selectedNode.getID();
com.allen_sauer.gwt.log.client.Log.info("Node selected in tree: " + selectedNode);
- ResourceType type = (ResourceType) selectedNode.getAttributeAsObject("resourceType");
+ ResourceType type = selectedNode.getResourceType();
if (type != null) {
// It's a cluster group node, not a subcategory node or an autoTypeGroup node.
- ClusterKey key = (ClusterKey) selectedNode.getAttributeAsObject("key");
+ ClusterKey key = selectedNode.getClusterKey();
if (key == null) {
// The root group was selected.
- String groupId = selectedNode.getAttribute("id");
+ String groupId = selectedNode.getID();
com.allen_sauer.gwt.log.client.Log.debug("Selecting group [" + groupId + "]...");
String viewPath = ResourceGroupTopView.VIEW_ID + "/" + groupId;
String currentViewPath = History.getToken();
@@ -148,7 +148,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
// don't select the node on a right click, since we're not navigating to it
treeGrid.deselectRecord(event.getNode());
if (null != selectedNodeId) {
- treeGrid.selectRecord(treeGrid.getTree().findById(selectedNodeId));
+ treeGrid.selectRecord(treeGrid.getTree().findById(SeleniumUtility.getSafeId(selectedNodeId)));
}
contextMenu.showContextMenu(event.getNode());
@@ -181,14 +181,19 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
GroupCategory groupCategory = group.getGroupCategory();
switch (groupCategory) {
case MIXED:
+ // For mixed groups, there will only ever be one item in the tree, even if the group is recursive.
+ // This is because mixed groups don't normally have clustered/identical resources across members
+ // so there is no attempt here to build auto cluster nodes.
ResourceGroupTreeView.this.rootResourceGroup = group;
ResourceGroupTreeView.this.rootGroupId = rootResourceGroup.getId();
- TreeNode fakeRoot = new TreeNode("fakeRootNode");
- TreeNode rootNode = new TreeNode(rootResourceGroup.getName());
+ ResourceGroupEnhancedTreeNode fakeRoot = new ResourceGroupEnhancedTreeNode("fakeRootNode");
+ ResourceGroupEnhancedTreeNode rootNode = new ResourceGroupEnhancedTreeNode(group.getName());
String icon = ImageManager.getGroupIcon(GroupCategory.MIXED);
rootNode.setIcon(icon);
- rootNode.setID(String.valueOf(rootResourceGroup.getId())); //getClusterKey().toString());
- fakeRoot.setChildren(new TreeNode[] { rootNode });
+ rootNode.setID(String.valueOf(rootResourceGroup.getId()));
+ fakeRoot.setID("__fakeRoot__");
+ rootNode.setParentID(fakeRoot.getID());
+ fakeRoot.setChildren(new ResourceGroupEnhancedTreeNode[] { rootNode });
Tree tree = new Tree();
tree.setRoot(fakeRoot);
treeGrid.setData(tree);
@@ -213,12 +218,14 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
if (groupId == this.rootGroupId) {
// Still looking at the same compat-recursive tree
- TreeNode selectedNode;
+ ResourceGroupEnhancedTreeNode selectedNode;
if (this.selectedGroup.getClusterKey() != null) {
- //selectedNode = treeGrid.getTree().findById(this.selectedGroup.getClusterKey());
- selectedNode = treeGrid.getTree().find("key", this.selectedGroup.getClusterKey());
+ selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().find(
+ ResourceGroupEnhancedTreeNode.CLUSTER_KEY, this.selectedGroup.getClusterKey());
} else {
- selectedNode = treeGrid.getTree().findById(String.valueOf(this.selectedGroup.getId()));
+ // TODO not sure when this else would happen, why would a group's cluster key be null?
+ selectedNode = (ResourceGroupEnhancedTreeNode) treeGrid.getTree().findById(
+ SeleniumUtility.getSafeId(String.valueOf(this.selectedGroup.getId())));
}
// TODO reselect tree to selected node
@@ -269,8 +276,6 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
@Override
public void onSuccess(ResourceGroup result) {
renderAutoCluster(result);
- //int groupId = result.getId();
- //History.newItem(ResourceGroupTopView.VIEW_ID + "/" + groupId);
}
});
}
@@ -284,32 +289,36 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
private void loadTree(ClusterFlyweight root) {
- TreeNode fakeRoot = new TreeNode("fakeRootNode");
+ ClusterKey rootKey = new ClusterKey(root.getGroupId());
+ ResourceGroupEnhancedTreeNode fakeRoot = new ResourceGroupEnhancedTreeNode("fakeRootNode");
+ fakeRoot.setID("__fakeRoot__");
- TreeNode rootNode = new TreeNode(rootResourceGroup.getName());
- rootNode.setID(String.valueOf(root.getGroupId())); //getClusterKey().toString());
+ ResourceGroupEnhancedTreeNode rootNode = new ResourceGroupEnhancedTreeNode(rootResourceGroup.getName());
+ rootNode.setID(rootKey.getKey());
+ rootNode.setParentID(fakeRoot.getID());
ResourceType rootResourceType = typeMap.get(rootResourceGroup.getResourceType().getId());
- rootNode.setAttribute("resourceType", rootResourceType);
+ rootNode.setResourceType(rootResourceType);
+
String icon = ImageManager.getClusteredResourceIcon(rootResourceType.getCategory());
rootNode.setIcon(icon);
- fakeRoot.setChildren(new TreeNode[] { rootNode });
+ fakeRoot.setChildren(new ResourceGroupEnhancedTreeNode[] { rootNode });
- ClusterKey rootKey = new ClusterKey(root.getGroupId());
loadTree(rootNode, root, rootKey);
Tree tree = new Tree();
tree.setRoot(fakeRoot);
- //TreeUtility.printTree(tree);
+ org.rhq.enterprise.gui.coregui.client.util.TreeUtility.printTree(tree);
treeGrid.setData(tree);
treeGrid.getTree().openFolder(rootNode);
treeGrid.markForRedraw();
}
- public void loadTree(TreeNode parentNode, ClusterFlyweight parentClusterGroup, ClusterKey parentKey) {
+ public void loadTree(ResourceGroupEnhancedTreeNode parentNode, ClusterFlyweight parentClusterGroup,
+ ClusterKey parentKey) {
if (!parentClusterGroup.getChildren().isEmpty()) {
// First pass - group the children by type.
Map<ResourceType, List<ClusterFlyweight>> childrenByType = new HashMap<ResourceType, List<ClusterFlyweight>>();
@@ -326,26 +335,27 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
// Second pass - process each of the sets of like-typed children created in the first pass.
- List<TreeNode> childNodes = new ArrayList<TreeNode>();
- Map<String, TreeNode> subCategoryNodesByName = new HashMap<String, TreeNode>();
- Map<String, List<TreeNode>> subCategoryChildrenByName = new HashMap<String, List<TreeNode>>();
+ List<ResourceGroupEnhancedTreeNode> childNodes = new ArrayList<ResourceGroupEnhancedTreeNode>();
+ Map<String, ResourceGroupEnhancedTreeNode> subCategoryNodesByName = new HashMap<String, ResourceGroupEnhancedTreeNode>();
+ Map<String, List<ResourceGroupEnhancedTreeNode>> subCategoryChildrenByName = new HashMap<String, List<ResourceGroupEnhancedTreeNode>>();
for (ResourceType childType : childrenByType.keySet()) {
List<ClusterFlyweight> children = childrenByType.get(childType);
- List<TreeNode> nodesByType = new ArrayList<TreeNode>();
+ List<ResourceGroupEnhancedTreeNode> nodesByType = new ArrayList<ResourceGroupEnhancedTreeNode>();
for (ClusterFlyweight child : children) {
- TreeNode node = createClusterGroupNode(parentKey, childType, child);
+ ResourceGroupEnhancedTreeNode node = createClusterGroupNode(parentKey, childType, child);
nodesByType.add(node);
if (!child.getChildren().isEmpty()) {
- // Recurse.
- ClusterKey key = (ClusterKey) node.getAttributeAsObject("key");
- loadTree(node, child, key);
+ ClusterKey key = node.getClusterKey();
+ loadTree(node, child, key); // recurse
}
}
// Insert an autoTypeGroup node if the type is not a singleton.
if (!childType.isSingleton()) {
- TreeNode autoTypeGroupNode = createAutoTypeGroupNode(childType, nodesByType);
+ // This will override the parent IDs of all nodesByType nodes with the auto group node ID that is being created
+ ResourceGroupEnhancedTreeNode autoTypeGroupNode = createAutoTypeGroupNode(parentKey, childType,
+ nodesByType);
nodesByType.clear();
nodesByType.add(autoTypeGroupNode);
}
@@ -353,19 +363,23 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
// Insert subcategory node(s) if the type has a subcategory.
ResourceSubCategory subcategory = childType.getSubCategory();
if (subcategory != null) {
- TreeNode lastSubcategoryNode = null;
+ ResourceGroupEnhancedTreeNode lastSubcategoryNode = null;
ResourceSubCategory currentSubCategory = subcategory;
boolean currentSubcategoryNodeCreated = false;
do {
- TreeNode currentSubcategoryNode = subCategoryNodesByName.get(currentSubCategory.getName());
+ ResourceGroupEnhancedTreeNode currentSubcategoryNode = subCategoryNodesByName
+ .get(currentSubCategory.getName());
if (currentSubcategoryNode == null) {
- currentSubcategoryNode = new EnhancedTreeNode(currentSubCategory.getName());
+ currentSubcategoryNode = new ResourceGroupEnhancedTreeNode(currentSubCategory.getName());
// Note, subcategory names are typically already plural, so there's no need to pluralize them.
currentSubcategoryNode.setTitle(currentSubCategory.getDisplayName());
currentSubcategoryNode.setIsFolder(true);
+ currentSubcategoryNode.setID("cat" + currentSubCategory.getName());
+ currentSubcategoryNode.setParentID(parentKey.getKey());
subCategoryNodesByName.put(currentSubCategory.getName(), currentSubcategoryNode);
- subCategoryChildrenByName.put(currentSubCategory.getName(), new ArrayList<TreeNode>());
+ subCategoryChildrenByName.put(currentSubCategory.getName(),
+ new ArrayList<ResourceGroupEnhancedTreeNode>());
if (currentSubCategory.getParentSubCategory() == null) {
// It's a root subcategory - add a node for it to the tree.
@@ -376,15 +390,20 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
if (lastSubcategoryNode != null) {
- List<TreeNode> currentSubcategoryChildren = subCategoryChildrenByName
+ List<ResourceGroupEnhancedTreeNode> currentSubcategoryChildren = subCategoryChildrenByName
.get(currentSubcategoryNode.getName());
+ // make sure we re-parent the child so it is under the subcategory folder
+ for (ResourceGroupEnhancedTreeNode currentSubcategoryChild : currentSubcategoryChildren) {
+ currentSubcategoryChild.setParentID(currentSubcategoryNode.getID());
+ }
currentSubcategoryChildren.add(lastSubcategoryNode);
}
lastSubcategoryNode = currentSubcategoryNode;
} while (currentSubcategoryNodeCreated
&& (currentSubCategory = currentSubCategory.getParentSubCategory()) != null);
- List<TreeNode> subcategoryChildren = subCategoryChildrenByName.get(subcategory.getName());
+ List<ResourceGroupEnhancedTreeNode> subcategoryChildren = subCategoryChildrenByName.get(subcategory
+ .getName());
subcategoryChildren.addAll(nodesByType);
} else {
childNodes.addAll(nodesByType);
@@ -392,37 +411,53 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
for (String subcategoryName : subCategoryNodesByName.keySet()) {
- TreeNode subcategoryNode = subCategoryNodesByName.get(subcategoryName);
- List<TreeNode> subcategoryChildren = subCategoryChildrenByName.get(subcategoryName);
- subcategoryNode.setChildren(subcategoryChildren.toArray(new TreeNode[subcategoryChildren.size()]));
+ ResourceGroupEnhancedTreeNode subcategoryNode = subCategoryNodesByName.get(subcategoryName);
+ List<ResourceGroupEnhancedTreeNode> subcategoryChildren = subCategoryChildrenByName
+ .get(subcategoryName);
+ // make sure the parent for the subcat children are referring to the parent subcat node
+ for (ResourceGroupEnhancedTreeNode subcatChild : subcategoryChildren) {
+ subcatChild.setParentID(subcategoryNode.getID());
+ }
+ subcategoryNode.setChildren(subcategoryChildren
+ .toArray(new ResourceGroupEnhancedTreeNode[subcategoryChildren.size()]));
}
- Collections.sort(childNodes, new TreeNodeComparator());
- parentNode.setChildren(childNodes.toArray(new TreeNode[childNodes.size()]));
+ parentNode.setChildren(childNodes.toArray(new ResourceGroupEnhancedTreeNode[childNodes.size()]));
}
}
- private TreeNode createClusterGroupNode(ClusterKey parentKey, ResourceType type, ClusterFlyweight child) {
- TreeNode node = new EnhancedTreeNode(child.getName());
+ private ResourceGroupEnhancedTreeNode createClusterGroupNode(ClusterKey parentKey, ResourceType type,
+ ClusterFlyweight child) {
+
+ ResourceGroupEnhancedTreeNode node = new ResourceGroupEnhancedTreeNode(child.getName());
ClusterKeyFlyweight keyFlyweight = child.getClusterKey();
ClusterKey key = new ClusterKey(parentKey, keyFlyweight.getResourceTypeId(), keyFlyweight.getResourceKey());
+ String icon = ImageManager.getClusteredResourceIcon(type.getCategory());
String id = key.getKey();
- node.setID(SeleniumUtility.getSafeId(id));
- node.setAttribute("key", key);
- node.setAttribute("resourceType", type);
+ String parentId = parentKey.getKey();
+ node.setID(id);
+ node.setParentID(parentId);
+ node.setClusterKey(key);
+ node.setResourceType(type);
node.setIsFolder(!child.getChildren().isEmpty());
-
- String icon = ImageManager.getClusteredResourceIcon(type.getCategory());
node.setIcon(icon);
return node;
}
- private TreeNode createAutoTypeGroupNode(ResourceType type, List<TreeNode> memberNodes) {
+ private ResourceGroupEnhancedTreeNode createAutoTypeGroupNode(ClusterKey parentKey, ResourceType type,
+ List<ResourceGroupEnhancedTreeNode> memberNodes) {
String name = StringUtility.pluralize(type.getName());
- TreeNode autoTypeGroupNode = new EnhancedTreeNode(name);
+ ResourceGroupEnhancedTreeNode autoTypeGroupNode = new ResourceGroupEnhancedTreeNode(name);
+ String parentId = parentKey.getKey();
+ String autoTypeGroupNodeId = "rt" + String.valueOf(type.getId());
+ autoTypeGroupNode.setID(autoTypeGroupNodeId);
+ autoTypeGroupNode.setParentID(parentId);
autoTypeGroupNode.setIsFolder(true);
- autoTypeGroupNode.setChildren(memberNodes.toArray(new TreeNode[memberNodes.size()]));
+ for (ResourceGroupEnhancedTreeNode memberNode : memberNodes) {
+ memberNode.setParentID(autoTypeGroupNodeId);
+ }
+ autoTypeGroupNode.setChildren(memberNodes.toArray(new ResourceGroupEnhancedTreeNode[memberNodes.size()]));
return autoTypeGroupNode;
}
@@ -453,4 +488,40 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
getTreeTypes(child, typeIds);
}
}
+
+ private class ResourceGroupEnhancedTreeNode extends EnhancedTreeNode {
+ private static final String CLUSTER_KEY = "key";
+ private static final String RESOURCE_TYPE = "resourceType";
+
+ public ResourceGroupEnhancedTreeNode(String name) {
+ super(name);
+ }
+
+ public ClusterKey getClusterKey() {
+ return (ClusterKey) getAttributeAsObject(CLUSTER_KEY);
+ }
+
+ public void setClusterKey(ClusterKey key) {
+ setAttribute(CLUSTER_KEY, key);
+ }
+
+ @Override
+ public void setID(String id) {
+ super.setID(SeleniumUtility.getSafeId(id));
+ }
+
+ @Override
+ public void setParentID(String parentID) {
+ super.setParentID(SeleniumUtility.getSafeId(parentID));
+ }
+
+ public ResourceType getResourceType() {
+ return (ResourceType) getAttributeAsObject(RESOURCE_TYPE);
+ }
+
+ public void setResourceType(ResourceType rt) {
+ setAttribute(RESOURCE_TYPE, rt);
+ }
+
+ }
}
commit 6bbbef7ed9d481f1c1f664311e0271a35ac8ef6a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Mar 10 09:58:19 2011 -0500
add some code to make debugging cluster tree easier
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
index 202e54c..08e5752 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
@@ -111,6 +111,13 @@ public class ClusterFlyweight implements Serializable {
}
@Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("ClusterFlyweight [name=").append(name).append(", clusterKey=").append(clusterKey).append("]");
+ return builder.toString();
+ }
+
+ @Override
public int hashCode() {
int result = 1;
result = 31 * result + groupId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
index 2917f6d..78ae584 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.util;
import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeNode;
+
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
/**
@@ -30,19 +31,27 @@ import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
public class TreeUtility {
public static void printTree(Tree tree) {
+ String treeString = getTreeString(tree);
+ System.out.print(treeString);
+ com.allen_sauer.gwt.log.client.Log.info(treeString);
+ }
+
+ public static String getTreeString(Tree tree) {
TreeNode rootNode = tree.getRoot();
- printTreeNode(tree, rootNode);
+ StringBuilder str = new StringBuilder();
+ appendTreeNode(tree, rootNode, str);
+ return str.toString();
}
- private static void printTreeNode(Tree tree, TreeNode node) {
+ private static void appendTreeNode(Tree tree, TreeNode node, StringBuilder str) {
int level = tree.getLevel(node);
for (int i = 0; i < level; i++) {
- System.out.print(" ");
+ str.append(" ");
}
- com.allen_sauer.gwt.log.client.Log.info("* " + toString(node));
+ str.append("* ").append(toString(node)).append('\n');
TreeNode[] childNodes = tree.getChildren(node);
for (TreeNode childNode : childNodes) {
- printTreeNode(tree, childNode);
+ appendTreeNode(tree, childNode, str);
}
}
@@ -67,5 +76,5 @@ public class TreeUtility {
private TreeUtility() {
}
-
+
}
commit 7a19bacb1afb9b29ab2e7b1acff5f7b08cc7a320
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Mar 9 13:22:14 2011 -0500
fix table refresh so it maintains the initial criteria even when entering additional search criteria from the search bar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 7b5d087..ce0754e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -458,7 +458,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
IButton refreshButton = new LocatableIButton(extendLocatorId("Refresh"), MSG.common_button_refresh());
refreshButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- listGrid.invalidateCache();
+ refresh();
}
});
footer.addMember(refreshButton);
@@ -545,22 +545,54 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private ArrayList<Integer> fieldSizes = new ArrayList<Integer>();
- public void refresh(Criteria criteria) {
+ /**
+ * Refreshes the list grid with the explicit criteria.
+ * Usually you do not want to call this - to maintain proper filtering
+ * and usage of the initial criteria, call {@link #refresh()} instead.
+ *
+ * @param criteria the criteria to use to refresh the table with
+ */
+ protected void refresh(Criteria criteria) {
if (null != this.listGrid) {
- this.listGrid.invalidateCache();
this.listGrid.setCriteria(criteria);
+ this.listGrid.invalidateCache();
this.listGrid.markForRedraw();
}
}
+ /**
+ * Refreshes the list grid so it reloads. This attempts to maintain
+ * the original criteria along with any current filter settings.
+ */
public void refresh() {
- // if this table has a filter form (table filters OR search bar)
- // we need to refresh it as per the filtering. If there are no filters,
- // just do a allow for a default refresh by simply invalidating the cache
if (null != this.listGrid) {
+ // if this table has a filter form (table filters OR search bar)
+ // we need to refresh it as per the filtering.
if (this.filterForm != null && this.filterForm.hasContent()) {
- refresh(this.filterForm.getValuesAsCriteria());
+ Criteria filterFormCriteria = this.filterForm.getValuesAsCriteria();
+ if (this.criteria == null) {
+ // there was no initial criteria, filter based on the filter form data only
+ refresh(filterFormCriteria);
+ } else {
+ // there is both initial criteria and filters. We need criteria that combines both.
+ Criteria fullCriteria = new Criteria();
+ String[] criteriaAttribs = this.criteria.getAttributes(); // the initial criteria attributes
+ for (String attribName : criteriaAttribs) {
+ Object attribValue = this.criteria.getAttributeAsObject(attribName);
+ fullCriteria.setAttribute(attribName, attribValue);
+ }
+ if (filterFormCriteria != null) {
+ criteriaAttribs = filterFormCriteria.getAttributes(); // the filter form criteria attributes (like the search bar)
+ for (String attribName : criteriaAttribs) {
+ Object attribValue = filterFormCriteria.getAttributeAsObject(attribName);
+ fullCriteria.setAttribute(attribName, attribValue);
+ }
+ }
+ refresh(fullCriteria);
+ }
} else {
+ // If there are no filters, just do a default refresh by simply invalidating the cache.
+ // This should reuse the original initial criteria.
this.listGrid.invalidateCache();
this.listGrid.markForRedraw();
}
@@ -862,6 +894,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
String name = searchBarItem.getName();
searchBarItem.setName(name + "_hidden");
hiddenItem = new HiddenItem(name);
+ hiddenItem.setValue(searchBarItem.getSearchBar().getValue());
}
}
@@ -876,7 +909,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
}
private void fetchFilteredTableData() {
- table.refresh(getValuesAsCriteria());
+ table.refresh();
}
public void onKeyPress(KeyPressEvent event) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
index d861fad..f14d791 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
@@ -61,17 +61,14 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto
private Timer refreshTimer;
public FavoriteResourcesPortlet(String locatorId) {
- super(locatorId);
+ super(locatorId, createInitialCriteria());
setOverflow(Overflow.VISIBLE);
setShowHeader(false);
setShowFooter(false);
}
- @Override
- protected void configureTable() {
- super.configureTable();
-
+ private static Criteria createInitialCriteria() {
Set<Integer> favoriteIds = UserSessionManager.getUserPreferences().getFavoriteResources();
Integer[] favArray = favoriteIds.toArray(new Integer[favoriteIds.size()]);
@@ -83,7 +80,12 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto
criteria.addCriteria("resourceIds", favArray);
}
- refresh(criteria);
+ return criteria;
+ }
+
+ @Override
+ protected void configureTable() {
+ super.configureTable();
getListGrid().addFieldStateChangedHandler(new FieldStateChangedHandler() {
public void onFieldStateChanged(FieldStateChangedEvent fieldStateChangedEvent) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index 2517d3e..465b37c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -138,7 +138,7 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView {
}
for (Table t : viewsWithTags) {
- t.refresh(criteria);
+ t.refresh();
}
}
commit f11084492de20a48c9368ec2b514aa5b909bcc7f
Merge: e872546... 3fce94f...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 17:29:16 2011 -0500
Merge commit 'origin/master' into group-fixes
commit e8725466f05ec287dea74530bd0a647dc2a56537
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 17:29:11 2011 -0500
working on the group tree
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java
index 5b7a9a6..c12f554 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ClusterKey.java
@@ -53,7 +53,6 @@ public class ClusterKey implements Serializable {
private int clusterGroupId = 0;
private List<ClusterKey.Node> hierarchy;
private String key = null;
- private String namedKey = null;
public ClusterKey() {
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
index 5422c95..202e54c 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterFlyweight.java
@@ -27,6 +27,13 @@ import java.util.ArrayList;
import java.util.List;
/**
+ * This is a cluster node in a group tree. A cluster node represents an aggregation
+ * of one or more individual resources that are identical, where "identical" means
+ * the same resource type and resource key (see {@link ClusterKeyFlyweight}.
+ * The number of individual resources that make up this cluster node is the
+ * {@link #getMembers() member count}. The total size of the cluster (that is,
+ * the maximum number of members that can be expected) is {@link #getClusterSize()}.
+ *
* @author Greg Hinkle
*/
public class ClusterFlyweight implements Serializable {
@@ -34,14 +41,11 @@ public class ClusterFlyweight implements Serializable {
private static final long serialVersionUID = 1L;
private int groupId;
-
private ClusterKeyFlyweight clusterKey;
-
private String name;
-
private List<ClusterFlyweight> children = new ArrayList<ClusterFlyweight>(0);
-
- private int members;
+ private int members = 0;
+ private int clusterSize = 0;
public ClusterFlyweight() {
}
@@ -54,11 +58,23 @@ public class ClusterFlyweight implements Serializable {
this.clusterKey = clusterKey;
}
+ public int getGroupId() {
+ return groupId;
+ }
+
+ public ClusterKeyFlyweight getClusterKey() {
+ return clusterKey;
+ }
+
+ public String getName() {
+ return (name != null) ? name : "?";
+ }
+
public void addResource(String s) {
if (name == null) {
name = s;
} else if (!name.equals(s)) {
- name = "?";
+ name = "..."; // more than one "identical" resource had different names - don't know what to call this node
}
}
@@ -70,24 +86,61 @@ public class ClusterFlyweight implements Serializable {
this.members = members;
}
- public void setChildren(List<ClusterFlyweight> clusterKeyFlyweights) {
- this.children = (null != clusterKeyFlyweights) ? clusterKeyFlyweights : new ArrayList<ClusterFlyweight>(0);
- }
-
- public int getGroupId() {
- return groupId;
+ public void incrementMembers() {
+ this.members++;
}
- public ClusterKeyFlyweight getClusterKey() {
- return clusterKey;
+ public int getClusterSize() {
+ return clusterSize;
}
- public String getName() {
- return name;
+ public void setClusterSize(int size) {
+ this.clusterSize = size;
}
public List<ClusterFlyweight> getChildren() {
return children;
}
+ public void setChildren(List<ClusterFlyweight> clusterKeyFlyweights) {
+ if (clusterKeyFlyweights == null) {
+ this.children = new ArrayList<ClusterFlyweight>(0);
+ } else {
+ this.children = clusterKeyFlyweights;
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ int result = 1;
+ result = 31 * result + groupId;
+ result = 31 * result + ((clusterKey == null) ? 0 : clusterKey.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof ClusterFlyweight)) {
+ return false;
+ }
+
+ ClusterFlyweight other = (ClusterFlyweight) obj;
+
+ if (groupId != other.groupId) {
+ return false;
+ }
+
+ if (clusterKey == null) {
+ if (other.clusterKey != null) {
+ return false;
+ }
+ } else if (!clusterKey.equals(other.clusterKey)) {
+ return false;
+ }
+ return true;
+ }
+
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java
index 7ed08db..1548aa6 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ClusterKeyFlyweight.java
@@ -44,13 +44,21 @@ public class ClusterKeyFlyweight implements Serializable {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ClusterKeyFlyweight)) {
+ return false;
+ }
ClusterKeyFlyweight node = (ClusterKeyFlyweight) o;
- if (resourceTypeId != node.resourceTypeId) return false;
- if (resourceKey != null ? !resourceKey.equals(node.resourceKey) : node.resourceKey != null) return false;
+ if (resourceTypeId != node.resourceTypeId) {
+ return false;
+ }
+ if (resourceKey != null ? !resourceKey.equals(node.resourceKey) : node.resourceKey != null) {
+ return false;
+ }
return true;
}
@@ -72,9 +80,6 @@ public class ClusterKeyFlyweight implements Serializable {
@Override
public String toString() {
- return "ClusterKeyFlyweight{" +
- "resourceTypeId=" + resourceTypeId +
- ", resourceKey='" + resourceKey + '\'' +
- '}';
+ return "ClusterKeyFlyweight[" + "type=" + resourceTypeId + ",key=" + resourceKey + ']';
}
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java
new file mode 100644
index 0000000..ebcc9e7
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tree/TreeNodeComparator.java
@@ -0,0 +1,56 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.gui.coregui.client.components.tree;
+
+import java.util.Comparator;
+
+import com.smartgwt.client.widgets.tree.TreeNode;
+
+/**
+ * Compares two tree nodes - first compares the title but if that is null, compares the name.
+ *
+ * @author John Mazzitelli
+ */
+public class TreeNodeComparator implements Comparator<TreeNode> {
+
+ @Override
+ public int compare(TreeNode o1, TreeNode o2) {
+ String s1 = getStringToCompare(o1);
+ String s2 = getStringToCompare(o2);
+ return s1.compareTo(s2);
+ }
+
+ private String getStringToCompare(TreeNode node) {
+ // this method will never return null
+ if (node.getTitle() != null) {
+ return node.getTitle();
+ } else if (node.getName() != null) {
+ return node.getName();
+ } else {
+ // last ditch effort; if this node has an ID attribute, use it to compare
+ Object id = node.getAttributeAsObject("id");
+ if (id != null) {
+ return id.toString();
+ } else {
+ return "";
+ }
+ }
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 15945c6..11d8748 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -23,6 +23,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -57,6 +58,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
+import org.rhq.enterprise.gui.coregui.client.components.tree.TreeNodeComparator;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -395,6 +397,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
subcategoryNode.setChildren(subcategoryChildren.toArray(new TreeNode[subcategoryChildren.size()]));
}
+ Collections.sort(childNodes, new TreeNodeComparator());
parentNode.setChildren(childNodes.toArray(new TreeNode[childNodes.size()]));
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
index 63c9537..2a9703c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
@@ -176,10 +176,14 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
}
public ClusterFlyweight getClusterTree(Subject subject, int groupId) {
- Query query = entityManager
- .createQuery("SELECT r.id, r.resourceType.id, r.parentResource.id, r.resourceKey, r.name, "
- + "(SELECT count(r2) FROM Resource r2 join r2.explicitGroups g2 WHERE g2.id = :groupId and r2.id = r.id) "
- + "FROM Resource r join r.implicitGroups g " + "WHERE g.id = :groupId");
+ final String queryString = //
+ "SELECT r.id, r.resourceType.id, r.parentResource.id, r.resourceKey, r.name, " //
+ + " (SELECT count(r2)" //
+ + " FROM Resource r2 JOIN r2.explicitGroups g2 " //
+ + " WHERE g2.id = :groupId and r2.id = r.id) " //
+ + " FROM Resource r join r.implicitGroups g " //
+ + " WHERE g.id = :groupId ";
+ Query query = entityManager.createQuery(queryString);
query.setParameter("groupId", groupId);
List<Object[]> rs = query.getResultList();
@@ -238,6 +242,10 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
// has the same as children above except its values aren't child nodes, but just the child nodes' resource IDs
Map<ClusterKeyFlyweight, Set<Integer>> members = new HashMap<ClusterKeyFlyweight, Set<Integer>>();
+ // we would expect a maximum number of identical child resources to be the same as the number of parents we have.
+ // in other words, this happens when each individual parent resource has an identical child (which is the typical use case).
+ int maxChildrenExpected = parentIds.size();
+
// loop through each identical parent resource to aggregate their children into a single cluster node
for (Integer parentId : parentIds) {
@@ -249,6 +257,7 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
Set<Integer> memberList;
if (childNode == null) {
childNode = new ClusterFlyweight(childNodeKey);
+ childNode.setClusterSize(maxChildrenExpected);
children.put(childNodeKey, childNode);
memberList = new HashSet<Integer>();
members.put(childNodeKey, memberList);
@@ -256,6 +265,7 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
memberList = members.get(childNodeKey);
}
childNode.addResource(child.resourceName);
+ childNode.incrementMembers();
memberList.add(child.resourceId);
}
}
commit c5560f0db5ba5350cacbf99e072d7d8826ce19b1
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 13:39:02 2011 -0500
fix the buildTree recursive method - it was losing child nodes
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
index dc857a6..63c9537 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
@@ -201,43 +201,75 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
}
}
- ClusterFlyweight key = new ClusterFlyweight(groupId);
+ ClusterFlyweight topTreeNode = new ClusterFlyweight(groupId);
- buildTree(groupId, key, explicitResources, dataMap);
+ // dataMap contains one key for every *parent resource* that is a parent to a group resource.
+ // this could include platform resources if group members are top level servers.
+ buildTree(groupId, topTreeNode, explicitResources, dataMap);
- return key;
+ return topTreeNode;
}
+ /**
+ * Recursively builds tree nodes (where tree nodes are of type ClusterFlyweight).
+ * The <code>parent</code> object will be modified - it is the tree that is being built.
+ * The parent node reprents a single cluster node, where a cluster node is an aggregation
+ * of N identical resources that belong to the group (where "identical" means the same
+ * resource type and resource key).
+ *
+ * @param groupId identifies the group whose tree is being built
+ * @param parent the top "parent cluster node" of the tree - will get its children assigned to it via this method
+ * @param parentIds the resource IDs for all identical parent resources that make up the one "parent cluster node"
+ * @param data keyed on resource ID whose list is that of the resource's children. A few of these data
+ * won't necessarily be placed in the "parent" top node because these may not be part of the tree, but
+ * may be parents themselves of the top most resources (for example, if I have a group of JBossAS
+ * Server resources, some of these data will be the platform resources since they are parents to the
+ * JBossAS Server resources - those platforms will not be represented in the "parent" top tree node).
+ * Every parent resource, regardless of where they are in the cluster hierarchy, is represented by a key
+ * in this data map.
+ */
private void buildTree(int groupId, ClusterFlyweight parent, Set<Integer> parentIds,
Map<Integer, List<ClusterTreeQueryResults>> data) {
+ // this is the children cluster nodes for the parent cluster node we are building
+ // notice the key to this map is a ClusterKeyFlyweight, which is a resourceType/resourceKey tuple
+ Map<ClusterKeyFlyweight, ClusterFlyweight> children = new HashMap<ClusterKeyFlyweight, ClusterFlyweight>();
+
+ // has the same as children above except its values aren't child nodes, but just the child nodes' resource IDs
+ Map<ClusterKeyFlyweight, Set<Integer>> members = new HashMap<ClusterKeyFlyweight, Set<Integer>>();
+
+ // loop through each identical parent resource to aggregate their children into a single cluster node
for (Integer parentId : parentIds) {
- Map<ClusterKeyFlyweight, ClusterFlyweight> children = new HashMap<ClusterKeyFlyweight, ClusterFlyweight>();
- Map<ClusterKeyFlyweight, Set<Integer>> members = new HashMap<ClusterKeyFlyweight, Set<Integer>>();
-
- if (data.get(parentId) != null) {
- for (ClusterTreeQueryResults child : data.get(parentId)) {
- ClusterKeyFlyweight n = new ClusterKeyFlyweight(child.resourceTypeId, child.resourceKey);
- ClusterFlyweight flyweight = children.get(n);
- Set<Integer> memberList = members.get(n);
- if (flyweight == null) {
- flyweight = new ClusterFlyweight(n);
- children.put(n, flyweight);
+ List<ClusterTreeQueryResults> directChildren = data.get(parentId);
+ if (directChildren != null) {
+ for (ClusterTreeQueryResults child : directChildren) {
+ ClusterKeyFlyweight childNodeKey = new ClusterKeyFlyweight(child.resourceTypeId, child.resourceKey);
+ ClusterFlyweight childNode = children.get(childNodeKey);
+ Set<Integer> memberList;
+ if (childNode == null) {
+ childNode = new ClusterFlyweight(childNodeKey);
+ children.put(childNodeKey, childNode);
memberList = new HashSet<Integer>();
- members.put(n, memberList);
+ members.put(childNodeKey, memberList);
+ } else {
+ memberList = members.get(childNodeKey);
}
- flyweight.addResource(child.resourceName);
+ childNode.addResource(child.resourceName);
memberList.add(child.resourceId);
}
}
+ }
- parent.setChildren(new ArrayList<ClusterFlyweight>(children.values()));
+ // now that we have aggregated all the children for the individual yet identical parent resources, assign those
+ // aggregated child nodes to the parent cluster node
+ parent.setChildren(new ArrayList<ClusterFlyweight>(children.values()));
- for (ClusterFlyweight child : children.values()) {
- buildTree(groupId, child, members.get(child.getClusterKey()), data);
- }
+ for (ClusterFlyweight child : children.values()) {
+ buildTree(groupId, child, members.get(child.getClusterKey()), data);
}
+
+ return;
}
private class ClusterTreeQueryResults {
commit 54c25e10ff4fef6f957cb3a7308a6c1aa0f61b42
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 11:04:55 2011 -0500
bz 683108 - make sys config view more tolerant of configs not set but where we have defaults
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
index 6d8aaa2..15ca21f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
@@ -38,6 +38,7 @@ import org.rhq.core.domain.common.ServerDetails.Detail;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
import org.rhq.core.domain.configuration.definition.PropertyGroupDefinition;
import org.rhq.core.domain.configuration.definition.PropertySimpleType;
@@ -172,6 +173,7 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu
config.put(prop);
}
+ // build our config definition and populate our config editor
editor = new ConfigurationEditor(extendLocatorId("configEditor"), getSystemSettingsDefinition(config),
config);
editor.addPropertyValueChangeListener(SystemSettingsView.this);
@@ -518,8 +520,23 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu
ldapBindPW.setDefaultValue("");
def.put(ldapBindPW);
- return def;
+ //
+ // if the config is missing any properties for which we have defaults, set them to their defaults
+ //
+ Map<String, PropertyDefinition> allDefinitions = def.getPropertyDefinitions();
+ for (Map.Entry<String, PropertyDefinition> defEntry : allDefinitions.entrySet()) {
+ String propertyName = defEntry.getKey();
+ PropertyDefinition propertyDef = defEntry.getValue();
+ if (config.get(propertyName) == null) {
+ if (propertyDef instanceof PropertyDefinitionSimple
+ && ((PropertyDefinitionSimple) propertyDef).getDefaultValue() != null) {
+ config.put(new PropertySimple(propertyName, ((PropertyDefinitionSimple) propertyDef)
+ .getDefaultValue()));
+ }
+ }
+ }
+ return def;
}
private DynamicForm getServerDetails() {
commit d97666cc344acd35a757fe6dc6bd9aad90384afb
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 10:21:44 2011 -0500
encapulate the Object[] query results in a small inner pojo to make the code more understandable
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
index b81400d..dc857a6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java
@@ -184,20 +184,20 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
query.setParameter("groupId", groupId);
List<Object[]> rs = query.getResultList();
- Map<Integer, List<Object[]>> dataMap = new HashMap<Integer, List<Object[]>>();
+ Map<Integer, List<ClusterTreeQueryResults>> dataMap = new HashMap<Integer, List<ClusterTreeQueryResults>>();
Set<Integer> explicitResources = new HashSet<Integer>();
for (Object[] d : rs) {
-
- Integer parentId = (Integer) d[2];
- List<Object[]> childList = dataMap.get(parentId);
+ ClusterTreeQueryResults row = new ClusterTreeQueryResults(d);
+ Integer parentId = row.parentId;
+ List<ClusterTreeQueryResults> childList = dataMap.get(parentId);
if (childList == null) {
- childList = new ArrayList<Object[]>();
+ childList = new ArrayList<ClusterTreeQueryResults>();
dataMap.put(parentId, childList);
}
- childList.add(d);
- if ((Long) d[5] > 0) {
- explicitResources.add((Integer) d[0]);
+ childList.add(row);
+ if (row.isExplicitResource) {
+ explicitResources.add(row.resourceId);
}
}
@@ -209,7 +209,7 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
}
private void buildTree(int groupId, ClusterFlyweight parent, Set<Integer> parentIds,
- Map<Integer, List<Object[]>> data) {
+ Map<Integer, List<ClusterTreeQueryResults>> data) {
for (Integer parentId : parentIds) {
@@ -217,8 +217,8 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
Map<ClusterKeyFlyweight, Set<Integer>> members = new HashMap<ClusterKeyFlyweight, Set<Integer>>();
if (data.get(parentId) != null) {
- for (Object[] child : data.get(parentId)) {
- ClusterKeyFlyweight n = new ClusterKeyFlyweight((Integer) child[1], (String) child[3]);
+ for (ClusterTreeQueryResults child : data.get(parentId)) {
+ ClusterKeyFlyweight n = new ClusterKeyFlyweight(child.resourceTypeId, child.resourceKey);
ClusterFlyweight flyweight = children.get(n);
Set<Integer> memberList = members.get(n);
if (flyweight == null) {
@@ -227,8 +227,8 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
memberList = new HashSet<Integer>();
members.put(n, memberList);
}
- flyweight.addResource((String) child[4]);
- memberList.add((Integer) child[0]);
+ flyweight.addResource(child.resourceName);
+ memberList.add(child.resourceId);
}
}
@@ -240,6 +240,24 @@ public class ClusterManagerBean implements ClusterManagerLocal, ClusterManagerRe
}
}
+ private class ClusterTreeQueryResults {
+ Integer resourceId;
+ Integer resourceTypeId;
+ Integer parentId;
+ String resourceKey;
+ String resourceName;
+ boolean isExplicitResource;
+
+ private ClusterTreeQueryResults(Object[] queryResults) {
+ resourceId = (Integer) queryResults[0];
+ resourceTypeId = (Integer) queryResults[1];
+ parentId = (Integer) queryResults[2];
+ resourceKey = (String) queryResults[3];
+ resourceName = (String) queryResults[4];
+ isExplicitResource = ((Number) queryResults[5]).intValue() > 0;
+ }
+ }
+
private String getClusterKeyQuery(ClusterKey clusterKey) {
if (null == clusterKey)
return null;
commit ffde8a105327d7da42a2b785d2e206c1b6cc303c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Mar 8 10:10:03 2011 -0500
add a "refresh" button on the standalone window so its easier to quickly get the new data
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java
index 5024c59..7a36f1d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java
@@ -153,6 +153,14 @@ public class TestRemoteServiceStatisticsView extends Table {
}
});
+ addTableAction(extendLocatorId("refresh"), MSG.common_button_refresh(), new AbstractTableAction(
+ TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ refresh();
+ }
+ });
+
if (window != null) {
LinkedHashMap<String, Integer> timerValues = new LinkedHashMap<String, Integer>();
timerValues.put("Now", Integer.valueOf("-2"));
@@ -172,43 +180,35 @@ public class TestRemoteServiceStatisticsView extends Table {
}
});
- addTableAction(extendLocatorId("refreshTimer"), "Refresh", null, timerValues, new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
-
- Integer timeout = (Integer) actionValue;
-
- // if being asked to refresh now, just refresh but don't touch our schedules
- if (timeout == null || timeout.intValue() == -2) {
- refresh();
- return;
+ addTableAction(extendLocatorId("refreshTimer"), "Refresh Timer", null, timerValues,
+ new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+
+ Integer timeout = (Integer) actionValue;
+
+ // if being asked to refresh now, just refresh but don't touch our schedules
+ if (timeout == null || timeout.intValue() == -2) {
+ refresh();
+ return;
+ }
+
+ // cancel everything - will reinstate if user elected to do one of these
+ refreshTimer.cancel();
+ refreshOnPageChange = false;
+
+ if (timeout.intValue() == -1) {
+ setTableTitle(TABLE_TITLE);
+ } else if (timeout.intValue() == 0) {
+ refreshOnPageChange = true;
+ setTableTitle(TABLE_TITLE + " (refresh on page change)");
+ } else {
+ refreshTimer.scheduleRepeating(timeout.intValue() * 1000);
+ setTableTitle(TABLE_TITLE + " (refresh every " + timeout + "s)");
+ }
}
-
- // cancel everything - will reinstate if user elected to do one of these
- refreshTimer.cancel();
- refreshOnPageChange = false;
-
- if (timeout.intValue() == -1) {
- setTableTitle(TABLE_TITLE);
- } else if (timeout.intValue() == 0) {
- refreshOnPageChange = true;
- setTableTitle(TABLE_TITLE + " (refresh on page change)");
- } else {
- refreshTimer.scheduleRepeating(timeout.intValue() * 1000);
- setTableTitle(TABLE_TITLE + " (refresh every " + timeout + "s)");
- }
- }
- });
+ });
} else { // not in the standalone window
- addTableAction(extendLocatorId("refresh"), MSG.common_button_refresh(), new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- refresh();
- }
- });
-
addTableAction(extendLocatorId("showInWin"), "Show In Window", new AbstractTableAction(
TableActionEnablement.ALWAYS) {
@Override
13 years, 3 months
- 1
- 0
[rhq] 3 commits - modules/enterprise
by Simeon Pinder
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java | 177 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 340 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java | 179 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java | 211 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java | 56 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 27
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 102 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java | 198 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java | 398 +++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java | 419 +++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 426 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 47 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 36
20 files changed, 2393 insertions(+), 282 deletions(-)
New commits:
commit 60684c2c6bb89d80b584f56bc53a2d743122688f
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Mar 10 07:33:36 2011 -0500
i)shared portlet config cleanup
ii)GroupMetricsPortlet: incomplete as still has criteria issue.
iii)GroupAlert2 portlet in table format.
iv)share AbstractActivityView methods.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index 0cd64b2..e8dc553 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -404,4 +404,12 @@ public class ImageManager {
return "subsystems/event/Events" + icon + "_16.png";
}
+
+ public static String getMonitorIcon() {
+ return "subsystems/monitor/Monitor_16.png";
+ }
+
+ public static String getMonitorLargeIcon() {
+ return "subsystems/monitor/Monitor_24.png";
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
new file mode 100644
index 0000000..6ccd6af
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java
@@ -0,0 +1,177 @@
+package org.rhq.enterprise.gui.coregui.client.alert;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.rpc.RPCResponse;
+
+import org.rhq.core.domain.alert.Alert;
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.AlertCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.RecentAlertsPortlet;
+
+public class AlertPortletConfigurationDataSource extends AlertDataSource {
+ //configuration attributes
+ private Integer[] alertFilterResourceIds = {};
+ private DashboardPortlet portlet = null;
+ private Configuration configuration = null;
+ private Integer groupId = null;
+ private Integer[] resourceIds = null;
+ private String alertResourcesToUse;
+
+ public AlertPortletConfigurationDataSource() {
+ super();
+ }
+
+ public AlertPortletConfigurationDataSource(DashboardPortlet recentAlertsPortlet, Configuration configuration,
+ Integer groupId, Integer[] resourceIds) {
+ super();
+ this.portlet = recentAlertsPortlet;
+ this.configuration = configuration;
+ this.groupId = groupId;
+ this.resourceIds = resourceIds;
+ }
+
+ /** Override the executeFetch for AlertPortlet to allow specifying smaller than total
+ * result displays.
+ */
+ protected void executeFetch(final DSRequest request, final DSResponse response) {
+ final long start = System.currentTimeMillis();
+ AlertCriteria criteria = new AlertCriteria();
+ //initialize to only five for quick queries.
+ criteria.setPageControl(new PageControl(0, Integer
+ .valueOf(PortletConfigurationEditorComponent.Constant.RESULT_COUNT_DEFAULT)));
+ //retrieve previous settings from portlet config
+ if ((portlet != null) && (this.portlet instanceof DashboardPortlet)) {
+ Configuration portletConfig = configuration;
+ //filter priority
+ PropertySimple property = portletConfig.getSimple(Constant.ALERT_PRIORITY);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ String[] parsedValues = currentSetting.trim().split(",");
+ if (currentSetting.trim().isEmpty() || parsedValues.length == 3) {
+ //all alert priorities assumed
+ } else {
+ AlertPriority[] filterPriorities = new AlertPriority[parsedValues.length];
+ int indx = 0;
+ for (String priority : parsedValues) {
+ AlertPriority p = AlertPriority.valueOf(priority);
+ filterPriorities[indx++] = p;
+ }
+ criteria.addFilterPriorities(filterPriorities);
+ }
+ }
+ PageControl pc = new PageControl();
+ //result sort order
+ property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) {
+ criteria.addSortCtime(PageOrdering.DESC);
+ pc.setPrimarySortOrder(PageOrdering.DESC);
+ } else {
+ criteria.addSortCtime(PageOrdering.ASC);
+ pc.setPrimarySortOrder(PageOrdering.ASC);
+ }
+ }
+ //result timeframe if enabled
+ property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
+ if (Boolean.valueOf(property.getBooleanValue())) {//then proceed setting
+ property = portletConfig.getSimple(Constant.METRIC_RANGE);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ String[] range = currentSetting.split(",");
+ criteria.addFilterStartTime(Long.valueOf(range[0]));
+ criteria.addFilterEndTime(Long.valueOf(range[1]));
+ }
+ }
+
+ //result count
+ property = portletConfig.getSimple(Constant.RESULT_COUNT);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase("5")) {
+ PageControl pageControl = new PageControl(0, 5);
+ pc.setPageSize(5);
+ } else {
+ PageControl pageControl = new PageControl(0, Integer.valueOf(currentSetting));
+ pc.setPageSize(Integer.valueOf(currentSetting));
+ }
+ }
+ criteria.setPageControl(pc);
+ if (groupId != null) {
+ criteria.addFilterResourceGroupIds(groupId);
+ }
+ if ((resourceIds != null) && (resourceIds.length > 0)) {
+ criteria.addFilterResourceIds(resourceIds);
+ }
+ }
+ criteria.fetchAlertDefinition(true);
+ criteria.fetchRecoveryAlertDefinition(true);
+
+ getAlertService().findAlertsByCriteria(criteria, new AsyncCallback<PageList<Alert>>() {
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_alerts_loadFailed(), caught);
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(PageList<Alert> result) {
+ long fetchTime = System.currentTimeMillis() - start;
+ Log.info(result.size() + " alerts fetched in: " + fetchTime + "ms");
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.size());
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ public String getAlertResourcesToUse() {
+ return alertResourcesToUse;
+ }
+
+ public void setAlertResourcesToUse(String resourcesToUse) {
+ this.alertResourcesToUse = resourcesToUse;
+ }
+
+ public Integer[] getAlertFilterResourceIds() {
+ return alertFilterResourceIds;
+ }
+
+ public void setAlertFilterResourceId(Integer[] alertFilterResourceId) {
+ this.alertFilterResourceIds = alertFilterResourceId;
+ }
+
+ public Integer[] extractFilterResourceIds(DashboardPortlet storedPortlet, Integer[] filterResourceIds) {
+ PropertyList propertyList = storedPortlet.getConfiguration().getList(
+ RecentAlertsPortlet.ALERT_RANGE_RESOURCE_IDS);
+ if ((propertyList != null) && (propertyList.getList() != null) && (!propertyList.getList().isEmpty())
+ && (propertyList.getList().get(0) != null)) {
+ Property container = propertyList.getList().get(0);
+ if (container instanceof PropertyList) {
+ PropertyList anotherList = (PropertyList) container;
+ if (anotherList.getList() != null) {
+ filterResourceIds = new Integer[anotherList.getList().size()];
+ int index = 0;
+ for (Property p : anotherList.getList()) {
+ filterResourceIds[index++] = ((PropertySimple) p).getIntegerValue();
+ }
+ }
+ }
+ }
+ return filterResourceIds;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
index 260655f..f4e9a0e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
@@ -23,16 +23,16 @@ import java.util.List;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRangeEditor {
- public static final String PREF_METRIC_RANGE = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE;
- public static final String PREF_METRIC_RANGE_LASTN = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_LASTN;
- public static final String PREF_METRIC_RANGE_UNIT = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_UNIT;
- public static final String PREF_METRIC_RANGE_BEGIN_END_FLAG = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG;
- public static final String ALERT_METRIC_RANGE_ENABLE = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_ENABLE;
+ public static final String PREF_METRIC_RANGE = Constant.METRIC_RANGE;
+ public static final String PREF_METRIC_RANGE_LASTN = Constant.METRIC_RANGE_LASTN;
+ public static final String PREF_METRIC_RANGE_UNIT = Constant.METRIC_RANGE_UNIT;
+ public static final String PREF_METRIC_RANGE_BEGIN_END_FLAG = Constant.METRIC_RANGE_BEGIN_END_FLAG;
+ public static final String ALERT_METRIC_RANGE_ENABLE = Constant.METRIC_RANGE_ENABLE;
public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString();
public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(8);
@@ -156,7 +156,7 @@ public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRange
//disable text field view to prevent bad data entry. Use widget or dropdowns.
//TODO: spinder 3/9/11: this should be renabled to allow minute/second tuning here too, but need to handle validation.
advancedStartItem.setUseTextField(false);
- // advancedEndItem.setUseTextField(false);
+ advancedEndItem.setUseTextField(false);
advancedStartItem.setType("selection");
simpleLastValuesItem.setWidth(50);
simpleLastUnitsItem.setWidth(70);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
index 0d109ab..87193f4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
@@ -25,6 +25,8 @@ import java.util.List;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet2;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.queue.AutodiscoveryPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.FavoriteResourcesPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.GraphPortlet;
@@ -92,10 +94,14 @@ public class PortletFactory {
//defines mapping for Group Activity Dashboard
registeredGroupPortletFactoryMap = new HashMap<String, PortletViewFactory>();
registeredGroupPortletFactoryMap.put(GroupAlertsPortlet.KEY, GroupAlertsPortlet.Factory.INSTANCE);
+ registeredGroupPortletFactoryMap.put(GroupAlertsPortlet2.KEY, GroupAlertsPortlet2.Factory.INSTANCE);
+ // registeredGroupPortletFactoryMap.put(GroupMetricsPortlet.KEY, GroupMetricsPortlet.Factory.INSTANCE);
//register group portlet names
registeredGroupPortletNameMap = new HashMap<String, String>(registeredGroupPortletFactoryMap.size());
registeredGroupPortletNameMap.put(GroupAlertsPortlet.KEY, GroupAlertsPortlet.NAME);
+ registeredGroupPortletNameMap.put(GroupAlertsPortlet2.KEY, GroupAlertsPortlet2.NAME);
+ // registeredGroupPortletNameMap.put(GroupMetricsPortlet.KEY, GroupMetricsPortlet.NAME);
//############## Resource Activity Dashboard ############################################
//defines mapping for Group Activity Dashboard
@@ -108,6 +114,8 @@ public class PortletFactory {
//register portlet names
registeredPortletIconMap = new HashMap<String, String>(registeredPortletFactoryMap.size());
registeredPortletIconMap.put(GroupAlertsPortlet.KEY, ImageManager.getAlertLargeIcon());
+ registeredPortletIconMap.put(GroupAlertsPortlet2.KEY, ImageManager.getAlertLargeIcon());
+ registeredPortletIconMap.put(GroupMetricsPortlet.KEY, ImageManager.getMonitorLargeIcon());
}
public static Portlet buildPortlet(String locatorId, PortletWindow portletWindow, DashboardPortlet storedPortlet) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
new file mode 100644
index 0000000..e68b6cc
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
@@ -0,0 +1,198 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.dashboard.portlets;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.smartgwt.client.types.MultipleAppearance;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor;
+
+/** Shared portlet configuration component where initial configuration settings
+ * and widgets shared across portlet editors is defined.
+ *
+ * @author Simeon Pinder
+ */
+public class PortletConfigurationEditorComponent {
+
+ static Messages MSG = CoreGUI.getMessages();
+
+ public interface Constant {
+ String ALERT_PRIORITY = "ALERT_PRIORITY";
+ String METRIC_RANGE_ENABLE = "METRIC_RANGE_ENABLE";
+ String METRIC_RANGE_BEGIN_END_FLAG = "METRIC_RANGE_BEGIN_END_FLAG";
+ String METRIC_RANGE = "METRIC_RANGE";
+ String METRIC_RANGE_LASTN = "METRIC_RANGE_LASTN";
+ String METRIC_RANGE_LASTN_DEFAULT = String.valueOf(8);
+ String METRIC_RANGE_UNIT = "METRIC_RANGE_UNIT";
+ String RESULT_SEVERITY = "severities";
+ String RESULT_SORT_ORDER = "RESULT_SORT_ORDER";
+ String RESULT_SORT_PRIORITY = "sort.priority";
+ String RESULT_COUNT = "RESULT_COUNT";
+ String RESULT_COUNT_DEFAULT = "5";
+ String CUSTOM_REFRESH = "CUSTOM_REFRESH";
+ }
+
+ //configuration map initialization
+ public static Map<String, String> CONFIG_PROPERTY_INITIALIZATION = new HashMap<String, String>();
+ static {// Key, Default value
+ //alert priority, if empty initialize to "" i.e. all priorities
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_PRIORITY, "");
+ //result sort order, if empty initialize to "DESC"
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_SORT_ORDER, PageOrdering.DESC.name());
+ //result count, if empty initialize to 5
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT);
+ //whether to specify time range for alerts. Defaults to false
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.METRIC_RANGE_ENABLE, String.valueOf(false));
+ //whether Begin and End values set for time. Aka. Advanced/full range setting Defaults to false
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.METRIC_RANGE_BEGIN_END_FLAG, String.valueOf(false));
+ //whether in simple mode. Ex. 8 hrs. Defaults to 8
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.METRIC_RANGE_LASTN, Constant.METRIC_RANGE_LASTN_DEFAULT);
+ }
+
+ /* Single select combobox for number of items to display on the dashboard
+ *
+ * @return Populated selectItem instance.
+ */
+ public static SelectItem getResultCountEditor(Configuration portletConfig) {
+
+ final SelectItem maximumResultsComboBox = new SelectItem(Constant.RESULT_COUNT);
+ maximumResultsComboBox.setTitle("Results Count");
+ maximumResultsComboBox.setWrapTitle(false);
+ maximumResultsComboBox.setTooltip("<nobr><b> " + "Displays N results with alerts" + "</b></nobr>");
+ //spinder 9/3/10: the following is required workaround to disable editability of combobox.
+ maximumResultsComboBox.setType("selection");
+ //set width of dropdown display region
+ maximumResultsComboBox.setWidth(100);
+
+ //TODO: spinder 3/4/11 this is arbitrary. Get UXD input for better acceptable defaults
+ int[] selectionValues = { 5, 10, 30, 100 };
+
+ //define acceptable values for display amount
+ String[] displayValues = new String[selectionValues.length];
+ int i = 0;
+ for (int selection : selectionValues) {
+ displayValues[i++] = String.valueOf(selection);
+ }
+ maximumResultsComboBox.setValueMap(displayValues);
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.RESULT_COUNT).getStringValue();
+ if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT)) {
+ maximumResultsComboBox.setValue(Constant.RESULT_COUNT_DEFAULT);
+ } else {
+ maximumResultsComboBox.setValue(currentValue);
+ }
+ return maximumResultsComboBox;
+ }
+
+ /* Multiple select combobox for alert priorities to display on dashboard
+ *
+ * @return Populated selectItem instance.
+ */
+ public static SelectItem getAlertPriorityEditor(Configuration portletConfig) {
+ SelectItem priorityFilter = new SelectItem(Constant.RESULT_SEVERITY, MSG.view_alerts_table_filter_priority());
+ priorityFilter.setWrapTitle(false);
+ priorityFilter.setWidth(200);
+ priorityFilter.setMultiple(true);
+ priorityFilter.setMultipleAppearance(MultipleAppearance.PICKLIST);
+
+ LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3);
+ priorities.put(AlertPriority.HIGH.name(), MSG.common_alert_high());
+ priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
+ priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
+ LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3);
+ priorityIcons.put(AlertPriority.HIGH.name(), ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(), ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(), ImageManager.getAlertIcon(AlertPriority.LOW));
+ priorityFilter.setValueMap(priorities);
+ priorityFilter.setValueIcons(priorityIcons);
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.ALERT_PRIORITY).getStringValue();
+ if (currentValue.isEmpty() || currentValue.split(",").length == AlertPriority.values().length) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
+ } else {
+ //spinder:3/4/11 doing this nonsense due to some weird smartgwt issue with SelectItem in VLayout.
+ if (currentValue.equalsIgnoreCase("HIGH")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name());
+ } else if (currentValue.equalsIgnoreCase("HIGH,MEDIUM")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name());
+ } else if (currentValue.equalsIgnoreCase("HIGH,LOW")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.LOW.name());
+ } else if (currentValue.equalsIgnoreCase("MEDIUM")) {
+ priorityFilter.setValues(AlertPriority.MEDIUM.name());
+ } else if (currentValue.equalsIgnoreCase("MEDIUM,LOW")) {
+ priorityFilter.setValues(AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
+ } else {
+ priorityFilter.setValues(AlertPriority.LOW.name());
+ }
+ }
+ return priorityFilter;
+ }
+
+ /* Single select combobox for sort order of items to display on dashboard
+ *
+ * @return Populated selectItem instance.
+ */
+ public static SelectItem getResulSortOrderEditor(Configuration portletConfig) {
+ SelectItem sortPrioritySelection = new SelectItem(Constant.RESULT_SORT_PRIORITY, "Sort Order");
+ sortPrioritySelection.setWrapTitle(false);
+ sortPrioritySelection.setTooltip("Sets sort order for results.");
+ LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(2);
+ priorities.put(PageOrdering.ASC.name(), "Ascending");
+ priorities.put(PageOrdering.DESC.name(), "Descending");
+ LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(2);
+ priorityIcons.put(PageOrdering.ASC.name(), "ascending");
+ priorityIcons.put(PageOrdering.DESC.name(), "descending");
+
+ sortPrioritySelection.setValueMap(priorities);
+ sortPrioritySelection.setValueIcons(priorityIcons);
+ //TODO: spinder 3/4/11 not sure why this is necessary. [SKIN] not being interpreted.
+ String skinDir = "../org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images";
+ sortPrioritySelection.setImageURLPrefix(skinDir + "/actions/sort_");
+ sortPrioritySelection.setImageURLSuffix(".png");
+
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.RESULT_SORT_ORDER).getStringValue();
+ if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(PageOrdering.DESC.name())) {//default to descending order
+ sortPrioritySelection.setDefaultValue(PageOrdering.DESC.name());
+ } else {
+ sortPrioritySelection.setDefaultValue(PageOrdering.ASC.name());
+ }
+ return sortPrioritySelection;
+ }
+
+ /** Convenience method to construct CustomConfigMeasurementRangeEditor instances.
+ *
+ * @param portletConfig
+ * @return
+ */
+ public static CustomConfigMeasurementRangeEditor getMeasurementRangeEditor(Configuration portletConfig) {
+ return new CustomConfigMeasurementRangeEditor("alertTimeFrame", portletConfig);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
index 1d63f04..483d858 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
@@ -18,16 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.types.MultipleAppearance;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.form.DynamicForm;
@@ -51,14 +47,14 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeEvent;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeListener;
import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
@@ -77,51 +73,12 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*
* @author Simeon Pinder
*/
-public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet,
- PropertyValueChangeListener {
-
- public interface Constant {
- String ALERT_PRIORITY = "ALERT_PRIORITY";
- String ALERT_METRIC_RANGE_ENABLE = "ALERT_METRIC_RANGE_ENABLE";
- String ALERT_METRIC_RANGE_BEGIN_END_FLAG = "ALERT_METRIC_RANGE_BEGIN_END_FLAG";
- String ALERT_METRIC_RANGE = "ALERT_METRIC_RANGE";
- String ALERT_METRIC_RANGE_LASTN = "ALERT_METRIC_RANGE_LASTN";
- String ALERT_METRIC_RANGE_LASTN_DEFAULT = String.valueOf(8);
- String ALERT_METRIC_RANGE_UNIT = "ALERT_METRIC_RANGE_UNIT";
- String RESULT_SORT_ORDER = "RESULT_SORT_ORDER";
- String RESULT_COUNT = "RESULT_COUNT";
- String RESULT_COUNT_DEFAULT = "5";
- String CUSTOM_REFRESH = "CUSTOM_REFRESH";
- }
-
- //configuration map initialization
- private static Map<String, String> CONFIG_PROPERTY_INITIALIZATION = new HashMap<String, String>();
- static {// Key, Default value
- //alert priority, if empty initialize to "" i.e. all priorities
- CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_PRIORITY, "");
- //result sort order, if empty initialize to "DESC"
- CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_SORT_ORDER, PageOrdering.DESC.name());
- //result count, if empty initialize to 5
- CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT);
- //whether to specify time range for alerts. Defaults to false
- CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_METRIC_RANGE_ENABLE, String.valueOf(false));
- //whether Begin and End values set for time. Aka. Advanced/full range setting Defaults to false
- CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG, String.valueOf(false));
- //whether in simple mode. Ex. 8 hrs. Defaults to 8
- CONFIG_PROPERTY_INITIALIZATION
- .put(Constant.ALERT_METRIC_RANGE_LASTN, Constant.ALERT_METRIC_RANGE_LASTN_DEFAULT);
-
- }
-
+public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
private int groupId = -1;
protected LocatableCanvas recentAlertsContent = new LocatableCanvas(extendLocatorId("RecentAlerts"));
private static AlertGWTServiceAsync alertService = GWTServiceLookup.getAlertService();
private boolean currentlyLoading = false;
private Configuration portletConfig = null;
- private SelectItem alertPrioritySelector = null;
- private SelectItem resultSortSelector = null;
- private SelectItem resultCountSelector = null;
- private CustomConfigMeasurementRangeEditor measurementRangeEditor = null;
private DashboardPortlet storedPortlet;
public GroupAlertsPortlet(String locatorId) {
@@ -175,14 +132,12 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
- for (String key : CONFIG_PROPERTY_INITIALIZATION.keySet()) {
+ for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
if (portletConfig.getSimple(key) == null) {
- portletConfig.put(new PropertySimple(key, CONFIG_PROPERTY_INITIALIZATION.get(key)));
+ portletConfig.put(new PropertySimple(key,
+ PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.get(key)));
}
}
-
- //custom refresh
- //CUSTOM_REFRESH
}
public Canvas getHelpCanvas() {
@@ -236,9 +191,9 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
}
}
//result timeframe if enabled
- property = portletConfig.getSimple(Constant.ALERT_METRIC_RANGE_ENABLE);
+ property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
if (Boolean.valueOf(property.getBooleanValue())) {//then proceed setting
- property = portletConfig.getSimple(Constant.ALERT_METRIC_RANGE);
+ property = portletConfig.getSimple(Constant.METRIC_RANGE);
if (property != null) {
String currentSetting = property.getStringValue();
String[] range = currentSetting.split(",");
@@ -294,7 +249,7 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
} else {
LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentAlertsContent
// .extendLocatorId("None"), AbstractActivityView.RECENT_ALERTS_NONE);
- .extendLocatorId("None"), "No results using criteria specified.");
+ .extendLocatorId("None"), "No results found using criteria specified.");
column.addMember(row);
}
for (Canvas child : recentAlertsContent.getChildren()) {
@@ -327,20 +282,19 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
//add label about what configuration affects
//add alert priority selector
- alertPrioritySelector = getAlertPriorityEditor();
+ final SelectItem alertPrioritySelector = PortletConfigurationEditorComponent
+ .getAlertPriorityEditor(portletConfig);
//add sort priority selector
- resultSortSelector = getResulSortOrderEditor("sort.priority", "Sort Order", "Sets sort order for results.");
+ // final SelectItem resultSortSelector = PortletConfigurationEditorComponent
+ // .getResulSortOrderEditor(portletConfig);
//add result count selector
- //TODO: spinder 3/4/11 this is arbitrary. Get UXD input for better acceptable defaults
- int[] countSelections = { 5, 10, 30, 100 };
- resultCountSelector = getResultCountEditor(Constant.RESULT_COUNT, "Results Count",
- "Displays N results with alerts", countSelections);
-
+ final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig);
//add range selector
- measurementRangeEditor = new CustomConfigMeasurementRangeEditor(page.extendLocatorId("alertTimeFrame"),
- portletConfig);
-
- form.setItems(alertPrioritySelector, resultSortSelector, resultCountSelector);
+ final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent
+ .getMeasurementRangeEditor(portletConfig);
+ //TODO: spinder 3/10/11 renable sort selector once it's working in criteria
+ // form.setItems(alertPrioritySelector, resultSortSelector, resultCountSelector);
+ form.setItems(alertPrioritySelector, resultCountSelector);
//submit handler
customSettings.addSubmitValuesHandler(new SubmitValuesHandler() {
@@ -354,13 +308,13 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
} else {//some subset of available alertPriorities will be used
portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, selectedValue));
}
- //result sort order
- selectedValue = resultSortSelector.getValue().toString();
- if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
- portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
- } else {
- portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
- }
+ // //result sort order
+ // selectedValue = resultSortSelector.getValue().toString();
+ // if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
+ // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
+ // } else {
+ // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
+ // }
//result count
selectedValue = resultCountSelector.getValue().toString();
if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT))) {//then 5
@@ -374,20 +328,19 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
CheckboxItem itemC = (CheckboxItem) item;
selectedValue = String.valueOf(itemC.getValueAsBoolean());
if (!selectedValue.trim().isEmpty()) {//then call
- portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE_ENABLE, selectedValue));
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, selectedValue));
}
//alert time advanced time filter enabled.
selectedValue = String.valueOf(measurementRangeEditor.isAdvanced());
if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) {
- portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG, selectedValue));
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, selectedValue));
}
//alert time frame
List<Long> begEnd = measurementRangeEditor.getBeginEndTimes();
if (begEnd.get(0) != 0) {//advanced settings
- portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE, (begEnd.get(0) + "," + begEnd
- .get(1))));
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, (begEnd.get(0) + "," + begEnd.get(1))));
}
//persist
@@ -403,111 +356,6 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
return customSettings;
}
- /* single select combobox for number of items to display on the dashboard
- *
- * @param identifier Form identifier
- * @param selectionTitle Title to left of combobox
- * @param selectionHint Hint to display on mouseover
- * @param selectionValues Integer[] to show as drop down options.
- * @return Populated selectItem instance.
- */
- private SelectItem getResultCountEditor(String identifier, String selectionTitle, String selectionHint,
- int[] selectionValues) {
-
- final SelectItem maximumResultsComboBox = new SelectItem(identifier);
- maximumResultsComboBox.setTitle(selectionTitle);
- maximumResultsComboBox.setWrapTitle(false);
- maximumResultsComboBox.setTooltip("<nobr><b> " + selectionHint + "</b></nobr>");
- //spinder 9/3/10: the following is required workaround to disable editability of combobox.
- maximumResultsComboBox.setType("selection");
- //set width of dropdown display region
- maximumResultsComboBox.setWidth(100);
-
- //define acceptable values for display amount
- String[] displayValues = new String[selectionValues.length];
- int i = 0;
- for (int selection : selectionValues) {
- displayValues[i++] = String.valueOf(selection);
- }
- maximumResultsComboBox.setValueMap(displayValues);
- //reload current settings if they exist, otherwise enable all.
- String currentValue = portletConfig.getSimple(Constant.RESULT_COUNT).getStringValue();
- if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT)) {
- maximumResultsComboBox.setValue(Constant.RESULT_COUNT_DEFAULT);
- } else {
- maximumResultsComboBox.setValue(currentValue);
- }
- return maximumResultsComboBox;
- }
-
- private SelectItem getAlertPriorityEditor() {
- SelectItem priorityFilter = new SelectItem("severities", MSG.view_alerts_table_filter_priority());
- priorityFilter.setWrapTitle(false);
- priorityFilter.setWidth(200);
- priorityFilter.setMultiple(true);
- priorityFilter.setMultipleAppearance(MultipleAppearance.PICKLIST);
-
- LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3);
- priorities.put(AlertPriority.HIGH.name(), MSG.common_alert_high());
- priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
- priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
- LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3);
- priorityIcons.put(AlertPriority.HIGH.name(), ImageManager.getAlertIcon(AlertPriority.HIGH));
- priorityIcons.put(AlertPriority.MEDIUM.name(), ImageManager.getAlertIcon(AlertPriority.MEDIUM));
- priorityIcons.put(AlertPriority.LOW.name(), ImageManager.getAlertIcon(AlertPriority.LOW));
- priorityFilter.setValueMap(priorities);
- priorityFilter.setValueIcons(priorityIcons);
- //reload current settings if they exist, otherwise enable all.
- String currentValue = portletConfig.getSimple(Constant.ALERT_PRIORITY).getStringValue();
- if (currentValue.isEmpty() || currentValue.split(",").length == AlertPriority.values().length) {
- priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
- } else {
- //spinder:3/4/11 doing this nonsense due to some weird smartgwt issue with SelectItem in VLayout.
- if (currentValue.equalsIgnoreCase("HIGH")) {
- priorityFilter.setValues(AlertPriority.HIGH.name());
- } else if (currentValue.equalsIgnoreCase("HIGH,MEDIUM")) {
- priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name());
- } else if (currentValue.equalsIgnoreCase("HIGH,LOW")) {
- priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.LOW.name());
- } else if (currentValue.equalsIgnoreCase("MEDIUM")) {
- priorityFilter.setValues(AlertPriority.MEDIUM.name());
- } else if (currentValue.equalsIgnoreCase("MEDIUM,LOW")) {
- priorityFilter.setValues(AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
- } else {
- priorityFilter.setValues(AlertPriority.LOW.name());
- }
- }
- return priorityFilter;
- }
-
- private SelectItem getResulSortOrderEditor(String identifier, String selectionTitle, String selectionHint) {
- SelectItem sortPrioritySelection = new SelectItem(identifier, selectionTitle);
- sortPrioritySelection.setWrapTitle(false);
- sortPrioritySelection.setTooltip(selectionHint);
- LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(2);
- priorities.put(PageOrdering.ASC.name(), "Ascending");
- priorities.put(PageOrdering.DESC.name(), "Descending");
- LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(2);
- priorityIcons.put(PageOrdering.ASC.name(), "ascending");
- priorityIcons.put(PageOrdering.DESC.name(), "descending");
-
- sortPrioritySelection.setValueMap(priorities);
- sortPrioritySelection.setValueIcons(priorityIcons);
- //TODO: spinder 3/4/11 not sure why this is necessary. [SKIN] not being interpreted.
- String skinDir = "../org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images";
- sortPrioritySelection.setImageURLPrefix(skinDir + "/actions/sort_");
- sortPrioritySelection.setImageURLSuffix(".png");
-
- //reload current settings if they exist, otherwise enable all.
- String currentValue = portletConfig.getSimple(Constant.RESULT_SORT_ORDER).getStringValue();
- if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(PageOrdering.DESC.name())) {//default to descending order
- sortPrioritySelection.setDefaultValue(PageOrdering.DESC.name());
- } else {
- sortPrioritySelection.setDefaultValue(PageOrdering.ASC.name());
- }
- return sortPrioritySelection;
- }
-
@Override
public void startRefreshCycle() {
//current setting
@@ -547,10 +395,4 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
super.redraw();
loadData();
}
-
- @Override
- public void propertyValueChanged(PropertyValueChangeEvent event) {
- // TODO Auto-generated method stub
-
- }
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java
index 72631b6..ee8cdd0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java
@@ -18,8 +18,11 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+import java.util.HashMap;
+import java.util.List;
import java.util.Set;
+import com.google.gwt.user.client.History;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.Canvas;
@@ -29,18 +32,15 @@ import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.SpacerItem;
-import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
-import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.VLayout;
-import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.authz.Permission;
-import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.resource.ResourceType;
@@ -49,17 +49,18 @@ import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView;
-import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletDataSource;
+import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletConfigurationDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.PortletAlertSelector;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -69,39 +70,16 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSettingsPortlet, AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet
- public static final String KEY = "Group: Alerts2";
+ public static final String KEY = "GroupAlerts2";
// A default displayed, persisted name for the portlet
- public static final String NAME = MSG.view_portlet_defaultName_recentAlerts();
+ // public static final String NAME = MSG.view_portlet_defaultName_recentAlerts();
+ public static final String NAME = "Group: Alerts2";
- //widget keys also used in form population
- public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE = "alert-range-display-amount-value";
- public static final String ALERT_RANGE_PRIORITY_VALUE = "alert-range-priority-value";
- public static final String ALERT_RANGE_TIME_VALUE = "alert-range-time-value";
public static final String ALERT_RANGE_RESOURCES_VALUE = "alert-range-resource-value";
public static final String ALERT_RANGE_RESOURCE_IDS = "alert-range-resource-ids";
- //configuration default information
- private static final String defaultAlertCountValue = "5";
- private static final String PRIORITY_ALL = MSG.common_label_all();
- private static final String PRIORITY_HIGH = AlertPriority.HIGH.getDisplayName();
- private static final String PRIORITY_MEDIUM = AlertPriority.MEDIUM.getDisplayName();
- private static final String PRIORITY_LOW = AlertPriority.LOW.getDisplayName();
- private static final String defaultPriorityValue = PRIORITY_ALL;
- private static final String TIME_30_MINS = "30 " + MSG.common_label_minutes();
- private static final String TIME_HOUR = MSG.common_label_hour();
- private static final String TIME_12_HRS = "12 " + MSG.common_label_hours();
- private static final String TIME_DAY = MSG.common_label_day();
- private static final String TIME_WEEK = MSG.common_label_week();
- private static final String TIME_MONTH = MSG.common_label_month();
- private static final String defaultTimeValue = TIME_DAY;
public static final String RESOURCES_ALL = MSG.common_label_all_resources();
public static final String RESOURCES_SELECTED = MSG.common_label_selected_resources();
public static final String defaultResourceValue = RESOURCES_ALL;
- private static final String unlimited = MSG.common_label_unlimited();
- //alert resource labels
- public static final String ALERT_LABEL_SELECTED_RESOURCES = MSG.common_title_selected_resources();
- public static final String ALERT_LABEL_AVAILABLE_RESOURCES = MSG.common_title_available_resources();
- public static final String ALERT_LABEL_RESOURCE_INVENTORY = MSG.common_title_resource_inventory();
- public static final int ALERT_RESOURCE_SELECTION_WIDTH = 800;
public static final String ID = "id";
// set on initial configuration, the window for this portlet view.
@@ -110,17 +88,29 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
//shared private UI elements
private AlertResourceSelectorRegion resourceSelector;
- private AlertPortletDataSource dataSource;
+ private AlertPortletConfigurationDataSource dataSource;
//instance ui widgets
private Canvas containerCanvas;
private Timer refreshTimer;
+ private DashboardPortlet storedPortlet;
+ private Configuration portletConfig;
+ private int groupId;
+ private boolean portletConfigInitialized = false;
public GroupAlertsPortlet2(String locatorId) {
super(locatorId);
//override the shared datasource
- this.dataSource = new AlertPortletDataSource();
+ //figure out which page we're loading
+ String currentPage = History.getToken();
+ String[] elements = currentPage.split("/");
+ int currentGroupIdentifier = Integer.valueOf(elements[1]);
+ this.groupId = currentGroupIdentifier;
+
+ //initalize the datasource
+ this.dataSource = new AlertPortletConfigurationDataSource(storedPortlet, portletConfig, currentGroupIdentifier,
+ null);
setDataSource(this.dataSource);
setShowHeader(false);
@@ -131,8 +121,18 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
setOverflow(Overflow.VISIBLE);
}
- public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ private static HashMap<String, String> updatedMapping = new HashMap<String, String>();
+ static {
+ updatedMapping.putAll(PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION);
+ //Key, default
+ updatedMapping.put(ALERT_RANGE_RESOURCES_VALUE, RESOURCES_ALL);
+ updatedMapping.put(ALERT_RANGE_RESOURCE_IDS, RESOURCES_ALL);
+ }
+ /** Responsible for initialization and lazy configuration of the portlet values
+ */
+ public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ //populate portlet configuration details
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
@@ -140,56 +140,21 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
+ this.storedPortlet = storedPortlet;
+ portletConfig = storedPortlet.getConfiguration();
- //Operation range property - retrieve existing value
- PropertySimple property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE);
- if ((property != null) && (property.getStringValue() != null)) {
- //retrieve and translate to int
- String retrieved = property.getStringValue();
- int translatedAlertRangeSelection = translatedAlertRangeSelection(retrieved);
- getDataSource().setAlertRangeCompleted(translatedAlertRangeSelection);
- } else {//create setting
- storedPortlet.getConfiguration().put(
- new PropertySimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, defaultAlertCountValue));
- getDataSource().setAlertRangeCompleted(Integer.parseInt(defaultAlertCountValue));
- }
- //Operation priority property setting
- property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE);
- if ((property != null) && (property.getStringValue() != null)) {
- //retrieve and translate to int
- String retrieved = property.getStringValue();
- int translatedPriorityIndex = translatedPriorityToValidIndex(retrieved);
- getDataSource().setAlertPriorityIndex(translatedPriorityIndex);
- } else {//create setting
- storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_PRIORITY_VALUE, defaultPriorityValue));
- getDataSource().setAlertPriorityIndex(translatedPriorityToValidIndex(PRIORITY_ALL));
+ if (!portletConfigInitialized) {
+ this.dataSource = new AlertPortletConfigurationDataSource(storedPortlet, portletConfig, this.groupId, null);
+ setDataSource(this.dataSource);
+ portletConfigInitialized = true;
}
- //Range to time that alerts will be shown for
- property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE);
- if ((property != null) && (property.getStringValue() != null)) {
- //retrieve and translate to int
- String retrieved = property.getStringValue();
- long translatedRange = translateTimeToValidRange(retrieved);
- getDataSource().setAlertTimeRange(translatedRange);
- } else {//create setting
- storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_TIME_VALUE, defaultTimeValue));
- getDataSource().setAlertTimeRange(translateTimeToValidRange(defaultTimeValue));
- }
-
- //Range of resources to be included in the query
- property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
- if ((property != null) && (property.getStringValue() != null)) {
- //retrieve and translate to int
- String retrieved = property.getStringValue();
- if (retrieved.trim().equalsIgnoreCase(RESOURCES_SELECTED)) {
- getDataSource().setAlertResourcesToUse(RESOURCES_SELECTED);
- } else {
- getDataSource().setAlertResourcesToUse(RESOURCES_ALL);
+ //lazy init any elements not yet configured.
+ for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
+ if (portletConfig.getSimple(key) == null) {
+ portletConfig.put(new PropertySimple(key,
+ PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.get(key)));
}
- } else {//create setting
- storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_RESOURCES_VALUE, defaultResourceValue));
- getDataSource().setAlertResourcesToUse(RESOURCES_ALL);
}
//resource ids to be conditionally included in the query
@@ -213,347 +178,99 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
containerCanvas.addChild(new Canvas());
}
}
- }
-
- private int translatedAlertRangeSelection(String retrieved) {
- int translated = -1;
- if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
- if (retrieved.equalsIgnoreCase(unlimited)) {
- translated = -1;
- } else {
- translated = Integer.parseInt(retrieved);//default to all
- }
- } else {//default to defaultValue
- if (defaultAlertCountValue.equalsIgnoreCase(unlimited)) {
- translated = -1;
- } else {
- translated = Integer.parseInt(defaultAlertCountValue);
- }
- }
- return translated;
- }
-
- private int translatedPriorityToValidIndex(String retrieved) {
- int translatedPriority = 0;//default to all
- if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
- if (retrieved.equalsIgnoreCase(PRIORITY_HIGH)) {
- translatedPriority = 3;
- } else if (retrieved.equalsIgnoreCase(PRIORITY_MEDIUM)) {
- translatedPriority = 2;
- } else if (retrieved.equalsIgnoreCase(PRIORITY_LOW)) {
- translatedPriority = 1;
- } else {
- translatedPriority = 0;//default to all
- }
- }
- return translatedPriority;
- }
- /**Translates the UI selection options into time values for alert query.
- *
- * @param retrieved
- * @return long value mapping to string passed in.
- */
- private long translateTimeToValidRange(String retrieved) {
- long translated = 0;//default to ALL
- if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
- if (retrieved.equalsIgnoreCase(TIME_30_MINS)) {
- translated = MeasurementUtility.MINUTES * 30;
- } else if (retrieved.equalsIgnoreCase(TIME_HOUR)) {
- translated = MeasurementUtility.HOURS;
- } else if (retrieved.equalsIgnoreCase(TIME_12_HRS)) {
- translated = MeasurementUtility.HOURS * 12;
- } else if (retrieved.equalsIgnoreCase(TIME_DAY)) {
- translated = MeasurementUtility.DAYS;
- } else if (retrieved.equalsIgnoreCase(TIME_WEEK)) {
- translated = MeasurementUtility.WEEKS;
- } else if (retrieved.equalsIgnoreCase(TIME_MONTH)) {
- translated = MeasurementUtility.DAYS * 28;//replicated from old struts def.
- } else {
- translated = MeasurementUtility.DAYS;//default to day otherwise.
- }
- }
- return translated;
}
public Canvas getHelpCanvas() {
return new HTMLFlow(MSG.view_portlet_help_recentAlerts());
}
+ @Override
public DynamicForm getCustomSettingsForm() {
- //root dynamic form instance
- final LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("custom-settings"));
- form.setWidth(GroupAlertsPortlet2.ALERT_RESOURCE_SELECTION_WIDTH + 40);//largest widget display + 40 for buttons
- form.setHeight(400);
+ LocatableDynamicForm customSettings = new LocatableDynamicForm(extendLocatorId("customSettings"));
+ LocatableVLayout page = new LocatableVLayout(customSettings.extendLocatorId("page"));
+ //build editor form container
+ final LocatableDynamicForm form = new LocatableDynamicForm(page.extendLocatorId("alert-filter"));
form.setMargin(5);
- final DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
-
- //vertical container
- VLayout column = new VLayout();
-
- //label
- LocatableLabel alertRangeLabel = new LocatableLabel(extendLocatorId("DynamicForm_Label_Alert_Range"), "<b>"
- + MSG.common_title_alert_range() + "</b>");
-
- //horizontal layout
- LocatableHLayout row = new LocatableHLayout(extendLocatorId("alert-range-settings-row-1"));
- row.setMembersMargin(10);
-
- //-------------combobox for number of completed scheduled ops to display on the dashboard
- final SelectItem alertRangeLastComboBox = new SelectItem(ALERT_RANGE_DISPLAY_AMOUNT_VALUE);
- alertRangeLastComboBox.setTitle(MSG.view_measureRange_last());
- alertRangeLastComboBox.setType("selection");
- alertRangeLastComboBox.setWrapTitle(false);
- //define acceptable values for display amount
- String[] acceptableDisplayValues = { "5", "10", MSG.common_label_unlimited() };
- alertRangeLastComboBox.setValueMap(acceptableDisplayValues);
- //set width of dropdown display region
- alertRangeLastComboBox.setWidth(100);
- alertRangeLastComboBox.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- String selectedItem = "" + event.getValue();
- //stuff into the master form for retrieval
- form.setValue(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, selectedItem);
- }
- });
+ //add label about what configuration affects
- //default selected value to 'unlimited'(live lists) and check both combobox settings here.
- String selectedValue = defaultAlertCountValue;
- if (storedPortlet != null) {
- //if property exists retrieve it
- if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE) != null) {
- selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE)
- .getStringValue();
- } else {//insert default value
- storedPortlet.getConfiguration().put(
- new PropertySimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, defaultAlertCountValue));
- }
- }
- //prepopulate the combobox with the previously stored selection
- alertRangeLastComboBox.setDefaultValue(selectedValue);
-
- //-------------combobox for number of completed scheduled ops to display on the dashboard
- final SelectItem alertRangePriorityComboBox = new SelectItem(ALERT_RANGE_PRIORITY_VALUE);
- alertRangePriorityComboBox.setTitle("");
- alertRangePriorityComboBox.setHint("<nobr> <b> " + MSG.view_portlet_recentAlerts_config_priority_label()
- + "</b></nobr>");
- alertRangePriorityComboBox.setType("selection");
- //define acceptable values for display amount
- String[] acceptablePriorityDisplayValues = { PRIORITY_ALL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW };
- alertRangePriorityComboBox.setValueMap(acceptablePriorityDisplayValues);
- //set width of dropdown display region
- alertRangePriorityComboBox.setWidth(100);
- alertRangePriorityComboBox.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- String selectedItem = "" + event.getValue();
- //stuff into the master form for retrieval
- form.setValue(ALERT_RANGE_PRIORITY_VALUE, selectedItem);
- }
- });
+ //add alert priority selector
+ final SelectItem alertPrioritySelector = PortletConfigurationEditorComponent
+ .getAlertPriorityEditor(portletConfig);
+ //add sort priority selector
+ // final SelectItem resultSortSelector = PortletConfigurationEditorComponent
+ // .getResulSortOrderEditor(portletConfig);
+ //add result count selector
+ final SelectItem resultCountSelector = PortletConfigurationEditorComponent.getResultCountEditor(portletConfig);
- //default selected value to 'unlimited'(live lists) and check both combobox settings here.
- selectedValue = defaultPriorityValue;
- if (storedPortlet != null) {
- //if property exists retrieve it
- if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE) != null) {
- selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE).getStringValue();
- } else {//insert default value
- storedPortlet.getConfiguration().put(
- new PropertySimple(ALERT_RANGE_PRIORITY_VALUE, defaultPriorityValue));
- }
- }
- //prepopulate the combobox with the previously stored selection
- alertRangePriorityComboBox.setDefaultValue(selectedValue);
- row.addMember(alertRangeLabel);
- DynamicForm wrappedRange = new DynamicForm();
- wrappedRange.setFields(alertRangeLastComboBox);
- row.addMember(wrappedRange);
-
- DynamicForm wrappedPriority = new DynamicForm();
- wrappedPriority.setFields(alertRangePriorityComboBox);
- row.addMember(wrappedPriority);
-
- //horizontal layout
- LocatableHLayout row2 = new LocatableHLayout(extendLocatorId("alert-range-settings-row-2"));
-
- LocatableLabel alertRangeSpanLabel = new LocatableLabel(extendLocatorId("range-span-label"), "<b>"
- + MSG.view_portlet_recentAlerts_config_when() + "<b>");
- //------------- Build second combobox for timeframe for problem resources search.
- final SelectItem alertRangeTimeComboBox = new SelectItem(ALERT_RANGE_TIME_VALUE);
- alertRangeTimeComboBox.setTitle("");
- alertRangeTimeComboBox.setHint("");
- alertRangeTimeComboBox.setType("selection");
- String[] acceptableTimeDisplayValues = { TIME_30_MINS, TIME_HOUR, TIME_12_HRS, TIME_DAY, TIME_WEEK, TIME_MONTH };
- alertRangeTimeComboBox.setValueMap(acceptableTimeDisplayValues);
- alertRangeTimeComboBox.setWidth(100);
- alertRangeTimeComboBox.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- String selectedItem = "" + event.getValue();
- //stuff into the master form for retrieval
- form.setValue(ALERT_RANGE_TIME_VALUE, selectedItem);
- }
- });
+ //add range selector
+ final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent
+ .getMeasurementRangeEditor(portletConfig);
- //set to default
- selectedValue = defaultTimeValue;
- if (storedPortlet != null) {
- //if property exists retrieve it
- if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE) != null) {
- selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE).getStringValue();
- } else {//insert default value
- storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_TIME_VALUE, defaultTimeValue));
- }
- }
- //prepopulate the combobox with the previously stored selection
- alertRangeTimeComboBox.setDefaultValue(selectedValue);
- DynamicForm timeSelectionWrapper = new DynamicForm();
- timeSelectionWrapper.setFields(alertRangeTimeComboBox);
-
- // build resource selection drop down
- //------------- Build second combobox for timeframe for problem resources search.
- final SelectItem alertResourcesComboBox = new SelectItem(ALERT_RANGE_RESOURCES_VALUE);
- alertResourcesComboBox.setTitle(MSG.common_val_for());
- alertResourcesComboBox.setHint("");
- alertResourcesComboBox.setType("selection");
- String[] acceptableResourceDisplayValues = { RESOURCES_ALL, RESOURCES_SELECTED };
- alertResourcesComboBox.setValueMap(acceptableResourceDisplayValues);
- alertResourcesComboBox.setWidth(150);
- alertResourcesComboBox.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- String selectedItem = "" + event.getValue();
- //stuff into the master form for retrieval
- form.setValue(ALERT_RANGE_RESOURCES_VALUE, selectedItem);
- //empty out earlier canvas
- for (Canvas c : containerCanvas.getChildren()) {
- c.destroy();
+ form.setItems(alertPrioritySelector, resultCountSelector);
+
+ //submit handler
+ customSettings.addSubmitValuesHandler(new SubmitValuesHandler() {
+
+ @Override
+ public void onSubmitValues(SubmitValuesEvent event) {
+ //alert severity
+ String selectedValue = alertPrioritySelector.getValue().toString();
+ if ((selectedValue.trim().isEmpty()) || (selectedValue.split(",").length == 3)) {//then no alertPriority specified
+ portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, ""));
+ } else {//some subset of available alertPriorities will be used
+ portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, selectedValue));
}
- if (selectedItem.equals(RESOURCES_SELECTED)) {
- containerCanvas.addChild(resourceSelector.getCanvas());
+ // //result sort order
+ // selectedValue = resultSortSelector.getValue().toString();
+ // if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
+ // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
+ // } else {
+ // portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
+ // }
+ //result count
+ selectedValue = resultCountSelector.getValue().toString();
+ if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT))) {//then 5
+ portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT));
} else {
- containerCanvas.addChild(new Canvas());
+ portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, selectedValue));
}
- }
- });
- //set to default
- selectedValue = defaultResourceValue;
- if (storedPortlet != null) {
- //if property exists retrieve it
- if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE) != null) {
- selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE)
- .getStringValue();
- } else {//insert default value
- storedPortlet.getConfiguration().put(
- new PropertySimple(ALERT_RANGE_RESOURCES_VALUE, defaultResourceValue));
- }
- }
- //prepopulate the combobox with the previously stored selection
- alertResourcesComboBox.setDefaultValue(selectedValue);
- DynamicForm resourceSelectionWrapper = new DynamicForm();
- resourceSelectionWrapper.setFields(alertResourcesComboBox);
-
- alertRangeSpanLabel.setWrap(false);
- alertRangeSpanLabel.setWidth(150);
- row2.addMember(alertRangeSpanLabel);
- row2.addMember(timeSelectionWrapper);
- row2.addMember(resourceSelectionWrapper);
-
- //if portlet config setting exist, then retrieve
- Integer[] alertFilterResourceIds = null;
- alertFilterResourceIds = getDataSource().extractFilterResourceIds(storedPortlet, alertFilterResourceIds);
-
- LocatableHLayout resourceSelectionRegion = new LocatableHLayout(extendLocatorId("selection-canvas"));
- resourceSelector = new AlertResourceSelectorRegion(extendLocatorId("ResourcesWithAlerts"),
- alertFilterResourceIds);
- resourceSelectionRegion.setWidth100();
-
- if (alertFilterResourceIds != null) {
- getDataSource().setAlertFilterResourceId(alertFilterResourceIds);
- resourceSelector.setCurrentlyAssignedIds(alertFilterResourceIds);
- }
-
- //instantiate canvas area to display empty or rich resource selection based on dropdown selection
- containerCanvas = new Canvas();
- String previousAlertFilterChoice = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE)
- .getStringValue();
-
- //reload the ResourceSelectionRegion if user has chosen to focus on specific resources with alerts
- if (previousAlertFilterChoice.equals(RESOURCES_SELECTED)) {
- containerCanvas.addChild(resourceSelector.getCanvas());
- } else {// define empty canvas
- containerCanvas.addChild(new Canvas());
- }
-
- //add contain resource selection region.
- resourceSelectionRegion.addMember(containerCanvas);
+ //alert time range filter. Check for enabled and then persist property. Dealing with compound widget.
+ FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM);
+ CheckboxItem itemC = (CheckboxItem) item;
+ selectedValue = String.valueOf(itemC.getValueAsBoolean());
+ if (!selectedValue.trim().isEmpty()) {//then call
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, selectedValue));
+ }
- //finish construction of the layout
- column.addMember(row);
- column.addMember(row2);
- SpacerItem verticalSpace = new SpacerItem();
- verticalSpace.setHeight(20);
- DynamicForm spacerWrapper = new DynamicForm();
- spacerWrapper.setItems(verticalSpace);
- column.addMember(spacerWrapper);
- column.addMember(resourceSelectionRegion);
- form.addChild(column);
+ //alert time advanced time filter enabled.
+ selectedValue = String.valueOf(measurementRangeEditor.isAdvanced());
+ if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) {
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, selectedValue));
+ }
- //submit handler
- form.addSubmitValuesHandler(new SubmitValuesHandler() {
- @Override
- public void onSubmitValues(SubmitValuesEvent event) {
- //no need to insert validation here as user not allowed to enter values
- parseFormAndPopulateConfiguration(form, storedPortlet, ALERT_RANGE_DISPLAY_AMOUNT_VALUE,
- ALERT_RANGE_PRIORITY_VALUE, ALERT_RANGE_RESOURCES_VALUE, ALERT_RANGE_TIME_VALUE);
-
- //retrieve alert-resource-selection property
- PropertySimple prop = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
-
- //check to see if "Selected Resources" or "All Resources"
- if (prop != null && RESOURCES_SELECTED.equals(prop.getStringValue())) {
- //retrieve currentlyAssignedIds
- Integer[] valuesToPersist = resourceSelector.getListGridValues();
- resourceSelector.setCurrentlyAssignedIds(valuesToPersist);
-
- //build property list of ids to persist
- PropertyList list = new PropertyList(ALERT_RANGE_RESOURCE_IDS);
- for (int rid : resourceSelector.getCurrentlyAssignedIds()) {
- list.add(new PropertySimple(ALERT_RANGE_RESOURCE_IDS, rid));
- }
- storedPortlet.getConfiguration().put(new PropertyList(ALERT_RANGE_RESOURCE_IDS, list));
- getDataSource().setAlertFilterResourceId(resourceSelector.getCurrentlyAssignedIds());
+ //alert time frame
+ List<Long> begEnd = measurementRangeEditor.getBeginEndTimes();
+ if (begEnd.get(0) != 0) {//advanced settings
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, (begEnd.get(0) + "," + begEnd.get(1))));
}
+ //persist and reload portlet
+ storedPortlet.setConfiguration(portletConfig);
configure(portletWindow, storedPortlet);
-
- refresh();//reload form with new data selections
- markForRedraw();
+ refresh();
}
});
-
- return form;
- }
-
- /**Iterates over DynamicForm instance to check for properties passed in and if they have been set
- * to put that property into the DashboardPortlet configuration.
- *
- * @param form Dynamic form storing user selections
- * @param portlet Container for configuration changes
- * @param properties Variable list of keys used to verify or populate properties.
- */
- private void parseFormAndPopulateConfiguration(final DynamicForm form, DashboardPortlet storedPortlet,
- String... properties) {
- if ((form != null) && (storedPortlet != null)) {
- for (String property : properties) {
- if (form.getValue(property) != null) {//if new value supplied
- storedPortlet.getConfiguration().put(new PropertySimple(property, form.getValue(property)));
- }
- }
- }
+ form.markForRedraw();
+ page.addMember(measurementRangeEditor);
+ page.addMember(form);
+ customSettings.addChild(page);
+ return customSettings;
}
- public AlertPortletDataSource getDataSource() {
+ public AlertPortletConfigurationDataSource getDataSource() {
return dataSource;
}
@@ -592,7 +309,6 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
@Override
protected void onDestroy() {
if (refreshTimer != null) {
-
refreshTimer.cancel();
}
@@ -627,7 +343,6 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
@Override
protected void configureTable() {
- // TODO Auto-generated method stub
super.configureTable();
setListGridDoubleClickHandler(new DoubleClickHandler() {
@@ -644,9 +359,27 @@ public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSetti
});
}
+ @Override
+ protected void onInit() {
+ super.onInit();
+ getListGrid().setEmptyMessage("No results found using specified criteria.");
+ }
+
+ @Override
+ protected void refreshTableInfo() {
+ super.refreshTableInfo();
+ if (getTableInfo() != null) {
+ int count = getListGrid().getSelection().length;
+ getTableInfo().setContents(
+ // MSG.view_table_totalRows(String.valueOf(listGrid.getTotalRows()), String.valueOf(count)));
+ //Ex. Total Rows: {0} (selected: {1})
+ "Matching Rows: " + String.valueOf(getListGrid().getTotalRows()) + " (selected "
+ + String.valueOf(count) + ")");
+ }
+ }
}
-/** Bundles a ResourceSelector instance with labelling in Canvas for display.
+/** Bundles a ResourceSelector instance with labeling in Canvas for display.
* Also modifies the AssignedGrid to listen for AvailbleGrid completion and act accordingly.
*/
class AlertResourceSelectorRegion extends LocatableVLayout {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
new file mode 100644
index 0000000..e26f08c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -0,0 +1,426 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
+import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
+import com.smartgwt.client.widgets.form.fields.CanvasItem;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.LinkItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.ResourceGroupCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
+import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
+import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+/**This portlet allows the end user to customize the metric display
+ *
+ * @author Simeon Pinder
+ */
+public class GroupMetricsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet {
+
+ private int groupId = -1;
+ protected LocatableCanvas recentMeasurementsContent = new LocatableCanvas(extendLocatorId("RecentMetrics"));
+ private boolean currentlyLoading = false;
+ private Configuration portletConfig = null;
+ private DashboardPortlet storedPortlet;
+
+ public GroupMetricsPortlet(String locatorId) {
+ super(locatorId);
+ //figure out which page we're loading
+ String currentPage = History.getToken();
+ String[] elements = currentPage.split("/");
+ int currentGroupIdentifier = Integer.valueOf(elements[1]);
+ this.groupId = currentGroupIdentifier;
+ initializeUi();
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+ loadData();
+ }
+
+ /**Defines layout for the portlet page.
+ */
+ protected void initializeUi() {
+ setPadding(5);
+ setMembersMargin(5);
+ addMember(recentMeasurementsContent);
+ }
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "GroupMetrics";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = "Group: Metrics";
+ public static final String ID = "id";
+
+ // set on initial configuration, the window for this portlet view.
+ private PortletWindow portletWindow;
+ //instance ui widgets
+
+ private Timer refreshTimer;
+
+ /** Responsible for initialization and lazy configuration of the portlet values
+ */
+ public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ //populate portlet configuration details
+ if (null == this.portletWindow && null != portletWindow) {
+ this.portletWindow = portletWindow;
+ }
+
+ if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
+ return;
+ }
+ this.storedPortlet = storedPortlet;
+ portletConfig = storedPortlet.getConfiguration();
+
+ //lazy init any elements not yet configured.
+ for (String key : PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
+ if (portletConfig.getSimple(key) == null) {
+ portletConfig.put(new PropertySimple(key,
+ PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.get(key)));
+ }
+ }
+ }
+
+ public Canvas getHelpCanvas() {
+ //TODO: spinder change.
+ return new HTMLFlow(MSG.view_portlet_help_recentAlerts());
+ }
+
+ public static final class Factory implements PortletViewFactory {
+ public static PortletViewFactory INSTANCE = new Factory();
+
+ public final Portlet getInstance(String locatorId) {
+ return new GroupMetricsPortlet(locatorId);
+ }
+ }
+
+ protected void loadData() {
+ currentlyLoading = true;
+ getRecentMetrics();
+ }
+
+ @Override
+ public DynamicForm getCustomSettingsForm() {
+ LocatableDynamicForm customSettings = new LocatableDynamicForm(extendLocatorId("customSettings"));
+ LocatableVLayout page = new LocatableVLayout(customSettings.extendLocatorId("page"));
+ final CustomConfigMeasurementRangeEditor measurementRangeEditor = PortletConfigurationEditorComponent
+ .getMeasurementRangeEditor(portletConfig);
+
+ //submit handler
+ customSettings.addSubmitValuesHandler(new SubmitValuesHandler() {
+
+ @Override
+ public void onSubmitValues(SubmitValuesEvent event) {
+
+ //alert time range filter. Check for enabled and then persist property. Dealing with compound widget.
+ FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM);
+ CheckboxItem itemC = (CheckboxItem) item;
+ String selectedValue = String.valueOf(itemC.getValueAsBoolean());
+ if (!selectedValue.trim().isEmpty()) {//then call
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_ENABLE, selectedValue));
+ }
+
+ //alert time advanced time filter enabled.
+ selectedValue = String.valueOf(measurementRangeEditor.isAdvanced());
+ if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) {
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE_BEGIN_END_FLAG, selectedValue));
+ }
+
+ //alert time frame
+ List<Long> begEnd = measurementRangeEditor.getBeginEndTimes();
+ if (begEnd.get(0) != 0) {//advanced settings
+ portletConfig.put(new PropertySimple(Constant.METRIC_RANGE, (begEnd.get(0) + "," + begEnd.get(1))));
+ }
+
+ //persist
+ storedPortlet.setConfiguration(portletConfig);
+ configure(portletWindow, storedPortlet);
+ loadData();
+ }
+ });
+ page.addMember(measurementRangeEditor);
+ customSettings.addChild(page);
+ return customSettings;
+ }
+
+ /** Fetches recent metric information and updates the DynamicForm instance with i)sparkline information,
+ * ii) link to recent metric graph for more details and iii) last metric value formatted to show significant
+ * digits.
+ */
+ private void getRecentMetrics() {
+
+ //display container
+ final VLayout column = new VLayout();
+ column.setHeight(10);//pack
+ // final int groupId = this.groupComposite.getResourceGroup().getId();
+ final int groupId = this.groupId;
+ ResourceGroupCriteria criteria = new ResourceGroupCriteria();
+ criteria.addFilterIds(groupId);
+ criteria.fetchGroupDefinition(true);
+ criteria.fetchResourceType(true);
+ criteria.fetchExplicitResources(true);
+ GWTServiceLookup.getResourceGroupService().findResourceGroupCompositesByCriteria(criteria,
+ new AsyncCallback<PageList<ResourceGroupComposite>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.debug("Error retrieving resource group composite for group [" + groupId + "]:"
+ + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(PageList<ResourceGroupComposite> result) {
+ if (!result.isEmpty()) {
+ //retrieve all relevant measurement definition ids.
+ // Set<MeasurementDefinition> definitions = this.groupComposite.getResourceGroup().getResourceType()
+ ResourceGroupComposite composite = result.get(0);
+ ResourceGroup group = composite.getResourceGroup();
+ ResourceType type = group.getResourceType();
+ Set<MeasurementDefinition> defs = type.getMetricDefinitions();
+ // Log.debug("------------- Composite:" + composite);
+ // Log.debug("------------- Group:" + group);
+ // Log.debug("------------- Type:" + type);
+ // Log.debug("------------- Defs:" + defs);
+
+ Set<MeasurementDefinition> definitions = result.get(0).getResourceGroup().getResourceType()
+ .getMetricDefinitions();
+
+ //build id mapping for measurementDefinition instances Ex. Free Memory -> MeasurementDefinition[100071]
+ final HashMap<String, MeasurementDefinition> measurementDefMap = new HashMap<String, MeasurementDefinition>();
+ for (MeasurementDefinition definition : definitions) {
+ measurementDefMap.put(definition.getDisplayName(), definition);
+ }
+ //bundle definition ids for asynch call.
+ int[] definitionArrayIds = new int[definitions.size()];
+ final String[] displayOrder = new String[definitions.size()];
+ measurementDefMap.keySet().toArray(displayOrder);
+ //sort the charting data ex. Free Memory, Free Swap Space,..System Load
+ Arrays.sort(displayOrder);
+
+ //organize definitionArrayIds for ordered request on server.
+ int index = 0;
+ for (String definitionToDisplay : displayOrder) {
+ definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay).getId();
+ }
+
+ //make the asynchronous call for all the measurement data
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(groupId,
+ definitionArrayIds, System.currentTimeMillis() - (1000L * 60 * 60 * 8),
+ System.currentTimeMillis(), 60,
+ new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.debug("Error retrieving recent metrics charting data for group [" + groupId
+ + "]:" + caught.getMessage());
+ }
+
+ @Override
+ public void onSuccess(List<List<MeasurementDataNumericHighLowComposite>> results) {
+ if (!results.isEmpty()) {
+ boolean someChartedData = false;
+ //iterate over the retrieved charting data
+ for (int index = 0; index < displayOrder.length; index++) {
+ //retrieve the correct measurement definition
+ MeasurementDefinition md = measurementDefMap.get(displayOrder[index]);
+
+ //load the data results for the given metric definition
+ List<MeasurementDataNumericHighLowComposite> data = results.get(index);
+
+ //locate last and minimum values.
+ double lastValue = -1;
+ double minValue = Double.MAX_VALUE;//
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ if (d.getValue() < minValue) {
+ minValue = d.getValue();
+ }
+ lastValue = d.getValue();
+ }
+ }
+
+ //collapse the data into comma delimited list for consumption by third party javascript library(jquery.sparkline)
+ String commaDelimitedList = "";
+
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ commaDelimitedList += d.getValue() + ",";
+ }
+ }
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent.extendLocatorId(md.getName()));
+ row.setNumCols(3);
+ HTMLFlow graph = new HTMLFlow();
+ // String contents = "<span id='sparkline_" + index + "' class='dynamicsparkline' width='0'>"
+ // + commaDelimitedList + "</span>";
+ String contents = "<span id='sparkline_" + index
+ + "' class='dynamicsparkline' width='0' " + "values='"
+ + commaDelimitedList + "'>...</span>";
+ graph.setContents(contents);
+ graph.setContentsType(ContentsType.PAGE);
+ //diable scrollbars on span
+ graph.setScrollbarSize(0);
+
+ CanvasItem graphContainer = new CanvasItem();
+ graphContainer.setShowTitle(false);
+ graphContainer.setHeight(16);
+ graphContainer.setWidth(60);
+ graphContainer.setCanvas(graph);
+
+ //Link/title element
+ //TODO: spinder, change link whenever portal.war/graphing is removed.
+ String title = md.getDisplayName() + ":";
+ // String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricSingleResource&id="
+ // + resourceId + "&m=" + md.getId();
+ String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricMultiResource&groupId="
+ + groupId + "&m=" + md.getId();
+ LinkItem link = AbstractActivityView.newLinkItem(title, destination);
+
+ //Value
+ String convertedValue = lastValue + " " + md.getUnits();
+ convertedValue = AbstractActivityView.convertLastValueForDisplay(lastValue,
+ md);
+ StaticTextItem value = AbstractActivityView.newTextItem(convertedValue);
+
+ row.setItems(graphContainer, link, value);
+ //if graph content returned
+ if ((md.getName().trim().indexOf("Trait.") == -1) && (lastValue != -1)) {
+ column.addMember(row);
+ someChartedData = true;
+ }
+ }
+ if (!someChartedData) {// when there are results but no chartable entries.
+ LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(
+ recentMeasurementsContent.extendLocatorId("None"),
+ AbstractActivityView.RECENT_MEASUREMENTS_NONE);
+ column.addMember(row);
+ } else {
+ //insert see more link
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent
+ .extendLocatorId("RecentMeasurementsContentSeeMore"));
+ AbstractActivityView.addSeeMoreLink(row, ReportDecorator.GWT_GROUP_URL
+ + groupId + "/Monitoring/Graphs/", column);
+ }
+ //call out to 3rd party javascript lib
+ BrowserUtility.graphSparkLines();
+ } else {
+ LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(
+ recentMeasurementsContent.extendLocatorId("None"),
+ AbstractActivityView.RECENT_MEASUREMENTS_NONE);
+ column.addMember(row);
+ }
+ }
+ });
+ }
+
+ }
+ });
+
+ //cleanup
+ for (Canvas child : recentMeasurementsContent.getChildren()) {
+ child.destroy();
+ }
+ recentMeasurementsContent.addChild(column);
+ recentMeasurementsContent.markForRedraw();
+ }
+
+ @Override
+ public void startRefreshCycle() {
+ //current setting
+ final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval();
+
+ //cancel any existing timer
+ if (refreshTimer != null) {
+ refreshTimer.cancel();
+ }
+
+ if (refreshInterval >= MeasurementUtility.MINUTES) {
+
+ refreshTimer = new Timer() {
+ public void run() {
+ if (!currentlyLoading) {
+ loadData();
+ redraw();
+ }
+ }
+ };
+
+ refreshTimer.scheduleRepeating(refreshInterval);
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (refreshTimer != null) {
+
+ refreshTimer.cancel();
+ }
+ super.onDestroy();
+ }
+
+ @Override
+ public void redraw() {
+ super.redraw();
+ loadData();
+ }
+
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 6db94eb..b183bf5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -379,7 +379,8 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
* @param md MeasurementDefinition
* @return formatted String representation of the last value retrieved.
*/
- protected String convertLastValueForDisplay(double lastValue, MeasurementDefinition md) {
+ // protected String convertLastValueForDisplay(double lastValue, MeasurementDefinition md) {
+ public static String convertLastValueForDisplay(double lastValue, MeasurementDefinition md) {
String convertedValue = "";
String[] convertedValues = GwtMonitorUtils.formatSimpleMetrics(new double[] { lastValue }, md);
convertedValue = convertedValues[0];
commit 992f2357e314aed1198596a9c6ce870ab7e26669
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Mar 9 15:15:48 2011 -0500
abstractMeasurementRangeEditor and associated UI widget changes.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java
new file mode 100644
index 0000000..82be574
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java
@@ -0,0 +1,340 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components.measurement;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import com.smartgwt.client.widgets.form.fields.ButtonItem;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.DateTimeItem;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
+import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
+import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
+import com.smartgwt.client.widgets.grid.ListGrid;
+
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+
+/**
+ * @author Simeon Pinder
+ * @author Greg Hinkle
+ */
+public abstract class AbstractMeasurementRangeEditor extends LocatableDynamicForm implements TableWidget {
+
+ //keyed map of translated date units Ex. minutes,hours,days
+ private static LinkedHashMap<String, String> lastUnits;
+ //array of values available for displaying/selecting 'last N hours|minutes|days'.
+ private static String[] lastValues;
+
+ protected boolean advanced;
+ private ButtonItem advancedSimpleButton;
+ protected SelectItem simpleLastValuesItem;
+ protected SelectItem simpleLastUnitsItem;
+ protected DateTimeItem advancedStartItem;
+ protected DateTimeItem advancedEndItem;
+ private boolean displaySetButton = true;
+ private boolean displayEnableButton = false;
+ private boolean displayRangeItemGrouping = false;
+ protected CheckboxItem enableRangeItem;
+
+ private ButtonItem setButton;
+ public static String ENABLE_RANGE_ITEM = "ENABLE_RANGE_ITEM";
+ public static String ADVANCED_BUTTON_ITEM = "advanced";
+ public static String SIMPLE_VALUE_ITEM = "lastValues";
+ public static String SIMPLE_UNIT_ITEM = "lastUnits";
+ public static String ADVANCED_START_ITEM = "start";
+ public static String ADVANCED_END_ITEM = "end";
+ public static String SET_ITEM = "set";
+
+ static {
+ lastUnits = new LinkedHashMap<String, String>(3);
+ lastUnits.put(String.valueOf(MeasurementUtility.UNIT_MINUTES), MSG.common_label_minutes());
+ lastUnits.put(String.valueOf(MeasurementUtility.UNIT_HOURS), MSG.common_label_hours());
+ lastUnits.put(String.valueOf(MeasurementUtility.UNIT_DAYS), MSG.common_label_days());
+
+ lastValues = new String[] { "4", "8", "12", "24", "30", "36", "48", "60", "90", "120" };
+ }
+
+ public AbstractMeasurementRangeEditor(String locatorId) {
+ super(locatorId);
+ setNumCols(12);
+ setWrapItemTitles(false);
+ }
+
+ /**
+ * Returns the current range that is persisted. Note this may NOT be the begin and end times
+ * as shown in the UI if the user changed the values but did not hit the set button.
+ * @return begin/end epoch times in a list
+ */
+ public abstract List<Long> getBeginEndTimes();
+
+ public abstract MetricRangePreferences getMetricRangePreferences();
+
+ public abstract void setMetricRangeProperties(MetricRangePreferences prefs);
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+ if (isDisplayRangeItemGrouping()) {
+ setIsGroup(true);
+ setGroupTitle("Filter by: Time");
+ }
+ enableRangeItem = new CheckboxItem(ENABLE_RANGE_ITEM, "");
+ enableRangeItem.setStartRow(true);
+ enableRangeItem.setShowTitle(false);
+ enableRangeItem.setShowLabel(false);
+ enableRangeItem.addChangeHandler(new ChangeHandler() {
+ @Override
+ public void onChange(ChangeEvent event) {
+ boolean enableRange = Boolean.valueOf(event.getItem().getValue() + "");
+ enableMeasurementRange(enableRange);
+ }
+ });
+
+ //combobox of last items
+ simpleLastValuesItem = new SelectItem(SIMPLE_VALUE_ITEM, MSG.view_measureRange_last());
+ simpleLastValuesItem.setStartRow(false);
+ simpleLastValuesItem.setEndRow(false);
+ simpleLastValuesItem.setValueMap(lastValues);
+ simpleLastValuesItem.setWidth("*");
+ simpleLastValuesItem.setRedrawOnChange(true);
+
+ //combobox of units of time
+ simpleLastUnitsItem = new SelectItem(SIMPLE_UNIT_ITEM);
+ simpleLastUnitsItem.setStartRow(false);
+ simpleLastUnitsItem.setEndRow(false);
+ simpleLastUnitsItem.setValueMap(lastUnits);
+ simpleLastUnitsItem.setShowTitle(false);
+ simpleLastUnitsItem.setWidth("*");
+ simpleLastUnitsItem.setRedrawOnChange(true);
+
+ //time range start from
+ advancedStartItem = new DateTimeItem(ADVANCED_START_ITEM, MSG.view_measureRange_start());
+ advancedStartItem.setStartRow(false);
+ advancedStartItem.setEndRow(false);
+
+ //time range end
+ advancedEndItem = new DateTimeItem(ADVANCED_END_ITEM, MSG.common_title_end());
+ advancedEndItem.setStartRow(false);
+ advancedEndItem.setEndRow(false);
+
+ setButton = new ButtonItem(SET_ITEM, MSG.common_button_set());
+ setButton.setStartRow(false);
+ setButton.setEndRow(false);
+ setButton.setShowTitle(false);
+ setButton.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ MetricRangePreferences prefs = new MetricRangePreferences();
+ prefs.explicitBeginEnd = advanced;
+ if (advanced) {
+ prefs.begin = advancedStartItem.getValueAsDate().getTime();
+ prefs.end = advancedEndItem.getValueAsDate().getTime();
+ } else {
+ prefs.lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString());
+ prefs.unit = Integer.valueOf(simpleLastUnitsItem.getValueAsString());
+ }
+ setMetricRangeProperties(prefs);
+ }
+ });
+
+ advancedSimpleButton = new ButtonItem(ADVANCED_BUTTON_ITEM, MSG.common_button_advanced());
+ advancedSimpleButton.setStartRow(false);
+ advancedSimpleButton.setEndRow(false);
+ advancedSimpleButton.setShowTitle(false);
+ advancedSimpleButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ advanced = !advanced;
+ update();
+ }
+ });
+
+ MetricRangePreferences metricRangePrefs = getMetricRangePreferences();
+ if (metricRangePrefs != null) {
+ advanced = (metricRangePrefs.explicitBeginEnd);
+ }
+
+ if (displaySetButton) {
+ setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, setButton,
+ advancedSimpleButton);
+ } else {//not displaying Set button
+ if (displayEnableButton) {
+ setItems(enableRangeItem, simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem,
+ advancedEndItem, advancedSimpleButton);
+ setNumCols(9);//extend to encompass expanded
+ } else {
+ setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem,
+ advancedSimpleButton);
+ }
+ }
+ update();
+ }
+
+ private void assignDefaultsToAdvancedItems() {
+ advancedStartItem.setValue(new Date(System.currentTimeMillis() - (1000L * 60 * 60 * 8)));
+ advancedEndItem.setValue(new Date());
+ }
+
+ private void assignDefaultsToSimpleItems() {
+ simpleLastValuesItem.setValue("8");
+ simpleLastUnitsItem.setValue(String.valueOf(MeasurementUtility.UNIT_HOURS));
+ }
+
+ protected void enableMeasurementRange(boolean enableRange) {
+ if (enableRange) {
+ simpleLastValuesItem.disable();
+ simpleLastUnitsItem.disable();
+ advancedStartItem.disable();
+ advancedEndItem.disable();
+ advancedSimpleButton.disable();
+ } else {
+ simpleLastValuesItem.enable();
+ simpleLastUnitsItem.enable();
+ advancedStartItem.enable();
+ advancedEndItem.enable();
+ advancedSimpleButton.enable();
+ }
+ }
+
+ private void update() {
+ if (advanced) {
+ advancedSimpleButton.setTitle(MSG.view_measureRange_simple());
+ showItem("start");
+ showItem("end");
+ hideItem("lastValues");
+ hideItem("lastUnits");
+ } else {
+ advancedSimpleButton.setTitle(MSG.common_button_advanced());
+ hideItem("start");
+ hideItem("end");
+ showItem("lastValues");
+ showItem("lastUnits");
+ }
+
+ // populate the fields - first with defaults in case we have no prefs, then with the appropriate prefs
+ assignDefaultsToSimpleItems();
+ assignDefaultsToAdvancedItems();
+
+ try {
+ MetricRangePreferences metricRangePrefs = getMetricRangePreferences();
+ if (metricRangePrefs.explicitBeginEnd) {
+ if (metricRangePrefs.begin != null && metricRangePrefs.end != null) {
+ advancedStartItem.setValue(new Date(metricRangePrefs.begin.longValue()));
+ advancedEndItem.setValue(new Date(metricRangePrefs.end.longValue()));
+ }
+ } else {
+ if (lastUnits.containsKey(String.valueOf(metricRangePrefs.unit))) {
+ simpleLastUnitsItem.setValue(String.valueOf(metricRangePrefs.unit));
+ }
+ if (Arrays.asList(lastValues).contains(String.valueOf(metricRangePrefs.lastN))) {
+ simpleLastValuesItem.setValue(String.valueOf(metricRangePrefs.lastN));
+ }
+ }
+ } catch (Exception e) {
+ // in case any odd errors occur (like bad format of preference strings), just fill in some defaults
+ CoreGUI.getMessageCenter().notify(
+ new Message("Failed to get range user preferences, using defaults", e, Severity.Warning));
+ assignDefaultsToSimpleItems();
+ assignDefaultsToAdvancedItems();
+ }
+
+ markForRedraw();
+ }
+
+ @Override
+ public void refresh(ListGrid listGrid) {
+ update();
+ }
+
+ public static class MetricRangePreferences {
+ // if readOnly is true, then the beginning and ending range dates are specified with explicit dates
+ // if readOnly is false, then the time is relative to NOW and is specified as <lastN> units of <unit> time
+ public boolean explicitBeginEnd;
+
+ // simple, when readOnly is false
+ public int lastN;
+ public int unit; // see MeasurementUtility.UNIT_xxx
+
+ // advanced, when readOnly is true
+ public Long begin;
+ public Long end;
+
+ /**
+ * Returns a two element <code>List</code> of <code>Long</code> objects representing the begin and end times (in
+ * milliseconds since the epoch) of the time frame.
+ **/
+ public ArrayList<Long> getBeginEndTimes() {
+ if (explicitBeginEnd) {
+ ArrayList<Long> times = new ArrayList<Long>(2);
+ times.add(begin);
+ times.add(end);
+ return times;
+ } else {
+ return MeasurementUtility.calculateTimeFrame(lastN, unit);
+ }
+ }
+
+ public String toString() {
+ return (explicitBeginEnd) ? "[begin=" + begin + end + ",end=" + end + "]" : "[lastN=" + lastN + ",unit="
+ + unit + "]";
+ }
+ }
+
+ public boolean isDisplaySetButton() {
+ return displaySetButton;
+ }
+
+ public void setDisplaySetButton(boolean displaySetButton) {
+ this.displaySetButton = displaySetButton;
+ }
+
+ public boolean isDisplayEnableButton() {
+ return displayEnableButton;
+ }
+
+ public void setDisplayEnableButton(boolean displayEnableButton) {
+ this.displayEnableButton = displayEnableButton;
+ }
+
+ public boolean isAdvanced() {
+ return advanced;
+ }
+
+ public void setAdvanced(boolean advanced) {
+ this.advanced = advanced;
+ }
+
+ public boolean isDisplayRangeItemGrouping() {
+ return displayRangeItemGrouping;
+ }
+
+ public void setDisplayRangeItemGrouping(boolean displayRangeItemGrouping) {
+ this.displayRangeItemGrouping = displayRangeItemGrouping;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
new file mode 100644
index 0000000..260655f
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
@@ -0,0 +1,179 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components.measurement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
+
+public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRangeEditor {
+
+ public static final String PREF_METRIC_RANGE = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE;
+ public static final String PREF_METRIC_RANGE_LASTN = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_LASTN;
+ public static final String PREF_METRIC_RANGE_UNIT = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_UNIT;
+ public static final String PREF_METRIC_RANGE_BEGIN_END_FLAG = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG;
+ public static final String ALERT_METRIC_RANGE_ENABLE = GroupAlertsPortlet.Constant.ALERT_METRIC_RANGE_ENABLE;
+
+ public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString();
+ public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(8);
+ public static final Integer DEFAULT_VALUE_RANGE_UNIT = Integer.valueOf(3);
+
+ private ConfigurationMeasurementPreferences measurementPrefs;
+
+ public CustomConfigMeasurementRangeEditor(String locatorId, Configuration config) {
+ super(locatorId);
+ measurementPrefs = new ConfigurationMeasurementPreferences(config);
+ setDisplaySetButton(false);
+ setDisplayEnableButton(true);
+ setDisplayRangeItemGrouping(true);
+ setWidth(650);
+ }
+
+ @Override
+ public List<Long> getBeginEndTimes() {
+ List<Long> beginEndTimes = new ArrayList<Long>();
+ if (advanced) {
+ beginEndTimes.add(advancedStartItem.getValueAsDate().getTime());
+ beginEndTimes.add(advancedEndItem.getValueAsDate().getTime());
+ return beginEndTimes;
+ } else {
+ int lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString());
+ String unit = simpleLastUnitsItem.getValueAsString();
+ return MeasurementUtility.calculateTimeFrame(lastN, Integer.valueOf(unit));
+ }
+ }
+
+ @Override
+ public MetricRangePreferences getMetricRangePreferences() {
+ return measurementPrefs.getMetricRangePreferences();
+ }
+
+ @Override
+ public void setMetricRangeProperties(MetricRangePreferences prefs) {
+ measurementPrefs.setMetricRangePreferences(prefs);
+ }
+
+ public String getSimpleProperty(String propertyKey) {
+ String propertyValue = "";
+ if ((propertyKey != null) && (propertyKey.trim().length() > 0)) {
+ if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) {
+ PropertySimple property = measurementPrefs.configuration.getSimple(propertyKey);
+ if (property != null) {
+ propertyValue = property.getStringValue();
+ }
+ }
+ }
+ return propertyValue;
+ }
+
+ public void setSimpleProperty(String propertyKey, String value) {
+ if ((propertyKey != null) && (propertyKey.trim().length() > 0) && (value != null) && (!value.trim().isEmpty())) {
+ if ((measurementPrefs != null) && (measurementPrefs.configuration != null)) {
+ measurementPrefs.configuration.put(new PropertySimple(propertyKey, value));
+ }
+ }
+ }
+
+ class ConfigurationMeasurementPreferences {
+
+ private MetricRangePreferences metricRangePreferences;
+ private Configuration configuration;
+
+ public ConfigurationMeasurementPreferences(Configuration config) {
+ if (metricRangePreferences == null) {
+ metricRangePreferences = new MetricRangePreferences();
+ }
+ // //parse config and lazily init timing elements
+ metricRangePreferences.explicitBeginEnd = Boolean.valueOf(
+ config.getSimple(PREF_METRIC_RANGE_BEGIN_END_FLAG).getStringValue()).booleanValue();
+ //check to display advanced settings widget components
+ if (metricRangePreferences.explicitBeginEnd == false) {
+ metricRangePreferences.lastN = config.getSimple(PREF_METRIC_RANGE_LASTN).getIntegerValue();
+ List<Long> range = MeasurementUtility.calculateTimeFrame(metricRangePreferences.lastN,
+ metricRangePreferences.unit);
+ metricRangePreferences.begin = range.get(0);
+ metricRangePreferences.end = range.get(1);
+ } else {//in advanced view
+ try {
+ String rangeString = config.getSimpleValue(PREF_METRIC_RANGE, "");
+ if (rangeString != null && rangeString.trim().length() > 0) {
+ if (rangeString.contains(",")) { // legacy support: old prefs used to use commas
+ rangeString = rangeString.replace(",", "|");
+ //userPrefs.setPreference(PREF_METRIC_RANGE, rangeString); // TODO set only if we don't support JSF anymore
+ }
+ String[] beginEnd = rangeString.split("\\|");
+ metricRangePreferences.begin = Long.parseLong(beginEnd[0]);
+ metricRangePreferences.end = Long.parseLong(beginEnd[1]);
+ }
+ } catch (IllegalArgumentException iae) {
+ // that's OK, range will remain null and we might use the lastN / unit
+ List<Long> range = MeasurementUtility.calculateTimeFrame(DEFAULT_VALUE_RANGE_LASTN,
+ DEFAULT_VALUE_RANGE_UNIT);
+ metricRangePreferences.begin = range.get(0);
+ metricRangePreferences.end = range.get(1);
+ }
+ }
+ // update configuration
+ this.configuration = config;
+ }
+
+ public void setMetricRangePreferences(MetricRangePreferences metricRangePreferences) {
+ this.metricRangePreferences = metricRangePreferences;
+ }
+
+ public MetricRangePreferences getMetricRangePreferences() {
+ return metricRangePreferences;
+ }
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+ //turn on date entry validation
+ enableRangeItem.setWidth(30);
+ // advancedStartItem.setEnforceDate(true);
+ // advancedEndItem.setEnforceDate(true);
+ //disable text field view to prevent bad data entry. Use widget or dropdowns.
+ //TODO: spinder 3/9/11: this should be renabled to allow minute/second tuning here too, but need to handle validation.
+ advancedStartItem.setUseTextField(false);
+ // advancedEndItem.setUseTextField(false);
+ advancedStartItem.setType("selection");
+ simpleLastValuesItem.setWidth(50);
+ simpleLastUnitsItem.setWidth(70);
+
+ //set fields to previously populated values
+ PropertySimple cp = measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE);
+ if (Boolean.valueOf(measurementPrefs.configuration.getSimple(ALERT_METRIC_RANGE_ENABLE).getStringValue())) {
+ enableRangeItem.setValue(true);
+ enableMeasurementRange(false);
+ } else {
+ enableRangeItem.setValue(false);
+ enableMeasurementRange(true);
+ }
+ //AlertMetric rangeValues
+ cp = measurementPrefs.configuration.getSimple(PREF_METRIC_RANGE);
+ if ((cp != null) && (!cp.getStringValue().trim().isEmpty())) {
+ String metricRange = cp.getStringValue();
+ }
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java
deleted file mode 100644
index a0a5e9f..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.components.measurement;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import com.smartgwt.client.widgets.form.fields.ButtonItem;
-import com.smartgwt.client.widgets.form.fields.DateTimeItem;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
-import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
-import com.smartgwt.client.widgets.grid.ListGrid;
-
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget;
-import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences;
-import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences.MetricRangePreferences;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-
-/**
- * @author Greg Hinkle
- */
-public class MeasurementRangeEditor extends LocatableDynamicForm implements TableWidget {
-
- private static LinkedHashMap<String, String> lastUnits;
- private static String[] lastValues;
-
- private MeasurementUserPreferences measurementUserPrefs;
-
- private boolean advanced;
- private ButtonItem advancedSimpleButton;
- private SelectItem simpleLastValuesItem;
- private SelectItem simpleLastUnitsItem;
- private DateTimeItem advancedStartItem;
- private DateTimeItem advancedEndItem;
- private ButtonItem setButton;
-
- static {
- lastUnits = new LinkedHashMap<String, String>(3);
- lastUnits.put(String.valueOf(MeasurementUtility.UNIT_MINUTES), MSG.common_label_minutes());
- lastUnits.put(String.valueOf(MeasurementUtility.UNIT_HOURS), MSG.common_label_hours());
- lastUnits.put(String.valueOf(MeasurementUtility.UNIT_DAYS), MSG.common_label_days());
-
- lastValues = new String[] { "4", "8", "12", "24", "30", "36", "48", "60", "90", "120" };
- }
-
- public MeasurementRangeEditor(String locatorId) {
- super(locatorId);
- setNumCols(12);
- setWrapItemTitles(false);
-
- measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences());
- }
-
- /**
- * Returns the current range that is persisted. Note this may NOT be the begin and end times
- * as shown in the UI if the user changed the values but did not hit the set button.
- * @return begin/end epoch times in a list
- */
- public List<Long> getBeginEndTimes() {
- return measurementUserPrefs.getMetricRangePreferences().getBeginEndTimes();
- }
-
- @Override
- protected void onInit() {
- super.onInit();
-
- simpleLastValuesItem = new SelectItem("lastValues", MSG.view_measureRange_last());
- simpleLastValuesItem.setStartRow(false);
- simpleLastValuesItem.setEndRow(false);
- simpleLastValuesItem.setValueMap(lastValues);
- simpleLastValuesItem.setWidth("*");
- simpleLastValuesItem.setRedrawOnChange(true);
-
- simpleLastUnitsItem = new SelectItem("lastUnits");
- simpleLastUnitsItem.setStartRow(false);
- simpleLastUnitsItem.setEndRow(false);
- simpleLastUnitsItem.setValueMap(lastUnits);
- simpleLastUnitsItem.setShowTitle(false);
- simpleLastUnitsItem.setWidth("*");
- simpleLastUnitsItem.setRedrawOnChange(true);
-
- advancedStartItem = new DateTimeItem("start", MSG.view_measureRange_start());
- advancedStartItem.setStartRow(false);
- advancedStartItem.setEndRow(false);
-
- advancedEndItem = new DateTimeItem("end", MSG.common_title_end());
- advancedEndItem.setStartRow(false);
- advancedEndItem.setEndRow(false);
-
- setButton = new ButtonItem("set", MSG.common_button_set());
- setButton.setStartRow(false);
- setButton.setEndRow(false);
- setButton.setShowTitle(false);
- setButton.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- MetricRangePreferences prefs = new MetricRangePreferences();
- prefs.explicitBeginEnd = advanced;
- if (advanced) {
- prefs.begin = advancedStartItem.getValueAsDate().getTime();
- prefs.end = advancedEndItem.getValueAsDate().getTime();
- } else {
- prefs.lastN = Integer.valueOf(simpleLastValuesItem.getValueAsString());
- prefs.unit = Integer.valueOf(simpleLastUnitsItem.getValueAsString());
- }
- measurementUserPrefs.setMetricRangePreferences(prefs);
- }
- });
-
- advancedSimpleButton = new ButtonItem("advanced", MSG.common_button_advanced());
- advancedSimpleButton.setStartRow(false);
- advancedSimpleButton.setEndRow(false);
- advancedSimpleButton.setShowTitle(false);
- advancedSimpleButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
- advanced = !advanced;
- update();
- }
- });
-
- MetricRangePreferences metricRangePrefs = measurementUserPrefs.getMetricRangePreferences();
- advanced = (metricRangePrefs.explicitBeginEnd);
-
- setItems(simpleLastValuesItem, simpleLastUnitsItem, advancedStartItem, advancedEndItem, setButton,
- advancedSimpleButton);
- }
-
- private void assignDefaultsToAdvancedItems() {
- advancedStartItem.setValue(new Date(System.currentTimeMillis() - (1000L * 60 * 60 * 8)));
- advancedEndItem.setValue(new Date());
- }
-
- private void assignDefaultsToSimpleItems() {
- simpleLastValuesItem.setValue("8");
- simpleLastUnitsItem.setValue(String.valueOf(MeasurementUtility.UNIT_HOURS));
- }
-
- private void update() {
- if (advanced) {
- advancedSimpleButton.setTitle(MSG.view_measureRange_simple());
- showItem("start");
- showItem("end");
- hideItem("lastValues");
- hideItem("lastUnits");
- } else {
- advancedSimpleButton.setTitle(MSG.common_button_advanced());
- hideItem("start");
- hideItem("end");
- showItem("lastValues");
- showItem("lastUnits");
- }
-
- // populate the fields - first with defaults in case we have no prefs, then with the appropriate prefs
- assignDefaultsToSimpleItems();
- assignDefaultsToAdvancedItems();
-
- try {
- MetricRangePreferences metricRangePrefs = measurementUserPrefs.getMetricRangePreferences();
- if (metricRangePrefs.explicitBeginEnd) {
- if (metricRangePrefs.begin != null && metricRangePrefs.end != null) {
- advancedStartItem.setValue(new Date(metricRangePrefs.begin.longValue()));
- advancedEndItem.setValue(new Date(metricRangePrefs.end.longValue()));
- }
- } else {
- if (lastUnits.containsKey(String.valueOf(metricRangePrefs.unit))) {
- simpleLastUnitsItem.setValue(String.valueOf(metricRangePrefs.unit));
- }
- if (Arrays.asList(lastValues).contains(String.valueOf(metricRangePrefs.lastN))) {
- simpleLastValuesItem.setValue(String.valueOf(metricRangePrefs.lastN));
- }
- }
- } catch (Exception e) {
- // in case any odd errors occur (like bad format of preference strings), just fill in some defaults
- CoreGUI.getMessageCenter().notify(
- new Message("Failed to get range user preferences, using defaults", e, Severity.Warning));
- assignDefaultsToSimpleItems();
- assignDefaultsToAdvancedItems();
- }
-
- markForRedraw();
- }
-
- @Override
- public void refresh(ListGrid listGrid) {
- update();
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java
new file mode 100644
index 0000000..02733e8
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java
@@ -0,0 +1,56 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.gui.coregui.client.components.measurement;
+
+import java.util.List;
+
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences;
+
+public class UserPreferencesMeasurementRangeEditor extends AbstractMeasurementRangeEditor {
+
+ private MeasurementUserPreferences measurementUserPrefs;
+
+ public UserPreferencesMeasurementRangeEditor(String locatorId) {
+ super(locatorId);
+ measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences());
+ }
+
+ /**
+ * Returns the current range that is persisted. Note this may NOT be the begin and end times
+ * as shown in the UI if the user changed the values but did not hit the set button.
+ * @return begin/end epoch times in a list
+ */
+ @Override
+ public List<Long> getBeginEndTimes() {
+ return measurementUserPrefs.getMetricRangePreferences().getBeginEndTimes();
+ }
+
+ @Override
+ public MetricRangePreferences getMetricRangePreferences() {
+ return measurementUserPrefs.getMetricRangePreferences();
+ }
+
+ @Override
+ public void setMetricRangeProperties(MetricRangePreferences prefs) {
+ measurementUserPrefs.setMetricRangePreferences(prefs);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
index 74c3ee9..1d63f04 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
@@ -18,7 +18,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import com.allen_sauer.gwt.log.client.Log;
@@ -31,6 +33,8 @@ import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.LinkItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
@@ -49,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeEvent;
import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeListener;
-import org.rhq.enterprise.gui.coregui.client.components.measurement.MeasurementRangeEditor;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.CustomConfigMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
@@ -63,7 +67,6 @@ import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**This portlet allows the end user to customize the:
@@ -77,14 +80,39 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet,
PropertyValueChangeListener {
- private interface Constant {
+ public interface Constant {
String ALERT_PRIORITY = "ALERT_PRIORITY";
+ String ALERT_METRIC_RANGE_ENABLE = "ALERT_METRIC_RANGE_ENABLE";
+ String ALERT_METRIC_RANGE_BEGIN_END_FLAG = "ALERT_METRIC_RANGE_BEGIN_END_FLAG";
+ String ALERT_METRIC_RANGE = "ALERT_METRIC_RANGE";
+ String ALERT_METRIC_RANGE_LASTN = "ALERT_METRIC_RANGE_LASTN";
+ String ALERT_METRIC_RANGE_LASTN_DEFAULT = String.valueOf(8);
+ String ALERT_METRIC_RANGE_UNIT = "ALERT_METRIC_RANGE_UNIT";
String RESULT_SORT_ORDER = "RESULT_SORT_ORDER";
String RESULT_COUNT = "RESULT_COUNT";
String RESULT_COUNT_DEFAULT = "5";
String CUSTOM_REFRESH = "CUSTOM_REFRESH";
}
+ //configuration map initialization
+ private static Map<String, String> CONFIG_PROPERTY_INITIALIZATION = new HashMap<String, String>();
+ static {// Key, Default value
+ //alert priority, if empty initialize to "" i.e. all priorities
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_PRIORITY, "");
+ //result sort order, if empty initialize to "DESC"
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_SORT_ORDER, PageOrdering.DESC.name());
+ //result count, if empty initialize to 5
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT);
+ //whether to specify time range for alerts. Defaults to false
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_METRIC_RANGE_ENABLE, String.valueOf(false));
+ //whether Begin and End values set for time. Aka. Advanced/full range setting Defaults to false
+ CONFIG_PROPERTY_INITIALIZATION.put(Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG, String.valueOf(false));
+ //whether in simple mode. Ex. 8 hrs. Defaults to 8
+ CONFIG_PROPERTY_INITIALIZATION
+ .put(Constant.ALERT_METRIC_RANGE_LASTN, Constant.ALERT_METRIC_RANGE_LASTN_DEFAULT);
+
+ }
+
private int groupId = -1;
protected LocatableCanvas recentAlertsContent = new LocatableCanvas(extendLocatorId("RecentAlerts"));
private static AlertGWTServiceAsync alertService = GWTServiceLookup.getAlertService();
@@ -93,7 +121,7 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
private SelectItem alertPrioritySelector = null;
private SelectItem resultSortSelector = null;
private SelectItem resultCountSelector = null;
- private MeasurementRangeEditor measurementRangeEditor = null;
+ private CustomConfigMeasurementRangeEditor measurementRangeEditor = null;
private DashboardPortlet storedPortlet;
public GroupAlertsPortlet(String locatorId) {
@@ -128,12 +156,9 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
// set on initial configuration, the window for this portlet view.
private PortletWindow portletWindow;
- // private AlertPortletDataSource dataSource;
//instance ui widgets
- private Canvas containerCanvas;
private Timer refreshTimer;
- private LocatableIButton saveButton;
/** Responsible for initialization and lazy configuration of the portlet values
*/
@@ -150,17 +175,10 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
- //alert priority, if empty initialize to "" i.e. all priorities
- if (portletConfig.getSimple(Constant.ALERT_PRIORITY) == null) {
- portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, ""));
- }
- //result sort order, if empty initialize to "DESC"
- if (portletConfig.getSimple(Constant.RESULT_SORT_ORDER) == null) {
- portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
- }
- //result count, if empty initialize to 5
- if (portletConfig.getSimple(Constant.RESULT_COUNT) == null) {
- portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT));
+ for (String key : CONFIG_PROPERTY_INITIALIZATION.keySet()) {
+ if (portletConfig.getSimple(key) == null) {
+ portletConfig.put(new PropertySimple(key, CONFIG_PROPERTY_INITIALIZATION.get(key)));
+ }
}
//custom refresh
@@ -175,7 +193,6 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
public static PortletViewFactory INSTANCE = new Factory();
public final Portlet getInstance(String locatorId) {
-
return new GroupAlertsPortlet(locatorId);
}
}
@@ -218,6 +235,18 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
pc.setPrimarySortOrder(PageOrdering.ASC);
}
}
+ //result timeframe if enabled
+ property = portletConfig.getSimple(Constant.ALERT_METRIC_RANGE_ENABLE);
+ if (Boolean.valueOf(property.getBooleanValue())) {//then proceed setting
+ property = portletConfig.getSimple(Constant.ALERT_METRIC_RANGE);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ String[] range = currentSetting.split(",");
+ criteria.addFilterStartTime(Long.valueOf(range[0]));
+ criteria.addFilterEndTime(Long.valueOf(range[1]));
+ }
+ }
+
//result count
property = portletConfig.getSimple(Constant.RESULT_COUNT);
if (property != null) {
@@ -264,7 +293,8 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
+ "/Alerts/History/", column);
} else {
LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentAlertsContent
- .extendLocatorId("None"), AbstractActivityView.RECENT_ALERTS_NONE);
+ // .extendLocatorId("None"), AbstractActivityView.RECENT_ALERTS_NONE);
+ .extendLocatorId("None"), "No results using criteria specified.");
column.addMember(row);
}
for (Canvas child : recentAlertsContent.getChildren()) {
@@ -288,8 +318,8 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
@Override
public DynamicForm getCustomSettingsForm() {
- LocatableDynamicForm custom = new LocatableDynamicForm(extendLocatorId("customSettings"));
- LocatableVLayout page = new LocatableVLayout(custom.extendLocatorId("page"));
+ LocatableDynamicForm customSettings = new LocatableDynamicForm(extendLocatorId("customSettings"));
+ LocatableVLayout page = new LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
final LocatableDynamicForm form = new LocatableDynamicForm(page.extendLocatorId("alert-filter"));
form.setMargin(5);
@@ -307,12 +337,13 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
"Displays N results with alerts", countSelections);
//add range selector
- measurementRangeEditor = new MeasurementRangeEditor(page.extendLocatorId("alertTimeFrame"));
+ measurementRangeEditor = new CustomConfigMeasurementRangeEditor(page.extendLocatorId("alertTimeFrame"),
+ portletConfig);
form.setItems(alertPrioritySelector, resultSortSelector, resultCountSelector);
//submit handler
- custom.addSubmitValuesHandler(new SubmitValuesHandler() {
+ customSettings.addSubmitValuesHandler(new SubmitValuesHandler() {
@Override
public void onSubmitValues(SubmitValuesEvent event) {
@@ -338,9 +369,26 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, selectedValue));
}
+ //alert time range filter. Check for enabled and then persist property. Dealing with compound widget.
+ FormItem item = measurementRangeEditor.getItem(CustomConfigMeasurementRangeEditor.ENABLE_RANGE_ITEM);
+ CheckboxItem itemC = (CheckboxItem) item;
+ selectedValue = String.valueOf(itemC.getValueAsBoolean());
+ if (!selectedValue.trim().isEmpty()) {//then call
+ portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE_ENABLE, selectedValue));
+ }
+
+ //alert time advanced time filter enabled.
+ selectedValue = String.valueOf(measurementRangeEditor.isAdvanced());
+ if ((selectedValue != null) && (!selectedValue.trim().isEmpty())) {
+ portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE_BEGIN_END_FLAG, selectedValue));
+ }
+
//alert time frame
- Map selectedValue3 = measurementRangeEditor.getValues();
- String selectedValue2 = measurementRangeEditor.getValue("") + "";
+ List<Long> begEnd = measurementRangeEditor.getBeginEndTimes();
+ if (begEnd.get(0) != 0) {//advanced settings
+ portletConfig.put(new PropertySimple(Constant.ALERT_METRIC_RANGE, (begEnd.get(0) + "," + begEnd
+ .get(1))));
+ }
//persist
storedPortlet.setConfiguration(portletConfig);
@@ -351,8 +399,8 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
form.markForRedraw();
page.addMember(measurementRangeEditor);
page.addMember(form);
- custom.addChild(page);
- return custom;
+ customSettings.addChild(page);
+ return customSettings;
}
/* single select combobox for number of items to display on the dashboard
@@ -395,7 +443,6 @@ public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettin
private SelectItem getAlertPriorityEditor() {
SelectItem priorityFilter = new SelectItem("severities", MSG.view_alerts_table_filter_priority());
priorityFilter.setWrapTitle(false);
- // priorityFilter.setWidth("*");
priorityFilter.setWidth(200);
priorityFilter.setMultiple(true);
priorityFilter.setMultipleAppearance(MultipleAppearance.PICKLIST);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java
new file mode 100644
index 0000000..72631b6
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet2.java
@@ -0,0 +1,686 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+
+import java.util.Set;
+
+import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.events.DoubleClickEvent;
+import com.smartgwt.client.widgets.events.DoubleClickHandler;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
+import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.SpacerItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.authz.Permission;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView;
+import org.rhq.enterprise.gui.coregui.client.alert.AlertPortletDataSource;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.alerts.PortletAlertSelector;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+
+/**
+ * @author Simeon Pinder
+ */
+public class GroupAlertsPortlet2 extends AlertHistoryView implements CustomSettingsPortlet, AutoRefreshPortlet {
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Group: Alerts2";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_recentAlerts();
+
+ //widget keys also used in form population
+ public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE = "alert-range-display-amount-value";
+ public static final String ALERT_RANGE_PRIORITY_VALUE = "alert-range-priority-value";
+ public static final String ALERT_RANGE_TIME_VALUE = "alert-range-time-value";
+ public static final String ALERT_RANGE_RESOURCES_VALUE = "alert-range-resource-value";
+ public static final String ALERT_RANGE_RESOURCE_IDS = "alert-range-resource-ids";
+ //configuration default information
+ private static final String defaultAlertCountValue = "5";
+ private static final String PRIORITY_ALL = MSG.common_label_all();
+ private static final String PRIORITY_HIGH = AlertPriority.HIGH.getDisplayName();
+ private static final String PRIORITY_MEDIUM = AlertPriority.MEDIUM.getDisplayName();
+ private static final String PRIORITY_LOW = AlertPriority.LOW.getDisplayName();
+ private static final String defaultPriorityValue = PRIORITY_ALL;
+ private static final String TIME_30_MINS = "30 " + MSG.common_label_minutes();
+ private static final String TIME_HOUR = MSG.common_label_hour();
+ private static final String TIME_12_HRS = "12 " + MSG.common_label_hours();
+ private static final String TIME_DAY = MSG.common_label_day();
+ private static final String TIME_WEEK = MSG.common_label_week();
+ private static final String TIME_MONTH = MSG.common_label_month();
+ private static final String defaultTimeValue = TIME_DAY;
+ public static final String RESOURCES_ALL = MSG.common_label_all_resources();
+ public static final String RESOURCES_SELECTED = MSG.common_label_selected_resources();
+ public static final String defaultResourceValue = RESOURCES_ALL;
+ private static final String unlimited = MSG.common_label_unlimited();
+ //alert resource labels
+ public static final String ALERT_LABEL_SELECTED_RESOURCES = MSG.common_title_selected_resources();
+ public static final String ALERT_LABEL_AVAILABLE_RESOURCES = MSG.common_title_available_resources();
+ public static final String ALERT_LABEL_RESOURCE_INVENTORY = MSG.common_title_resource_inventory();
+ public static final int ALERT_RESOURCE_SELECTION_WIDTH = 800;
+ public static final String ID = "id";
+
+ // set on initial configuration, the window for this portlet view.
+ private PortletWindow portletWindow;
+
+ //shared private UI elements
+ private AlertResourceSelectorRegion resourceSelector;
+
+ private AlertPortletDataSource dataSource;
+ //instance ui widgets
+ private Canvas containerCanvas;
+
+ private Timer refreshTimer;
+
+ public GroupAlertsPortlet2(String locatorId) {
+ super(locatorId);
+
+ //override the shared datasource
+ this.dataSource = new AlertPortletDataSource();
+ setDataSource(this.dataSource);
+
+ setShowHeader(false);
+ setShowFooter(true);
+ setShowFooterRefresh(false); //disable footer refresh
+ setShowFilterForm(false); //disable filter form for portlet
+
+ setOverflow(Overflow.VISIBLE);
+ }
+
+ public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+
+ if (null == this.portletWindow && null != portletWindow) {
+ this.portletWindow = portletWindow;
+ }
+
+ if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
+ return;
+ }
+
+ //Operation range property - retrieve existing value
+ PropertySimple property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE);
+ if ((property != null) && (property.getStringValue() != null)) {
+ //retrieve and translate to int
+ String retrieved = property.getStringValue();
+ int translatedAlertRangeSelection = translatedAlertRangeSelection(retrieved);
+ getDataSource().setAlertRangeCompleted(translatedAlertRangeSelection);
+ } else {//create setting
+ storedPortlet.getConfiguration().put(
+ new PropertySimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, defaultAlertCountValue));
+ getDataSource().setAlertRangeCompleted(Integer.parseInt(defaultAlertCountValue));
+ }
+ //Operation priority property setting
+ property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE);
+ if ((property != null) && (property.getStringValue() != null)) {
+ //retrieve and translate to int
+ String retrieved = property.getStringValue();
+ int translatedPriorityIndex = translatedPriorityToValidIndex(retrieved);
+ getDataSource().setAlertPriorityIndex(translatedPriorityIndex);
+ } else {//create setting
+ storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_PRIORITY_VALUE, defaultPriorityValue));
+ getDataSource().setAlertPriorityIndex(translatedPriorityToValidIndex(PRIORITY_ALL));
+ }
+
+ //Range to time that alerts will be shown for
+ property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE);
+ if ((property != null) && (property.getStringValue() != null)) {
+ //retrieve and translate to int
+ String retrieved = property.getStringValue();
+ long translatedRange = translateTimeToValidRange(retrieved);
+ getDataSource().setAlertTimeRange(translatedRange);
+ } else {//create setting
+ storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_TIME_VALUE, defaultTimeValue));
+ getDataSource().setAlertTimeRange(translateTimeToValidRange(defaultTimeValue));
+ }
+
+ //Range of resources to be included in the query
+ property = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
+ if ((property != null) && (property.getStringValue() != null)) {
+ //retrieve and translate to int
+ String retrieved = property.getStringValue();
+ if (retrieved.trim().equalsIgnoreCase(RESOURCES_SELECTED)) {
+ getDataSource().setAlertResourcesToUse(RESOURCES_SELECTED);
+ } else {
+ getDataSource().setAlertResourcesToUse(RESOURCES_ALL);
+ }
+ } else {//create setting
+ storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_RESOURCES_VALUE, defaultResourceValue));
+ getDataSource().setAlertResourcesToUse(RESOURCES_ALL);
+ }
+
+ //resource ids to be conditionally included in the query
+ Integer[] filterResourceIds = null;
+ filterResourceIds = getDataSource().extractFilterResourceIds(storedPortlet, filterResourceIds);
+ //no defaults
+
+ if (filterResourceIds != null) {
+ getDataSource().setAlertFilterResourceId(filterResourceIds);
+ }
+
+ //conditionally display the selected resources ui
+ if (containerCanvas != null) {
+ //empty out earlier canvas
+ for (Canvas c : containerCanvas.getChildren()) {
+ c.destroy();
+ }
+ if ((resourceSelector != null) && getDataSource().getAlertResourcesToUse().equals(RESOURCES_SELECTED)) {
+ containerCanvas.addChild(resourceSelector.getCanvas());
+ } else {
+ containerCanvas.addChild(new Canvas());
+ }
+ }
+ }
+
+ private int translatedAlertRangeSelection(String retrieved) {
+ int translated = -1;
+ if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
+ if (retrieved.equalsIgnoreCase(unlimited)) {
+ translated = -1;
+ } else {
+ translated = Integer.parseInt(retrieved);//default to all
+ }
+ } else {//default to defaultValue
+ if (defaultAlertCountValue.equalsIgnoreCase(unlimited)) {
+ translated = -1;
+ } else {
+ translated = Integer.parseInt(defaultAlertCountValue);
+ }
+ }
+ return translated;
+ }
+
+ private int translatedPriorityToValidIndex(String retrieved) {
+ int translatedPriority = 0;//default to all
+ if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
+ if (retrieved.equalsIgnoreCase(PRIORITY_HIGH)) {
+ translatedPriority = 3;
+ } else if (retrieved.equalsIgnoreCase(PRIORITY_MEDIUM)) {
+ translatedPriority = 2;
+ } else if (retrieved.equalsIgnoreCase(PRIORITY_LOW)) {
+ translatedPriority = 1;
+ } else {
+ translatedPriority = 0;//default to all
+ }
+ }
+ return translatedPriority;
+ }
+
+ /**Translates the UI selection options into time values for alert query.
+ *
+ * @param retrieved
+ * @return long value mapping to string passed in.
+ */
+ private long translateTimeToValidRange(String retrieved) {
+ long translated = 0;//default to ALL
+ if ((retrieved != null) && (!retrieved.trim().isEmpty())) {
+ if (retrieved.equalsIgnoreCase(TIME_30_MINS)) {
+ translated = MeasurementUtility.MINUTES * 30;
+ } else if (retrieved.equalsIgnoreCase(TIME_HOUR)) {
+ translated = MeasurementUtility.HOURS;
+ } else if (retrieved.equalsIgnoreCase(TIME_12_HRS)) {
+ translated = MeasurementUtility.HOURS * 12;
+ } else if (retrieved.equalsIgnoreCase(TIME_DAY)) {
+ translated = MeasurementUtility.DAYS;
+ } else if (retrieved.equalsIgnoreCase(TIME_WEEK)) {
+ translated = MeasurementUtility.WEEKS;
+ } else if (retrieved.equalsIgnoreCase(TIME_MONTH)) {
+ translated = MeasurementUtility.DAYS * 28;//replicated from old struts def.
+ } else {
+ translated = MeasurementUtility.DAYS;//default to day otherwise.
+ }
+ }
+ return translated;
+ }
+
+ public Canvas getHelpCanvas() {
+ return new HTMLFlow(MSG.view_portlet_help_recentAlerts());
+ }
+
+ public DynamicForm getCustomSettingsForm() {
+ //root dynamic form instance
+ final LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("custom-settings"));
+ form.setWidth(GroupAlertsPortlet2.ALERT_RESOURCE_SELECTION_WIDTH + 40);//largest widget display + 40 for buttons
+ form.setHeight(400);
+ form.setMargin(5);
+
+ final DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
+
+ //vertical container
+ VLayout column = new VLayout();
+
+ //label
+ LocatableLabel alertRangeLabel = new LocatableLabel(extendLocatorId("DynamicForm_Label_Alert_Range"), "<b>"
+ + MSG.common_title_alert_range() + "</b>");
+
+ //horizontal layout
+ LocatableHLayout row = new LocatableHLayout(extendLocatorId("alert-range-settings-row-1"));
+ row.setMembersMargin(10);
+
+ //-------------combobox for number of completed scheduled ops to display on the dashboard
+ final SelectItem alertRangeLastComboBox = new SelectItem(ALERT_RANGE_DISPLAY_AMOUNT_VALUE);
+ alertRangeLastComboBox.setTitle(MSG.view_measureRange_last());
+ alertRangeLastComboBox.setType("selection");
+ alertRangeLastComboBox.setWrapTitle(false);
+ //define acceptable values for display amount
+ String[] acceptableDisplayValues = { "5", "10", MSG.common_label_unlimited() };
+ alertRangeLastComboBox.setValueMap(acceptableDisplayValues);
+ //set width of dropdown display region
+ alertRangeLastComboBox.setWidth(100);
+ alertRangeLastComboBox.addChangeHandler(new ChangeHandler() {
+ public void onChange(ChangeEvent event) {
+ String selectedItem = "" + event.getValue();
+ //stuff into the master form for retrieval
+ form.setValue(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, selectedItem);
+ }
+ });
+
+ //default selected value to 'unlimited'(live lists) and check both combobox settings here.
+ String selectedValue = defaultAlertCountValue;
+ if (storedPortlet != null) {
+ //if property exists retrieve it
+ if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE) != null) {
+ selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE)
+ .getStringValue();
+ } else {//insert default value
+ storedPortlet.getConfiguration().put(
+ new PropertySimple(ALERT_RANGE_DISPLAY_AMOUNT_VALUE, defaultAlertCountValue));
+ }
+ }
+ //prepopulate the combobox with the previously stored selection
+ alertRangeLastComboBox.setDefaultValue(selectedValue);
+
+ //-------------combobox for number of completed scheduled ops to display on the dashboard
+ final SelectItem alertRangePriorityComboBox = new SelectItem(ALERT_RANGE_PRIORITY_VALUE);
+ alertRangePriorityComboBox.setTitle("");
+ alertRangePriorityComboBox.setHint("<nobr> <b> " + MSG.view_portlet_recentAlerts_config_priority_label()
+ + "</b></nobr>");
+ alertRangePriorityComboBox.setType("selection");
+ //define acceptable values for display amount
+ String[] acceptablePriorityDisplayValues = { PRIORITY_ALL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW };
+ alertRangePriorityComboBox.setValueMap(acceptablePriorityDisplayValues);
+ //set width of dropdown display region
+ alertRangePriorityComboBox.setWidth(100);
+ alertRangePriorityComboBox.addChangeHandler(new ChangeHandler() {
+ public void onChange(ChangeEvent event) {
+ String selectedItem = "" + event.getValue();
+ //stuff into the master form for retrieval
+ form.setValue(ALERT_RANGE_PRIORITY_VALUE, selectedItem);
+ }
+ });
+
+ //default selected value to 'unlimited'(live lists) and check both combobox settings here.
+ selectedValue = defaultPriorityValue;
+ if (storedPortlet != null) {
+ //if property exists retrieve it
+ if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE) != null) {
+ selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_PRIORITY_VALUE).getStringValue();
+ } else {//insert default value
+ storedPortlet.getConfiguration().put(
+ new PropertySimple(ALERT_RANGE_PRIORITY_VALUE, defaultPriorityValue));
+ }
+ }
+ //prepopulate the combobox with the previously stored selection
+ alertRangePriorityComboBox.setDefaultValue(selectedValue);
+ row.addMember(alertRangeLabel);
+ DynamicForm wrappedRange = new DynamicForm();
+ wrappedRange.setFields(alertRangeLastComboBox);
+ row.addMember(wrappedRange);
+
+ DynamicForm wrappedPriority = new DynamicForm();
+ wrappedPriority.setFields(alertRangePriorityComboBox);
+ row.addMember(wrappedPriority);
+
+ //horizontal layout
+ LocatableHLayout row2 = new LocatableHLayout(extendLocatorId("alert-range-settings-row-2"));
+
+ LocatableLabel alertRangeSpanLabel = new LocatableLabel(extendLocatorId("range-span-label"), "<b>"
+ + MSG.view_portlet_recentAlerts_config_when() + "<b>");
+ //------------- Build second combobox for timeframe for problem resources search.
+ final SelectItem alertRangeTimeComboBox = new SelectItem(ALERT_RANGE_TIME_VALUE);
+ alertRangeTimeComboBox.setTitle("");
+ alertRangeTimeComboBox.setHint("");
+ alertRangeTimeComboBox.setType("selection");
+ String[] acceptableTimeDisplayValues = { TIME_30_MINS, TIME_HOUR, TIME_12_HRS, TIME_DAY, TIME_WEEK, TIME_MONTH };
+ alertRangeTimeComboBox.setValueMap(acceptableTimeDisplayValues);
+ alertRangeTimeComboBox.setWidth(100);
+ alertRangeTimeComboBox.addChangeHandler(new ChangeHandler() {
+ public void onChange(ChangeEvent event) {
+ String selectedItem = "" + event.getValue();
+ //stuff into the master form for retrieval
+ form.setValue(ALERT_RANGE_TIME_VALUE, selectedItem);
+ }
+ });
+
+ //set to default
+ selectedValue = defaultTimeValue;
+ if (storedPortlet != null) {
+ //if property exists retrieve it
+ if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE) != null) {
+ selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_TIME_VALUE).getStringValue();
+ } else {//insert default value
+ storedPortlet.getConfiguration().put(new PropertySimple(ALERT_RANGE_TIME_VALUE, defaultTimeValue));
+ }
+ }
+ //prepopulate the combobox with the previously stored selection
+ alertRangeTimeComboBox.setDefaultValue(selectedValue);
+ DynamicForm timeSelectionWrapper = new DynamicForm();
+ timeSelectionWrapper.setFields(alertRangeTimeComboBox);
+
+ // build resource selection drop down
+ //------------- Build second combobox for timeframe for problem resources search.
+ final SelectItem alertResourcesComboBox = new SelectItem(ALERT_RANGE_RESOURCES_VALUE);
+ alertResourcesComboBox.setTitle(MSG.common_val_for());
+ alertResourcesComboBox.setHint("");
+ alertResourcesComboBox.setType("selection");
+ String[] acceptableResourceDisplayValues = { RESOURCES_ALL, RESOURCES_SELECTED };
+ alertResourcesComboBox.setValueMap(acceptableResourceDisplayValues);
+ alertResourcesComboBox.setWidth(150);
+ alertResourcesComboBox.addChangeHandler(new ChangeHandler() {
+ public void onChange(ChangeEvent event) {
+ String selectedItem = "" + event.getValue();
+ //stuff into the master form for retrieval
+ form.setValue(ALERT_RANGE_RESOURCES_VALUE, selectedItem);
+ //empty out earlier canvas
+ for (Canvas c : containerCanvas.getChildren()) {
+ c.destroy();
+ }
+ if (selectedItem.equals(RESOURCES_SELECTED)) {
+ containerCanvas.addChild(resourceSelector.getCanvas());
+ } else {
+ containerCanvas.addChild(new Canvas());
+ }
+ }
+ });
+
+ //set to default
+ selectedValue = defaultResourceValue;
+ if (storedPortlet != null) {
+ //if property exists retrieve it
+ if (storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE) != null) {
+ selectedValue = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE)
+ .getStringValue();
+ } else {//insert default value
+ storedPortlet.getConfiguration().put(
+ new PropertySimple(ALERT_RANGE_RESOURCES_VALUE, defaultResourceValue));
+ }
+ }
+ //prepopulate the combobox with the previously stored selection
+ alertResourcesComboBox.setDefaultValue(selectedValue);
+ DynamicForm resourceSelectionWrapper = new DynamicForm();
+ resourceSelectionWrapper.setFields(alertResourcesComboBox);
+
+ alertRangeSpanLabel.setWrap(false);
+ alertRangeSpanLabel.setWidth(150);
+ row2.addMember(alertRangeSpanLabel);
+ row2.addMember(timeSelectionWrapper);
+ row2.addMember(resourceSelectionWrapper);
+
+ //if portlet config setting exist, then retrieve
+ Integer[] alertFilterResourceIds = null;
+ alertFilterResourceIds = getDataSource().extractFilterResourceIds(storedPortlet, alertFilterResourceIds);
+
+ LocatableHLayout resourceSelectionRegion = new LocatableHLayout(extendLocatorId("selection-canvas"));
+ resourceSelector = new AlertResourceSelectorRegion(extendLocatorId("ResourcesWithAlerts"),
+ alertFilterResourceIds);
+ resourceSelectionRegion.setWidth100();
+
+ if (alertFilterResourceIds != null) {
+ getDataSource().setAlertFilterResourceId(alertFilterResourceIds);
+ resourceSelector.setCurrentlyAssignedIds(alertFilterResourceIds);
+ }
+
+ //instantiate canvas area to display empty or rich resource selection based on dropdown selection
+ containerCanvas = new Canvas();
+ String previousAlertFilterChoice = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE)
+ .getStringValue();
+
+ //reload the ResourceSelectionRegion if user has chosen to focus on specific resources with alerts
+ if (previousAlertFilterChoice.equals(RESOURCES_SELECTED)) {
+ containerCanvas.addChild(resourceSelector.getCanvas());
+ } else {// define empty canvas
+ containerCanvas.addChild(new Canvas());
+ }
+
+ //add contain resource selection region.
+ resourceSelectionRegion.addMember(containerCanvas);
+
+ //finish construction of the layout
+ column.addMember(row);
+ column.addMember(row2);
+ SpacerItem verticalSpace = new SpacerItem();
+ verticalSpace.setHeight(20);
+ DynamicForm spacerWrapper = new DynamicForm();
+ spacerWrapper.setItems(verticalSpace);
+ column.addMember(spacerWrapper);
+ column.addMember(resourceSelectionRegion);
+ form.addChild(column);
+
+ //submit handler
+ form.addSubmitValuesHandler(new SubmitValuesHandler() {
+ @Override
+ public void onSubmitValues(SubmitValuesEvent event) {
+ //no need to insert validation here as user not allowed to enter values
+ parseFormAndPopulateConfiguration(form, storedPortlet, ALERT_RANGE_DISPLAY_AMOUNT_VALUE,
+ ALERT_RANGE_PRIORITY_VALUE, ALERT_RANGE_RESOURCES_VALUE, ALERT_RANGE_TIME_VALUE);
+
+ //retrieve alert-resource-selection property
+ PropertySimple prop = storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
+
+ //check to see if "Selected Resources" or "All Resources"
+ if (prop != null && RESOURCES_SELECTED.equals(prop.getStringValue())) {
+ //retrieve currentlyAssignedIds
+ Integer[] valuesToPersist = resourceSelector.getListGridValues();
+ resourceSelector.setCurrentlyAssignedIds(valuesToPersist);
+
+ //build property list of ids to persist
+ PropertyList list = new PropertyList(ALERT_RANGE_RESOURCE_IDS);
+ for (int rid : resourceSelector.getCurrentlyAssignedIds()) {
+ list.add(new PropertySimple(ALERT_RANGE_RESOURCE_IDS, rid));
+ }
+ storedPortlet.getConfiguration().put(new PropertyList(ALERT_RANGE_RESOURCE_IDS, list));
+ getDataSource().setAlertFilterResourceId(resourceSelector.getCurrentlyAssignedIds());
+ }
+
+ configure(portletWindow, storedPortlet);
+
+ refresh();//reload form with new data selections
+ markForRedraw();
+ }
+ });
+
+ return form;
+ }
+
+ /**Iterates over DynamicForm instance to check for properties passed in and if they have been set
+ * to put that property into the DashboardPortlet configuration.
+ *
+ * @param form Dynamic form storing user selections
+ * @param portlet Container for configuration changes
+ * @param properties Variable list of keys used to verify or populate properties.
+ */
+ private void parseFormAndPopulateConfiguration(final DynamicForm form, DashboardPortlet storedPortlet,
+ String... properties) {
+ if ((form != null) && (storedPortlet != null)) {
+ for (String property : properties) {
+ if (form.getValue(property) != null) {//if new value supplied
+ storedPortlet.getConfiguration().put(new PropertySimple(property, form.getValue(property)));
+ }
+ }
+ }
+ }
+
+ public AlertPortletDataSource getDataSource() {
+ return dataSource;
+ }
+
+ public static final class Factory implements PortletViewFactory {
+ public static PortletViewFactory INSTANCE = new Factory();
+
+ public final Portlet getInstance(String locatorId) {
+
+ return new GroupAlertsPortlet2(locatorId);
+ }
+ }
+
+ @Override
+ public void startRefreshCycle() {
+ //current setting
+ final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval();
+
+ //cancel any existing timer
+ if (refreshTimer != null) {
+ refreshTimer.cancel();
+ }
+
+ if (refreshInterval >= MeasurementUtility.MINUTES) {
+
+ refreshTimer = new Timer() {
+ public void run() {
+
+ redraw();
+ }
+ };
+
+ refreshTimer.scheduleRepeating(refreshInterval);
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (refreshTimer != null) {
+
+ refreshTimer.cancel();
+ }
+
+ super.onDestroy();
+ }
+
+ @Override
+ protected void setupTableInteractions(boolean hasWriteAccess) {
+ // The portlet is a "subsystem" view. Meaning the alerts displayed can be from any accessible group for
+ // the user. This means the user can have varying permissions on the underlying groups and/or resources,
+ // which makes button enablement tricky. So, for the portlet don't even show the buttons unless the user
+ // is inventory manager. Other users will just have to navigate to the alert in question in order to
+ // manipulate it.
+
+ //determine if the user is inventory manager and if so render the buttons
+ Set<Permission> permissions = this.portletWindow.getGlobalPermissions();
+ if ((null != permissions) && permissions.contains(Permission.MANAGE_INVENTORY)) {
+ super.setupTableInteractions(true);
+ }
+ }
+
+ protected CellFormatter getDetailsLinkColumnCellFormatter() {
+ return new CellFormatter() {
+ public String format(Object value, ListGridRecord record, int i, int i1) {
+ Integer recordId = getId(record);
+ Integer resourceId = record.getAttributeAsInt("resourceId");
+ String detailsUrl = LinkManager.getSubsystemAlertHistoryLink(resourceId, recordId);
+ return SeleniumUtility.getLocatableHref(detailsUrl, value.toString(), null);
+ }
+ };
+ }
+
+ @Override
+ protected void configureTable() {
+ // TODO Auto-generated method stub
+ super.configureTable();
+
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
+ @Override
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid listGrid = (ListGrid) event.getSource();
+ ListGridRecord[] selectedRows = listGrid.getSelection();
+ if (selectedRows != null && selectedRows.length == 1) {
+ Integer recordId = getId(selectedRows[0]);
+ Integer resourceId = selectedRows[0].getAttributeAsInt("resourceId");
+ CoreGUI.goToView(LinkManager.getSubsystemAlertHistoryLink(resourceId, recordId));
+ }
+ }
+ });
+ }
+
+}
+
+/** Bundles a ResourceSelector instance with labelling in Canvas for display.
+ * Also modifies the AssignedGrid to listen for AvailbleGrid completion and act accordingly.
+ */
+class AlertResourceSelectorRegion extends LocatableVLayout {
+ public AlertResourceSelectorRegion(String locatorId, Integer[] assigned) {
+ super(locatorId);
+ this.currentlyAssignedIds = assigned;
+ }
+
+ private static final Messages MSG = CoreGUI.getMessages();
+ private PortletAlertSelector selector = null;
+
+ private Integer[] currentlyAssignedIds;
+
+ public Integer[] getCurrentlyAssignedIds() {
+ return currentlyAssignedIds;
+ }
+
+ public Integer[] getListGridValues() {
+ Integer[] listGridValues = new Integer[0];
+ if (null != selector) {
+ listGridValues = selector.getAssignedListGridValues();
+ }
+ return listGridValues;
+ }
+
+ public Canvas getCanvas() {
+ if (selector == null) {
+ selector = new PortletAlertSelector(extendLocatorId("AlertSelector"), this.currentlyAssignedIds,
+ ResourceType.ANY_PLATFORM_TYPE, false);
+ }
+ return selector;
+ }
+
+ public void setCurrentlyAssignedIds(Integer[] currentlyAssignedIds) {
+ this.currentlyAssignedIds = currentlyAssignedIds;
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index f8b7239..665898e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -304,6 +304,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements CustomSetti
final SelectItem alertRangeLastComboBox = new SelectItem(ALERT_RANGE_DISPLAY_AMOUNT_VALUE);
alertRangeLastComboBox.setTitle(MSG.view_measureRange_last());
alertRangeLastComboBox.setType("selection");
+ alertRangeLastComboBox.setWrapTitle(false);
//define acceptable values for display amount
String[] acceptableDisplayValues = { "5", "10", MSG.common_label_unlimited() };
alertRangeLastComboBox.setValueMap(acceptableDisplayValues);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
index 6f27e8f..dcd89d0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
@@ -36,7 +36,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.components.measurement.MeasurementRangeEditor;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -67,7 +67,7 @@ public class GraphListView extends LocatableVLayout implements ResourceSelectLis
// addMember(loadingLabel);
- addMember(new MeasurementRangeEditor(this.getLocatorId()));
+ addMember(new UserPreferencesMeasurementRangeEditor(this.getLocatorId()));
if (resource != null) {
buildGraphs();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
index 961dac4..f79dfef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
@@ -34,7 +34,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.components.measurement.MeasurementRangeEditor;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.UserPreferencesMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -60,7 +60,7 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
protected void configureTable() {
ArrayList<ListGridField> fields = getDataSource().getListGridFields();
setListGridFields(fields.toArray(new ListGridField[0]));
- addExtraWidget(new MeasurementRangeEditor(extendLocatorId("range")), true);
+ addExtraWidget(new UserPreferencesMeasurementRangeEditor(extendLocatorId("range")), true);
addTableAction(extendLocatorId("liveValue"), MSG.view_measureTable_getLive(), new TableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java
index 76ca6c9..47ba05c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java
@@ -19,10 +19,10 @@
package org.rhq.enterprise.gui.coregui.client.util.preferences;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor.MetricRangePreferences;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -60,40 +60,6 @@ public class MeasurementUserPreferences {
public List<String> views;
}
- public static class MetricRangePreferences {
- // if readOnly is true, then the beginning and ending range dates are specified with explicit dates
- // if readOnly is false, then the time is relative to NOW and is specified as <lastN> units of <unit> time
- public boolean explicitBeginEnd;
-
- // simple, when readOnly is false
- public int lastN;
- public int unit; // see MeasurementUtility.UNIT_xxx
-
- // advanced, when readOnly is true
- public Long begin;
- public Long end;
-
- /**
- * Returns a two element <code>List</code> of <code>Long</code> objects representing the begin and end times (in
- * milliseconds since the epoch) of the time frame.
- **/
- public ArrayList<Long> getBeginEndTimes() {
- if (explicitBeginEnd) {
- ArrayList<Long> times = new ArrayList<Long>(2);
- times.add(begin);
- times.add(end);
- return times;
- } else {
- return MeasurementUtility.calculateTimeFrame(lastN, unit);
- }
- }
-
- public String toString() {
- return (explicitBeginEnd) ? "[begin=" + begin + end + ",end=" + end + "]" : "[lastN=" + lastN + ",unit="
- + unit + "]";
- }
- }
-
public MetricRangePreferences getMetricRangePreferences() {
MetricRangePreferences prefs = new MetricRangePreferences();
commit 438dbc355f104e60215e5bc737a7cd220f362ce1
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Mar 8 07:46:30 2011 -0500
group alert dash commit:
i)dashboard allows only appropriate portlet additions for focus resource/group.
ii)icons for portlets
iii)still issues with MeasurementRangeEditor widget and Alert Criteria results sorting.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index f5f3fc8..456343d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -50,6 +50,8 @@ import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.dashboard.Dashboard;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
@@ -92,6 +94,8 @@ public class DashboardView extends LocatableVLayout {
private int refreshInterval = 0;
private LocatableIMenuButton refreshMenuButton;
private HashMap<String, PortletViewFactory> portletMap = null;
+ private ResourceGroup focusGroup = null;
+ private Resource focusResource = null;
// this is used to prevent an odd smartgwt problem where onInit() can get called multiple times if
// the view is set to a Tab's pane.
@@ -104,6 +108,13 @@ public class DashboardView extends LocatableVLayout {
this.storedDashboard = storedDashboard;
}
+ public DashboardView(String locatorId, DashboardContainer dashboardContainer, Dashboard storedDashboard,
+ ResourceGroup group, Resource resource) {
+ this(locatorId, dashboardContainer, storedDashboard);
+ this.focusGroup = group;
+ this.focusResource = resource;
+ }
+
@Override
protected void onInit() {
if (!isInitialized) {
@@ -230,6 +241,22 @@ public class DashboardView extends LocatableVLayout {
for (String portletKey : keyNameMap.keySet()) {
nameKeyMap.put(keyNameMap.get(portletKey), portletKey);
}
+ //if resourceGroup passed in then add additional portlets to list
+ if (this.focusGroup != null) {
+ HashMap<String, String> groupKeyNameMap = PortletFactory.getRegisteredGroupPortletNameMap();
+ for (String portletKey : groupKeyNameMap.keySet()) {
+ nameKeyMap.put(groupKeyNameMap.get(portletKey), portletKey);
+ }
+ }
+
+ //if resource passed in then add additional portlets to list
+ if (this.focusResource != null) {
+ HashMap<String, String> resourceKeyNameMap = PortletFactory.getRegisteredResourcePortletNameMap();
+ for (String portletKey : resourceKeyNameMap.keySet()) {
+ nameKeyMap.put(resourceKeyNameMap.get(portletKey), portletKey);
+ }
+ }
+
// now use the reversed map for the menu generation
for (String portletName : nameKeyMap.keySet()) {
MenuItem menuItem = new MenuItem(portletName);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
index eb1e172..0d109ab 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
@@ -23,6 +23,8 @@ import java.util.HashMap;
import java.util.List;
import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.queue.AutodiscoveryPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.FavoriteResourcesPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.resource.graph.GraphPortlet;
@@ -37,6 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MashupPortl
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MessagePortlet;
/**
+ * @author Simeon Pinder
* @author Greg Hinkle
*/
public class PortletFactory {
@@ -44,7 +47,17 @@ public class PortletFactory {
private static HashMap<String, PortletViewFactory> registeredPortletFactoryMap;
private static HashMap<String, String> registeredPortletNameMap;
+ //Group portlet registrations, diff from default portlets as only applicable for specific group
+ private static HashMap<String, PortletViewFactory> registeredGroupPortletFactoryMap;
+ //Resource portlet registrations, diff from default portlets as only applicable for specific resource
+ private static HashMap<String, PortletViewFactory> registeredResourcePortletFactoryMap;
+ private static HashMap<String, String> registeredGroupPortletNameMap;
+ private static HashMap<String, String> registeredResourcePortletNameMap;
+ private static HashMap<String, String> registeredPortletIconMap;
+
static {
+ //############## Default Dashboard ############################
+ //defines portlet factory mappings for landing page Dashboard
registeredPortletFactoryMap = new HashMap<String, PortletViewFactory>();
registeredPortletFactoryMap.put(InventorySummaryPortlet.KEY, InventorySummaryPortlet.Factory.INSTANCE);
registeredPortletFactoryMap.put(RecentlyAddedResourcesPortlet.KEY,
@@ -60,6 +73,7 @@ public class PortletFactory {
registeredPortletFactoryMap.put(ProblemResourcesPortlet.KEY, ProblemResourcesPortlet.Factory.INSTANCE);
registeredPortletFactoryMap.put(OperationsPortlet.KEY, OperationsPortlet.Factory.INSTANCE);
+ //defines portlet name mappings for landing page Dashboard
registeredPortletNameMap = new HashMap<String, String>(registeredPortletFactoryMap.size());
registeredPortletNameMap.put(InventorySummaryPortlet.KEY, InventorySummaryPortlet.NAME);
registeredPortletNameMap.put(RecentlyAddedResourcesPortlet.KEY, RecentlyAddedResourcesPortlet.NAME);
@@ -73,11 +87,38 @@ public class PortletFactory {
registeredPortletNameMap.put(MessagePortlet.KEY, MessagePortlet.NAME);
registeredPortletNameMap.put(ProblemResourcesPortlet.KEY, ProblemResourcesPortlet.NAME);
registeredPortletNameMap.put(OperationsPortlet.KEY, OperationsPortlet.NAME);
+
+ //############## Group Activity Dashboard ############################################
+ //defines mapping for Group Activity Dashboard
+ registeredGroupPortletFactoryMap = new HashMap<String, PortletViewFactory>();
+ registeredGroupPortletFactoryMap.put(GroupAlertsPortlet.KEY, GroupAlertsPortlet.Factory.INSTANCE);
+
+ //register group portlet names
+ registeredGroupPortletNameMap = new HashMap<String, String>(registeredGroupPortletFactoryMap.size());
+ registeredGroupPortletNameMap.put(GroupAlertsPortlet.KEY, GroupAlertsPortlet.NAME);
+
+ //############## Resource Activity Dashboard ############################################
+ //defines mapping for Group Activity Dashboard
+ registeredResourcePortletFactoryMap = new HashMap<String, PortletViewFactory>();
+
+ //register resource portlet names
+ registeredResourcePortletNameMap = new HashMap<String, String>(registeredResourcePortletFactoryMap.size());
+
+ //############## Portlet icon mappings ############################################
+ //register portlet names
+ registeredPortletIconMap = new HashMap<String, String>(registeredPortletFactoryMap.size());
+ registeredPortletIconMap.put(GroupAlertsPortlet.KEY, ImageManager.getAlertLargeIcon());
}
public static Portlet buildPortlet(String locatorId, PortletWindow portletWindow, DashboardPortlet storedPortlet) {
PortletViewFactory viewFactory = registeredPortletFactoryMap.get(storedPortlet.getPortletKey());
+ if (viewFactory == null) {//check group view factory
+ viewFactory = registeredGroupPortletFactoryMap.get(storedPortlet.getPortletKey());
+ }
+ if (viewFactory == null) {//check resource view factory
+ viewFactory = registeredResourcePortletFactoryMap.get(storedPortlet.getPortletKey());
+ }
Portlet view = viewFactory.getInstance(locatorId);
view.configure(portletWindow, storedPortlet);
@@ -96,6 +137,18 @@ public class PortletFactory {
return portletKeys;
}
+ public static List<String> getRegisteredGroupPortletKeys() {
+
+ ArrayList<String> portletKeys = new ArrayList<String>(registeredGroupPortletFactoryMap.keySet());
+ return portletKeys;
+ }
+
+ public static List<String> getRegisteredResourcePortletKeys() {
+
+ ArrayList<String> portletKeys = new ArrayList<String>(registeredResourcePortletFactoryMap.keySet());
+ return portletKeys;
+ }
+
/**
* @return Unmodifiable Map of registered portlet keys to names
*/
@@ -104,11 +157,36 @@ public class PortletFactory {
return registeredPortletNameMap;
}
+ public static HashMap<String, String> getRegisteredGroupPortletNameMap() {
+
+ return registeredGroupPortletNameMap;
+ }
+
+ public static HashMap<String, String> getRegisteredResourcePortletNameMap() {
+
+ return registeredResourcePortletNameMap;
+ }
+
public static String getRegisteredPortletName(String key) {
return registeredPortletNameMap.get(key);
}
+ public static String getRegisteredGroupPortletName(String key) {
+
+ return registeredGroupPortletNameMap.get(key);
+ }
+
+ public static String getRegisteredResourcePortletName(String key) {
+
+ return registeredResourcePortletNameMap.get(key);
+ }
+
+ public static String getRegisteredPortletIcon(String key) {
+
+ return registeredPortletIconMap.get(key);
+ }
+
public static PortletViewFactory getRegisteredPortletFactory(String key) {
PortletViewFactory portletFactory = null;
if ((key != null) & (!key.trim().isEmpty())) {
@@ -117,4 +195,20 @@ public class PortletFactory {
return portletFactory;
}
+ public static PortletViewFactory getRegisteredGroupPortletFactory(String key) {
+ PortletViewFactory portletFactory = null;
+ if ((key != null) & (!key.trim().isEmpty())) {
+ portletFactory = registeredGroupPortletFactoryMap.get(key);
+ }
+ return portletFactory;
+ }
+
+ public static PortletViewFactory getRegisteredResourcePortletFactory(String key) {
+ PortletViewFactory portletFactory = null;
+ if ((key != null) & (!key.trim().isEmpty())) {
+ portletFactory = registeredResourcePortletFactoryMap.get(key);
+ }
+ return portletFactory;
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
index 2eac777..24f31b5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
@@ -117,11 +117,28 @@ public class PortletWindow extends LocatableWindow {
"[SKIN]/headerIcons/clipboard.png"), rssHandler);
RssHeader.setTooltip(RSS);
+ //detect customized Header icon
+ HeaderControl headerIcon = null;
+ String portletKey = storedPortlet.getPortletKey();
+ String iconUrl = PortletFactory.getRegisteredPortletIcon(portletKey);
+ if ((iconUrl != null) && (!iconUrl.trim().isEmpty())) {
+ HeaderIcon icon = new HeaderIcon(iconUrl);
+ headerIcon = new HeaderControl(icon);
+ }
+
// customize the appearance and order of the controls in the window header
- setHeaderControls(HeaderControls.MINIMIZE_BUTTON, HeaderControls.HEADER_LABEL, new LocatableHeaderControl(
- extendLocatorId("Refresh"), HeaderControl.REFRESH, refreshHandler), new LocatableHeaderControl(
- extendLocatorId("Settings"), HeaderControl.SETTINGS, settingsHandler), new LocatableHeaderControl(
- extendLocatorId("Help"), HeaderControl.HELP, helpHandler), HeaderControls.CLOSE_BUTTON);
+ if (headerIcon != null) {
+ setHeaderControls(HeaderControls.MINIMIZE_BUTTON, headerIcon, HeaderControls.HEADER_LABEL,
+ new LocatableHeaderControl(extendLocatorId("Refresh"), HeaderControl.REFRESH, refreshHandler),
+ new LocatableHeaderControl(extendLocatorId("Settings"), HeaderControl.SETTINGS, settingsHandler),
+ new LocatableHeaderControl(extendLocatorId("Help"), HeaderControl.HELP, helpHandler),
+ HeaderControls.CLOSE_BUTTON);
+ } else {
+ setHeaderControls(HeaderControls.MINIMIZE_BUTTON, HeaderControls.HEADER_LABEL, new LocatableHeaderControl(
+ extendLocatorId("Refresh"), HeaderControl.REFRESH, refreshHandler), new LocatableHeaderControl(
+ extendLocatorId("Settings"), HeaderControl.SETTINGS, settingsHandler), new LocatableHeaderControl(
+ extendLocatorId("Help"), HeaderControl.HELP, helpHandler), HeaderControls.CLOSE_BUTTON);
+ }
// enable predefined component animation
setAnimateMinimize(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
new file mode 100644
index 0000000..74c3ee9
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java
@@ -0,0 +1,509 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.types.MultipleAppearance;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
+import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
+import com.smartgwt.client.widgets.form.fields.LinkItem;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import org.rhq.core.domain.alert.Alert;
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.AlertCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeEvent;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.PropertyValueChangeListener;
+import org.rhq.enterprise.gui.coregui.client.components.measurement.MeasurementRangeEditor;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
+import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView;
+import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
+import org.rhq.enterprise.gui.coregui.client.util.GwtRelativeDurationConverter;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableCanvas;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+/**This portlet allows the end user to customize the:
+ * i)range
+ * ii)priority
+ * iii)etc.
+ * of alerts to display for the given group
+ *
+ * @author Simeon Pinder
+ */
+public class GroupAlertsPortlet extends LocatableVLayout implements CustomSettingsPortlet, AutoRefreshPortlet,
+ PropertyValueChangeListener {
+
+ private interface Constant {
+ String ALERT_PRIORITY = "ALERT_PRIORITY";
+ String RESULT_SORT_ORDER = "RESULT_SORT_ORDER";
+ String RESULT_COUNT = "RESULT_COUNT";
+ String RESULT_COUNT_DEFAULT = "5";
+ String CUSTOM_REFRESH = "CUSTOM_REFRESH";
+ }
+
+ private int groupId = -1;
+ protected LocatableCanvas recentAlertsContent = new LocatableCanvas(extendLocatorId("RecentAlerts"));
+ private static AlertGWTServiceAsync alertService = GWTServiceLookup.getAlertService();
+ private boolean currentlyLoading = false;
+ private Configuration portletConfig = null;
+ private SelectItem alertPrioritySelector = null;
+ private SelectItem resultSortSelector = null;
+ private SelectItem resultCountSelector = null;
+ private MeasurementRangeEditor measurementRangeEditor = null;
+ private DashboardPortlet storedPortlet;
+
+ public GroupAlertsPortlet(String locatorId) {
+ super(locatorId);
+ //figure out which page we're loading
+ String currentPage = History.getToken();
+ String[] elements = currentPage.split("/");
+ int currentGroupIdentifier = Integer.valueOf(elements[1]);
+ this.groupId = currentGroupIdentifier;
+ initializeUi();
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+ loadData();
+ }
+
+ /**Defines layout for the Activity page.
+ */
+ protected void initializeUi() {
+ setPadding(5);
+ setMembersMargin(5);
+ addMember(recentAlertsContent);
+ }
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "GroupAlerts";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = "Group: Alerts";
+ public static final String ID = "id";
+
+ // set on initial configuration, the window for this portlet view.
+ private PortletWindow portletWindow;
+ // private AlertPortletDataSource dataSource;
+ //instance ui widgets
+ private Canvas containerCanvas;
+
+ private Timer refreshTimer;
+ private LocatableIButton saveButton;
+
+ /** Responsible for initialization and lazy configuration of the portlet values
+ */
+ public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
+ //populate portlet configuration details
+ if (null == this.portletWindow && null != portletWindow) {
+ this.portletWindow = portletWindow;
+ }
+
+ if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
+ return;
+ }
+ this.storedPortlet = storedPortlet;
+ portletConfig = storedPortlet.getConfiguration();
+
+ //lazy init any elements not yet configured.
+ //alert priority, if empty initialize to "" i.e. all priorities
+ if (portletConfig.getSimple(Constant.ALERT_PRIORITY) == null) {
+ portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, ""));
+ }
+ //result sort order, if empty initialize to "DESC"
+ if (portletConfig.getSimple(Constant.RESULT_SORT_ORDER) == null) {
+ portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
+ }
+ //result count, if empty initialize to 5
+ if (portletConfig.getSimple(Constant.RESULT_COUNT) == null) {
+ portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT));
+ }
+
+ //custom refresh
+ //CUSTOM_REFRESH
+ }
+
+ public Canvas getHelpCanvas() {
+ return new HTMLFlow(MSG.view_portlet_help_recentAlerts());
+ }
+
+ public static final class Factory implements PortletViewFactory {
+ public static PortletViewFactory INSTANCE = new Factory();
+
+ public final Portlet getInstance(String locatorId) {
+
+ return new GroupAlertsPortlet(locatorId);
+ }
+ }
+
+ /** Fetches alerts and updates the DynamicForm instance with the latest
+ * alert information.
+ */
+ private void getRecentAlerts() {
+ final int groupId = this.groupId;
+ currentlyLoading = false;
+ //fetches last five alerts for this resource
+ AlertCriteria criteria = new AlertCriteria();
+ //filter priority
+ PropertySimple property = portletConfig.getSimple(Constant.ALERT_PRIORITY);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ String[] parsedValues = currentSetting.trim().split(",");
+ if (currentSetting.trim().isEmpty() || parsedValues.length == 3) {
+ //all alert priorities assumed
+ } else {
+ AlertPriority[] filterPriorities = new AlertPriority[parsedValues.length];
+ int indx = 0;
+ for (String priority : parsedValues) {
+ AlertPriority p = AlertPriority.valueOf(priority);
+ filterPriorities[indx++] = p;
+ }
+ criteria.addFilterPriorities(filterPriorities);
+ }
+ }
+ PageControl pc = new PageControl();
+ //result sort order
+ property = portletConfig.getSimple(Constant.RESULT_SORT_ORDER);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase(PageOrdering.DESC.name())) {
+ criteria.addSortCtime(PageOrdering.DESC);
+ pc.setPrimarySortOrder(PageOrdering.DESC);
+ } else {
+ criteria.addSortCtime(PageOrdering.ASC);
+ pc.setPrimarySortOrder(PageOrdering.ASC);
+ }
+ }
+ //result count
+ property = portletConfig.getSimple(Constant.RESULT_COUNT);
+ if (property != null) {
+ String currentSetting = property.getStringValue();
+ if (currentSetting.trim().isEmpty() || currentSetting.equalsIgnoreCase("5")) {
+ PageControl pageControl = new PageControl(0, 5);
+ pc.setPageSize(5);
+ } else {
+ PageControl pageControl = new PageControl(0, Integer.valueOf(currentSetting));
+ pc.setPageSize(Integer.valueOf(currentSetting));
+ }
+ }
+ criteria.setPageControl(pc);
+ criteria.addFilterResourceGroupIds(groupId);
+ alertService.findAlertsByCriteria(criteria, new AsyncCallback<PageList<Alert>>() {
+ @Override
+ public void onSuccess(PageList<Alert> result) {
+ VLayout column = new VLayout();
+ column.setHeight(10);
+ if (!result.isEmpty()) {
+ int rowNum = 0;
+ for (Alert alert : result) {
+ // alert history records do not have a usable locatorId, we'll use rownum, which is unique and
+ // may be repeatable.
+ LocatableDynamicForm row = new LocatableDynamicForm(recentAlertsContent.extendLocatorId(String
+ .valueOf(rowNum++)));
+ row.setNumCols(3);
+
+ StaticTextItem iconItem = AbstractActivityView.newTextItemIcon(ImageManager.getAlertIcon(alert
+ .getAlertDefinition().getPriority()), alert.getAlertDefinition().getPriority()
+ .getDisplayName());
+ LinkItem link = AbstractActivityView.newLinkItem(alert.getAlertDefinition().getName() + ": ",
+ ReportDecorator.GWT_GROUP_URL + groupId + "/Alerts/History/" + alert.getId());
+ StaticTextItem time = AbstractActivityView.newTextItem(GwtRelativeDurationConverter
+ .format(alert.getCtime()));
+ row.setItems(iconItem, link, time);
+
+ column.addMember(row);
+ }
+ //link to more details
+ LocatableDynamicForm row = new LocatableDynamicForm(recentAlertsContent.extendLocatorId(String
+ .valueOf(rowNum++)));
+ AbstractActivityView.addSeeMoreLink(row, ReportDecorator.GWT_GROUP_URL + groupId
+ + "/Alerts/History/", column);
+ } else {
+ LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(recentAlertsContent
+ .extendLocatorId("None"), AbstractActivityView.RECENT_ALERTS_NONE);
+ column.addMember(row);
+ }
+ for (Canvas child : recentAlertsContent.getChildren()) {
+ child.destroy();
+ }
+ recentAlertsContent.addChild(column);
+ recentAlertsContent.markForRedraw();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.debug("Error retrieving recent alerts for group [" + groupId + "]:" + caught.getMessage());
+ }
+ });
+ }
+
+ protected void loadData() {
+ currentlyLoading = true;
+ getRecentAlerts();
+ }
+
+ @Override
+ public DynamicForm getCustomSettingsForm() {
+ LocatableDynamicForm custom = new LocatableDynamicForm(extendLocatorId("customSettings"));
+ LocatableVLayout page = new LocatableVLayout(custom.extendLocatorId("page"));
+ //build editor form container
+ final LocatableDynamicForm form = new LocatableDynamicForm(page.extendLocatorId("alert-filter"));
+ form.setMargin(5);
+
+ //add label about what configuration affects
+
+ //add alert priority selector
+ alertPrioritySelector = getAlertPriorityEditor();
+ //add sort priority selector
+ resultSortSelector = getResulSortOrderEditor("sort.priority", "Sort Order", "Sets sort order for results.");
+ //add result count selector
+ //TODO: spinder 3/4/11 this is arbitrary. Get UXD input for better acceptable defaults
+ int[] countSelections = { 5, 10, 30, 100 };
+ resultCountSelector = getResultCountEditor(Constant.RESULT_COUNT, "Results Count",
+ "Displays N results with alerts", countSelections);
+
+ //add range selector
+ measurementRangeEditor = new MeasurementRangeEditor(page.extendLocatorId("alertTimeFrame"));
+
+ form.setItems(alertPrioritySelector, resultSortSelector, resultCountSelector);
+
+ //submit handler
+ custom.addSubmitValuesHandler(new SubmitValuesHandler() {
+
+ @Override
+ public void onSubmitValues(SubmitValuesEvent event) {
+ //alert severity
+ String selectedValue = alertPrioritySelector.getValue().toString();
+ if ((selectedValue.trim().isEmpty()) || (selectedValue.split(",").length == 3)) {//then no alertPriority specified
+ portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, ""));
+ } else {//some subset of available alertPriorities will be used
+ portletConfig.put(new PropertySimple(Constant.ALERT_PRIORITY, selectedValue));
+ }
+ //result sort order
+ selectedValue = resultSortSelector.getValue().toString();
+ if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
+ portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.DESC));
+ } else {
+ portletConfig.put(new PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
+ }
+ //result count
+ selectedValue = resultCountSelector.getValue().toString();
+ if ((selectedValue.trim().isEmpty()) || (selectedValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT))) {//then 5
+ portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, Constant.RESULT_COUNT_DEFAULT));
+ } else {
+ portletConfig.put(new PropertySimple(Constant.RESULT_COUNT, selectedValue));
+ }
+
+ //alert time frame
+ Map selectedValue3 = measurementRangeEditor.getValues();
+ String selectedValue2 = measurementRangeEditor.getValue("") + "";
+
+ //persist
+ storedPortlet.setConfiguration(portletConfig);
+ configure(portletWindow, storedPortlet);
+ loadData();
+ }
+ });
+ form.markForRedraw();
+ page.addMember(measurementRangeEditor);
+ page.addMember(form);
+ custom.addChild(page);
+ return custom;
+ }
+
+ /* single select combobox for number of items to display on the dashboard
+ *
+ * @param identifier Form identifier
+ * @param selectionTitle Title to left of combobox
+ * @param selectionHint Hint to display on mouseover
+ * @param selectionValues Integer[] to show as drop down options.
+ * @return Populated selectItem instance.
+ */
+ private SelectItem getResultCountEditor(String identifier, String selectionTitle, String selectionHint,
+ int[] selectionValues) {
+
+ final SelectItem maximumResultsComboBox = new SelectItem(identifier);
+ maximumResultsComboBox.setTitle(selectionTitle);
+ maximumResultsComboBox.setWrapTitle(false);
+ maximumResultsComboBox.setTooltip("<nobr><b> " + selectionHint + "</b></nobr>");
+ //spinder 9/3/10: the following is required workaround to disable editability of combobox.
+ maximumResultsComboBox.setType("selection");
+ //set width of dropdown display region
+ maximumResultsComboBox.setWidth(100);
+
+ //define acceptable values for display amount
+ String[] displayValues = new String[selectionValues.length];
+ int i = 0;
+ for (int selection : selectionValues) {
+ displayValues[i++] = String.valueOf(selection);
+ }
+ maximumResultsComboBox.setValueMap(displayValues);
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.RESULT_COUNT).getStringValue();
+ if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(Constant.RESULT_COUNT_DEFAULT)) {
+ maximumResultsComboBox.setValue(Constant.RESULT_COUNT_DEFAULT);
+ } else {
+ maximumResultsComboBox.setValue(currentValue);
+ }
+ return maximumResultsComboBox;
+ }
+
+ private SelectItem getAlertPriorityEditor() {
+ SelectItem priorityFilter = new SelectItem("severities", MSG.view_alerts_table_filter_priority());
+ priorityFilter.setWrapTitle(false);
+ // priorityFilter.setWidth("*");
+ priorityFilter.setWidth(200);
+ priorityFilter.setMultiple(true);
+ priorityFilter.setMultipleAppearance(MultipleAppearance.PICKLIST);
+
+ LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(3);
+ priorities.put(AlertPriority.HIGH.name(), MSG.common_alert_high());
+ priorities.put(AlertPriority.MEDIUM.name(), MSG.common_alert_medium());
+ priorities.put(AlertPriority.LOW.name(), MSG.common_alert_low());
+ LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(3);
+ priorityIcons.put(AlertPriority.HIGH.name(), ImageManager.getAlertIcon(AlertPriority.HIGH));
+ priorityIcons.put(AlertPriority.MEDIUM.name(), ImageManager.getAlertIcon(AlertPriority.MEDIUM));
+ priorityIcons.put(AlertPriority.LOW.name(), ImageManager.getAlertIcon(AlertPriority.LOW));
+ priorityFilter.setValueMap(priorities);
+ priorityFilter.setValueIcons(priorityIcons);
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.ALERT_PRIORITY).getStringValue();
+ if (currentValue.isEmpty() || currentValue.split(",").length == AlertPriority.values().length) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
+ } else {
+ //spinder:3/4/11 doing this nonsense due to some weird smartgwt issue with SelectItem in VLayout.
+ if (currentValue.equalsIgnoreCase("HIGH")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name());
+ } else if (currentValue.equalsIgnoreCase("HIGH,MEDIUM")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.MEDIUM.name());
+ } else if (currentValue.equalsIgnoreCase("HIGH,LOW")) {
+ priorityFilter.setValues(AlertPriority.HIGH.name(), AlertPriority.LOW.name());
+ } else if (currentValue.equalsIgnoreCase("MEDIUM")) {
+ priorityFilter.setValues(AlertPriority.MEDIUM.name());
+ } else if (currentValue.equalsIgnoreCase("MEDIUM,LOW")) {
+ priorityFilter.setValues(AlertPriority.MEDIUM.name(), AlertPriority.LOW.name());
+ } else {
+ priorityFilter.setValues(AlertPriority.LOW.name());
+ }
+ }
+ return priorityFilter;
+ }
+
+ private SelectItem getResulSortOrderEditor(String identifier, String selectionTitle, String selectionHint) {
+ SelectItem sortPrioritySelection = new SelectItem(identifier, selectionTitle);
+ sortPrioritySelection.setWrapTitle(false);
+ sortPrioritySelection.setTooltip(selectionHint);
+ LinkedHashMap<String, String> priorities = new LinkedHashMap<String, String>(2);
+ priorities.put(PageOrdering.ASC.name(), "Ascending");
+ priorities.put(PageOrdering.DESC.name(), "Descending");
+ LinkedHashMap<String, String> priorityIcons = new LinkedHashMap<String, String>(2);
+ priorityIcons.put(PageOrdering.ASC.name(), "ascending");
+ priorityIcons.put(PageOrdering.DESC.name(), "descending");
+
+ sortPrioritySelection.setValueMap(priorities);
+ sortPrioritySelection.setValueIcons(priorityIcons);
+ //TODO: spinder 3/4/11 not sure why this is necessary. [SKIN] not being interpreted.
+ String skinDir = "../org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images";
+ sortPrioritySelection.setImageURLPrefix(skinDir + "/actions/sort_");
+ sortPrioritySelection.setImageURLSuffix(".png");
+
+ //reload current settings if they exist, otherwise enable all.
+ String currentValue = portletConfig.getSimple(Constant.RESULT_SORT_ORDER).getStringValue();
+ if (currentValue.isEmpty() || currentValue.equalsIgnoreCase(PageOrdering.DESC.name())) {//default to descending order
+ sortPrioritySelection.setDefaultValue(PageOrdering.DESC.name());
+ } else {
+ sortPrioritySelection.setDefaultValue(PageOrdering.ASC.name());
+ }
+ return sortPrioritySelection;
+ }
+
+ @Override
+ public void startRefreshCycle() {
+ //current setting
+ final int refreshInterval = UserSessionManager.getUserPreferences().getPageRefreshInterval();
+
+ //cancel any existing timer
+ if (refreshTimer != null) {
+ refreshTimer.cancel();
+ }
+
+ if (refreshInterval >= MeasurementUtility.MINUTES) {
+
+ refreshTimer = new Timer() {
+ public void run() {
+ if (!currentlyLoading) {
+ loadData();
+ redraw();
+ }
+ }
+ };
+
+ refreshTimer.scheduleRepeating(refreshInterval);
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (refreshTimer != null) {
+
+ refreshTimer.cancel();
+ }
+ super.onDestroy();
+ }
+
+ @Override
+ public void redraw() {
+ super.redraw();
+ loadData();
+ }
+
+ @Override
+ public void propertyValueChanged(PropertyValueChangeEvent event) {
+ // TODO Auto-generated method stub
+
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index ccbe871..6db94eb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -78,23 +78,23 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
protected LocatableCanvas recentBundleDeployContent = new LocatableCanvas(extendLocatorId("RecentBundleDeploy"));
//retrieve localized text
- protected String RECENT_MEASUREMENTS = MSG.common_title_recent_measurements();
- protected String RECENT_MEASUREMENTS_NONE = MSG.view_resource_inventory_activity_no_recent_metrics();
- protected String RECENT_ALERTS = MSG.common_title_recent_alerts();
- protected String RECENT_ALERTS_NONE = MSG.view_resource_inventory_activity_no_recent_alerts();
- protected String RECENT_OOB = MSG.common_title_recent_oob_metrics();
- protected String RECENT_OOB_NONE = MSG.view_resource_inventory_activity_no_recent_oob();
- protected String RECENT_CONFIGURATIONS = MSG.common_title_recent_configuration_updates();
- protected String RECENT_CONFIGURATIONS_NONE = MSG.view_resource_inventory_activity_no_recent_config_history();
- protected String RECENT_OPERATIONS = MSG.common_title_recent_operations();
- protected String RECENT_OPERATIONS_NONE = MSG.view_resource_inventory_activity_no_recent_operations();
- protected String RECENT_EVENTS = MSG.common_title_recent_event_counts();
- protected String RECENT_EVENTS_NONE = MSG.view_resource_inventory_activity_no_recent_events();
- protected String RECENT_PKG_HISTORY = MSG.common_title_recent_pkg_history();
- protected String RECENT_PKG_HISTORY_NONE = MSG.view_resource_inventory_activity_no_recent_pkg_history();
- protected String RECENT_BUNDLE_DEPLOY = MSG.common_title_recent_bundle_deployments();
- protected String RECENT_BUNDLE_DEPLOY_NONE = MSG.view_resource_inventory_activity_no_recent_bundle_deploy();
- protected String SEE_MORE = MSG.common_msg_see_more();
+ public static String RECENT_MEASUREMENTS = MSG.common_title_recent_measurements();
+ public static String RECENT_MEASUREMENTS_NONE = MSG.view_resource_inventory_activity_no_recent_metrics();
+ public static String RECENT_ALERTS = MSG.common_title_recent_alerts();
+ public static String RECENT_ALERTS_NONE = MSG.view_resource_inventory_activity_no_recent_alerts();
+ public static String RECENT_OOB = MSG.common_title_recent_oob_metrics();
+ public static String RECENT_OOB_NONE = MSG.view_resource_inventory_activity_no_recent_oob();
+ public static String RECENT_CONFIGURATIONS = MSG.common_title_recent_configuration_updates();
+ public static String RECENT_CONFIGURATIONS_NONE = MSG.view_resource_inventory_activity_no_recent_config_history();
+ public static String RECENT_OPERATIONS = MSG.common_title_recent_operations();
+ public static String RECENT_OPERATIONS_NONE = MSG.view_resource_inventory_activity_no_recent_operations();
+ public static String RECENT_EVENTS = MSG.common_title_recent_event_counts();
+ public static String RECENT_EVENTS_NONE = MSG.view_resource_inventory_activity_no_recent_events();
+ public static String RECENT_PKG_HISTORY = MSG.common_title_recent_pkg_history();
+ public static String RECENT_PKG_HISTORY_NONE = MSG.view_resource_inventory_activity_no_recent_pkg_history();
+ public static String RECENT_BUNDLE_DEPLOY = MSG.common_title_recent_bundle_deployments();
+ public static String RECENT_BUNDLE_DEPLOY_NONE = MSG.view_resource_inventory_activity_no_recent_bundle_deploy();
+ public static String SEE_MORE = MSG.common_msg_see_more();
private ResourceGroupComposite groupComposite = null;
private ResourceComposite resourceComposite = null;
@@ -393,7 +393,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
* @param emptyMessage Contents of the empty region
* @return
*/
- public LocatableDynamicForm createEmptyDisplayRow(String locatorId, String emptyMessage) {
+ public static LocatableDynamicForm createEmptyDisplayRow(String locatorId, String emptyMessage) {
LocatableDynamicForm row = null;
row = new LocatableDynamicForm(locatorId);
@@ -406,7 +406,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
return row;
}
- public StaticTextItem newTextItemIcon(String imageSrc, String mouseOver) {
+ public static StaticTextItem newTextItemIcon(String imageSrc, String mouseOver) {
StaticTextItem iconItem = new StaticTextItem();
FormItemIcon img = new FormItemIcon();
img.setSrc(imageSrc);
@@ -420,7 +420,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
return iconItem;
}
- public LinkItem newLinkItem(String title, String destination) {
+ public static LinkItem newLinkItem(String title, String destination) {
LinkItem link = new LinkItem();
link.setLinkTitle(title);
link.setTitle(title);
@@ -430,7 +430,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
return link;
}
- public StaticTextItem newTextItem(String contents) {
+ public static StaticTextItem newTextItem(String contents) {
StaticTextItem item = new StaticTextItem();
item.setDefaultValue(contents);
item.setShowTitle(false);
@@ -445,7 +445,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
* @param linkDestination
* @param column
*/
- protected void addSeeMoreLink(LocatableDynamicForm form, String linkDestination, VLayout column) {
+ public static void addSeeMoreLink(LocatableDynamicForm form, String linkDestination, VLayout column) {
if ((form != null) && (column != null)) {
form.setNumCols(1);
LinkItem link = newLinkItem(SEE_MORE, linkDestination);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 15945c6..efcd6d7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -219,7 +219,6 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
selectedNode = treeGrid.getTree().findById(String.valueOf(this.selectedGroup.getId()));
}
- // TODO reselect tree to selected node
if (selectedNode != null) {
TreeNode[] parents = treeGrid.getTree().getParents(selectedNode);
treeGrid.getTree().openFolders(parents);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
index 121193f..d819d8b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java
@@ -45,6 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardContainer;
import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardView;
+import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupAlertsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MessagePortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -55,6 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The content pane for the group Summary>Dashboard subtab.
*
+ * @author Simeon Pinder
* @author Jay Shaughnessy
*/
@@ -125,7 +127,9 @@ public class ActivityView2 extends LocatableVLayout implements DashboardContaine
Canvas[] members = getMembers();
removeMembers(members);
- dashboardView = new DashboardView(extendLocatorId(dashboard.getName()), this, dashboard);
+ //pass in the group information
+ dashboardView = new DashboardView(extendLocatorId(dashboard.getName()), this, dashboard, this.groupComposite
+ .getResourceGroup(), null);
addMember(dashboardView);
footer = new LocatableToolStrip(extendLocatorId("Footer"));
@@ -185,9 +189,13 @@ public class ActivityView2 extends LocatableVLayout implements DashboardContaine
dashboard.getConfiguration().put(new PropertySimple(Dashboard.CFG_BACKGROUND, "#F1F2F3"));
// Left Column
- DashboardPortlet dummyLeft = new DashboardPortlet(MessagePortlet.NAME, MessagePortlet.KEY, 220);
- dummyLeft.getConfiguration().put(new PropertySimple("message", "<br/>Coming Soon... :-)"));
- dashboard.addPortlet(dummyLeft, 0, 0);
+ // DashboardPortlet dummyLeft = new DashboardPortlet(MessagePortlet.NAME, MessagePortlet.KEY, 220);
+ // dummyLeft.getConfiguration().put(new PropertySimple("message", "<br/>Coming Soon... :-)"));
+ // dashboard.addPortlet(dummyLeft, 0, 0);
+
+ DashboardPortlet groupAlerts = new DashboardPortlet(GroupAlertsPortlet.NAME, GroupAlertsPortlet.KEY, 220);
+ // groupAlerts.getConfiguration().put(new PropertySimple("message", "<br/>Coming Soon... :-)"));
+ dashboard.addPortlet(groupAlerts, 0, 0);
// right Column
DashboardPortlet dummyRight = new DashboardPortlet(MessagePortlet.NAME, MessagePortlet.KEY, 220);
13 years, 3 months
- 1
- 0
[rhq] 2 commits - modules/plugins
by fdrabek
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 64 +++++-----
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java | 50 +++----
2 files changed, 62 insertions(+), 52 deletions(-)
New commits:
commit 26a412b6e7843cbda1c10053f565797eb8e3f06a
Merge: 9330563... da3e335...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Mar 10 09:25:02 2011 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 933056376e4c0a9864e07c613e8fa4b7ff53f317
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Fri Mar 4 20:50:43 2011 +0100
BZ-669542 - Deploying exploded WAR to JBoss EAP 5 throws NPE operation fails
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
index 1b2d7f0..5733012 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java
@@ -30,11 +30,13 @@ import java.util.jar.Manifest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.jboss.deployers.spi.management.KnownDeploymentTypes;
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.profileservice.spi.ProfileKey;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.content.PackageDetailsKey;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
@@ -60,7 +62,7 @@ public class ManagedComponentDeployer implements Deployer {
private PackageDownloader downloader;
private ProfileServiceConnection profileServiceConnection;
-
+
/**
* @param downloader
*/
@@ -88,7 +90,7 @@ public class ManagedComponentDeployer implements Deployer {
abortIfApplicationAlreadyDeployed(resourceType, archiveFile);
Configuration deployTimeConfig = details.getDeploymentTimeConfiguration();
- @SuppressWarnings( { "ConstantConditions" })
+ @SuppressWarnings({ "ConstantConditions" })
boolean deployExploded = deployTimeConfig.getSimple("deployExploded").getBooleanValue();
DeploymentManager deploymentManager = this.profileServiceConnection.getDeploymentManager();
@@ -114,8 +116,9 @@ public class ManagedComponentDeployer implements Deployer {
deploymentManager.loadProfile(FARM_PROFILE_KEY);
}
+ String[] deployedArchives;
try {
- DeploymentUtils.deployArchive(deploymentManager, archiveFile, deployExploded);
+ deployedArchives = DeploymentUtils.deployArchive(deploymentManager, archiveFile, deployExploded);
} finally {
// Make sure to switch back to the 'applications' profile if we switched to the 'farm' profile above.
if (deployFarmed) {
@@ -125,29 +128,38 @@ public class ManagedComponentDeployer implements Deployer {
//if deployed exploded, we need to store the sha of source package for correct versioning
if (deployExploded) {
- String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
- .getDigestString(archiveFile);
- String deploymentName = deployTimeConfig.getSimple(DEPLOYMENT_NAME_PROPERTY).getStringValue();
- URI deployePackageURI = URI.create(deploymentName);
- // e.g.: foo.war
- String path = deployePackageURI.getPath();
- File location = new File(path);
- //We've located the deployed
- if ((location != null) && (location.isDirectory())) {
- File manifestFile = new File(location, "META-INF/MANIFEST.MF");
- Manifest manifest;
- if (manifestFile.exists()) {
- FileInputStream inputStream = new FileInputStream(manifestFile);
- manifest = new Manifest(inputStream);
- inputStream.close();
- } else {
- manifest = new Manifest();
+ for (String archive : deployedArchives) {
+
+ String shaString = new MessageDigestGenerator(MessageDigestGenerator.SHA_256)
+ .getDigestString(archiveFile);
+
+ URI deployePackageURI = URI.create(archive);
+ // e.g.: foo.war
+ String path = deployePackageURI.getPath();
+ File location = new File(path);
+ //We've located the deployed
+ if ((location != null) && (location.isDirectory())) {
+ File manifestFile = new File(location, "META-INF/MANIFEST.MF");
+ Manifest manifest;
+ if (manifestFile.exists()) {
+ FileInputStream inputStream = new FileInputStream(manifestFile);
+ manifest = new Manifest(inputStream);
+ inputStream.close();
+ } else {
+ File metaInf = new File(location, "META-INF");
+ if (!metaInf.exists())
+ if (!metaInf.mkdir())
+ throw new Exception("Could not create directory " + location + "META-INF.");
+
+ manifestFile = new File(metaInf, "MANIFEST.MF");
+ manifest = new Manifest();
+ }
+ Attributes attribs = manifest.getMainAttributes();
+ attribs.putValue("RHQ-Sha256", shaString);
+ FileOutputStream outputStream = new FileOutputStream(manifestFile);
+ manifest.write(outputStream);
+ outputStream.close();
}
- Attributes attribs = manifest.getMainAttributes();
- attribs.putValue("RHQ-Sha256", shaString);
- FileOutputStream outputStream = new FileOutputStream(manifestFile);
- manifest.write(outputStream);
- outputStream.close();
}
}
@@ -179,5 +191,5 @@ public class ManagedComponentDeployer implements Deployer {
throw new IllegalArgumentException("An application named '" + archiveFileName
+ "' is already deployed.");
}
- }
+ }
}
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java
index 7d720e2..7fb2ee8 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java
@@ -23,18 +23,20 @@
package org.rhq.plugins.jbossas5.util;
import java.io.File;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.jboss.deployers.spi.management.deploy.DeploymentManager;
import org.jboss.deployers.spi.management.deploy.DeploymentProgress;
import org.jboss.deployers.spi.management.deploy.DeploymentStatus;
import org.jboss.profileservice.spi.DeploymentOption;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.util.exception.ThrowableUtil;
@@ -72,15 +74,14 @@ public class DeploymentUtils {
*
* @throws Exception if the deployment fails for any reason
*/
- public static void deployArchive(DeploymentManager deploymentManager, File archiveFile, boolean deployExploded)
+ public static String[] deployArchive(DeploymentManager deploymentManager, File archiveFile, boolean deployExploded)
throws Exception {
String archiveFileName = archiveFile.getName();
LOG.debug("Deploying '" + archiveFileName + "' (deployExploded=" + deployExploded + ")...");
URL contentURL;
try {
contentURL = archiveFile.toURI().toURL();
- }
- catch (MalformedURLException e) {
+ } catch (MalformedURLException e) {
throw new IllegalArgumentException("Failed to convert archive file path '" + archiveFile + "' to URL.", e);
}
List<DeploymentOption> deploymentOptions = new ArrayList<DeploymentOption>();
@@ -91,20 +92,19 @@ public class DeploymentUtils {
DeploymentStatus distributeStatus;
Exception distributeFailure = null;
try {
- progress = deploymentManager.distribute(archiveFileName, contentURL, deploymentOptions
- .toArray(new DeploymentOption[deploymentOptions.size()]));
+ progress = deploymentManager.distribute(archiveFileName, contentURL,
+ deploymentOptions.toArray(new DeploymentOption[deploymentOptions.size()]));
distributeStatus = run(progress);
if (distributeStatus.isFailed()) {
- distributeFailure = (distributeStatus.getFailure() != null) ? distributeStatus.getFailure() :
- new Exception("Distribute failed for unknown reason.");
+ distributeFailure = (distributeStatus.getFailure() != null) ? distributeStatus.getFailure()
+ : new Exception("Distribute failed for unknown reason.");
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
distributeFailure = e;
}
if (distributeFailure != null) {
throw new Exception("Failed to distribute '" + contentURL + "' to '" + archiveFileName + "' - cause: "
- + ThrowableUtil.getAllMessages(distributeFailure));
+ + ThrowableUtil.getAllMessages(distributeFailure));
}
// Now that we've successfully distributed the deployment, we need to start it.
@@ -115,16 +115,15 @@ public class DeploymentUtils {
progress = deploymentManager.start(deploymentNames);
startStatus = run(progress);
if (startStatus.isFailed()) {
- startFailure = (startStatus.getFailure() != null) ? startStatus.getFailure() :
- new Exception("Start failed for unknown reason.");
+ startFailure = (startStatus.getFailure() != null) ? startStatus.getFailure() : new Exception(
+ "Start failed for unknown reason.");
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
startFailure = e;
}
if (startFailure != null) {
- LOG.error("Failed to start deployment " + Arrays.asList(deploymentNames)
- + " during deployment of '" + archiveFileName + "'. Backing out the deployment...", startFailure);
+ LOG.error("Failed to start deployment " + Arrays.asList(deploymentNames) + " during deployment of '"
+ + archiveFileName + "'. Backing out the deployment...", startFailure);
// If start failed, the app is invalid, so back out the deployment.
DeploymentStatus removeStatus;
Exception removeFailure = null;
@@ -132,23 +131,22 @@ public class DeploymentUtils {
progress = deploymentManager.remove(deploymentNames);
removeStatus = run(progress);
if (removeStatus.isFailed()) {
- removeFailure = (removeStatus.getFailure() != null) ? removeStatus.getFailure() :
- new Exception("Remove failed for unknown reason.");
+ removeFailure = (removeStatus.getFailure() != null) ? removeStatus.getFailure() : new Exception(
+ "Remove failed for unknown reason.");
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
removeFailure = e;
}
if (removeFailure != null) {
- LOG.error("Failed to remove deployment " + Arrays.asList(deploymentNames)
- + " after start failure.", removeFailure);
+ LOG.error("Failed to remove deployment " + Arrays.asList(deploymentNames) + " after start failure.",
+ removeFailure);
}
throw new Exception("Failed to start deployment " + Arrays.asList(deploymentNames)
- + " during deployment of '" + archiveFileName + "' - cause: " +
- ThrowableUtil.getAllMessages(startFailure));
+ + " during deployment of '" + archiveFileName + "' - cause: "
+ + ThrowableUtil.getAllMessages(startFailure));
}
// If we made it this far, the deployment (distribution+start) was successful.
- return;
+ return deploymentNames;
}
public static DeploymentStatus run(DeploymentProgress progress) {
13 years, 3 months
- 1
- 0
[rhq] 4 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java | 27 -
modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java | 28 -
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java | 87 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java | 54 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 113 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 41 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java | 252 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java | 194 ++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 116 +---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 13
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 2
23 files changed, 613 insertions(+), 416 deletions(-)
New commits:
commit da3e335762d14a7de2d7e6252093f88d9f21b70e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 9 23:22:05 2011 -0500
Fix a problem with a D12N link
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 392790f..9ba7787 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -49,6 +49,7 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
public static abstract class Field extends AbstractOperationHistoryDataSource.Field {
public static final String RESOURCE = "resource";
+ public static final String RESOURCE_ID = "resource.id";
public static final String ANCESTRY = "resource.ancestry";
public static final String TYPE = "resource.resourceType.id";
public static final String GROUP_OPERATION_HISTORY = "groupOperationHistory";
@@ -126,7 +127,7 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
Record[] records = buildRecords(result);
for (Record record : records) {
// enhance resource name
- int resourceId = record.getAttributeAsInt("id");
+ int resourceId = record.getAttributeAsInt(Field.RESOURCE_ID);
int resourceTypeId = record.getAttributeAsInt(Field.TYPE);
String resourceName = record.getAttributeAsString(Field.RESOURCE);
ResourceType type = types.get(resourceTypeId);
@@ -159,6 +160,7 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
ListGridRecord record = super.copyValues(from);
record.setAttribute(Field.ID, from.getId());
+ record.setAttribute(Field.RESOURCE_ID, from.getResource().getId());
record.setAttribute(Field.RESOURCE, from.getResource().getName());
record.setAttribute(Field.ANCESTRY, from.getResource().getAncestry());
record.setAttribute(Field.TYPE, from.getResource().getResourceType().getId());
commit c276e8684ce8ec25e5a98cc28021d6d1116ada9a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 9 21:28:20 2011 -0500
Some misc minor cleanup.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index b21f9c4..7e6cf94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -70,7 +70,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
*
* @author Simeon Pinder
*/
-public class ProblemResourcesPortlet extends Table implements CustomSettingsPortlet, AutoRefreshPortlet {
+public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> implements CustomSettingsPortlet,
+ AutoRefreshPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ProblemResources";
@@ -93,7 +94,6 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort
private Timer refreshTimer;
- @SuppressWarnings("unchecked")
public ProblemResourcesPortlet(String locatorId) {
super(locatorId, NAME, true);
@@ -335,7 +335,6 @@ public class ProblemResourcesPortlet extends Table implements CustomSettingsPort
}
private String[] timeRange = null;
- private Timer reloader;
public String[] getTimeRange() {
return timeRange;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index f08f1ac..192beae 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -44,10 +44,11 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
this(locatorId, null, criteria, title, headerIcons);
}
- protected RPCDataSource getDataSourceInstance() {
+ protected RPCDataSource<?> getDataSourceInstance() {
return ResourceCompositeDataSource.getInstance();
}
+ @SuppressWarnings("unchecked")
@Override
protected void configureTable() {
addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 1977126..a4d2835 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -61,6 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
*/
+@SuppressWarnings("unchecked")
public class ResourceSearchView extends Table {
private static final String DEFAULT_TITLE = MSG.view_inventory_resources_title();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
index daa29e4..d354bbd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
@@ -58,15 +58,15 @@ public class ProblemResourcesDataSource extends RPCDataSource<ProblemResourceCom
public enum Field {
- ALERTS("numAlerts", CoreGUI.getMessages().dataSource_problemResources_field_alerts()),
+ ALERTS("numAlerts", MSG.dataSource_problemResources_field_alerts()),
- ANCESTRY("resource.ancestry", CoreGUI.getMessages().common_title_ancestry()),
+ ANCESTRY("ancestry", MSG.common_title_ancestry()),
- AVAILABILITY("availabilityType", CoreGUI.getMessages().common_title_availability()),
+ AVAILABILITY("availabilityType", MSG.common_title_availability()),
- RESOURCE("resource", CoreGUI.getMessages().common_title_resource()),
+ RESOURCE("resource", MSG.common_title_resource()),
- TYPE("resourceType", CoreGUI.getMessages().common_title_type());
+ TYPE("typeId", MSG.common_title_type());
/**
* Corresponds to a property name of Resource (e.g. resourceType.name).
commit 955ddcf603bc2488ac3dc635fc9a22349d3f5d25
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 9 21:27:48 2011 -0500
Disambiguation - Fix issue where ancestry was not assigned to Server
resources for a non-persisted platform. (basically, the first
discovery report for an agent). Now updates ancestry at persist-time,
at which time the parent has already been persisted.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
index 7ce7a66..8dbb707 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java
@@ -1259,6 +1259,7 @@ public class Resource implements Comparable<Resource>, Serializable {
@PrePersist
void onPersist() {
this.mtime = this.ctime = System.currentTimeMillis();
+ updateAncestryForResource();
}
@PostPersist
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 4eb3e9e..b4d092d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -884,8 +884,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
resource.setItime(System.currentTimeMillis());
resource.setModifiedBy(subjectManager.getOverlord().getName());
- // This can be removed I think because the ancestry should be built under the covers
- //resource.buildLineage();
for (Resource childResource : resource.getChildResources()) {
initAutoDiscoveredResource(childResource, resource);
}
commit 2df4e2a11769db4cebfa71fbbec9a8ed71c9cbe6
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Mar 9 21:23:15 2011 -0500
Disambiguation Work - Operations
- OperationsPortlet (recent/scheduled)
- Operations subsystem view
- ActivityView (only removed rhq3 D12N stuff)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
index 84a494a..55c0086 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java
@@ -68,8 +68,9 @@ import org.rhq.core.domain.configuration.Configuration;
+ " ro.createdTime, "
+ " ro.status, "
+ " ro.resource.id, "
+ + " ro.resource.resourceType.id, "
+ " ro.resource.name, "
- + " ro.resource.resourceType.name) "
+ + " ro.resource.ancestry) "
+ " FROM ResourceOperationHistory ro "
+ " WHERE ro.status != 'INPROGRESS' "
+ " AND ( ro.resource.id = :resourceId OR :resourceId IS NULL )"),
@@ -79,8 +80,9 @@ import org.rhq.core.domain.configuration.Configuration;
+ " ro.createdTime, "
+ " ro.status, "
+ " ro.resource.id, "
+ + " ro.resource.resourceType.id, "
+ " ro.resource.name, "
- + " ro.resource.resourceType.name) "
+ + " ro.resource.ancestry) "
+ " FROM ResourceOperationHistory ro JOIN ro.resource.implicitGroups g JOIN g.roles r JOIN r.subjects s "
+ " WHERE ro.status != 'INPROGRESS' AND s = :subject "
+ " AND ( ro.resource.id = :resourceId OR :resourceId IS NULL )"),
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java
index 6eea462..dd34fb8 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationScheduleEntity.java
@@ -64,8 +64,9 @@ import javax.persistence.Table;
+ " '', " //
+ " ro.nextFireTime, " //
+ " ro.resource.id, " //
+ + " ro.resource.resourceType.id, " //
+ " ro.resource.name, " //
- + " ro.resource.resourceType.name) " //
+ + " ro.resource.ancestry) " //
+ " FROM ResourceOperationScheduleEntity ro " //
+ " WHERE ro.nextFireTime IS NOT NULL "), //
@NamedQuery(name = OperationScheduleEntity.QUERY_GET_SCHEDULE_RESOURCE, query = "" //
@@ -76,8 +77,9 @@ import javax.persistence.Table;
+ " '', " //
+ " ro.nextFireTime, " //
+ " ro.resource.id, " //
+ + " ro.resource.resourceType.id, " //
+ " ro.resource.name, " //
- + " ro.resource.resourceType.name) " //
+ + " ro.resource.ancestry) " //
+ " FROM ResourceOperationScheduleEntity ro " //
+ " JOIN ro.resource.implicitGroups g " //
+ " JOIN g.roles r " //
@@ -127,7 +129,7 @@ public abstract class OperationScheduleEntity implements Serializable {
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "id")
@Id
- private int id;
+ private int id;
@Column(name = "JOB_NAME", nullable = false)
private String jobName;
@@ -226,5 +228,5 @@ public abstract class OperationScheduleEntity implements Serializable {
return this.getJobId().equals(other.getJobId());
}
-
+
}
\ No newline at end of file
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java
index 7d2ae83..dac6178 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationLastCompletedComposite.java
@@ -26,37 +26,48 @@ import org.rhq.core.domain.operation.OperationRequestStatus;
public class ResourceOperationLastCompletedComposite extends OperationLastCompletedComposite {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private int resourceId;
+ private int resourceTypeId;
private String resourceName;
- private String resourceTypeName;
+ private String ancestry;
//no args constructor. Not to be used. java bean/serialization requirement
+ @SuppressWarnings("unused")
private ResourceOperationLastCompletedComposite() {
super();
- this.resourceTypeName = "(uninitialized type)";
- this.resourceName = "(uninitialized)";
+
this.resourceId = 0;
+ this.resourceTypeId = 0;
+ this.resourceName = "(unitialized)";
+ this.ancestry = "(unitialized)";
}
public ResourceOperationLastCompletedComposite(int operationId, String operationName, long operationStartTime,
- OperationRequestStatus operationStatus, int resourceId, String resourceName, String resourceTypeName) {
+ OperationRequestStatus operationStatus, int resourceId, int resourceTypeId, String resourceName, String ancestry) {
+
super(operationId, operationName, operationStartTime, operationStatus);
+
this.resourceId = resourceId;
+ this.resourceTypeId = resourceTypeId;
this.resourceName = resourceName;
- this.resourceTypeName = resourceTypeName;
+ this.ancestry = ancestry;
}
public int getResourceId() {
return resourceId;
}
+ public int getResourceTypeId() {
+ return resourceTypeId;
+ }
+
public String getResourceName() {
return resourceName;
}
- public String getResourceTypeName() {
- return resourceTypeName;
+ public String getAncestry() {
+ return ancestry;
}
}
\ No newline at end of file
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java
index 7ddd0d1..692dd73 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/operation/composite/ResourceOperationScheduleComposite.java
@@ -24,26 +24,32 @@ package org.rhq.core.domain.operation.composite;
public class ResourceOperationScheduleComposite extends OperationScheduleComposite {
- private static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 3L;
private int resourceId;
+ private int resourceTypeId;
private String resourceName;
- private String resourceTypeName;
+ private String ancestry;
//private no args constructor for serialization. Not to be used.
private ResourceOperationScheduleComposite() {
super();
- this.resourceTypeName = "(unitialized type)";
- this.resourceName = "(uninitialized)";
+
this.resourceId = 0;
+ this.resourceTypeId = 0;
+ this.resourceName = "(unitialized)";
+ this.ancestry = "(unitialized)";
}
public ResourceOperationScheduleComposite(int id, String jobName, String jobGroup, String operationName,
- long operationNextFireTime, int resourceId, String resourceName, String resourceTypeName) {
+ long operationNextFireTime, int resourceId, int resourceTypeId, String resourceName, String ancestry) {
+
super(id, jobName, jobGroup, operationName, operationNextFireTime);
+
this.resourceId = resourceId;
+ this.resourceTypeId = resourceTypeId;
this.resourceName = resourceName;
- this.resourceTypeName = resourceTypeName;
+ this.ancestry = ancestry;
}
public int getResourceId() {
@@ -54,8 +60,12 @@ public class ResourceOperationScheduleComposite extends OperationScheduleComposi
return resourceName;
}
- public String getResourceTypeName() {
- return resourceTypeName;
+ public int getResourceTypeId() {
+ return resourceTypeId;
+ }
+
+ public String getAncestry() {
+ return ancestry;
}
@Override
@@ -63,7 +73,7 @@ public class ResourceOperationScheduleComposite extends OperationScheduleComposi
StringBuilder str = new StringBuilder("ResourceOperationScheduleComposite: " + super.toString());
str.append(", resource-id=[" + resourceId);
str.append("], resource-name=[" + resourceName);
- str.append("], resource-type-name=[" + resourceTypeName);
+ str.append("], resource-type-id=[" + resourceTypeId);
str.append("]");
return str.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
index 4961299..54f6d41 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operatio
*/
import com.google.gwt.user.client.Timer;
+import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.form.DynamicForm;
@@ -29,7 +30,11 @@ import com.smartgwt.client.widgets.form.fields.CheckboxItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
+import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HeaderSpan;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.VStack;
import org.rhq.core.domain.configuration.PropertySimple;
@@ -43,6 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
import org.rhq.enterprise.gui.coregui.client.operation.RecentOperationsDataSource;
import org.rhq.enterprise.gui.coregui.client.operation.ScheduledOperationsDataSource;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
@@ -105,8 +111,6 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
@Override
protected void onInit() {
super.onInit();
- //set title for larger container
- //setTitle(TITLE);
this.recentOperationsGrid = new LocatableListGrid(recentOperations);
recentOperationsGrid.setDataSource(getDataSourceCompleted());
@@ -114,9 +118,12 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
recentOperationsGrid.setTitle(recentOperations);
recentOperationsGrid.setWidth100();
//defining header span
- String[] completedRows = new String[] { RecentOperationsDataSource.FIELD_LOCATION,
- RecentOperationsDataSource.FIELD_OPERATION, RecentOperationsDataSource.FIELD_RESOURCE,
- RecentOperationsDataSource.FIELD_STATUS, RecentOperationsDataSource.FIELD_TIME };
+ String[] completedRows = new String[] { //
+ RecentOperationsDataSource.Field.RESOURCE.propertyName(), //
+ RecentOperationsDataSource.Field.ANCESTRY.propertyName(), //
+ RecentOperationsDataSource.Field.OPERATION.propertyName(), //
+ RecentOperationsDataSource.Field.TIME.propertyName(), //
+ RecentOperationsDataSource.Field.STATUS.propertyName() };
recentOperationsGrid.setHeaderSpans(new HeaderSpan(recentOperations, completedRows));
recentOperationsGrid.setHeaderSpanHeight(20);
recentOperationsGrid.setHeaderHeight(40);
@@ -131,9 +138,11 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
scheduledOperationsGrid.setAutoFetchData(true);
scheduledOperationsGrid.setTitle(scheduledOperations);
scheduledOperationsGrid.setWidth100();
- String[] scheduledRows = new String[] { ScheduledOperationsDataSource.FIELD_LOCATION,
- ScheduledOperationsDataSource.FIELD_OPERATION, ScheduledOperationsDataSource.FIELD_RESOURCE,
- ScheduledOperationsDataSource.FIELD_TIME };
+ String[] scheduledRows = new String[] { //
+ ScheduledOperationsDataSource.Field.RESOURCE.propertyName(), //
+ ScheduledOperationsDataSource.Field.ANCESTRY.propertyName(), //
+ ScheduledOperationsDataSource.Field.OPERATION.propertyName(), //
+ ScheduledOperationsDataSource.Field.TIME.propertyName() };
scheduledOperationsGrid.setHeaderSpans(new HeaderSpan(scheduledOperations, scheduledRows));
scheduledOperationsGrid.setHeaderSpanHeight(20);
scheduledOperationsGrid.setHeaderHeight(40);
@@ -144,7 +153,69 @@ public class OperationsPortlet extends LocatableVLayout implements CustomSetting
scheduledOperationsGrid.setWrapCells(true);
addMember(scheduledOperationsGrid);
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+
+ ListGridField resourceRecent = new ListGridField(RecentOperationsDataSource.Field.RESOURCE.propertyName(),
+ RecentOperationsDataSource.Field.RESOURCE.title());
+
+ ListGridField ancestryRecent = new ListGridField(RecentOperationsDataSource.Field.ANCESTRY.propertyName(),
+ RecentOperationsDataSource.Field.ANCESTRY.title());
+ ancestryRecent.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int rowNum, int colNum) {
+ return listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_RESOURCES);
+ }
+ });
+ ancestryRecent.setShowHover(true);
+ ancestryRecent.setHoverCustomizer(new HoverCustomizer() {
+ public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) {
+ return "<p style='width:400px'>"
+ + listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_RESOURCES) + "</br>"
+ + listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_TYPES) + "</p>";
+ }
+ });
+
+ ListGridField operationRecent = new ListGridField(RecentOperationsDataSource.Field.OPERATION.propertyName(),
+ RecentOperationsDataSource.Field.OPERATION.title());
+
+ ListGridField timeRecent = new ListGridField(RecentOperationsDataSource.Field.TIME.propertyName(),
+ RecentOperationsDataSource.Field.TIME.title(), 150);
+
+ ListGridField statusRecent = new ListGridField(RecentOperationsDataSource.Field.STATUS.propertyName(),
+ RecentOperationsDataSource.Field.STATUS.title(), 50);
+ statusRecent.setAlign(Alignment.CENTER);
+
+ recentOperationsGrid.setFields(resourceRecent, ancestryRecent, operationRecent, timeRecent, statusRecent);
+
+ ListGridField resourceNext = new ListGridField(ScheduledOperationsDataSource.Field.RESOURCE.propertyName(),
+ ScheduledOperationsDataSource.Field.RESOURCE.title());
+
+ ListGridField ancestryNext = new ListGridField(ScheduledOperationsDataSource.Field.ANCESTRY.propertyName(),
+ ScheduledOperationsDataSource.Field.ANCESTRY.title());
+ ancestryNext.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int rowNum, int colNum) {
+ return listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_RESOURCES);
+ }
+ });
+ ancestryNext.setShowHover(true);
+ ancestryNext.setHoverCustomizer(new HoverCustomizer() {
+ public String hoverHTML(Object value, ListGridRecord listGridRecord, int rowNum, int colNum) {
+ return "<p style='width:400px'>"
+ + listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_RESOURCES) + "</br>"
+ + listGridRecord.getAttributeAsString(ResourceDatasource.ATTR_ANCESTRY_TYPES) + "</p>";
+ }
+ });
+
+ ListGridField operationNext = new ListGridField(ScheduledOperationsDataSource.Field.OPERATION.propertyName(),
+ ScheduledOperationsDataSource.Field.OPERATION.title());
+
+ ListGridField timeNext = new ListGridField(ScheduledOperationsDataSource.Field.TIME.propertyName(),
+ ScheduledOperationsDataSource.Field.TIME.title(), 150);
+ scheduledOperationsGrid.setFields(resourceNext, ancestryNext, operationNext, timeNext);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java
index f6fe1c5..cd7e631 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java
@@ -31,7 +31,6 @@ import org.rhq.core.domain.operation.bean.GroupOperationSchedule;
import org.rhq.core.domain.operation.bean.ResourceOperationSchedule;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
import org.rhq.core.domain.operation.composite.ResourceOperationScheduleComposite;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -40,22 +39,18 @@ import org.rhq.core.domain.util.PageList;
*/
public interface OperationGWTService extends RemoteService {
- PageList<DisambiguationReport<ResourceOperationHistory>> findResourceOperationHistoriesByCriteria(
+ PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(
ResourceOperationHistoryCriteria criteria) throws RuntimeException;
PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(GroupOperationHistoryCriteria criteria)
throws RuntimeException;
- List<DisambiguationReport<GroupOperationHistory>> findGroupOperationHistoriesByCriteriaDisambiguated(
- GroupOperationHistoryCriteria criteria) throws RuntimeException;
-
void deleteOperationHistory(int operationHistoryId, boolean deleteEvenIfInProgress) throws RuntimeException;
- List<DisambiguationReport<ResourceOperationLastCompletedComposite>> findRecentCompletedOperations(int resourceId,
+ PageList<ResourceOperationLastCompletedComposite> findRecentCompletedOperations(int resourceId,
PageControl pageControl) throws RuntimeException;
- List<DisambiguationReport<ResourceOperationScheduleComposite>> findScheduledOperations(int pageSize)
- throws RuntimeException;
+ PageList<ResourceOperationScheduleComposite> findScheduledOperations(int pageSize) throws RuntimeException;
void invokeResourceOperation(int resourceId, String operationName, Configuration parameters, String description,
int timeout) throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
index c594103..c2e47fa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
@@ -89,18 +89,18 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati
// TODO: i18n
addTableAction(extendLocatorId("ForceDelete"), MSG.view_operationHistoryList_button_forceDelete(),
- getDeleteConfirmMessage(), new TableAction() {
- public boolean isEnabled(ListGridRecord[] selection) {
- int count = selection.length;
- return (count >= 1 && hasControlPermission());
- }
+ getDeleteConfirmMessage(), new TableAction() {
+ public boolean isEnabled(ListGridRecord[] selection) {
+ int count = selection.length;
+ return (count >= 1 && hasControlPermission());
+ }
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- DSRequest requestProperties = new DSRequest();
- requestProperties.setAttribute("force", true);
- deleteSelectedRecords(requestProperties);
- }
- });
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ DSRequest requestProperties = new DSRequest();
+ requestProperties.setAttribute("force", true);
+ deleteSelectedRecords(requestProperties);
+ }
+ });
super.configureTable();
}
@@ -158,18 +158,18 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati
String statusStr = record.getAttribute(AbstractOperationHistoryDataSource.Field.STATUS);
OperationRequestStatus status = OperationRequestStatus.valueOf(statusStr);
switch (status) {
- case SUCCESS: {
- return MSG.common_status_success();
- }
- case FAILURE: {
- return MSG.common_status_failed();
- }
- case INPROGRESS: {
- return MSG.common_status_inprogress();
- }
- case CANCELED: {
- return MSG.common_status_canceled();
- }
+ case SUCCESS: {
+ return MSG.common_status_success();
+ }
+ case FAILURE: {
+ return MSG.common_status_failed();
+ }
+ case INPROGRESS: {
+ return MSG.common_status_inprogress();
+ }
+ case CANCELED: {
+ return MSG.common_status_canceled();
+ }
}
// should never get here
return MSG.common_status_unknown();
@@ -246,6 +246,14 @@ public abstract class AbstractOperationHistoryListView<T extends AbstractOperati
return resourceField;
}
+ protected ListGridField createAncestryField() {
+ ListGridField ancestryField = new ListGridField(ResourceOperationHistoryDataSource.Field.ANCESTRY, MSG
+ .common_title_ancestry());
+ ancestryField.setAlign(Alignment.LEFT);
+ ancestryField.setCellAlign(Alignment.LEFT);
+ return ancestryField;
+ }
+
@Override
protected String getDetailsLinkColumnName() {
return AbstractOperationHistoryDataSource.Field.OPERATION_NAME;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
index b692f71..eb0f23c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
@@ -50,7 +50,6 @@ import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowCo
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.operation.GroupOperationHistory;
import org.rhq.core.domain.resource.ResourceTypeFacet;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
@@ -195,8 +194,8 @@ public class ActivityView extends AbstractActivityView {
criteria.setPageControl(pageControl);
criteria.addSortStatus(PageOrdering.DESC);
- GWTServiceLookup.getOperationService().findGroupOperationHistoriesByCriteriaDisambiguated(criteria,
- new AsyncCallback<List<DisambiguationReport<GroupOperationHistory>>>() {
+ GWTServiceLookup.getOperationService().findGroupOperationHistoriesByCriteria(criteria,
+ new AsyncCallback<PageList<GroupOperationHistory>>() {
@Override
public void onFailure(Throwable caught) {
@@ -204,12 +203,12 @@ public class ActivityView extends AbstractActivityView {
}
@Override
- public void onSuccess(List<DisambiguationReport<GroupOperationHistory>> result) {
+ public void onSuccess(PageList<GroupOperationHistory> result) {
VLayout column = new VLayout();
column.setHeight(10);
if (!result.isEmpty()) {
int rowNum = 0;
- for (DisambiguationReport<GroupOperationHistory> report : result) {
+ for (GroupOperationHistory report : result) {
// operation history records do not have a usable locatorId, we'll use rownum, which is unique and
// may be repeatable.
LocatableDynamicForm row = new LocatableDynamicForm(recentOperationsContent
@@ -217,11 +216,10 @@ public class ActivityView extends AbstractActivityView {
row.setNumCols(3);
StaticTextItem iconItem = newTextItemIcon(ImageManager.getOperationResultsIcon(report
- .getOriginal().getStatus()), report.getOriginal().getStatus().getDisplayName());
- LinkItem link = newLinkItem(report.getOriginal().getOperationDefinition().getDisplayName()
- + ": ", ReportDecorator.GWT_GROUP_URL + groupId + "/Operations/History/"
- + report.getOriginal().getId());
- StaticTextItem time = newTextItem(GwtRelativeDurationConverter.format(report.getOriginal()
+ .getStatus()), report.getStatus().getDisplayName());
+ LinkItem link = newLinkItem(report.getOperationDefinition().getDisplayName() + ": ",
+ ReportDecorator.GWT_GROUP_URL + groupId + "/Operations/History/" + report.getId());
+ StaticTextItem time = newTextItem(GwtRelativeDurationConverter.format(report
.getStartedTime()));
row.setItems(iconItem, link, time);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
index 15d1f01..392790f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java
@@ -19,26 +19,28 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
-
import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.operation.ResourceOperationHistory;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDataSource;
-import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
/**
* @author Ian Springer
@@ -47,6 +49,8 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
public static abstract class Field extends AbstractOperationHistoryDataSource.Field {
public static final String RESOURCE = "resource";
+ public static final String ANCESTRY = "resource.ancestry";
+ public static final String TYPE = "resource.resourceType.id";
public static final String GROUP_OPERATION_HISTORY = "groupOperationHistory";
}
@@ -62,6 +66,9 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE);
fields.add(resourceField);
+ DataSourceTextField ancestryField = new DataSourceTextField(Field.ANCESTRY);
+ fields.add(ancestryField);
+
return fields;
}
@@ -82,39 +89,81 @@ public class ResourceOperationHistoryDataSource extends AbstractOperationHistory
criteria.setPageControl(getPageControl(request));
operationService.findResourceOperationHistoriesByCriteria(criteria,
- new AsyncCallback<PageList<DisambiguationReport<ResourceOperationHistory>>>() {
+ new AsyncCallback<PageList<ResourceOperationHistory>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.dataSource_operationHistory_error_fetchFailure(), caught);
}
- public void onSuccess(PageList<DisambiguationReport<ResourceOperationHistory>> result) {
- ListGridRecord[] resourceOperationHistoryRecords = buildRecordsFromDisambiguationReports(result);
- response.setData(resourceOperationHistoryRecords);
- processResponse(request.getRequestId(), response);
+ public void onSuccess(PageList<ResourceOperationHistory> result) {
+ //ListGridRecord[] resourceOperationHistoryRecords = buildRecordsFromDisambiguationReports(result);
+ //response.setData(resourceOperationHistoryRecords);
+ //processResponse(request.getRequestId(), response);
+ dataRetrieved(result, response, request);
}
});
}
- private ListGridRecord[] buildRecordsFromDisambiguationReports(
- Collection<DisambiguationReport<ResourceOperationHistory>> disambiguationReports) {
- List<ResourceOperationHistory> dataObjects = new ArrayList<ResourceOperationHistory>(disambiguationReports.size());
- Map<Integer, String> idToDisambiguatedNameMap = new HashMap<Integer, String>();
- for (DisambiguationReport<ResourceOperationHistory> disambiguationReport : disambiguationReports) {
- ResourceOperationHistory dataObject = disambiguationReport.getOriginal();
- dataObjects.add(dataObject);
- String disambiguatedName = ReportDecorator.decorateDisambiguationReport(disambiguationReport,
- disambiguationReport.getId(), true);
- idToDisambiguatedNameMap.put(dataObject.getId(), disambiguatedName);
+ protected void dataRetrieved(final PageList<ResourceOperationHistory> result, final DSResponse response,
+ final DSRequest request) {
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ HashSet<String> ancestries = new HashSet<String>();
+ for (ResourceOperationHistory history : result) {
+ Resource resource = history.getResource();
+ typesSet.add(resource.getResourceType().getId());
+ ancestries.add(resource.getAncestry());
}
- ListGridRecord[] records = buildRecords(dataObjects, true);
- for (ListGridRecord record : records) {
- Integer id = record.getAttributeAsInt(Field.ID);
- String disambiguatedName = idToDisambiguatedNameMap.get(id);
- record.setAttribute(Field.RESOURCE, disambiguatedName);
- }
+ // In addition to the types of the result resources, get the types of their ancestry
+ // NOTE: this may be too labor intensive in general, but since this datasource is a singleton I couldn't
+ // make it easily optional.
+ typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
+
+ ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance();
+ typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() {
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+
+ Record[] records = buildRecords(result);
+ for (Record record : records) {
+ // enhance resource name
+ int resourceId = record.getAttributeAsInt("id");
+ int resourceTypeId = record.getAttributeAsInt(Field.TYPE);
+ String resourceName = record.getAttributeAsString(Field.RESOURCE);
+ ResourceType type = types.get(resourceTypeId);
+ record.setAttribute(Field.RESOURCE, AncestryUtil
+ .getResourceLongName(resourceId, resourceName, type));
+
+ // decode ancestry
+ String ancestry = record.getAttributeAsString(Field.ANCESTRY);
+ if (null == ancestry) {
+ continue;
+ }
+ String[] decodedAncestry = AncestryUtil.decodeAncestry(resourceId, ancestry, types);
+ // Preserve the encoded ancestry for special-case formatting at higher levels. Set the
+ // decoded strings as different attributes.
+ //record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_RESOURCES, decodedAncestry[0]);
+ //record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_TYPES, decodedAncestry[1]);
+ // TODO: If we elect to use a hover handler then we'll need ListGridFields set up
+ // Until then we'll just set the Ancestry field.
+ record.setAttribute(Field.ANCESTRY, decodedAncestry[0]);
+ }
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ @Override
+ public ListGridRecord copyValues(ResourceOperationHistory from) {
+ ListGridRecord record = super.copyValues(from);
+
+ record.setAttribute(Field.ID, from.getId());
+ record.setAttribute(Field.RESOURCE, from.getResource().getName());
+ record.setAttribute(Field.ANCESTRY, from.getResource().getAncestry());
+ record.setAttribute(Field.TYPE, from.getResource().getResourceType().getId());
- return records;
+ return record;
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
index 9c93065..18d7f05 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
@@ -19,29 +19,30 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history;
+import java.util.List;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.operation.GroupOperationHistory;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.ResourceOperationHistory;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
+import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView;
-import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import java.util.List;
-
/**
* @author Ian Springer
*/
@@ -66,7 +67,7 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
if (this.showResourceField) {
StaticTextItem resourceItem = new StaticTextItem(ResourceOperationHistoryDataSource.Field.RESOURCE,
- "Resource");
+ "Resource");
resourceItem.setValue(this.disambiguatedResourceName);
items.add(1, resourceItem);
}
@@ -74,9 +75,11 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
GroupOperationHistory groupOperationHistory = operationHistory.getGroupOperationHistory();
if (groupOperationHistory != null) {
StaticTextItem groupOperationHistoryItem = new StaticTextItem(
- ResourceOperationHistoryDataSource.Field.GROUP_OPERATION_HISTORY, "Parent Group Execution");
- String groupOperationHistoryUrl = LinkManager.getGroupOperationHistoryLink(groupOperationHistory.getGroup().getId(), groupOperationHistory.getId());
- String value = "<a href=\"" + groupOperationHistoryUrl + "\">" + groupOperationHistory.getId() + "</a> (on group '" + groupOperationHistory.getGroup().getName() + "')";
+ ResourceOperationHistoryDataSource.Field.GROUP_OPERATION_HISTORY, "Parent Group Execution");
+ String groupOperationHistoryUrl = LinkManager.getGroupOperationHistoryLink(groupOperationHistory.getGroup()
+ .getId(), groupOperationHistory.getId());
+ String value = "<a href=\"" + groupOperationHistoryUrl + "\">" + groupOperationHistory.getId()
+ + "</a> (on group '" + groupOperationHistory.getGroup().getName() + "')";
groupOperationHistoryItem.setValue(value);
items.add(groupOperationHistoryItem);
}
@@ -94,20 +97,21 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
criteria.fetchResults(true);
GWTServiceLookup.getOperationService().findResourceOperationHistoriesByCriteria(criteria,
- new AsyncCallback<PageList<DisambiguationReport<ResourceOperationHistory>>>() {
+ new AsyncCallback<PageList<ResourceOperationHistory>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler()
.handleError(MSG.view_operationHistoryDetails_error_fetchFailure(), caught);
}
- public void onSuccess(PageList<DisambiguationReport<ResourceOperationHistory>> result) {
- DisambiguationReport<ResourceOperationHistory> disambiguationReport = result.get(0);
+ public void onSuccess(PageList<ResourceOperationHistory> result) {
+ ResourceOperationHistory roh = result.get(0);
if (showResourceField) {
- disambiguatedResourceName = ReportDecorator.decorateDisambiguationReport(disambiguationReport,
- disambiguationReport.getId(), true);
+ Resource resource = roh.getResource();
+
+ disambiguatedResourceName = AncestryUtil.getResourceLongName(resource.getId(), resource
+ .getName(), resource.getResourceType());
+ displayDetails(roh);
}
- ResourceOperationHistory item = disambiguationReport.getOriginal();
- displayDetails(item);
}
});
}
@@ -123,9 +127,10 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
resultsSection.addMember(title);
OperationDefinition operationDefinition = operationHistory.getOperationDefinition();
- ConfigurationDefinition resultsConfigurationDefinition = operationDefinition.getResultsConfigurationDefinition();
- if (resultsConfigurationDefinition != null &&
- !resultsConfigurationDefinition.getPropertyDefinitions().isEmpty()) {
+ ConfigurationDefinition resultsConfigurationDefinition = operationDefinition
+ .getResultsConfigurationDefinition();
+ if (resultsConfigurationDefinition != null
+ && !resultsConfigurationDefinition.getPropertyDefinitions().isEmpty()) {
ConfigurationEditor editor = new ConfigurationEditor(extendLocatorId("results"), operationDefinition
.getResultsConfigurationDefinition(), operationHistory.getResults());
editor.setReadOnly(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
index 1e37f9b..1ef75de 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
@@ -50,7 +50,6 @@ import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedCom
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.ResourceTypeFacet;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -189,7 +188,7 @@ public class ActivityView extends AbstractActivityView {
PageControl pageControl = new PageControl(0, 5);
pageControl.initDefaultOrderingField("ro.createdTime", PageOrdering.DESC);
GWTServiceLookup.getOperationService().findRecentCompletedOperations(resourceId, pageControl,
- new AsyncCallback<List<DisambiguationReport<ResourceOperationLastCompletedComposite>>>() {
+ new AsyncCallback<PageList<ResourceOperationLastCompletedComposite>>() {
@Override
public void onFailure(Throwable caught) {
@@ -198,12 +197,12 @@ public class ActivityView extends AbstractActivityView {
}
@Override
- public void onSuccess(List<DisambiguationReport<ResourceOperationLastCompletedComposite>> result) {
+ public void onSuccess(PageList<ResourceOperationLastCompletedComposite> result) {
VLayout column = new VLayout();
column.setHeight(10);
if (!result.isEmpty()) {
int rowNum = 0;
- for (DisambiguationReport<ResourceOperationLastCompletedComposite> report : result) {
+ for (ResourceOperationLastCompletedComposite report : result) {
// operation history records do not have a usable locatorId, we'll use rownum, which is unique and
// may be repeatable.
LocatableDynamicForm row = new LocatableDynamicForm(recentOperationsContent
@@ -211,12 +210,11 @@ public class ActivityView extends AbstractActivityView {
row.setNumCols(3);
StaticTextItem iconItem = newTextItemIcon(ImageManager.getOperationResultsIcon(report
- .getOriginal().getOperationStatus()), report.getOriginal().getOperationStatus()
- .getDisplayName());
- LinkItem link = newLinkItem(report.getOriginal().getOperationName() + ": ", LinkManager
+ .getOperationStatus()), report.getOperationStatus().getDisplayName());
+ LinkItem link = newLinkItem(report.getOperationName() + ": ", LinkManager
.getResourceLink(resourceId)
- + "/Operations/History/" + report.getOriginal().getOperationHistoryId());
- StaticTextItem time = newTextItem(GwtRelativeDurationConverter.format(report.getOriginal()
+ + "/Operations/History/" + report.getOperationHistoryId());
+ StaticTextItem time = newTextItem(GwtRelativeDurationConverter.format(report
.getOperationStartTime()));
row.setItems(iconItem, link, time);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
index e1d5e40..db60b8c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/RecentOperationsDataSource.java
@@ -19,28 +19,34 @@
package org.rhq.enterprise.gui.coregui.client.operation;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
-import com.smartgwt.client.data.fields.DataSourceDateTimeField;
import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationsPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
@@ -48,16 +54,56 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
* translating the deserialized content into specific record entries for display
*
* @author Simeon Pinder
+ * @author Jay Shaughnessy
*/
-public class RecentOperationsDataSource extends
- RPCDataSource<DisambiguationReport<ResourceOperationLastCompletedComposite>> {
+public class RecentOperationsDataSource extends RPCDataSource<ResourceOperationLastCompletedComposite> {
- // fields
- public static final String FIELD_RESOURCE = "resource";
- public static final String FIELD_LOCATION = "location";
- public static final String FIELD_OPERATION = "operation";
- public static final String FIELD_TIME = "time";
- public static final String FIELD_STATUS = "status";
+ public enum Field {
+
+ ANCESTRY("ancestry", MSG.common_title_ancestry()),
+
+ OPERATION("operationName", MSG.dataSource_operationSchedule_field_operationName()),
+
+ RESOURCE("resource", MSG.common_title_resource()),
+
+ STATUS("operationStatus", MSG.common_title_status()),
+
+ TIME("operationStartTime", MSG.common_title_timestamp()),
+
+ TYPE("typeId", MSG.common_title_type());
+
+ /**
+ * Corresponds to a property name of Resource (e.g. resourceType.name).
+ */
+ private String propertyName;
+
+ /**
+ * The table header for the field or property (e.g. Type).
+ */
+ private String title;
+
+ private Field(String propertyName, String title) {
+ this.propertyName = propertyName;
+ this.title = title;
+ }
+
+ public String propertyName() {
+ return propertyName;
+ }
+
+ public String title() {
+ return title;
+ }
+
+ public ListGridField getListGridField() {
+ return new ListGridField(propertyName, title);
+ }
+
+ public ListGridField getListGridField(int width) {
+ return new ListGridField(propertyName, title, width);
+ }
+
+ }
private Portlet portlet;
@@ -78,25 +124,21 @@ public class RecentOperationsDataSource extends
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE, MSG
- .dataSource_recentOperations_field_resource());
- resourceField.setPrimaryKey(true);
+ DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE.propertyName, Field.RESOURCE.title);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION, MSG
- .dataSource_recentOperations_field_location(), 200);
- fields.add(locationField);
+ DataSourceTextField ancestryField = new DataSourceTextField(Field.ANCESTRY.propertyName(), Field.ANCESTRY
+ .title());
+ fields.add(ancestryField);
- DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION, MSG
- .dataSource_recentOperations_field_operation());
+ DataSourceTextField operationField = new DataSourceTextField(Field.OPERATION.propertyName(), Field.OPERATION
+ .title());
fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME, MSG
- .dataSource_recentOperations_field_time());
+ DataSourceTextField timeField = new DataSourceTextField(Field.TIME.propertyName(), Field.TIME.title());
fields.add(timeField);
- DataSourceTextField statusField = new DataSourceTextField(FIELD_STATUS, MSG
- .dataSource_recentOperations_field_status());
+ DataSourceTextField statusField = new DataSourceTextField(Field.STATUS.propertyName, Field.STATUS.title(), 20);
fields.add(statusField);
return fields;
@@ -134,74 +176,89 @@ public class RecentOperationsDataSource extends
int resourceId = -1;
GWTServiceLookup.getOperationService().findRecentCompletedOperations(resourceId, pageControl,
- new AsyncCallback<List<DisambiguationReport<ResourceOperationLastCompletedComposite>>>() {
+ new AsyncCallback<PageList<ResourceOperationLastCompletedComposite>>() {
public void onFailure(Throwable throwable) {
CoreGUI.getErrorHandler().handleError(MSG.dataSource_recentOperations_error_fetchFailure(),
throwable);
}
- public void onSuccess(
- List<DisambiguationReport<ResourceOperationLastCompletedComposite>> recentOperationsList) {
-
- //translate DisambiguationReport into dataset entries
- response.setData(buildList(recentOperationsList));
- //entry count
- if (null != recentOperationsList) {
- response.setTotalRows(recentOperationsList.size());
- } else {
- response.setTotalRows(0);
- }
- //pass off for processing
- processResponse(request.getRequestId(), response);
+ public void onSuccess(PageList<ResourceOperationLastCompletedComposite> result) {
+ dataRetrieved(result, response, request);
}
});
}
- /** Translates the DisambiguationReport of ResourceOperationLastCompletedComposites into specific
- * and ordered record values.
- *
- * @param list DisambiguationReport of entries.
- * @return Record[] ordered record entries.
- */
- protected Record[] buildList(List<DisambiguationReport<ResourceOperationLastCompletedComposite>> list) {
-
- ListGridRecord[] dataValues = null;
- if (list != null) {
- dataValues = new ListGridRecord[list.size()];
- int indx = 0;
-
- for (DisambiguationReport<ResourceOperationLastCompletedComposite> report : list) {
- ListGridRecord record = new ListGridRecord();
- //disambiguated Resource name, decorated with html anchors to problem resources
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(
- ReportDecorator.GWT_RESOURCE_URL, report.getResourceType(), report.getOriginal().getResourceName(),
- report.getOriginal().getResourceId(), true));
- //disambiguated resource lineage, decorated with html anchors
- record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true));
- //operation name.
- record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName());
- //timestamp.
- record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationStartTime()));
- String link = generateResourceOperationStatusLink(report);
- record.setAttribute(FIELD_STATUS, link);
-
- dataValues[indx++] = record;
- }
+ protected void dataRetrieved(final PageList<ResourceOperationLastCompletedComposite> result,
+ final DSResponse response, final DSRequest request) {
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ HashSet<String> ancestries = new HashSet<String>();
+ for (ResourceOperationLastCompletedComposite composite : result) {
+ typesSet.add(composite.getResourceTypeId());
+ ancestries.add(composite.getAncestry());
}
- return dataValues;
+
+ // In addition to the types of the result resources, get the types of their ancestry
+ // NOTE: this may be too labor intensive in general, but since this datasource is a singleton I couldn't
+ // make it easily optional.
+ typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
+
+ ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance();
+ typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() {
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+
+ Record[] records = buildRecords(result);
+ for (Record record : records) {
+ // enhance resource name
+ int resourceId = record.getAttributeAsInt("id");
+ int resourceTypeId = record.getAttributeAsInt(Field.TYPE.propertyName);
+ String resourceName = record.getAttributeAsString(Field.RESOURCE.propertyName);
+ ResourceType type = types.get(resourceTypeId);
+ record.setAttribute(Field.RESOURCE.propertyName, AncestryUtil.getResourceLongName(resourceId,
+ resourceName, type));
+
+ // decode ancestry
+ String ancestry = record.getAttributeAsString(Field.ANCESTRY.propertyName());
+ if (null == ancestry) {
+ continue;
+ }
+ String[] decodedAncestry = AncestryUtil.decodeAncestry(resourceId, ancestry, types);
+ // Preserve the encoded ancestry for special-case formatting at higher levels. Set the
+ // decoded strings as different attributes.
+ record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_RESOURCES, decodedAncestry[0]);
+ record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_TYPES, decodedAncestry[1]);
+ }
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(request.getRequestId(), response);
+ }
+ });
}
- /** Generates the ResourceOperationHistory status link from DisambiguationReport passed in.
- *
- * @param report
- * @return html string for display in table.
- */
- private String generateResourceOperationStatusLink(
- DisambiguationReport<ResourceOperationLastCompletedComposite> report) {
+ @Override
+ public ListGridRecord copyValues(ResourceOperationLastCompletedComposite from) {
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute("id", from.getResourceId());
+ record.setAttribute(Field.ANCESTRY.propertyName, from.getAncestry());
+ record.setAttribute(Field.OPERATION.propertyName, from.getOperationName());
+ record.setAttribute(Field.RESOURCE.propertyName, from.getResourceName());
+ record.setAttribute(Field.STATUS.propertyName, getStatusIconLink(from));
+ record.setAttribute(Field.TIME.propertyName, new Date(from.getOperationStartTime()));
+ record.setAttribute(Field.TYPE.propertyName, from.getResourceTypeId());
- OperationRequestStatus opStatus = report.getOriginal().getOperationStatus();
- String iconLink = ImageManager.getOperationResultsIcon(opStatus);
+ record.setAttribute("entity", from);
+ return record;
+ }
+
+ @Override
+ public ResourceOperationLastCompletedComposite copyValues(Record from) {
+ throw new UnsupportedOperationException("ResourceOperationLastCompletedComposite data is read only");
+ }
+
+ private String getStatusIconLink(ResourceOperationLastCompletedComposite composite) {
+
+ OperationRequestStatus opStatus = composite.getOperationStatus();
String statusStr = "";
switch (opStatus) {
case SUCCESS: {
@@ -222,33 +279,20 @@ public class RecentOperationsDataSource extends
}
}
- String link = "<a href='"
- + LinkManager.getSubsystemResourceOperationHistoryLink(report.getOriginal().getResourceId(), report
- .getOriginal().getOperationHistoryId()) + "'>";
- String img = "<img alt='" + statusStr + "' title='" + statusStr + "' src='";
- img += ImageManager.getFullImagePath(iconLink);
- link = link + img + "'></img></a>";
- return link;
- }
-
- @Override
- public DisambiguationReport<ResourceOperationLastCompletedComposite> copyValues(Record from) {
- throw new UnsupportedOperationException("ResourceOperations data is read only");
- }
-
- @Override
- public ListGridRecord copyValues(DisambiguationReport<ResourceOperationLastCompletedComposite> from) {
- ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL, from
- .getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
- record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true));
- record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName());
- record.setAttribute(FIELD_TIME, from.getOriginal().getOperationStartTime());
- record.setAttribute(FIELD_STATUS, generateResourceOperationStatusLink(from));
-
- record.setAttribute("entity", from);
-
- return record;
+ String iconLink = ImageManager.getOperationResultsIcon(opStatus);
+ StringBuilder sbImg = new StringBuilder();
+ sbImg.append("<img alt='");
+ sbImg.append(statusStr);
+ sbImg.append("' title='");
+ sbImg.append(statusStr);
+ sbImg.append("' src='");
+ sbImg.append(ImageManager.getFullImagePath(iconLink));
+ sbImg.append("'></img>");
+
+ String url = LinkManager.getSubsystemResourceOperationHistoryLink(composite.getResourceId(), composite
+ .getOperationHistoryId());
+
+ return "<a href='" + url + "'>" + sbImg.toString() + "</a>";
}
public boolean isOperationsRangeCompletedEnabled() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java
index 4bd84b0..0f509df 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/ScheduledOperationsDataSource.java
@@ -19,25 +19,30 @@
package org.rhq.enterprise.gui.coregui.client.operation;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Map;
-import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
-import com.smartgwt.client.data.fields.DataSourceDateTimeField;
import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.operation.composite.ResourceOperationScheduleComposite;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.recent.operations.OperationsPortlet;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.resource.disambiguation.ReportDecorator;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
@@ -45,20 +50,59 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
* translating the deserialized content into specific record entries for display
*
* @author Simeon Pinder
+ * @author Jay Shaughnessy
*/
-public class ScheduledOperationsDataSource extends
- RPCDataSource<DisambiguationReport<ResourceOperationScheduleComposite>> {
+public class ScheduledOperationsDataSource extends RPCDataSource<ResourceOperationScheduleComposite> {
- // fields
- public static final String FIELD_RESOURCE = "resource";
- public static final String FIELD_LOCATION = "location";
- public static final String FIELD_OPERATION = "operation";
- public static final String FIELD_TIME = "time";
+ public enum Field {
+
+ ANCESTRY("ancestry", MSG.common_title_ancestry()),
+
+ OPERATION("operationName", MSG.dataSource_operationSchedule_field_operationName()),
+
+ RESOURCE("resource", MSG.common_title_resource()),
+
+ TIME("operationNextFireTime", MSG.dataSource_operationSchedule_field_nextFireTime()),
+
+ TYPE("typeId", MSG.common_title_type());
+
+ /**
+ * Corresponds to a property name of Resource (e.g. resourceType.name).
+ */
+ private String propertyName;
+
+ /**
+ * The table header for the field or property (e.g. Type).
+ */
+ private String title;
+
+ private Field(String propertyName, String title) {
+ this.propertyName = propertyName;
+ this.title = title;
+ }
+
+ public String propertyName() {
+ return propertyName;
+ }
+
+ public String title() {
+ return title;
+ }
+
+ public ListGridField getListGridField() {
+ return new ListGridField(propertyName, title);
+ }
+
+ public ListGridField getListGridField(int width) {
+ return new ListGridField(propertyName, title, width);
+ }
+ }
+
+ private Portlet portlet;
//config settings
private boolean operationsRangeNextEnabled = false;
private int operationsRangeScheduled = -1;
- private Portlet portlet;
/** Build list of fields for the datasource and then adds them to it.
*/
@@ -73,21 +117,18 @@ public class ScheduledOperationsDataSource extends
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
- MSG.dataSource_scheduledOperations_field_resource());
- resourceField.setPrimaryKey(true);
+ DataSourceTextField resourceField = new DataSourceTextField(Field.RESOURCE.propertyName, Field.RESOURCE.title);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
- MSG.dataSource_scheduledOperations_field_location(), 200);
- fields.add(locationField);
+ DataSourceTextField ancestryField = new DataSourceTextField(Field.ANCESTRY.propertyName(), Field.ANCESTRY
+ .title());
+ fields.add(ancestryField);
- DataSourceTextField operationField = new DataSourceTextField(FIELD_OPERATION,
- MSG.dataSource_scheduledOperations_field_operation());
+ DataSourceTextField operationField = new DataSourceTextField(Field.OPERATION.propertyName(), Field.OPERATION
+ .title());
fields.add(operationField);
- DataSourceDateTimeField timeField = new DataSourceDateTimeField(FIELD_TIME,
- MSG.dataSource_scheduledOperations_field_time());
+ DataSourceTextField timeField = new DataSourceTextField(Field.TIME.propertyName(), Field.TIME.title());
fields.add(timeField);
return fields;
@@ -124,80 +165,83 @@ public class ScheduledOperationsDataSource extends
}
GWTServiceLookup.getOperationService().findScheduledOperations(pageSize,
- new AsyncCallback<List<DisambiguationReport<ResourceOperationScheduleComposite>>>() {
+ new AsyncCallback<PageList<ResourceOperationScheduleComposite>>() {
public void onFailure(Throwable throwable) {
CoreGUI.getErrorHandler().handleError(MSG.dataSource_scheduledOperations_error_fetchFailure(),
throwable);
}
- public void onSuccess(List<DisambiguationReport<ResourceOperationScheduleComposite>> scheduledOpsList) {
-
- //translate DisambiguationReport into dataset entries
- response.setData(buildList(scheduledOpsList));
- //entry count
- if (null != scheduledOpsList) {
- response.setTotalRows(scheduledOpsList.size());
- } else {
- response.setTotalRows(0);
- }
- //pass off for processing
- processResponse(request.getRequestId(), response);
+ public void onSuccess(PageList<ResourceOperationScheduleComposite> result) {
+ dataRetrieved(result, response, request);
}
});
}
- /** Translates the DisambiguationReport of ProblemResourceComposites into specific
- * and ordered record values.
- *
- * @param list DisambiguationReport of entries.
- * @return Record[] ordered record entries.
- */
- protected Record[] buildList(List<DisambiguationReport<ResourceOperationScheduleComposite>> list) {
-
- ListGridRecord[] dataValues = null;
- if (list != null) {
- dataValues = new ListGridRecord[list.size()];
- int indx = 0;
-
- for (DisambiguationReport<ResourceOperationScheduleComposite> report : list) {
- ListGridRecord record = new ListGridRecord();
-
- //disambiguated Resource name, decorated with html anchors to problem resources
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal()
- .getResourceId(), true));
- //disambiguated resource lineage, decorated with html anchors
- record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true));
- //operation name.
- record.setAttribute(FIELD_OPERATION, report.getOriginal().getOperationName());
- //timestamp.
- record.setAttribute(FIELD_TIME, new Date(report.getOriginal().getOperationNextFireTime()));
-
- dataValues[indx++] = record;
- }
+ protected void dataRetrieved(final PageList<ResourceOperationScheduleComposite> result, final DSResponse response,
+ final DSRequest request) {
+ HashSet<Integer> typesSet = new HashSet<Integer>();
+ HashSet<String> ancestries = new HashSet<String>();
+ for (ResourceOperationScheduleComposite composite : result) {
+ typesSet.add(composite.getResourceTypeId());
+ ancestries.add(composite.getAncestry());
}
- return dataValues;
+
+ // In addition to the types of the result resources, get the types of their ancestry
+ // NOTE: this may be too labor intensive in general, but since this datasource is a singleton I couldn't
+ // make it easily optional.
+ typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
+
+ ResourceTypeRepository typeRepo = ResourceTypeRepository.Cache.getInstance();
+ typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() {
+ @Override
+ public void onTypesLoaded(Map<Integer, ResourceType> types) {
+
+ Record[] records = buildRecords(result);
+ for (Record record : records) {
+ // enhance resource name
+ int resourceId = record.getAttributeAsInt("id");
+ int resourceTypeId = record.getAttributeAsInt(Field.TYPE.propertyName);
+ String resourceName = record.getAttributeAsString(Field.RESOURCE.propertyName);
+ ResourceType type = types.get(resourceTypeId);
+ record.setAttribute(Field.RESOURCE.propertyName, AncestryUtil.getResourceLongName(resourceId,
+ resourceName, type));
+
+ // decode ancestry
+ String ancestry = record.getAttributeAsString(Field.ANCESTRY.propertyName());
+ if (null == ancestry) {
+ continue;
+ }
+ String[] decodedAncestry = AncestryUtil.decodeAncestry(resourceId, ancestry, types);
+ // Preserve the encoded ancestry for special-case formatting at higher levels. Set the
+ // decoded strings as different attributes.
+ record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_RESOURCES, decodedAncestry[0]);
+ record.setAttribute(ResourceDatasource.ATTR_ANCESTRY_TYPES, decodedAncestry[1]);
+ }
+ response.setData(records);
+ response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
+ processResponse(request.getRequestId(), response);
+ }
+ });
}
@Override
- public DisambiguationReport<ResourceOperationScheduleComposite> copyValues(Record from) {
- throw new UnsupportedOperationException("ResourceOperations data is read only");
+ public ResourceOperationScheduleComposite copyValues(Record from) {
+ throw new UnsupportedOperationException("ResourceOperationScheduleComposite data is read only");
}
@Override
- public ListGridRecord copyValues(DisambiguationReport<ResourceOperationScheduleComposite> from) {
+ public ListGridRecord copyValues(ResourceOperationScheduleComposite from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
- from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
- record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true));
- record.setAttribute(FIELD_OPERATION, from.getOriginal().getOperationName());
- record.setAttribute(FIELD_TIME, from.getOriginal().getOperationNextFireTime());
+ record.setAttribute("id", from.getResourceId());
+ record.setAttribute(Field.ANCESTRY.propertyName, from.getAncestry());
+ record.setAttribute(Field.OPERATION.propertyName, from.getOperationName());
+ record.setAttribute(Field.RESOURCE.propertyName, from.getResourceName());
+ record.setAttribute(Field.TIME.propertyName, new Date(from.getOperationNextFireTime()));
+ record.setAttribute(Field.TYPE.propertyName, from.getResourceTypeId());
record.setAttribute("entity", from);
-
return record;
-
}
public boolean isOperationsRangeScheduleEnabled() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
index d3126d8..0d4e46f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
@@ -19,8 +19,13 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.operation;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.grid.ListGridField;
+
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
@@ -30,10 +35,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.h
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDetailsView;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
/**
* @author Ian Springer
*/
@@ -69,16 +70,20 @@ public class SubsystemOperationHistoryListView extends AbstractOperationHistoryL
List<ListGridField> fields = super.createFields();
ListGridField resourceField = createResourceField();
- resourceField.setWidth("40%");
+ resourceField.setWidth("20%");
fields.add(1, resourceField);
+ ListGridField ancestryField = createAncestryField();
+ resourceField.setWidth("20%");
+ fields.add(2, ancestryField);
+
for (ListGridField field : fields) {
String fieldName = field.getName();
if (fieldName.equals(AbstractOperationHistoryDataSource.Field.SUBJECT)) {
field.setWidth("10%");
}
- if (fieldName.equals(AbstractOperationHistoryDataSource.Field.OPERATION_NAME) ||
- fieldName.equals(AbstractOperationHistoryDataSource.Field.STARTED_TIME)) {
+ if (fieldName.equals(AbstractOperationHistoryDataSource.Field.OPERATION_NAME)
+ || fieldName.equals(AbstractOperationHistoryDataSource.Field.STARTED_TIME)) {
field.setWidth("25%");
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
index 92c9426..c903f13 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java
@@ -18,7 +18,11 @@
*/
package org.rhq.enterprise.gui.coregui.server.gwt;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.quartz.CronTrigger;
@@ -31,16 +35,13 @@ import org.rhq.core.domain.operation.bean.GroupOperationSchedule;
import org.rhq.core.domain.operation.bean.ResourceOperationSchedule;
import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedComposite;
import org.rhq.core.domain.operation.composite.ResourceOperationScheduleComposite;
-import org.rhq.core.domain.resource.composite.DisambiguationReport;
+import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
-import org.rhq.core.util.IntExtractor;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
import org.rhq.enterprise.server.operation.OperationManagerLocal;
-import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.resource.disambiguation.DefaultDisambiguationUpdateStrategies;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -49,22 +50,32 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements OperationGWTService {
+ private static final long serialVersionUID = 1L;
+
+ private static Set<String> resourceFieldsSet;
+
+ static {
+ // Like Resource services, filter Resource entities in operation histories for speedier transport
+ resourceFieldsSet = new HashSet<String>(Arrays.asList(ResourceGWTServiceImpl.importantFields));
+ resourceFieldsSet.add("operationHistories");
+ }
+
private OperationManagerLocal operationManager = LookupUtil.getOperationManager();
- private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
- public PageList<DisambiguationReport<ResourceOperationHistory>> findResourceOperationHistoriesByCriteria(
+ public PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria(
ResourceOperationHistoryCriteria criteria) throws RuntimeException {
try {
- PageList<ResourceOperationHistory> resourceOperationHistories = SerialUtility.prepare(operationManager
- .findResourceOperationHistoriesByCriteria(getSessionSubject(), criteria),
- "OperationService.findResourceOperationHistoriesByCriteria");
-
- List<DisambiguationReport<ResourceOperationHistory>> disambiguatedLastCompletedResourceOps = resourceManager
- .disambiguate(resourceOperationHistories, RESOURCE_OPERATION_HISTORY_RESOURCE_ID_EXTRACTOR,
- DefaultDisambiguationUpdateStrategies.getDefault());
+ PageList<ResourceOperationHistory> result = operationManager.findResourceOperationHistoriesByCriteria(
+ getSessionSubject(), criteria);
+ if (result.size() > 0) {
+ List<Resource> resources = new ArrayList<Resource>(result.size());
+ for (ResourceOperationHistory history : result) {
+ resources.add(history.getResource());
+ }
+ ObjectFilter.filterFieldsInCollection(resources, resourceFieldsSet);
+ }
- return new PageList<DisambiguationReport<ResourceOperationHistory>>(disambiguatedLastCompletedResourceOps,
- resourceOperationHistories.getTotalSize(), resourceOperationHistories.getPageControl());
+ return SerialUtility.prepare(result, "OperationService.findResourceOperationHistoriesByCriteria");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
}
@@ -73,30 +84,10 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
public PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(GroupOperationHistoryCriteria criteria)
throws RuntimeException {
try {
- return SerialUtility.prepare(operationManager.findGroupOperationHistoriesByCriteria(getSessionSubject(),
- criteria), "OperationService.findGroupOperationHistoriesByCriteria");
- } catch (Throwable t) {
- throw new RuntimeException(ThrowableUtil.getAllMessages(t));
- }
- }
-
- public List<DisambiguationReport<GroupOperationHistory>> findGroupOperationHistoriesByCriteriaDisambiguated(
- GroupOperationHistoryCriteria criteria) throws RuntimeException {
- try {
- try {
- PageList<GroupOperationHistory> lastCompletedGroupOps = operationManager
- .findGroupOperationHistoriesByCriteria(getSessionSubject(), criteria);
-
- //translate the returned groupOperationHistories to disambiguated links
- List<DisambiguationReport<GroupOperationHistory>> disambiguatedLastCompletedGroupOps = resourceManager
- .disambiguate(lastCompletedGroupOps, GROUP_OPERATION_HISTORY_RESOURCE_ID_EXTRACTOR,
- DefaultDisambiguationUpdateStrategies.getDefault());
+ PageList<GroupOperationHistory> result = operationManager.findGroupOperationHistoriesByCriteria(
+ getSessionSubject(), criteria);
- return SerialUtility.prepare(disambiguatedLastCompletedGroupOps,
- "OperationService.findGroupOperationHistoriesByCriteriaDisambiguated");
- } catch (Throwable t) {
- throw new RuntimeException(ThrowableUtil.getAllMessages(t));
- }
+ return SerialUtility.prepare(result, "OperationService.findGroupOperationHistoriesByCriteria");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
}
@@ -113,6 +104,7 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
public void invokeResourceOperation(int resourceId, String operationName, Configuration parameters,
String description, int timeout) throws RuntimeException {
try {
+ @SuppressWarnings("unused")
ResourceOperationSchedule opSchedule = operationManager.scheduleResourceOperation(getSessionSubject(),
resourceId, operationName, 0, 0, 0, 0, parameters, description);
} catch (Throwable t) {
@@ -125,6 +117,7 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
try {
CronTrigger cronTrigger = new CronTrigger("resource " + resourceId + "_" + operationName, "group",
cronString);
+ @SuppressWarnings("unused")
ResourceOperationSchedule opSchedule = operationManager.scheduleResourceOperation(getSessionSubject(),
resourceId, operationName, parameters, cronTrigger, description);
} catch (Throwable t) {
@@ -186,8 +179,8 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
/** Find recently completed operations, disambiguate them and return that list.
*
*/
- public List<DisambiguationReport<ResourceOperationLastCompletedComposite>> findRecentCompletedOperations(
- int resourceId, PageControl pageControl) throws RuntimeException {
+ public PageList<ResourceOperationLastCompletedComposite> findRecentCompletedOperations(int resourceId,
+ PageControl pageControl) throws RuntimeException {
Integer resourceIdentifier = null;
if (resourceId > 0) {
resourceIdentifier = new Integer(resourceId);
@@ -196,12 +189,7 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
PageList<ResourceOperationLastCompletedComposite> lastCompletedResourceOps = operationManager
.findRecentlyCompletedResourceOperations(getSessionSubject(), resourceIdentifier, pageControl);
- //translate the returned problem resources to disambiguated links
- List<DisambiguationReport<ResourceOperationLastCompletedComposite>> disambiguatedLastCompletedResourceOps = resourceManager
- .disambiguate(lastCompletedResourceOps, RESOURCE_OPERATION_RESOURCE_ID_EXTRACTOR,
- DefaultDisambiguationUpdateStrategies.getDefault());
-
- return disambiguatedLastCompletedResourceOps;
+ return SerialUtility.prepare(lastCompletedResourceOps, "OperationService.findRecentCompletedOperations");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
}
@@ -210,19 +198,13 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
/** Find scheduled operations, disambiguate them and return that list.
*
*/
- public List<DisambiguationReport<ResourceOperationScheduleComposite>> findScheduledOperations(int pageSize)
- throws RuntimeException {
+ public PageList<ResourceOperationScheduleComposite> findScheduledOperations(int pageSize) throws RuntimeException {
try {
PageControl pageControl = new PageControl(0, pageSize);
PageList<ResourceOperationScheduleComposite> scheduledResourceOps = operationManager
.findCurrentlyScheduledResourceOperations(getSessionSubject(), pageControl);
- //translate the returned problem resources to disambiguated links
- List<DisambiguationReport<ResourceOperationScheduleComposite>> disambiguatedNextScheduledResourceOps = resourceManager
- .disambiguate(scheduledResourceOps, RESOURCE_OPERATION_SCHEDULE_RESOURCE_ID_EXTRACTOR,
- DefaultDisambiguationUpdateStrategies.getDefault());
-
- return disambiguatedNextScheduledResourceOps;
+ return SerialUtility.prepare(scheduledResourceOps, "OperationService.findScheduledOperations");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
}
@@ -232,6 +214,7 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
try {
List<ResourceOperationSchedule> resourceOperationSchedules = operationManager
.findScheduledResourceOperations(getSessionSubject(), resourceId);
+
return SerialUtility.prepare(resourceOperationSchedules, "findScheduledResourceOperations");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
@@ -242,34 +225,11 @@ public class OperationGWTServiceImpl extends AbstractGWTServiceImpl implements O
try {
List<GroupOperationSchedule> groupOperationSchedules = operationManager.findScheduledGroupOperations(
getSessionSubject(), groupId);
+
return SerialUtility.prepare(groupOperationSchedules, "findScheduledGroupOperations");
} catch (Throwable t) {
throw new RuntimeException(ThrowableUtil.getAllMessages(t));
}
}
- private static final IntExtractor<GroupOperationHistory> GROUP_OPERATION_HISTORY_RESOURCE_ID_EXTRACTOR = new IntExtractor<GroupOperationHistory>() {
- public int extract(GroupOperationHistory groupOperationHistory) {
- return groupOperationHistory.getGroup().getId();
- }
- };
-
- private static final IntExtractor<ResourceOperationHistory> RESOURCE_OPERATION_HISTORY_RESOURCE_ID_EXTRACTOR = new IntExtractor<ResourceOperationHistory>() {
- public int extract(ResourceOperationHistory resourceOperationHistory) {
- return resourceOperationHistory.getResource().getId();
- }
- };
-
- private static final IntExtractor<ResourceOperationLastCompletedComposite> RESOURCE_OPERATION_RESOURCE_ID_EXTRACTOR = new IntExtractor<ResourceOperationLastCompletedComposite>() {
- public int extract(ResourceOperationLastCompletedComposite resourceOperationLastCompletedComposite) {
- return resourceOperationLastCompletedComposite.getResourceId();
- }
- };
-
- private static final IntExtractor<ResourceOperationScheduleComposite> RESOURCE_OPERATION_SCHEDULE_RESOURCE_ID_EXTRACTOR = new IntExtractor<ResourceOperationScheduleComposite>() {
- public int extract(ResourceOperationScheduleComposite resourceOperationScheduleComposite) {
- return resourceOperationScheduleComposite.getResourceId();
- }
- };
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index 2925d5e..44bcb42 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -44,7 +44,6 @@ import org.rhq.core.domain.resource.composite.ResourceInstallCount;
import org.rhq.core.domain.resource.composite.ResourceLineageComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
-import org.rhq.core.util.IntExtractor;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
@@ -59,13 +58,13 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements ResourceGWTService {
- private static final long serialVersionUID = 1L;
+ static final long serialVersionUID = 1L;
private ResourceManagerLocal resourceManager = LookupUtil.getResourceManager();
private ResourceFactoryManagerLocal resourceFactoryManager = LookupUtil.getResourceFactoryManager();
private DiscoveryBossLocal discoveryBoss = LookupUtil.getDiscoveryBoss();
- private static String[] importantFields = { //
+ public static final String[] importantFields = { //
"serialVersionUID", //
// "ROOT \n" +
// "ROOT_ID \n" +
@@ -110,12 +109,6 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
private static Set<String> importantFieldsSet = new HashSet<String>(Arrays.asList(importantFields));
- private static final IntExtractor<ProblemResourceComposite> RESOURCE_ID_EXTRACTOR = new IntExtractor<ProblemResourceComposite>() {
- public int extract(ProblemResourceComposite object) {
- return object.getResourceId();
- }
- };
-
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
@@ -142,7 +135,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
try {
PageList<ResourceComposite> result = resourceManager.findResourceCompositesByCriteria(getSessionSubject(),
criteria);
- if (result.size() > 1) {
+ if (result.size() > 0) {
List<Resource> resources = new ArrayList<Resource>(result.size());
for (ResourceComposite composite : result) {
resources.add(composite.getResource());
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index d2ad756..fd3e290 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -527,7 +527,7 @@ dataSource_operationSchedule_field_operationName = Operation
dataSource_operationSchedule_field_operationDisplayName = Operation
dataSource_operationSchedule_field_subject = Owner
dataSource_operationSchedule_field_description = Notes
-dataSource_operationSchedule_field_nextFireTime = Next Scheduled Execution
+dataSource_operationSchedule_field_nextFireTime = Next Execution
dataSource_operationSchedule_field_timeout = Timeout (in seconds)
# Operation Histories
13 years, 3 months
- 1
- 0
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 2 +-
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b2d9f6691fc6bca2834ab9bd81e3776c02657c6
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Mar 9 16:43:23 2011 -0500
fix a few small typos
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
index 361692d..9e005d2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java
@@ -354,7 +354,7 @@ public class UserSessionManager {
}
public void onSuccess(Subject result) {
- Log.trace("Succesfully processed subject '"
+ Log.trace("Successfully processed subject '"
+ validSessionSubject.getName() + "' for LDAP.");
callback.onSuccess(validSessionSubject);
return;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java
index ba6c6c9..a5bfb8a 100755
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java
@@ -222,7 +222,7 @@ public interface ParamConstants {
public static final String FILTER_BY_PARAM = "filterBy";
/**
- * a value for a request paramater that holds the message key that is the reason the user is bieng presented with
+ * a value for a request parameter that holds the message key that is the reason the user is being presented with
* login page.<br>
*/
public static final String LOGON_STATUS = "loginStatus";
13 years, 3 months
- 1
- 0
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 49 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 14 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 2
3 files changed, 50 insertions(+), 15 deletions(-)
New commits:
commit 1840dab79a64b517546aeb89ca2492bfb807d458
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Mar 9 13:22:14 2011 -0500
fix table refresh so it maintains the initial criteria even when entering additional search criteria from the search bar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 7b5d087..ce0754e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -458,7 +458,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
IButton refreshButton = new LocatableIButton(extendLocatorId("Refresh"), MSG.common_button_refresh());
refreshButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- listGrid.invalidateCache();
+ refresh();
}
});
footer.addMember(refreshButton);
@@ -545,22 +545,54 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private ArrayList<Integer> fieldSizes = new ArrayList<Integer>();
- public void refresh(Criteria criteria) {
+ /**
+ * Refreshes the list grid with the explicit criteria.
+ * Usually you do not want to call this - to maintain proper filtering
+ * and usage of the initial criteria, call {@link #refresh()} instead.
+ *
+ * @param criteria the criteria to use to refresh the table with
+ */
+ protected void refresh(Criteria criteria) {
if (null != this.listGrid) {
- this.listGrid.invalidateCache();
this.listGrid.setCriteria(criteria);
+ this.listGrid.invalidateCache();
this.listGrid.markForRedraw();
}
}
+ /**
+ * Refreshes the list grid so it reloads. This attempts to maintain
+ * the original criteria along with any current filter settings.
+ */
public void refresh() {
- // if this table has a filter form (table filters OR search bar)
- // we need to refresh it as per the filtering. If there are no filters,
- // just do a allow for a default refresh by simply invalidating the cache
if (null != this.listGrid) {
+ // if this table has a filter form (table filters OR search bar)
+ // we need to refresh it as per the filtering.
if (this.filterForm != null && this.filterForm.hasContent()) {
- refresh(this.filterForm.getValuesAsCriteria());
+ Criteria filterFormCriteria = this.filterForm.getValuesAsCriteria();
+ if (this.criteria == null) {
+ // there was no initial criteria, filter based on the filter form data only
+ refresh(filterFormCriteria);
+ } else {
+ // there is both initial criteria and filters. We need criteria that combines both.
+ Criteria fullCriteria = new Criteria();
+ String[] criteriaAttribs = this.criteria.getAttributes(); // the initial criteria attributes
+ for (String attribName : criteriaAttribs) {
+ Object attribValue = this.criteria.getAttributeAsObject(attribName);
+ fullCriteria.setAttribute(attribName, attribValue);
+ }
+ if (filterFormCriteria != null) {
+ criteriaAttribs = filterFormCriteria.getAttributes(); // the filter form criteria attributes (like the search bar)
+ for (String attribName : criteriaAttribs) {
+ Object attribValue = filterFormCriteria.getAttributeAsObject(attribName);
+ fullCriteria.setAttribute(attribName, attribValue);
+ }
+ }
+ refresh(fullCriteria);
+ }
} else {
+ // If there are no filters, just do a default refresh by simply invalidating the cache.
+ // This should reuse the original initial criteria.
this.listGrid.invalidateCache();
this.listGrid.markForRedraw();
}
@@ -862,6 +894,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
String name = searchBarItem.getName();
searchBarItem.setName(name + "_hidden");
hiddenItem = new HiddenItem(name);
+ hiddenItem.setValue(searchBarItem.getSearchBar().getValue());
}
}
@@ -876,7 +909,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
}
private void fetchFilteredTableData() {
- table.refresh(getValuesAsCriteria());
+ table.refresh();
}
public void onKeyPress(KeyPressEvent event) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
index d861fad..f14d791 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
@@ -61,17 +61,14 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto
private Timer refreshTimer;
public FavoriteResourcesPortlet(String locatorId) {
- super(locatorId);
+ super(locatorId, createInitialCriteria());
setOverflow(Overflow.VISIBLE);
setShowHeader(false);
setShowFooter(false);
}
- @Override
- protected void configureTable() {
- super.configureTable();
-
+ private static Criteria createInitialCriteria() {
Set<Integer> favoriteIds = UserSessionManager.getUserPreferences().getFavoriteResources();
Integer[] favArray = favoriteIds.toArray(new Integer[favoriteIds.size()]);
@@ -83,7 +80,12 @@ public class FavoriteResourcesPortlet extends ResourceSearchView implements Auto
criteria.addCriteria("resourceIds", favArray);
}
- refresh(criteria);
+ return criteria;
+ }
+
+ @Override
+ protected void configureTable() {
+ super.configureTable();
getListGrid().addFieldStateChangedHandler(new FieldStateChangedHandler() {
public void onFieldStateChanged(FieldStateChangedEvent fieldStateChangedEvent) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index 2517d3e..465b37c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -138,7 +138,7 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView {
}
for (Table t : viewsWithTags) {
- t.refresh(criteria);
+ t.refresh();
}
}
13 years, 3 months
- 1
- 0