Remove Tags from Network Topology View and others

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1529718
ManageIQ · Oct 30, 2019 · 12e8e50 · 12e8e50
1 parent 28a2178
commit 12e8e50
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 41 deletions.
diff --git a/app/assets/javascripts/controllers/topology/cloud_topology_controller.js b/app/assets/javascripts/controllers/topology/cloud_topology_controller.js
@@ -123,7 +123,6 @@ angular.module('ManageIQ').controller('cloudTopologyController', ['$scope', 'top
       case 'CloudManager':
         return { x: -20, y: -20, r: 28 };
       case 'AvailabilityZone':
-      case 'Tag':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: 13 };
       case 'CloudTenant':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: 19 };

diff --git a/app/assets/javascripts/controllers/topology/infra_topology_controller.js b/app/assets/javascripts/controllers/topology/infra_topology_controller.js
@@ -125,8 +125,6 @@ angular.module('ManageIQ').controller('infraTopologyController', ['$scope', 'top
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: defaultDimensions.r };
       case 'Host':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: defaultDimensions.r };
-      case 'Tag':
-        return { x: defaultDimensions.x, y: defaultDimensions.y, r: 13 };
       default:
         return defaultDimensions;
     }

diff --git a/app/assets/javascripts/controllers/topology/network_topology_controller.js b/app/assets/javascripts/controllers/topology/network_topology_controller.js
@@ -122,7 +122,6 @@ angular.module('ManageIQ').controller('networkTopologyController', ['$scope', 't
       case 'NetworkManager':
         return { x: -20, y: -20, r: 28 };
       case 'FloatingIp':
-      case 'Tag':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: 13 };
       case 'NetworkRouter':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: defaultDimensions.r };

diff --git a/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js b/app/assets/javascripts/controllers/topology/physical_infra_topology_controller.js
@@ -125,8 +125,6 @@ angular.module('ManageIQ').controller('physicalInfraTopologyController', ['$scop
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: defaultDimensions.r };
       case 'Host':
         return { x: defaultDimensions.x, y: defaultDimensions.y, r: defaultDimensions.r };
-      case 'Tag':
-        return { x: defaultDimensions.x, y: defaultDimensions.y, r: 13 };
       default:
         return defaultDimensions;
     }

diff --git a/app/assets/javascripts/services/topology_service.js b/app/assets/javascripts/services/topology_service.js
@@ -6,13 +6,6 @@ ManageIQ.angular.app.service('topologyService', ['$location', '$http', 'miqServi
       __('Status: ') + d.item.status,
     ];
 
-    if (d.item.kind === 'Tag') {
-      status = [
-        d.item.name,
-        __('Type: ') + d.item.display_kind,
-      ];
-    }
-
     if (d.item.kind === 'Host' || d.item.kind === 'Vm') {
       status.push(__('Provider: ') + d.item.provider);
     }
@@ -60,11 +53,9 @@ ManageIQ.angular.app.service('topologyService', ['$location', '$http', 'miqServi
           .style('top', mousePosition[1] + 'px');
         popup.append('h5').text('Actions on ' + data.item.display_kind);
 
-        if (data.item.kind !== 'Tag') {
-          popup.append('p').text(__('Go to summary page')).on('click', function() {
-            vm.dblclick(data);
-          });
-        }
+        popup.append('p').text(__('Go to summary page')).on('click', function() {
+          vm.dblclick(data);
+        });
 
         var canvasSize = [
           canvas.node().offsetWidth,
@@ -90,9 +81,6 @@ ManageIQ.angular.app.service('topologyService', ['$location', '$http', 'miqServi
     };
 
     vm.dblclick = function dblclick(d) {
-      if (d.item.kind === 'Tag') {
-        return false;
-      }
       $window.location.assign(topologyService.geturl(d));
     };
 

diff --git a/app/services/network_topology_service.rb b/app/services/network_topology_service.rb
@@ -2,24 +2,20 @@ class NetworkTopologyService < TopologyService
   @provider_class = ManageIQ::Providers::NetworkManager
 
   @included_relations = [
-    :writable_classification_tags,
     :availability_zones => [
       :vms => [
-        :writable_classification_tags,
-        :floating_ips    => :writable_classification_tags,
-        :cloud_tenant    => :writable_classification_tags,
-        :security_groups => :writable_classification_tags,
+        :floating_ips    => nil,
+        :cloud_tenant    => nil,
+        :security_groups => nil,
       ]
     ],
     :cloud_subnets      => [
       :parent_cloud_subnet,
-      :writable_classification_tags,
       :vms,
-      :cloud_network  => :writable_classification_tags,
+      :cloud_network  => nil,
       :network_router => [
-        :writable_classification_tags,
         :cloud_network => [
-          :floating_ips => :writable_classification_tags
+          :floating_ips => nil
         ]
       ]
     ],
@@ -35,7 +31,7 @@ class NetworkTopologyService < TopologyService
     ]
   ]
 
-  @kinds = %i[NetworkRouter CloudSubnet Vm NetworkManager FloatingIp CloudNetwork NetworkPort CloudTenant SecurityGroup LoadBalancer Tag AvailabilityZone]
+  @kinds = %i[NetworkRouter CloudSubnet Vm NetworkManager FloatingIp CloudNetwork NetworkPort CloudTenant SecurityGroup LoadBalancer AvailabilityZone]
 
   def entity_type(entity)
     if entity.kind_of?(CloudNetwork) || entity.kind_of?(CloudSubnet)

diff --git a/app/services/topology_service.rb b/app/services/topology_service.rb
@@ -42,12 +42,7 @@ def entity_id(entity)
   end
 
   def entity_name(entity)
-    if entity.kind_of?(Tag)
-      cls = entity.classification
-      [cls.parent, cls].map(&:description).join(': ')
-    else
-      entity.name
-    end
+    entity.name
   end
 
   # If needed, implemented this on its subclasses

diff --git a/app/views/network_topology/show.html.haml b/app/views/network_topology/show.html.haml
@@ -35,10 +35,6 @@
         %label
           %i.pficon.pficon-cloud-tenant
           = _("Cloud Tenants")
-      %kubernetes-topology-icon{tooltipOptions, :kind => "Tag"}
-        %label
-          %i.fa.fa-tag
-          = _("Tags")
 
   .alert.alert-info.alert-dismissable
     %button.close{"aria-hidden" => "true", "data-dismiss" => "alert", :type => "button"}