foreman_acd 0.7.0 → 0.9.2

data/app/services/foreman_acd/inventory_creator.rb

@@ -32,7 +32,7 @@ module ForemanAcd
 
         children[ansible_group] = { 'hosts' => {} } unless children.key?(host_service['ansibleGroup'])
 
-        ansible_vars = JSON.parse(foreman_host.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.
         ansible_vars['ansible_user'] = 'root' unless ansible_vars.key?('ansible_user')
@@ -46,6 +46,16 @@ module ForemanAcd
 
     private
 
+    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?

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

@@ -24,6 +24,10 @@
   if @app_definition.ansible_vars_all.present?
     json["ansibleVarsAll"] = JSON.parse(@app_definition.ansible_vars_all)
   end
+
+   json["supportedPlugins"] = {}
+   json["supportedPlugins"]["puppet"] = defined?(ForemanPuppet) != nil
+   json["supportedPlugins"]["katello"] = defined?(Katello) != nil
 %>
 
 <%= form_for @app_definition, :url => (@app_definition.new_record? ? app_definitions_path : app_definition_path(:id => @app_definition.id)) do |f| %>

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,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/_form.html.erb

@@ -24,6 +24,10 @@
         "ansibleVarsAll": @app_instance.ansible_vars_all.blank? ? [] : JSON.parse(@app_instance.ansible_vars_all),
       }
     end
+
+    json["supportedPlugins"] = {}
+    json["supportedPlugins"]["puppet"] = defined?(ForemanPuppet) != nil
+    json["supportedPlugins"]["katello"] = defined?(Katello) != nil
 %>
 
 <%= form_for @app_instance, :url => (@app_instance.new_record? ? app_instances_path : app_instance_path(:id => @app_instance.id)) do |f| %>

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

@@ -33,7 +33,7 @@ Foreman::Plugin.register :foreman_acd do
                :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :edit_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:update, :edit],
+               { :'foreman_acd/ansible_playbooks' => [:update, :edit, :sync_git_repo],
                  :'foreman_acd/api/v2/ansible_playbooks' => [:update] },
                :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
@@ -72,7 +72,7 @@ Foreman::Plugin.register :foreman_acd do
                :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :export_app_definitions,
-               { :'foreman_acd/app_definitions' => [:export],
+               { :'foreman_acd/app_definitions' => [:export, :handle_file_upload],
                  :'foreman_acd/api/v2/app_definitions' => [:export] },
                :resource_type => 'ForemanAcd::AppDefinition'
 
@@ -111,16 +111,16 @@ 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] }
+               { :ui_acd => [:app, :foreman_data, :ansible_data, :validate_hostname, :report_data] }
 
     permission :acd_foreman_hosts,
                { :'foreman_acd/app_instances' => [:create, :edit, :update, :deploy, :destroy_with_hosts, :destroy] },
@@ -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.2'
 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/package.json

@@ -1,42 +1,25 @@
 {
   "name": "foreman_acd",
-  "version": "0.3.0",
+  "version": "0.9.2",
   "description": "foreman application centric deployment",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
-  "dependencies": {
-    "@theforeman/vendor": "^1.7.0",
-    "react-intl": "^2.8.0"
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 10.1.0"
   },
   "devDependencies": {
-    "@theforeman/vendor-dev": "^1.7.0",
-    "babel-eslint": "^8.2.1",
-    "babel-jest": "^23.6.0",
-    "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "@theforeman/builder": "^10.1.0",
+    "@theforeman/eslint-plugin-foreman": "^10.1.0",
+    "@theforeman/test": "^10.1.0",
+    "@theforeman/vendor-dev": "^10.1.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.6",
-    "enzyme-to-json": "^3.6.1",
-    "eslint": "^4.18.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "eslint-plugin-react": "^7.22.0",
-    "identity-obj-proxy": "^3.0.0",
     "jest": "^23.6.0",
-    "jest-cli": "^23.6.0",
     "jest-prop-type-error": "^1.1.0",
-    "lodash": "^4.17.21",
-    "react-redux-test-utils": "^0.1.1",
-    "sortabular": "~1.5.1",
-    "table-resolver": "~3.2.0"
+    "react-redux-test-utils": "^0.1.1"
   },
   "scripts": {
     "test": "node node_modules/.bin/jest --no-cache"

data/test/controllers/ui_acd_controller_test.rb

@@ -30,7 +30,10 @@ class UiAcdControllerTest < ActionController::TestCase
     assert_equal json_app_all.first['name'], parsed_all_response.first['name']
   end
 
-  test 'get foreman data json' do
+  test 'get foreman data json foreman <3' do
+    # TODO: Get rid of the puppet dependency at all!
+    skip 'Puppet env was removed with foreman >= 3.x' unless defined?(ForemanPuppet)
+
     hostgroup = FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment)
     get :foreman_data, :params => { :id => hostgroup.id }, :session => set_session_user
     assert_response :success

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

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

data/webpack/__snapshots__/helper.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`helper creates a object from an array 1`] = `
+exports[`helper formats a nice, easy header 1`] = `
 <TableHeading
   align=""
   aria-label="TheLabel"

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';
@@ -56,7 +57,7 @@ class ApplicationDefinition extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups },
+      data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups, supportedPlugins },
       initApplicationDefinition,
       addApplicationDefinitionService,
       deleteApplicationDefinitionService,
@@ -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
@@ -193,6 +194,7 @@ class ApplicationDefinition extends React.Component {
       ansiblePlaybook,
       services,
       ansibleVarsAll,
+      supportedPlugins,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -202,9 +204,11 @@ class ApplicationDefinition extends React.Component {
   render() {
     const {
       data: { organization, location, mode, ansiblePlaybooks, foremanDataUrl, ansibleDataUrl },
+      showAlertModal, alertModalText, alertModalTitle, closeAlertModal,
       ansiblePlaybook,
       services,
       columns,
+      hiddenForemanParameterTypes,
       addApplicationDefinitionService,
       confirmEditApplicationDefinitionService,
       cancelEditApplicationDefinitionService,
@@ -216,12 +220,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 +244,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 +293,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>
@@ -296,6 +310,7 @@ class ApplicationDefinition extends React.Component {
               <ParameterSelection
                 editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
+                hiddenParameterTypes={ hiddenForemanParameterTypes }
                 location={ location }
                 organization={ organization }
                 paramDataUrl= { foremanDataUrl }
@@ -339,13 +354,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,23 +371,32 @@ class ApplicationDefinition extends React.Component {
 
 ApplicationDefinition.defaultProps = {
   error: {},
+  showAlertModal: false,
+  alertModalText: '',
+  alertModalTitle: '',
   editMode: false,
   ansiblePlaybook: { "id": '', "name": '' },
   services: [],
   ansibleVarsAll: [],
   parametersData: {},
   columns: [],
+  hiddenForemanParameterTypes: [],
   editParamsOfRowId: null,
   paramEditMode: false,
 }
 
 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,
+  hiddenForemanParameterTypes: 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,
@@ -33,6 +34,10 @@ import {
   APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
+import {
+  supportedPluginsToHiddenParameterTypes,
+} from '../../helper';
+
 import {
   transformAnsiblePlaybook,
 } from './ApplicationDefinitionHelper';
@@ -41,6 +46,7 @@ export const initApplicationDefinition = (
   ansiblePlaybook,
   services,
   ansibleVarsAll,
+  supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -167,6 +173,7 @@ export const initApplicationDefinition = (
   }
   initialState.services = services;
   initialState.ansibleVarsAll = ansibleVarsAll;
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
 
   dispatch({
     type: APPLICATION_DEFINITION_INIT,
@@ -182,6 +189,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';