modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 18 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 16 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java | 13 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 48 ++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 29 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 27 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 41 +---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 73 ++++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 36 +++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 8 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 43 +++-- modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png |binary modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 3 23 files changed, 261 insertions(+), 110 deletions(-)
New commits: commit 6e01a497d59df4735dee428668251d606e35c189 Author: Greg Hinkle ghinkle@redhat.com Date: Thu May 27 11:46:06 2010 -0400
Bundle buttons and images
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java index 80af8fe..4c5ad03 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java @@ -89,6 +89,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView { + ""/> " + destination.getName()));
DynamicForm form = new DynamicForm(); + form.setWidth100(); form.setNumCols(4);
LinkItem bundleName = new LinkItem("bundle"); @@ -118,6 +119,11 @@ public class BundleDestinationView extends VLayout implements BookmarkableView { tagItem.setCanvas(tagEditor); tagItem.setRowSpan(4);
+ CanvasItem actionItem = new CanvasItem("actions"); + actionItem.setShowTitle(false); + actionItem.setCanvas(getActionLayout()); + actionItem.setRowSpan(4); + StaticTextItem created = new StaticTextItem("created", "Created"); created.setValue(new Date(destination.getCtime()));
@@ -130,7 +136,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView { StaticTextItem path = new StaticTextItem("path", "Path"); path.setValue(destination.getDeployDir());
- form.setFields(bundleName, tagItem, created, destinationGroup, path); + form.setFields(bundleName, tagItem, actionItem, created, destinationGroup, path);
addMember(form);
@@ -139,26 +145,33 @@ public class BundleDestinationView extends VLayout implements BookmarkableView { deployments.setShowResizeBar(true); addMember(createDeploymentsTable());
+ + detail = new Canvas(); + detail.setHeight("50%"); + detail.hide(); + addMember(detail); + } + + private Canvas getActionLayout() { + VLayout actionLayout = new VLayout(); IButton deployButton = new IButton("Deploy"); + deployButton.setIcon("subsystems/bundle/BundleAction_Deploy_16.png"); deployButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { new BundleDeployWizard(destination).startBundleWizard(); } }); - addMember(deployButton); + actionLayout.addMember(deployButton);
IButton revertButton = new IButton("Revert"); + revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png"); revertButton.addClickHandler(new ClickHandler() { public void onClick(ClickEvent clickEvent) { new BundleRevertWizard(destination).startBundleWizard(); } }); - addMember(revertButton); - - detail = new Canvas(); - detail.setHeight("50%"); - detail.hide(); - addMember(detail); + actionLayout.addMember(revertButton); + return actionLayout; }
private Table createDeploymentsTable() { diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png new file mode 100644 index 0000000..1cfd351 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png new file mode 100644 index 0000000..fa06d44 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png new file mode 100644 index 0000000..f323445 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png new file mode 100644 index 0000000..47b8a6e Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png new file mode 100644 index 0000000..f59537a Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png differ diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png new file mode 100644 index 0000000..934800f Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png differ
commit d73773b42b3a1f6ee740cc9a33c31f851cf2283a Author: Greg Hinkle ghinkle@redhat.com Date: Thu May 27 11:31:44 2010 -0400
refactored new bundle list view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java new file mode 100644 index 0000000..4c83319 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.enterprise.gui.coregui.client.bundle.version; + +import com.smartgwt.client.data.Criteria; +import com.smartgwt.client.types.SelectionAppearance; +import com.smartgwt.client.types.SelectionStyle; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; + +/** + * @author Greg Hinkle + */ +public class BundleVersionListView extends Table { + + + public BundleVersionListView() { + } + + public BundleVersionListView(Criteria criteria) { + super("Bundle Versions", criteria); + setHeaderIcon("subsystems/bundle/BundleVersion_24.png"); + } + + @Override + protected void onInit() { + super.onInit(); + + setHeight100(); + + BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource(); + setDataSource(bundleVersionsDataSource); + + getListGrid().getField("id").setWidth("60"); + getListGrid().getField("name").setWidth("25%"); + getListGrid().getField("name").setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { + return "<a href="#Bundles/Bundle/" + listGridRecord.getAttribute("bundleId") + "/versions/" + listGridRecord.getAttribute("id") + "">" + o + "</a>"; + } + }); + + getListGrid().getField("version").setWidth("10%"); + getListGrid().getField("fileCount").setWidth("10%"); + getListGrid().getField("description").setWidth("*"); + + getListGrid().setSelectionType(SelectionStyle.NONE); + getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE); + + } +}
commit fcb208d106ecf38f9ae7f3a4842a15885bc55aab Author: Greg Hinkle ghinkle@redhat.com Date: Thu May 27 11:31:24 2010 -0400
Table cleanups in the bundle section
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java index 31c506f..9e231bd 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java @@ -70,6 +70,7 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment> @Override protected void executeFetch(final DSRequest request, final DSResponse response) { BundleDeploymentCriteria criteria = new BundleDeploymentCriteria(); + criteria.fetchBundleVersion(true);
if (request.getCriteria().getValues().containsKey("bundleId")) { criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttribute("bundleId"))); @@ -79,6 +80,18 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment> criteria.addFilterBundleVersionId(Integer.parseInt(request.getCriteria().getAttribute("bundleVersionId"))); }
+ if (request.getCriteria().getValues().get("tagNamespace") != null) { + criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace")); + } + + if (request.getCriteria().getValues().get("tagSemantic") != null) { + criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic")); + } + + if (request.getCriteria().getValues().get("tagName") != null) { + criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName")); + } + bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError("Failed to load bundle deployments", caught); @@ -109,9 +122,14 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment> record.setAttribute("createdTime", new Date(from.getCtime())); record.setAttribute("configuration", from.getConfiguration());
+ if (from.getBundleVersion() != null) { record.setAttribute("bundleVersionVersion", from.getBundleVersion().getVersion()); record.setAttribute("bundleVersionId", from.getBundleVersion().getId()); + + if (from.getBundleVersion().getBundle() != null) { + record.setAttribute("bundleId", from.getBundleVersion().getBundle().getId()); + } }
return record; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java index b0413b6..907a2a0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java @@ -47,12 +47,14 @@ public class BundleDeploymentListView extends Table {
public BundleDeploymentListView(Bundle bundle) { - super("Bundle Versions"); + super("Bundle Deployments");
this.bundle = bundle; this.bundleId = bundle.getId(); + }
- + public BundleDeploymentListView(Criteria criteria) { + super("Bundle Deployments", criteria); }
public BundleDeploymentListView(BundleVersion bundleVersion) { @@ -63,9 +65,12 @@ public class BundleDeploymentListView extends Table { @Override protected void onInit() { super.onInit(); + setHeaderIcon("subsystems/bundle/BundleDeployment_24.png"); +
- String title = "Bundle Versions"; + + String title = "Bundle Deployments"; Criteria criteria = new Criteria(); if (bundle != null) { title = bundle.getName() + " deployments"; @@ -81,10 +86,11 @@ public class BundleDeploymentListView extends Table {
setDataSource(new BundleDeploymentDataSource());
- + getListGrid().getField("id").setWidth("60"); + getListGrid().getField("name").setWidth("25%"); getListGrid().getField("name").setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord record, int i, int i1) { - return "<a href="#Bundles/Bundle/" + bundleId + "/deployments/" + record.getAttribute("id") + "">" + String.valueOf(o) + "</a>"; + return "<a href="#Bundles/Bundle/" + record.getAttribute("bundleId") + "/deployments/" + record.getAttribute("id") + "">" + String.valueOf(o) + "</a>"; } });
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java index 4787e40..a375981 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java @@ -88,6 +88,19 @@ public class BundleDestinationDataSource extends RPCDataSource<BundleDestination criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttributeAsString("bundleId"))); }
+ if (request.getCriteria().getValues().get("tagNamespace") != null) { + criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace")); + } + + if (request.getCriteria().getValues().get("tagSemantic") != null) { + criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic")); + } + + if (request.getCriteria().getValues().get("tagName") != null) { + criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName")); + } + + criteria.fetchBundle(true); criteria.fetchDeployments(true); criteria.fetchGroup(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java index cffb484..0cd85a4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java @@ -28,7 +28,6 @@ import com.smartgwt.client.data.Criteria; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; -import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeploymentStatus; import org.rhq.enterprise.gui.coregui.client.components.table.Table; @@ -36,51 +35,43 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; /** * @author Greg Hinkle */ -public class BundleDestinationListView extends VLayout { +public class BundleDestinationListView extends Table {
- private Integer bundleId;
public BundleDestinationListView() { - setWidth100(); - setHeight100(); + super("Bundle Destinations"); + }
- public BundleDestinationListView(Integer bundleId) { - this(); - this.bundleId = bundleId; + public BundleDestinationListView(Criteria criteria) { + super("Bundle Destinations", criteria); + setHeaderIcon("subsystems/bundle/BundleDestination_24.png"); }
@Override - protected void onDraw() { - super.onDraw(); - - - Criteria criteria = new Criteria(); - if (bundleId != null) { - criteria.setAttribute("bundleId",bundleId.intValue()); - } + protected void onInit() { + super.onInit();
- Table table = new Table("Bundle Destinations", criteria);
- table.setDataSource(new BundleDestinationDataSource()); + setDataSource(new BundleDestinationDataSource());
- table.getListGrid().getField("id").setWidth(45); - table.getListGrid().getField("name").setWidth("20%"); - table.getListGrid().getField("name").setCellFormatter(new CellFormatter() { + getListGrid().getField("id").setWidth(45); + getListGrid().getField("name").setWidth("20%"); + getListGrid().getField("name").setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { return "<a href="#Bundles/Bundles/" + listGridRecord.getAttribute("bundleId") + "/destinations/" + listGridRecord.getAttribute("id") + "">" + o + "</a>"; } });
- table.getListGrid().getField("description").setWidth("15%"); - //table.getListGrid().getField("bundleName").setWidth("20%"); - table.getListGrid().hideField("bundleName"); - table.getListGrid().getField("groupName").setWidth("15%"); - table.getListGrid().getField("deployDir").setWidth("15%"); + getListGrid().getField("description").setWidth("15%"); + //getListGrid().getField("bundleName").setWidth("20%"); + getListGrid().hideField("bundleName"); + getListGrid().getField("groupName").setWidth("15%"); + getListGrid().getField("deployDir").setWidth("15%");
- ListGridField status = table.getListGrid().getField("latestDeploymentStatus"); + ListGridField status = getListGrid().getField("latestDeploymentStatus"); HashMap<String, String> statusIcons = new HashMap<String, String>(); statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif"); statusIcons.put(BundleDeploymentStatus.FAILURE.name(), "subsystems/bundle/Warning_11.png"); @@ -91,8 +82,5 @@ public class BundleDestinationListView extends VLayout { status.setValueIconHeight(11); status.setWidth(80);
- - - addMember(table); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java index 9a576a6..e8985c7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java @@ -59,22 +59,30 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> { addField(deploymentCountField); }
- public int getBundleId() { - return bundleId; - } - - public void setBundleId(int bundleId) { - this.bundleId = bundleId; - } - @Override protected void executeFetch(final DSRequest request, final DSResponse response) {
BundleVersionCriteria criteria = new BundleVersionCriteria(); - criteria.addFilterBundleId(this.bundleId); criteria.fetchBundleFiles(true); + criteria.fetchBundle(true); criteria.setPageControl(getPageControl(request));
+ if (request.getCriteria().getValues().get("bundleId") != null) { + criteria.addFilterBundleId(Integer.parseInt(String.valueOf(request.getCriteria().getValues().get("bundleId")))); + } + + if (request.getCriteria().getValues().get("tagNamespace") != null) { + criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace")); + } + + if (request.getCriteria().getValues().get("tagSemantic") != null) { + criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic")); + } + + if (request.getCriteria().getValues().get("tagName") != null) { + criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName")); + } + bundleService.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError("Failed to load bundle version data", caught); @@ -112,6 +120,7 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> { ListGridRecord record = new ListGridRecord();
record.setAttribute("id", from.getId()); + record.setAttribute("bundleId", from.getBundle().getId()); record.setAttribute("name", from.getName()); record.setAttribute("description", from.getDescription()); record.setAttribute("version", from.getVersion()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java index 091ea7a..a75587f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.list; import java.util.HashSet;
import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.SelectionAppearance; import com.smartgwt.client.types.SelectionStyle; @@ -46,8 +47,10 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentView; import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView; import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationView; +import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView; import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionView; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; +import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView; import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback; @@ -82,6 +85,9 @@ public class BundleView extends VLayout implements BookmarkableView {
this.bundle = bundle;
+ addMember(new BackButton("Back to All Bundles", "Bundles")); + + headerLabel = new HeaderLabel("subsystems/bundle/Bundle_24.png", bundle.getName());
@@ -112,8 +118,10 @@ public class BundleView extends VLayout implements BookmarkableView { private Tab createDestinationsTab() { Tab destinationsTab = new Tab("Destinations");
+ Criteria criteria = new Criteria(); + criteria.addCriteria("bundleId", bundle.getId());
- destinationsTab.setPane(new BundleDestinationListView(bundle.getId())); + destinationsTab.setPane(new BundleDestinationListView(criteria));
return destinationsTab; } @@ -121,36 +129,13 @@ public class BundleView extends VLayout implements BookmarkableView { private Tab createVersionsTab() { Tab versionsTab = new Tab("Versions");
- bundleVersionsTable = new Table(); - bundleVersionsTable.setHeight100(); - - BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource(); - bundleVersionsTable.setDataSource(bundleVersionsDataSource); - - bundleVersionsTable.getListGrid().getField("id").setWidth("60"); - bundleVersionsTable.getListGrid().getField("name").setWidth("25%"); - bundleVersionsTable.getListGrid().getField("name").setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - return "<a href="#Bundles/Bundle/" + bundle.getId() + "/versions/" + listGridRecord.getAttribute("id") + "">" + o + "</a>"; - } - }); + Criteria criteria = new Criteria(); + criteria.addCriteria("bundleId", bundleBeingViewed);
- bundleVersionsTable.getListGrid().getField("version").setWidth("10%"); - bundleVersionsTable.getListGrid().getField("fileCount").setWidth("10%"); - bundleVersionsTable.getListGrid().getField("description").setWidth("*"); - - bundleVersionsTable.getListGrid().setSelectionType(SelectionStyle.NONE); - bundleVersionsTable.getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE); + bundleVersionsTable = new BundleVersionListView(criteria);
versionsTab.setPane(bundleVersionsTable);
- // versions tab - BundleVersionDataSource bvDataSource; - bvDataSource = (BundleVersionDataSource) bundleVersionsTable.getDataSource(); - bvDataSource.setBundleId(bundleBeingViewed); - bvDataSource.fetchData(); - bundleVersionsTable.getListGrid().invalidateCache(); // TODO: is there a better way to refresh? - return versionsTab; }
@@ -239,7 +224,7 @@ public class BundleView extends VLayout implements BookmarkableView { Bundle bundle = result.get(0); viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName())); viewBundle(bundle, viewPath.getCurrent()); - viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName())); +// viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName())); CoreGUI.refreshBreadCrumbTrail(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java index bd2cfe9..e6cfcd6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java @@ -53,6 +53,7 @@ public class BundlesListView extends Table {
public BundlesListView(Criteria criteria) { super("Bundles", criteria); + setHeaderIcon("subsystems/bundle/Bundle_24.png"); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java index e36289e..037418e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java @@ -49,7 +49,7 @@ public class BundleTreeView extends TreeGrid {
setWidth100(); setHeight100(); - setShowRoot(true); +// setShowRoot(true); setAutoFetchData(true); setAnimateFolders(false); setSelectionType(SelectionStyle.SINGLE); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java index c678d6f..c668e84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java @@ -42,6 +42,7 @@ import org.rhq.core.domain.criteria.BundleVersionCriteria; import org.rhq.core.domain.tagging.Tag; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; +import org.rhq.enterprise.gui.coregui.client.Breadcrumb; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ViewId; import org.rhq.enterprise.gui.coregui.client.ViewPath; @@ -189,6 +190,7 @@ public class BundleVersionView extends VLayout implements BookmarkableView { public void renderView(final ViewPath viewPath) { int bundleVersionId = Integer.parseInt(viewPath.getCurrent().getPath());
+ final ViewId viewId = viewPath.getCurrent();
BundleVersionCriteria criteria = new BundleVersionCriteria(); criteria.addFilterId(bundleVersionId); @@ -205,7 +207,9 @@ public class BundleVersionView extends VLayout implements BookmarkableView { }
public void onSuccess(PageList<BundleVersion> result) { - viewBundleVersion(result.get(0), viewPath.getCurrent()); + BundleVersion version = result.get(0); + viewBundleVersion(version, viewPath.getCurrent()); + viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(version.getId()), version.getName())); } });
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 d264d36..592bceb 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 @@ -29,6 +29,7 @@ import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.Img; import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; @@ -65,6 +66,8 @@ public class Table extends VLayout { private Label tableInfo; private String[] excludedFieldNames;
+ private String headerIcon; +
private boolean showFooter = true;
@@ -170,16 +173,6 @@ public class Table extends VLayout { } }
- titleLayout = new HLayout(); - titleLayout.setAutoHeight(); - titleLayout.setAlign(VerticalAlignment.BOTTOM); - titleLayout.addMember(title); - - if (titleComponent != null) { - titleLayout.addMember(new LayoutSpacer()); - titleLayout.addMember(titleComponent); - } -
tableInfo.setWrap(false);
@@ -193,6 +186,22 @@ public class Table extends VLayout {
removeMembers(getMembers());
+ + titleLayout = new HLayout(); + titleLayout.setAutoHeight(); + titleLayout.setAlign(VerticalAlignment.BOTTOM); + + if (headerIcon != null) { + titleLayout.addMember(new Img(headerIcon,24, 24)); + } + + titleLayout.addMember(title); + + if (titleComponent != null) { + titleLayout.addMember(new LayoutSpacer()); + titleLayout.addMember(titleComponent); + } + addMember(titleLayout); addMember(listGrid); if (showFooter) { @@ -335,6 +344,13 @@ public class Table extends VLayout { this.extraWidgets.add(canvas); }
+ public String getHeaderIcon() { + return headerIcon; + } + + public void setHeaderIcon(String headerIcon) { + this.headerIcon = headerIcon; + }
private void refreshTableInfo() { if (showFooter) { 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 61cd57f..91627d2 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 @@ -75,6 +75,8 @@ public class ResourceSearchView extends Table { public ResourceSearchView(Criteria criteria, String title, SortSpecifier[] sortSpecifier, String[] excludeFields) { super(title, criteria, sortSpecifier, excludeFields);
+ setHeaderIcon("types/Platform_up_24.png"); + setWidth100(); setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java index c97936c..a166177 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java @@ -66,6 +66,10 @@ public class TagCloudView extends VLayout {
private void drawTags(PageList<TagReportComposite> tags) {
+ if (tags == null) { + return; // Tags still loading + } + this.tags = tags;
addMember(new HeaderLabel("Tag Cloud")); @@ -96,6 +100,10 @@ public class TagCloudView extends VLayout {
buf.append("<a href="#Tag/" + tag.getTag().toString() + "" style="font-size: " + font + "pt; margin: 8px;"");
+ + buf.append(" title="Tag used " + tag.getTotal() + " times""); + + if (tag.getTag().toString().equals(selectedTag)) { buf.append(" class="selectedTag""); } 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 f837397..b69eb0e 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 @@ -22,6 +22,8 @@ */ package org.rhq.enterprise.gui.coregui.client.report.tag;
+import java.util.ArrayList; + import com.smartgwt.client.data.Criteria; import com.smartgwt.client.data.SortSpecifier; import com.smartgwt.client.widgets.Canvas; @@ -31,7 +33,11 @@ import com.smartgwt.client.widgets.tile.TileLayout; import org.rhq.core.domain.tagging.Tag; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.ViewPath; +import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentListView; +import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView; import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView; +import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/** @@ -43,9 +49,8 @@ public class TaggedView extends VLayout implements BookmarkableView {
private Criteria criteria;
- private ResourceSearchView resourceView;
- private BundlesListView bundlesView; + private ArrayList<Table> tiles = new ArrayList<Table>();
private TileLayout tileLayout;
@@ -88,27 +93,31 @@ public class TaggedView extends VLayout implements BookmarkableView { tileLayout.setTileWidth(getWidth() / 2 - 20); addMember(tileLayout);
- tileLayout.addTile(getResourceCanvas(criteria)); - tileLayout.addTile(getBundleCanvas(criteria));
- } + ResourceSearchView resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[]{}, new String[]{"pluginName", "category", "currentAvailability"}); + tiles.add(resourceView);
- resourceView.refresh(criteria); - bundlesView.refresh(criteria); - } + BundlesListView bundlesView = new BundlesListView(criteria); + tiles.add(bundlesView);
+ BundleVersionListView bundleVersionListView = new BundleVersionListView(criteria); + tiles.add(bundleVersionListView);
- private Canvas getResourceCanvas(Criteria criteria) { - resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[] {},new String[]{"pluginName", "category", "currentAvailability"}); - resourceView.setShowFooter(false); - return resourceView; - } + BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(criteria); + tiles.add(bundleDeploymentListView);
+ BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(criteria); + tiles.add(bundleDestinationListView);
- private Canvas getBundleCanvas(Criteria criteria) { - bundlesView = new BundlesListView(criteria); - bundlesView.setShowFooter(false); - return bundlesView; + for (Table t : tiles) { + t.setShowFooter(false); + tileLayout.addTile(t); + } + } + + for (Table t : tiles) { + t.refresh(criteria); + } }
commit 4f834c8e08c274914f9532bab0e869f2a5d372ec Author: Greg Hinkle ghinkle@redhat.com Date: Thu May 27 11:28:56 2010 -0400
Links to bundle system in admin->content menu
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index b493582..9f9995a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -71,6 +71,9 @@ public class MenuBarView extends VLayout { protected void onDraw() { super.onDraw();
+ this.aboutModalWindow = new AboutModalWindow(); + + // TODO GH: This is a nasty hack... it injects the css to override the smartgwt skin String css = ".menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {\n" + " border: none;\n" + @@ -131,7 +134,6 @@ public class MenuBarView extends VLayout { overviewMenu.addItem(subsystemsSubMenuItem); overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue",LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng")); overviewMenu.addItem(new EMenuItem("Dashboard",LinkManager.getDashboardLink()));//,new LinkCommand("#cofng")); - overviewMenu.addItem(new EMenuItem("Bundles", "#Bundles"));
Menu resourcesMenu = new Menu(); @@ -179,6 +181,7 @@ public class MenuBarView extends VLayout {
Menu contentMenu = new Menu(); contentMenu.setTitle("Content"); + contentMenu.addItem(new EMenuItem("Bundles","#Bundles")); contentMenu.addItem(new EMenuItem("Content Providers",LinkManager.getAdminContentProvidersLink())); contentMenu.addItem(new EMenuItem("Content Repositories",LinkManager.getAdminContentReposLink())); MenuItem contentSubMenuItem = new MenuItem("Content"); diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml index 50efde2..ab5ece0 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml @@ -344,6 +344,9 @@
ui:remove***** Administration > CONTENT *****</ui:remove> <rich:menuGroup value="Content" rendered="#{GlobalPermissionsUIBean.inventory}"> + <rich:menuItem submitMode="none" onclick="window.location = '/coregui/CoreGUI.html#Bundles'"> + <h:outputText value="Bundles"/> + </rich:menuItem> <rich:menuItem submitMode="none" onclick="window.location = '/rhq/content/listContentProviders.xhtml'"> <h:outputText value="Content Sources"/> </rich:menuItem>