Add option to start policy simulation with report data in angular

Add correct policies in nested view Add explorer when adding policy for simulation if explorer is in @edit
ManageIQ · Mar 6, 2017 · 79ff5d5 · 79ff5d5
1 parent 08e1e59
commit 79ff5d5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/app/assets/javascripts/controllers/report_data_controller.js b/app/assets/javascripts/controllers/report_data_controller.js
@@ -12,6 +12,10 @@
     MiQEndpointsService.endpoints.listDataTable = '/' + ManageIQ.constants.reportData;
   }
 
+  function isCurrentControllerOrPolicies(splitUrl) {
+    return splitUrl && (splitUrl[1] === ManageIQ.controller || splitUrl[2] === 'policies');
+  }
+
   /**
   * Method for init paging component for GTL.
   * Default paging has 5, 10, 20, 50, 100, 1000
@@ -150,17 +154,18 @@
     event.preventDefault();
     var prefix = this.initObject.showUrl;
     var splitUrl = this.initObject.showUrl.split('/');
-    if (this.initObject.isExplorer && splitUrl && splitUrl[1] === ManageIQ.controller) {
+    if (this.initObject.isExplorer && isCurrentControllerOrPolicies(splitUrl)) {
       var itemId = item.id;
       if (this.initObject.showUrl.indexOf('?id=') !== -1 ){
         var itemId = this.initObject.showUrl.indexOf('xx-') !== -1 ? '_-' + item.id : '-' + item.id;
       }
-      url = prefix + itemId;
+      var url = prefix + itemId;
       $.post(url).always(function() {
         this.setExtraClasses();
       }.bind(this));
     } else {
-      this.$window.DoNav(prefix + '/' + item.id);
+      prefix = prefix[prefix.length -1 ] !== '/' ? prefix + '/' : prefix;
+      this.$window.DoNav(prefix + item.id);
     }
     return false;
   };
@@ -189,6 +194,14 @@
   ReportDataController.prototype.initObjects = function(initObject) {
     this.gtlData = { cols: [], rows: [] };
     this.initObject = initObject;
+    if (this.initObject.showUrl === '') {
+      this.initObject.showUrl = '/' + ManageIQ.controller;
+      if (this.initObject.isExplorer) {
+        this.initObject.showUrl += '/x_show/';
+      } else {
+        this.initObject.showUrl += '/show/';
+      }
+    }
     this.gtlType = initObject.gtlType || 'grid';
     this.settings.isLoading = true;
     ManageIQ.gridChecks = [];
@@ -310,6 +323,12 @@
         this.gtlData = gtlData;
         this.perPage.text = this.settings.perpage;
         this.perPage.value = this.settings.perpage;
+        this.initObject.showUrl = this.settings.url || this.initObject.showUrl;
+        var splitUrl = this.initObject.showUrl.split('/');
+        if (splitUrl && splitUrl[1] === 'vm') {
+          splitUrl[1] = 'vm_infra';
+          this.initObject.showUrl = splitUrl.join('/');
+        }
         return gtlData;
       }.bind(this));
   };

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -342,6 +342,14 @@ def report_data
     settings[:sort_dir] = @sortdir unless settings.nil?
     settings[:sort_col] = @sortcol unless settings.nil?
     @edit = session[:edit]
+    @policy_sim = @edit[:policy_sim] unless @edit.nil?
+    controller, _action = db_to_controller(current_view.db)
+    if !@policy_sim.nil? && session[:policies] && session[:policies].length > 0
+      settings[:url] = '/' + controller + '/policies/'
+    end
+    if session[:sandboxes] && @sb
+      session[:sandboxes][controller] = @sb
+    end
     render :json => {
       :settings => settings,
       :data     => view_to_hash(current_view),

diff --git a/app/controllers/application_controller/policy_support.rb b/app/controllers/application_controller/policy_support.rb
@@ -99,6 +99,7 @@ def policy_sim
   # Add selected policy to the simulation
   def policy_sim_add
     @edit = session[:edit]
+    @explorer = @edit[:explorer]
     # Profile was selected
     if params[:profile_id] != "<select>"
       prof = MiqPolicySet.find(params[:profile_id])               # Go thru all the profiles

diff --git a/app/controllers/vm_common.rb b/app/controllers/vm_common.rb
@@ -501,7 +501,7 @@ def policies
         return
       end
       @in_a_form = true
-      replace_right_cell
+      replace_right_cell({:action => 'policy_sim'})
     else
       render :template => 'vm/show'
     end

diff --git a/app/views/layouts/_policy_sim.html.haml b/app/views/layouts/_policy_sim.html.haml
@@ -43,5 +43,7 @@
   - if @tagitems
     - @embedded = true
     - @policy_sim = true
+    - session[:edit] ||= {} 
+    - session[:edit][:policy_sim] = @policy_sim
     = render :partial => "layouts/gtl",
              :locals  => {:view => @pol_view}