Remove datawarehouse views

ManageIQ · Jan 10, 2018 · 8d9a0fa · 8d9a0fa
1 parent 5d739a2
commit 8d9a0fa
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 654 deletions.
diff --git a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
@@ -294,7 +294,7 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
       $scope.emsCommonModel.metrics_password != '' && $scope.angularForm.metrics_password.$valid)) {
       return true;
     } else if($scope.currentTab == "default" &&
-        ["ems_container", "ems_middleware", "ems_datawarehouse", "ems_physical_infra"].indexOf($scope.emsCommonModel.ems_controller) >= 0 &&
+        ["ems_container", "ems_middleware", "ems_physical_infra"].indexOf($scope.emsCommonModel.ems_controller) >= 0 &&
       ($scope.emsCommonModel.emstype) &&
       ($scope.emsCommonModel.default_hostname != '' && $scope.emsCommonModel.default_api_port) &&
       ($scope.emsCommonModel.default_password != '' && $scope.angularForm.default_password.$valid)) {

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1671,8 +1671,6 @@ def render_or_redirect_partial(pfx)
       javascript_redirect edit_ems_container_path(params[:id])
     elsif params[:pressed] == "ems_middleware_edit" && params[:id]
       javascript_redirect edit_ems_middleware_path(params[:id])
-    elsif params[:pressed] == "ems_datawarehouse_edit" && params[:id]
-      javascript_redirect edit_ems_datawarehouse_path(params[:id])
     elsif params[:pressed] == "ems_network_edit" && params[:id]
       javascript_redirect edit_ems_network_path(params[:id])
     elsif params[:pressed] == "ems_physical_infra_edit" && params[:id]

diff --git a/app/controllers/ems_datawarehouse_controller.rb b/app/controllers/ems_datawarehouse_controller.rb
diff --git a/app/controllers/mixins/ems_common_angular.rb b/app/controllers/mixins/ems_common_angular.rb
@@ -436,17 +436,6 @@ def ems_form_fields
                          :ems_controller            => controller_name,
                          :default_auth_status       => default_auth_status}
       end
-
-      render :json => {:name                => @ems.name,
-                       :emstype             => @ems.emstype,
-                       :zone                => zone,
-                       :default_hostname    => @ems.connection_configurations.default.endpoint.hostname,
-                       :default_api_port    => @ems.connection_configurations.default.endpoint.port,
-                       :service_account     => service_account.to_s,
-                       :bearer_token_exists => @ems.authentication_token(:bearer).nil? ? false : true,
-                       :ems_controller      => controller_name,
-                       :default_auth_status => default_auth_status,
-      } if controller_name == "ems_datawarehouse"
     end
 
     private ############################
@@ -589,11 +578,6 @@ def set_ems_record_vars(ems, mode = nil)
         default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs))
       end
 
-      if ems.kind_of?(ManageIQ::Providers::Hawkular::DatawarehouseManager)
-        params[:cred_type] = ems.default_authentication_type
-        default_endpoint = {:role => :default, :hostname => hostname, :port => port}
-      end
-
       if ems.kind_of?(ManageIQ::Providers::Nuage::NetworkManager)
         default_endpoint = {:role => :default, :hostname => hostname, :port => port, :security_protocol => ems.security_protocol}
         amqp_endpoint = {:role => :amqp, :hostname => amqp_hostname, :port => amqp_port, :security_protocol => amqp_security_protocol}
@@ -725,10 +709,6 @@ def build_credentials(ems, mode)
         creds[:bearer] = {:auth_key => default_key, :save => (mode != :validate)}
         creds.delete(:default)
       end
-      if ems.kind_of?(ManageIQ::Providers::DatawarehouseManager)
-        default_key = params[:default_password] ? params[:default_password] : ems.authentication_key
-        creds[:default] = {:auth_key => default_key, :userid => "_", :save => (mode != :validate)}
-      end
       creds
     end
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -345,9 +345,6 @@ def view_to_url(view, parent = nil)
       if controller == "ems_middleware" && action == "show"
         return ems_middlewares_path
       end
-      if controller == "ems_datawarehouse" && action == "show"
-        return ems_datawarehouses_path
-      end
       if controller == "ems_network" && action == "show"
         return ems_networks_path
       end
@@ -1435,7 +1432,6 @@ def render_listnav_filename
           ems_cloud
           ems_cluster
           ems_container
-          ems_datawarehouse
           ems_infra
           ems_middleware
           ems_network
@@ -1506,7 +1502,6 @@ def render_listnav_filename
              ems_cloud
              ems_cluster
              ems_container
-             ems_datawarehouse
              ems_infra
              ems_middleware
              ems_network

diff --git a/app/helpers/application_helper/toolbar/ems_datawarehouse_center.rb b/app/helpers/application_helper/toolbar/ems_datawarehouse_center.rb
diff --git a/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb b/app/helpers/application_helper/toolbar/ems_datawarehouses_center.rb
diff --git a/app/helpers/application_helper/toolbar_chooser.rb b/app/helpers/application_helper/toolbar_chooser.rb
@@ -498,7 +498,6 @@ def center_toolbar_filename_classic
               ems_cloud
               ems_cluster
               ems_container
-              ems_datawarehouse
               ems_middleware
               container_project
               container_route

diff --git a/app/helpers/datawarehouse_summary_helper.rb b/app/helpers/datawarehouse_summary_helper.rb
diff --git a/app/helpers/ems_datawarehouse_helper.rb b/app/helpers/ems_datawarehouse_helper.rb
diff --git a/app/helpers/ems_datawarehouse_helper/textual_summary.rb b/app/helpers/ems_datawarehouse_helper/textual_summary.rb
diff --git a/app/presenters/menu/default_menu.rb b/app/presenters/menu/default_menu.rb
@@ -115,15 +115,6 @@ def container_menu_section
         ])
       end
 
-      def datawarehouse_menu_section
-        if ::Settings.product.datawarehouse_manager
-          Menu::Section.new(:dwh, N_("Datawarehouse"), 'pficon pficon-enterprise', [
-            Menu::Item.new('ems_datawarehouse', N_('Providers'), 'ems_datawarehouse',
-                           {:feature => 'ems_datawarehouse_show_list'}, '/ems_datawarehouse')
-            ])
-        end
-      end
-
       def network_menu_section
         Menu::Section.new(:net, N_("Networks"), 'pficon pficon-network', [
           Menu::Item.new('ems_network',      N_('Providers'),       'ems_network',      {:feature => 'ems_network_show_list'},    '/ems_network'),
@@ -290,9 +281,8 @@ def help_menu_section
 
       def default_menu
         [cloud_inteligence_menu_section, services_menu_section, compute_menu_section, configuration_menu_section,
-         network_menu_section, datawarehouse_menu_section, storage_menu_section,
-         control_menu_section, automation_menu_section, optimize_menu_section, monitor_menu_section,
-         settings_menu_section, help_menu_section].compact
+         network_menu_section, storage_menu_section, control_menu_section, automation_menu_section,
+         optimize_menu_section, monitor_menu_section, settings_menu_section, help_menu_section].compact
       end
 
       private