Merge pull request #264 from josejulio/josejulio/jon-minus-rha

Bug 1341348 - Remove Red Hat Access (RHA) integration from JBoss ON UI
rhq-project · Jun 6, 2016 · 4d67d2e · 4d67d2e
2 parents c9290a4 + 496ccb2
commit 4d67d2e
Show file tree

Hide file tree

Showing 26 changed files with 1 addition and 23,723 deletions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java
@@ -53,7 +53,6 @@
 import org.rhq.coregui.client.dashboard.DashboardsView;
 import org.rhq.coregui.client.gwt.GWTServiceLookup;
 import org.rhq.coregui.client.help.HelpView;
-import org.rhq.coregui.client.help.RhAccessView;
 import org.rhq.coregui.client.inventory.InventoryView;
 import org.rhq.coregui.client.inventory.groups.detail.ResourceGroupDetailView;
 import org.rhq.coregui.client.inventory.groups.detail.ResourceGroupTopView;
@@ -440,8 +439,6 @@ public Canvas createContent(String viewName) {
             canvas = new AlertHistoryView();
         } else if (viewName.equals(TestTopView.VIEW_ID.getName())) {
             canvas = new TestTopView();
-        } else if (!isRHQ() && viewName.equals(RhAccessView.VIEW_ID.getName())) {
-            canvas = new RhAccessView();
         } else {
             canvas = null;
         }

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/RhAccessView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/RhAccessView.java
diff --git a/...c/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java b/...c/main/java/org/rhq/coregui/client/inventory/resource/detail/OpenSupportCaseMenuItem.java
diff --git a/...egui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java b/...egui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -568,9 +568,6 @@ public void onClick(MenuItemClickEvent event) {
             resourceContextMenu.addItem(operations);
         }
 
-        // this menu item will be the last one
-        final OpenSupportCaseMenuItem openSupportCase = new OpenSupportCaseMenuItem(resourceComposite);
-
         // Create Child Menu and Manual Import Menu
         final Set<ResourceType> creatableChildTypes = getCreatableChildTypes(resourceType);
         final Set<ResourceType> importableChildTypes = getImportableChildTypes(resourceType);
@@ -604,20 +601,12 @@ public void onSuccess(PageList<Resource> singletonChildren) {
                             addMenu(MSG.common_button_import(), true, singletonChildren, resource, displayNameMap,
                                 false);
                         }
-                        if (openSupportCase.isToBeIncluded()) {
-                            resourceContextMenu.addItem(new MenuItemSeparator());
-                            resourceContextMenu.addItem(openSupportCase);
-                        }
                         resourceContextMenu.showContextMenu();
                     }
 
                     @Override
                     public void onFailure(Throwable caught) {
                         Log.error("Error resources with parentId:" + resource.getId(), caught);
-                        if (openSupportCase.isToBeIncluded()) {
-                            resourceContextMenu.addItem(new MenuItemSeparator());
-                            resourceContextMenu.addItem(openSupportCase);
-                        }
                         resourceContextMenu.showContextMenu();
                     }
                 });
@@ -631,10 +620,6 @@ public void onFailure(Throwable caught) {
                 Map<String, ResourceType> displayNameMap = getDisplayNames(importableChildTypes);
                 addMenu(MSG.common_button_import(), true, null, resource, displayNameMap, false);
             }
-            if (openSupportCase.isToBeIncluded()) {
-                resourceContextMenu.addItem(new MenuItemSeparator());
-                resourceContextMenu.addItem(openSupportCase);
-            }
             resourceContextMenu.showContextMenu();
 
         } else {
@@ -644,10 +629,6 @@ public void onFailure(Throwable caught) {
             if (!canCreate && hasImportableTypes) {
                 addMenu(MSG.common_button_import(), false, null, null, null, false);
             }
-            if (openSupportCase.isToBeIncluded()) {
-                resourceContextMenu.addItem(new MenuItemSeparator());
-                resourceContextMenu.addItem(openSupportCase);
-            }
             resourceContextMenu.showContextMenu();
         }
     }