foreman_acd 0.4.0 → 0.9.0

data/app/services/foreman_acd/inventory_creator.rb

@@ -3,12 +3,11 @@
 module ForemanAcd
   # inventory creator for application instances
   class InventoryCreator
-
     delegate :logger, :to => :Rails
 
-    def initialize(app_instance, host_ids)
+    def initialize(app_instance, foreman_hosts)
       @app_instance = app_instance
-      @host_ids = host_ids
+      @foreman_hosts = foreman_hosts
     end
 
     # TODO: this might be part of the smart proxy plugin.
@@ -16,52 +15,64 @@ module ForemanAcd
       inventory = {}
       inventory['all'] = {}
 
-      inventory['all'] = { 'vars' => inventory_all_vars } unless @app_instance.ansible_vars_all.nil? || @app_instance.ansible_vars_all.empty?
+      inventory['all'] = { 'vars' => inventory_all_vars } if @app_instance.ansible_vars_all.present?
 
       services = JSON.parse(@app_instance.app_definition.services)
-      app_hosts = filtered_hosts
 
       children = {}
-      app_hosts.each do |host_data|
-        if host_data['foreman_host_id'].nil?
-          logger.warn "Ignore host #{host_data['hostname']} because no foreman host id could be found. Is the host not provisioned yet?"
+      @foreman_hosts.each do |foreman_host|
+        if foreman_host.host_id.nil?
+          logger.warn "Ignore host #{foreman_h.hostname} because no foreman host id could be found. Is the host not provisioned yet?"
           next
         end
 
-        service_id = host_data['service'].to_i
+        service_id = foreman_host.service.to_i
         host_service = services.select { |s| s['id'] == service_id }.first
         ansible_group = host_service['ansibleGroup']
 
-        unless children.has_key?(host_service['ansibleGroup'])
-          children[ansible_group] = { 'hosts' => {} }
-        end
+        children[ansible_group] = { 'hosts' => {} } unless children.key?(host_service['ansibleGroup'])
 
-        ansible_vars = host_data['ansibleParameters'].map { |v| { v['name'] => v['value'] } }.reduce({}, :merge!)
+        ansible_vars = JSON.parse(foreman_host.ansibleParameters).map { |v| { v['name'] => get_param_value(foreman_host.host, v['value']) } }.reduce({}, :merge!)
 
         # in case there is no ansible_user defined, set "root" as default.
-        unless ansible_vars.has_key?('ansible_user')
-          ansible_vars['ansible_user'] = 'root'
-        end
+        ansible_vars['ansible_user'] = 'root' unless ansible_vars.key?('ansible_user')
+        ansible_vars['ansible_ssh_private_key_file'] = ansible_or_rex_ssh_private_key(foreman_host.host)
 
-        children[ansible_group]['hosts'][get_fqdn(host_data['foreman_host_id'])] = ansible_vars
+        children[ansible_group]['hosts'][foreman_host.host.name] = ansible_vars
       end
       inventory['all']['children'] = children
       inventory
     end
 
     private
-    def inventory_all_vars
-      JSON.parse(@app_instance.ansible_vars_all).map do |a|
-        { a['name'] => a['value'] }
-      end.reduce({}, :merge!)
+
+    def get_param_value(host, value)
+      search_param = value.match(/PARAM\[([^\s]*)\]/)
+      return value if search_param.nil?
+
+      resolved_value = host.host_param(search_param[1])
+      logger.warn "Could not resolve ansible host param value #{value} for host #{host}" if resolved_value.nil?
+
+      resolved_value
+    end
+
+    def ansible_or_rex_ssh_private_key(host)
+      ansible_private_file = host_setting(host, 'ansible_ssh_private_key_file')
+      if !ansible_private_file.empty?
+        ansible_private_file
+      else
+        ForemanRemoteExecutionCore.settings[:ssh_identity_key_file]
+      end
     end
 
-    def get_fqdn(host_id)
-      Host.find(host_id)&.name
+    def host_setting(host, setting)
+      host.params[setting] || Setting[setting]
     end
 
-    def filtered_hosts
-      JSON.parse(@app_instance.hosts).select{ |h| h&.key?('foreman_host_id') && @host_ids.include?(h['foreman_host_id']) }
+    def inventory_all_vars
+      JSON.parse(@app_instance.ansible_vars_all).map do |a|
+        { a['name'] => a['value'] }
+      end.reduce({}, :merge!)
     end
   end
 end

data/app/views/foreman_acd/ansible_playbooks/_form.html.erb

@@ -1,21 +1,64 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_acd %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_acd %>
+<% end %>
+
+<%
+    if @ansible_playbook.new_record?
+    json = {
+      "scmTypes": {"directory" => "directory", "git" => "git"},
+      "mode": "newPlaybook",
+      "organization": current_organization,
+      "location": current_location,
+      "path": "",
+      "gitUrl": "",
+      "gitCommit": "",
+      "scmType": "",
+      "appDefinitions": [],
+    }
+
+    else
+      json = {
+      "scmTypes": {"directory" => "directory", "git" => "git"},
+      "mode": "editPlaybook",
+      "organization": current_organization,
+      "location": current_location,
+      "path": @ansible_playbook.path,
+      "gitUrl": @ansible_playbook.git_url,
+      "gitCommit": @ansible_playbook.git_commit,
+      "scmType": @ansible_playbook.scm_type,
+      "appDefinitions": @ansible_playbook.app_definitions
+      }
+    end
+%>
+
 <%= form_for @ansible_playbook, :url => (@ansible_playbook.new_record? ? ansible_playbooks_path : ansible_playbook_path(:id => @ansible_playbook.id)) do |f| %>
   <%= base_errors_for @ansible_playbook %>
 
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _('Ansible playbooks') %></a></li>
+    <% if show_location_tab? %>
+          <li><a href="#locations" data-toggle="tab"><%= _("Locations") %></a></li>
+      <% end %>
+      <% if show_organization_tab? %>
+          <li><a href="#organizations" data-toggle="tab"><%= _("Organizations") %></a></li>
+      <% end %>
   </ul>
 
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
+    
       <%= text_f f, :name %>
       <%= text_f f, :description %>
-      <%= f.hidden_field :scm_type, :value => 'directory' %>
-      <% # TODO:
-         # select_f(f, :scm_type, %w[Directory GIT], :downcase, :to_s)
-      %>
-      <%= text_f f, :path %>
-      <%= text_f f, :playfile %>
+      <div id='ansible_playbook'>
+       <%= react_component('SyncGitRepo', :data => json,)  %>
+      </div>
+      <%= text_f f, :playfile, :required => true %>
+    </div>
+    
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @ansible_playbook %>
   </div>
-
   <%= submit_or_cancel f %>
 <% end %>

data/app/views/foreman_acd/ansible_playbooks/edit.html.erb

@@ -1,3 +1,11 @@
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/ansible_playbooks",
+              :items => [
+                { :caption => _('Ansible Playbooks'),
+                  :url => url_for(ansible_playbooks_path) },
+                { :caption => "Edit #{@ansible_playbook.name}",
+                  :url => (edit_ansible_playbook_path(@ansible_playbook) if authorized_for(hash_for_edit_ansible_playbook_path(@ansible_playbook))) }
+              ])
+%>
 <% title(_('Edit Ansible Playbook %s') % @ansible_playbook) %>
-
 <%= render :partial => 'form' %>

data/app/views/foreman_acd/ansible_playbooks/index.html.erb

@@ -12,12 +12,12 @@
   </tr>
   <% for ansible_playbook in @ansible_playbooks %>
     <tr>
-      <td><%=link_to_if_authorized h(ansible_playbook.name), hash_for_edit_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(ansible_playbook.name), hash_for_edit_ansible_playbook_path(:id => ansible_playbook) %></td>
       <td><%= ansible_playbook.description %></td>
       <td>
         <%= action_buttons(
-          display_link_if_authorized(_("Import group variables"), hash_for_import_vars_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer)),
-          display_delete_if_authorized(hash_for_ansible_playbook_path(:id => ansible_playbook).merge(:auth_object => ansible_playbook, :authorizer => authorizer),
+          display_link_if_authorized(_("Import groups"), hash_for_import_vars_ansible_playbook_path(:id => ansible_playbook)),
+          display_delete_if_authorized(hash_for_ansible_playbook_path(:id => ansible_playbook),
                                        :data => { 'confirm': _('Delete %s?') % ansible_playbook.name })
         ) %>
       </td>

data/app/views/foreman_acd/api/v2/ansible_playbooks/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @ansible_playbook
 
 attributes :id, :name

data/app/views/foreman_acd/api/v2/ansible_playbooks/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @ansible_playbooks
 
 extends 'foreman_acd/api/v2/ansible_playbooks/base'

data/app/views/foreman_acd/api/v2/ansible_playbooks/show.json.rabl

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 object @ansible_playbook
 
 extends 'foreman_acd/api/v2/ansible_playbooks/base'
+
+node do |ansible_playbook|
+  partial('api/v2/taxonomies/children_nodes', :object => ansible_playbook)
+end

data/app/views/foreman_acd/api/v2/app_definitions/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_definition
 
 attributes :id, :name

data/app/views/foreman_acd/api/v2/app_definitions/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @app_definitions
 
 extends 'foreman_acd/api/v2/app_definitions/base'

data/app/views/foreman_acd/api/v2/app_definitions/show.json.rabl

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 object @app_definition
 
 extends 'foreman_acd/api/v2/app_definitions/base'
+
+node do |app_definition|
+  partial('api/v2/taxonomies/children_nodes', :object => app_definition)
+end

data/app/views/foreman_acd/api/v2/app_instances/base.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_instance
 
-attributes :id, :name
+attributes :id, :name, :organization_id, :organization_name, :location_id, :location_name

data/app/views/foreman_acd/api/v2/app_instances/index.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 collection @app_instances
 
 extends 'foreman_acd/api/v2/app_instances/base'

data/app/views/foreman_acd/api/v2/app_instances/show.json.rabl

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 object @app_instance
 
 extends 'foreman_acd/api/v2/app_instances/base'

data/app/views/foreman_acd/app_definitions/_form.html.erb

@@ -30,6 +30,12 @@
   <%= base_errors_for @app_definition %>
   <ul class="nav nav-tabs" data-tabs="tabs">
     <li class="active"><a href="#primary" data-toggle="tab"><%= _('Application Definitions') %></a></li>
+    <% if show_location_tab? %>
+          <li><a href="#locations" data-toggle="tab"><%= _("Locations") %></a></li>
+      <% end %>
+      <% if show_organization_tab? %>
+          <li><a href="#organizations" data-toggle="tab"><%= _("Organizations") %></a></li>
+      <% end %>
   </ul>
 
   <div class="tab-content">
@@ -38,8 +44,10 @@
       <%= text_f f, :description %>
 
       <div id='app_definition'></div>
-      <%=  mount_react_component('ApplicationDefinition', "#app_definition", json.to_json) %>
+      <%=  react_component('ApplicationDefinition', :data => json) %>
     </div>
+
+    <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @app_definition %>
   </div>
 
   <%= submit_or_cancel f %>

data/app/views/foreman_acd/app_definitions/edit.html.erb

@@ -1,10 +1,15 @@
-<% title(_('Edit Application Definition %s') % @app_definition) %>
-
-<%= breadcrumbs(
-  :resource_url => acd_api_v2_app_definitions_path
-  )
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/app_definitions",
+              :items => [
+                { :caption => _('App Definitions'),
+                  :url => url_for(app_definitions_path) },
+                { :caption => "Edit #{@app_definition.name}",
+                  :url => (edit_app_definition_path(@app_definition) if authorized_for(hash_for_edit_app_definition_path(@app_definition))) }
+              ])
 %>
 
+<% title(_('Edit Application Definition %s') % @app_definition) %>
+
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_acd %>
 <% end %>

data/app/views/foreman_acd/app_definitions/import.html.erb

@@ -1,3 +1,22 @@
+<%= javascript_include_tag *webpack_asset_paths('foreman_acd', extension: 'js') %>
+<%
+  json = {
+    "organization": current_organization,
+    "location": current_location,
+    "hostgroups": @hostgroups,
+    "foremanDataUrl": ui_acd_foreman_data_path("__id__"),
+    "ansibleDataUrl": ui_acd_ansible_data_path("__id__"),
+    "services": [],
+    "ansibleVarsAll": [],
+  }
+
+  if @app_definition.new_record?
+    json["mode"] = "newDefinition"
+  else
+    json["mode"] = "editDefinition"
+  end
+%>
+
 <% title _('Import Application Definition') %>
 
 <%= form_for @app_definition, :url => (app_definitions_path), :html => { :multipart => true } do |f| %>
@@ -10,7 +29,7 @@
     <div class="tab-pane active" id="primary">
       <%= text_f f, :name %>
       <%= text_f f, :description %>
-      <%= file_field_f f, :app_definition_file, :label_help => _("Application Definition file") %>
+      <%= react_component('ApplicationDefinitionImport', json,)  %>
     </div>
   </div>
 

data/app/views/foreman_acd/app_definitions/index.html.erb

@@ -1,25 +1,22 @@
 <% title _('Application Definitions') %>
 
-<% title_actions button_group(
-  new_link(_('New Application Definition')),
-  display_link_if_authorized(_("Import"), hash_for_import_app_definitions_path, :class => 'btn btn-default')
-) %>
+<% title_actions new_link(_('New Application Definition')), display_link_if_authorized(_("Import"), hash_for_import_app_definitions_path, :class => 'btn btn-default')  %>
 
 <table class="table table-bordered table-striped">
   <tr>
     <th><%= sort :name, :as => s_('AppDefinition|Name') %></th>
     <th><%= _('Description') %></th>
-    <th></th>
+    <th><%= _('Actions') %></th>
   </tr>
   <% for app_definition in @app_definitions %>
     <tr>
-      <td><%=link_to_if_authorized h(app_definition.name), hash_for_edit_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(app_definition.name), hash_for_edit_app_definition_path(:id => app_definition) %></td>
       <td><%= app_definition.description %></td>
       <td>
         <%= action_buttons(
-          display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer),
+          display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition),
                                        :data => { 'confirm': _('Delete %s?') % app_definition.name }),
-          display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition).merge(:auth_object => app_definition, :authorizer => authorizer))
+          display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition))
         ) %>
       </td>
     </tr>

data/app/views/foreman_acd/app_instances/_form.html.erb

@@ -20,7 +20,7 @@
           "id": @app_instance.app_definition.id,
           "name": @app_instance.app_definition.name,
         },
-        "hosts": JSON.parse(@app_instance.hosts),
+        "hosts": collect_hosts_data,
         "ansibleVarsAll": @app_instance.ansible_vars_all.blank? ? [] : JSON.parse(@app_instance.ansible_vars_all),
       }
     end
@@ -38,11 +38,11 @@
       <%= text_f f, :description %>
 
       <div id='app_instance'></div>
-        <%=  mount_react_component('ApplicationInstance', "#app_instance", json.to_json) %>
+        <%=  react_component('ApplicationInstance', :data => json) %>
       </div>
     </div>
   </div>
-
+  <%= f.hidden_field :organization_id %>
+  <%= f.hidden_field :location_id %>
   <%= submit_or_cancel f %>
 <% end %>
-

data/app/views/foreman_acd/app_instances/edit.html.erb

@@ -1,3 +1,13 @@
+<%=
+  breadcrumbs(:resource_url => "/acd/api/v2/app_instances?location_id=#{@location.id}&organization_id=#{@organization.id}",
+              :items => [
+                { :caption => _('App Instances'),
+                  :url => url_for(app_instances_path) },
+                { :caption => "Edit #{@app_instance.name}",
+                  :url => (edit_app_instance_path(@app_instance) if authorized_for(hash_for_edit_app_instance_path(@app_instance))) }
+              ])
+%>
+
 <% title(_('Edit Application Instance %s') % @app_instance) %>
 
 <% content_for(:javascripts) do %>

data/app/views/foreman_acd/app_instances/index.html.erb

@@ -7,29 +7,108 @@
     <th><%= sort :name, :as => s_('AppInstance|Name') %></th>
     <th><%= sort :application, :as => _('Application'), :default => 'DESC' %></th>
     <th><%= _('Description') %></th>
+    <th><%= _('Report') %></th>
     <th></th>
   </tr>
   <% for app_instance in @app_instances %>
     <tr>
-      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance) %></td>
       <td><%= app_instance.app_definition %></td>
       <td><%= app_instance.description %></td>
+      <td><%= link_to_if((authorized_for(:auth_object => app_instance, :authorizer => authorizer, :permission => :report_app_instances) &&
+                         !app_instance.last_deploy_task.nil? && app_instance.last_deploy_task.ended_at?),
+                         _("Show Report"),
+                         hash_for_report_app_instance_path(:id => app_instance),
+                         :method => :get, :title => _("Show last deployment report for application #{app_instance}")) %></td>
       <td>
-        <%= action_buttons(display_link_if_authorized(_("Deploy"), hash_for_deploy_app_instance_path(:id => app_instance), :method => :post,
-                                                        :title => _("Deploy application #{app_instance}")),
-                           display_link_if_authorized(_("Run Playbook"), hash_for_remote_execution_path(:id => app_instance), :method => :post,
-                                                        :title => _("Run ansible playbook for application #{app_instance}")),
-        display_link_if_authorized(_("Run Playbook - customize first"), hash_for_remote_execution_path(:id => app_instance, :customize => true), :method => :post,
-                                                        :title => _("Prepare job to run ansible playbook for application #{app_instance}")),
-                           display_link_if_authorized(_("Report"), hash_for_report_app_instance_path(:id => app_instance), :method => :get,
-                                                        :title => _("Show last deployment report for application #{app_instance}")),
-                           display_delete_if_authorized(hash_for_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer),
-                                                        :data => { 'confirm': _('Delete %s?') % app_instance.name })) %>
-      </td>
+        <%= action_buttons(
+          display_link_if_authorized(_("Deploy"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :deploy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#deploy#{app_instance.id}",
+                                                  :title => _("Deploy application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook"),
+                                     hash_for_remote_execution_path(:id => app_instance.id),
+                                     :method => :post,
+                                     :title => _("Run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook - customize first"),
+                                     hash_for_remote_execution_path(:id => app_instance.id, :customize => true),
+                                     :method => :post,
+                                     :title => _("Prepare job to run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Delete"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :destroy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#delete#{app_instance.id}",
+                                                  :title => _("Delete application #{app_instance}"))
+          ) %>
+    </td>
     </tr>
+    <!-- Delete Modal -->
+      <div class="modal fade" id="delete<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deleteLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation')%></h4>
+            </div>
+            <div class="modal-body">
+              <p> <%= _("Confirm to delete application instance: ") %> <%= app_instance %></p>
+              <%= form_tag destroy_with_hosts_app_instance_path(:id => app_instance.id), :method => :delete do %>
+                <% showSelectHostsNote = true %>
+                <% app_instance.foreman_hosts.select(&:fresh_host?).each do |foreman_host|%>
+                  <% if foreman_host.host_id? %>
+                    <% if showSelectHostsNote %>
+                      <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
+                      <% showSelectHostsNote = false %>
+                    <% end %>
+                      <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id, false, class: 'acd_host' -%> <%= h foreman_host.host.name -%>
+                      </br>
+                  <% end %>
+                <% end %>
+                <hr width="90%">
+                <p> <%= check_box_tag "check_all", "", false, { :onchange => "toggleCheckboxesBySelector('.acd_host')" } %> Select / unselect all hosts</p>
+                <br /><p><%= _("Note: Hosts which already existed and were added to the application instance are not shown in this dialog!") %></p> 
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-primary" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Delete"), name: nil, class: "btn btn-danger" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+      </div><!-- /.modal -->
+
+      <!-- Deploy Modal -->
+      <div class="modal fade" id="deploy<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deployLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation Box') %></h4>
+            </div>
+            <div class="modal-body">
+              <p><%= _('Confirm to deploy ') %><%= app_instance%></p>
+              <%= form_tag deploy_app_instance_path(:id => app_instance.id), :method => :post do %>
+                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
+                  <ul>
+                  <li><%= check_box_tag 'delete_hosts'-%> <%= _('Delete all hosts before deploying ') %><%= app_instance%></li>
+                  <li><%= check_box_tag 'safe_deploy' -%> <%= _('Deploy only new and changed hosts for ') %><%= app_instance%></li>
+                  </ul>
+                <% end %>
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-danger" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Submit"), name: nil, class: "btn btn-success" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+     </div><!-- /.modal -->
   <% end %>
 </table>
-
 <%= page_entries_info @app_instances %>
 <%= will_paginate @app_instances %>
-

data/app/views/foreman_acd/app_instances/report.html.erb

@@ -1,4 +1,4 @@
-<% title _("Deployment Report for Application Instance #{@app_instance}") %>
+<% title _("Provisioning details for application instance #{@app_instance}") %>
 
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_acd %>
@@ -9,11 +9,19 @@
 
 <%
   json = {
-    "mode": 'lastReport',
-    "hosts": @report_hosts
+    "deploymentState": @app_instance.deployment_state.to_s,
+    "initialConfigureState": @app_instance.initial_configure_state.to_s,
+    "appInstanceName": @app_instance.name,
+    "hosts": @report_hosts,
+    "deployTaskUrl": foreman_tasks_task_path(@app_instance.last_deploy_task),
+    "configureJobUrl": job_invocations_path(search: "description ~ \"ACD application #{@app_instance.name}\""),
+    "reportDataUrl": ui_acd_report_data_path("__id__"),
+    "appInstanceId": @app_instance.id,
   }
+
+  json["initialConfigureJobUrl"] = job_invocation_path(@app_instance.initial_configure_job) unless @app_instance.initial_configure_job.nil?
 %>
 
 <div id='report'></div>
-  <%=  mount_react_component('ApplicationInstanceReport', "#report", json.to_json) %>
+  <%=  react_component('ApplicationInstanceReport', :data => json) %>
 </div