foreman_acd 0.7.0 → 0.9.0

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

@@ -1,15 +1,12 @@
 <% 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', :style => "display: none;") 
-) %>
+<% 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>
@@ -19,7 +16,7 @@
         <%= action_buttons(
           display_delete_if_authorized(hash_for_app_definition_path(:id => app_definition),
                                        :data => { 'confirm': _('Delete %s?') % app_definition.name }),
-          # TODO: add export feature again if app-def + ansible playbook can be exported together display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition))
+          display_link_if_authorized(_("Export"), hash_for_export_app_definition_path(:id => app_definition))
         ) %>
       </td>
     </tr>

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

@@ -53,21 +53,25 @@
           <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>
+              <h4 class="modal-title"><%= _('Confirmation')%></h4>
             </div>
             <div class="modal-body">
-              <p> <%= _("Confirm to delete ") %> <%= app_instance %></p>
+              <p> <%= _("Confirm to delete application instance: ") %> <%= app_instance %></p>
               <%= form_tag destroy_with_hosts_app_instance_path(:id => app_instance.id), :method => :delete do %>
-                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
-                  <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
-                <% end %>
-                <% app_instance.foreman_hosts.each do |foreman_host|%>
+                <% showSelectHostsNote = true %>
+                <% app_instance.foreman_hosts.select(&:fresh_host?).each do |foreman_host|%>
                   <% if foreman_host.host_id? %>
-                    <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id -%>
-                    <%= h foreman_host.host.name -%>
-                    </br>
+                    <% 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>
@@ -91,8 +95,8 @@
               <%= 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>
+                  <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>

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

@@ -9,12 +9,17 @@
 
 <%
   json = {
-    "mode": 'lastReport',
+    "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}\"")
+    "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>

data/app/views/ui_acd/host_report.json.rabl

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+collection @hosts
+attributes :id, :name, :build, :hostUrl, :isExistingHost, :progress_report, :powerStatusUrl

data/app/views/ui_acd/report_data.json.rabl

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+object @report_data
+attribute :deploymentState
+attribute :initialConfigureState
+attribute :initialConfigureJobUrl
+
+child :hosts => :hosts do
+  extends 'ui_acd/host_report'
+end

data/app/views/ui_acd/validate_hostname.json.rabl

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+object @host_validation
+attribute :hostname
+attribute :fqdn
+attribute :result

data/config/routes.rb

@@ -18,6 +18,7 @@ Rails.application.routes.draw do
       collection do
         get 'auto_complete_search'
         get 'import'
+        post 'handle_file_upload'
       end
 
       member do
@@ -42,6 +43,8 @@ Rails.application.routes.draw do
     get 'ui_acd_app/:id', :to => 'ui_acd#app', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_app
     get 'ui_acd_foreman_data/:id', :to => 'ui_acd#foreman_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_foreman_data
     get 'ui_acd_ansible_data/:id', :to => 'ui_acd#ansible_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_ansible_data
+    get 'ui_acd_report_data/:id', :to => 'ui_acd#report_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_report_data
+    get 'ui_acd_validate_hostname', :to => 'ui_acd#validate_hostname', :as => :ui_acd_validate_hostname
 
     scope :api, :path => '/api', :defaults => { :format => 'json' } do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },

data/db/migrate/20210818125913_add_is_existing_host_to_foreman_host.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add is_existing_host to app instance
+class AddIsExistingHostToForemanHost < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_foreman_hosts, :is_existing_host, :boolean, :default => false, :null => false
+  end
+end

data/db/migrate/20210902110645_add_initial_configure_task.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add AddInitialConfigureTask
+class AddInitialConfigureTask < ActiveRecord::Migration[5.2]
+  def change
+    add_column :acd_app_instances, :initial_configure_task_id, :uuid, :null => true
+  end
+end

data/lib/foreman_acd/plugin.rb

@@ -111,13 +111,13 @@ Foreman::Plugin.register :foreman_acd do
                  :'foreman_acd/api/v2/app_instances' => [:report] },
                :resource_type => 'ForemanAcd::AppInstance'
 
-    permission :new_remote_execution,
+    permission :new_acd_configure_job,
                { :'foreman_acd/remote_execution' => [:new] },
-               :resource_type => 'ForemanAcd::RemoteExecution'
+               :resource_type => 'ForemanAcd::AppInstance'
 
-    permission :create_remote_execution,
+    permission :create_acd_configure_job,
                { :'foreman_acd/remote_execution' => [:create] },
-               :resource_type => 'ForemanAcd::RemoteExecution'
+               :resource_type => 'ForemanAcd::AppInstance'
 
     permission :view_ui_acd,
                { :ui_acd => [:app, :foreman_data, :ansible_data] }
@@ -137,7 +137,7 @@ Foreman::Plugin.register :foreman_acd do
                                                   :create_app_instances, :view_app_instances, :edit_app_instances,
                                                   :destroy_app_instances,
                                                   :deploy_app_instances,
-                                                  :new_remote_execution, :create_remote_execution,
+                                                  :new_acd_configure_job, :create_acd_configure_job,
                                                   :report_app_instances,
                                                   :view_ui_acd,
                                                   :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,
@@ -150,7 +150,7 @@ Foreman::Plugin.register :foreman_acd do
   role 'Application Centric Deployment User', [:create_app_instances, :view_app_instances, :edit_app_instances,
                                                :destroy_app_instances,
                                                :deploy_app_instances,
-                                               :new_remote_execution, :create_remote_execution,
+                                               :new_acd_configure_job, :create_acd_configure_job,
                                                :report_app_instances,
                                                :view_ui_acd,
                                                :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,

data/lib/foreman_acd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAcd
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

data/lib/foreman_acd.rb

@@ -4,16 +4,34 @@ require 'foreman_acd/engine'
 
 # Module required to start the Foreman Rails engine
 module ForemanAcd
-  def self.acd_base_path
-    '/var/lib/foreman/foreman_acd/'
-  end
+  RUN_CONFIGURATOR_DELAY = 240
 
-  def self.ansible_playbook_path
-    File.join(acd_base_path, 'ansible-playbooks')
-  end
+  class << self
+    def acd_base_path
+      '/var/lib/foreman/foreman_acd/'
+    end
+
+    def ansible_playbook_path
+      File.join(acd_base_path, 'ansible-playbooks')
+    end
+
+    def proxy_setting
+      HttpProxy.default_global_content_proxy&.full_url ||
+        Setting[:http_proxy]
+    end
+
+    def initiate_acd_app_configurator(app_instance)
+      return unless app_instance.hosts_deployment_finished?
+
+      ::Foreman::Logging.logger('foreman_acd').info("All hosts of app (#{app_instance.name}) were built. Schedule app configurator...")
+      start_acd_app_configurator(app_instance)
+    end
 
-  def self.proxy_setting
-    HttpProxy.default_global_content_proxy&.full_url ||
-      Setting[:http_proxy]
+    def start_acd_app_configurator(app_instance)
+      task = ForemanTasks.delay(::Actions::ForemanAcd::RunConfigurator,
+                                { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
+                                app_instance)
+      app_instance.update(:initial_configure_task_id => task.id)
+    end
   end
 end

data/webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js

@@ -0,0 +1,2 @@
+export const setModalOpen = () => jest.fn();
+export const setModalClosed = () => jest.fn();

data/webpack/components/ApplicationDefinition/ApplicationDefinition.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import {
   Icon,
   Button,
+  MessageDialog,
 } from 'patternfly-react';
 import * as resolve from 'table-resolver';
 import ForemanModal from 'foremanReact/components/ForemanModal';
@@ -75,21 +76,21 @@ class ApplicationDefinition extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationDefinitionService(additionalData)}
           >
-            <Icon type="pf" name="edit" title={__("edit entry")} />
+            <Icon type="pf" name="edit" title={__("Edit entry")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openForemanParameterSelectionModal(additionalData)}
           >
-            <Icon type="pf" name="settings" title={__("change parameters")} />
+            <Icon type="pf" name="settings" title={__("Change parameters")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openAnsibleParameterSelectionModal(additionalData)}
           >
-            <span title={__("change ansible variables")}>A</span>
+            <span title={__("Change ansible variables")}>A</span>
           </Button>
           &nbsp;
           <DeleteTableEntry
@@ -202,6 +203,7 @@ class ApplicationDefinition extends React.Component {
   render() {
     const {
       data: { organization, location, mode, ansiblePlaybooks, foremanDataUrl, ansibleDataUrl },
+      showAlertModal, alertModalText, alertModalTitle, closeAlertModal,
       ansiblePlaybook,
       services,
       columns,
@@ -216,12 +218,22 @@ class ApplicationDefinition extends React.Component {
       loadAnsibleData,
     } = this.props;
 
-
     return (
       <span>
+        <MessageDialog
+          show={showAlertModal}
+          onHide={closeAlertModal}
+          primaryAction={closeAlertModal}
+          primaryActionButtonContent={__('OK')}
+          primaryActionButtonBsStyle={"danger"}
+          icon={<Icon type="pf" name="error-circle-o" />}
+          title={alertModalTitle}
+          primaryContent={alertModalText}
+        />
         <div>
           <AnsiblePlaybookSelector
             label="Ansible Playbook"
+            hidden={ false }
             editable={ mode == 'newDefinition' }
             viewText={ ansiblePlaybook.name }
             options={ ansiblePlaybooks }
@@ -230,9 +242,9 @@ class ApplicationDefinition extends React.Component {
             additionalData={{url: ansibleDataUrl }}
           />
           {ansiblePlaybook.id == '' ? (
-          <p style={{ paddingTop: 25 }}>
+          <div style={{ paddingTop: 25 }}>
             <pre>{ "Ansible Playbook can't be blank" }</pre>
-          </p>
+          </div>
         ) : (<div></div>)}
 
         </div>
@@ -279,7 +291,7 @@ class ApplicationDefinition extends React.Component {
                 isAllGroup: true
               })}
             >
-              <span title={__("change ansible variables for 'all'")}>A</span>
+              <span title={__("Change ansible variables for 'all'")}>A</span>
             </Button>
           </span>
         </div>
@@ -339,13 +351,13 @@ class ApplicationDefinition extends React.Component {
           </ForemanModal>
         </div>
         <RailsData
-          key='applications_definition'
+          key='application_definition_services_data'
           view='app_definition'
           parameter='services'
           value={JSON.stringify(this.props.services)}
         />
         <RailsData
-          key='applications_definition'
+          key='application_definition_ansible_data'
           view='app_definition'
           parameter='ansible_vars_all'
           value={JSON.stringify(this.props.ansibleVarsAll)}
@@ -356,6 +368,9 @@ class ApplicationDefinition extends React.Component {
 
 ApplicationDefinition.defaultProps = {
   error: {},
+  showAlertModal: false,
+  alertModalText: '',
+  alertModalTitle: '',
   editMode: false,
   ansiblePlaybook: { "id": '', "name": '' },
   services: [],
@@ -368,11 +383,15 @@ ApplicationDefinition.defaultProps = {
 
 ApplicationDefinition.propTypes = {
   initApplicationDefinition: PropTypes.func,
+  showAlertModal: PropTypes.bool,
+  alertModalText: PropTypes.string,
+  alertModalTitle: PropTypes.string,
   editMode: PropTypes.bool.isRequired,
   ansiblePlaybook: PropTypes.object,
   services: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
   columns: PropTypes.array,
+  closeAlertModal: PropTypes.func,
   addApplicationDefinitionService: PropTypes.func,
   deleteApplicationDefinitionService: PropTypes.func,
   activateEditApplicationDefinitionService: PropTypes.func,

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -17,6 +17,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -182,6 +183,11 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
+export const closeAlertModal = () => ({
+  type: APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
+  payload: {}
+});
+
 export const loadAnsibleData = (
   ansiblePlaybookId,
   additionalData

data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js

@@ -1,4 +1,5 @@
 export const APPLICATION_DEFINITION_INIT = 'INIT_APPLICATION_DEFINITION_INIT';
+export const APPLICATION_DEFINITION_CLOSE_ALERT_MODAL = 'APPLICATION_DEFINITION_CLOSE_ALERT_MODAL';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS';
 export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE';

data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js

@@ -1,4 +1,5 @@
 import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   cloneDeep,
@@ -8,6 +9,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -45,8 +47,15 @@ const applicationDefinitionConf = (state = initialState, action) => {
     case APPLICATION_DEFINITION_INIT: {
       return state.merge(payload);
     }
-
+    case APPLICATION_DEFINITION_CLOSE_ALERT_MODAL: {
+      return state.merge({
+        showAlertModal: false,
+        alertModalTitle: '',
+        alertModalText: '',
+      });
+    }
    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
+      console.log("Error while loading ansible data: "+ payload.error);
       return state.merge({ error: payload.error, loading: false });
     }
     case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST: {
@@ -113,23 +122,35 @@ const applicationDefinitionConf = (state = initialState, action) => {
       const thisService = services[index];
 
       if (thisService.name == '') {
-        window.alert("Every service needs to have a valid name.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to have a valid name."),
+        });
       }
 
       if (thisService.hostgroup == '') {
-        window.alert("Every service needs to be assigned to a hostgroup.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to a hostgroup."),
+        });
       }
 
       if (thisService.ansibleGroup == '') {
-        window.alert("Every service needs to be assigned to a ansible group.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to an ansible group."),
+        });
       }
 
       if (state.services.filter(v => v.name === thisService.name && v.id != thisService.id).length > 0) {
-        window.alert("Service name already used in this Application Definition. Please make sure that every service name is unique.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Service name already used in this Application Definition. Please make sure that every service name is unique."),
+        });
       }
 
       delete services[index].backup;

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -1,5 +1,8 @@
 const applicationDefinitionConf = state => state.foremanAcd.applicationDefinitionConf;
 
+export const selectShowAlertModal = state => applicationDefinitionConf(state).showAlertModal;
+export const selectAlertModalText = state => applicationDefinitionConf(state).alertModalText;
+export const selectAlertModalTitle = state => applicationDefinitionConf(state).alertModalTitle;
 export const selectEditMode = state => applicationDefinitionConf(state).editMode;
 export const selectAnsiblePlaybook = state => applicationDefinitionConf(state).ansiblePlaybook;
 export const selectServices = state => applicationDefinitionConf(state).services;

data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinition.test.js

@@ -15,6 +15,7 @@ const fixtures = {
       services: [],
       ansibleVarsAll: [],
     },
+    closeAlertModal: noop,
     loadAnsibleData: noop,
     initApplicationDefinition: noop,
     addApplicationDefinitionService: noop,

data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinition.test.js.snap

@@ -2,6 +2,30 @@
 
 exports[`ApplicationDefinition should render application definition 1`] = `
 <span>
+  <MessageDialog
+    accessibleDescription=""
+    accessibleName=""
+    className=""
+    enforceFocus={true}
+    footer={null}
+    icon={
+      <Icon
+        name="error-circle-o"
+        type="pf"
+      />
+    }
+    onHide={[Function]}
+    primaryAction={[Function]}
+    primaryActionButtonBsStyle="danger"
+    primaryActionButtonContent="OK"
+    primaryContent=""
+    secondaryAction={[Function]}
+    secondaryActionButtonBsStyle="default"
+    secondaryActionButtonContent={null}
+    secondaryContent={null}
+    show={false}
+    title=""
+  />
   <div>
     <AnsiblePlaybookSelector
       additionalData={
@@ -10,12 +34,13 @@ exports[`ApplicationDefinition should render application definition 1`] = `
         }
       }
       editable={false}
+      hidden={false}
       label="Ansible Playbook"
       onChange={[Function]}
       selectValue=""
       viewText=""
     />
-    <p
+    <div
       style={
         Object {
           "paddingTop": 25,
@@ -25,7 +50,7 @@ exports[`ApplicationDefinition should render application definition 1`] = `
       <pre>
         Ansible Playbook can't be blank
       </pre>
-    </p>
+    </div>
   </div>
   <div
     className="form-group"
@@ -88,7 +113,7 @@ exports[`ApplicationDefinition should render application definition 1`] = `
         }
       >
         <span
-          title="change ansible variables for 'all'"
+          title="Change ansible variables for 'all'"
         >
           A
         </span>
@@ -185,13 +210,13 @@ exports[`ApplicationDefinition should render application definition 1`] = `
     </ForemanModal>
   </div>
   <RailsData
-    key="applications_definition"
+    key="application_definition_services_data"
     parameter="services"
     value="[]"
     view="app_definition"
   />
   <RailsData
-    key="applications_definition"
+    key="application_definition_ansible_data"
     parameter="ansible_vars_all"
     value="[]"
     view="app_definition"

data/webpack/components/ApplicationDefinition/components/AnsiblePlaybookSelector.js

@@ -27,7 +27,7 @@ const AnsiblePlaybookSelector= ({
           additionalData={additionalData}
         />
         <RailsData
-          key='ansible_playbook_id'
+          key='ansible_playbook_data'
           view='app_definition'
           parameter='acd_ansible_playbook_id'
           value={selectValue}

data/webpack/components/ApplicationDefinition/components/__tests__/__snapshots__/AnsiblePlaybookSelector.test.js.snap

@@ -31,7 +31,7 @@ exports[`AnsiblePlaybookSelector should render ansible playbook selector 1`] = `
       viewText="myText"
     />
     <RailsData
-      key="ansible_playbook_id"
+      key="ansible_playbook_data"
       parameter="acd_ansible_playbook_id"
       value="1"
       view="app_definition"
@@ -71,7 +71,7 @@ exports[`AnsiblePlaybookSelector should render hidden ansible playbook selector
       viewText="myText"
     />
     <RailsData
-      key="ansible_playbook_id"
+      key="ansible_playbook_data"
       parameter="acd_ansible_playbook_id"
       value="1"
       view="app_definition"
@@ -111,7 +111,7 @@ exports[`AnsiblePlaybookSelector should render not editable ansible playbook sel
       viewText="myText"
     />
     <RailsData
-      key="ansible_playbook_id"
+      key="ansible_playbook_data"
       parameter="acd_ansible_playbook_id"
       value="1"
       view="app_definition"

data/webpack/components/ApplicationDefinition/index.js

@@ -6,6 +6,9 @@ import ApplicationDefinition from './ApplicationDefinition';
 import * as ApplicationDefinitionActions from './ApplicationDefinitionActions';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAnsiblePlaybook,
   selectServices,
@@ -16,6 +19,9 @@ import {
 } from './ApplicationDefinitionSelectors';
 
 const mapStateToProps = state => ({
+  showAlertModal: selectShowAlertModal(state),
+  alertModalText: selectAlertModalText(state),
+  alertModalTitle: selectAlertModalTitle(state),
   editMode: selectEditMode(state),
   ansiblePlaybook: selectAnsiblePlaybook(state),
   services: selectServices(state),