foreman_acd 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6ffd04ba17f399f8ecbf17615fde7ba6391cf389e16d83e427adb2c15cff9f
-  data.tar.gz: 9de27331a51e5bb6887250b01e40d6557fb9e5f66f96005f16e8d5fb2e6999f8
+  metadata.gz: 2a738c9828728db02d8d06460befc527ffbf7c3662d0bd0ba4d252ffe416be7e
+  data.tar.gz: 30c1d33e7525179ac752d949116fd99bc9fefb27e11c1a6f69567803ef5a0e25
 SHA512:
-  metadata.gz: ee8e1c5f4b7d842ce1f153c282b74a07a83edd6405e0b0ba7476602bd0c225bf8fefdb7e19aacfd2d79033f0c5429bc675e9c0dd1d794b2f1cfbe9d91764e9ed
-  data.tar.gz: 1d74484d949e080478432b0d76cba89b87fde3eda56a1d6cf7c69dc2207cdca2308a73b9f11de6a25d5713b2de12a546423b3d251d793925f55c33440cad108c
+  metadata.gz: 8311857ec1c4a78e95e4f6a401548fa975b876fba04839a0641d84c4dd138d20858717df830d391651bb517ce07e423fc4faa2b4abc42e25a8fe332233e7460c
+  data.tar.gz: 455afe8abd543214663b4a621d92893a8e63e28a44e412b1de65695c32e712432906324b73b09c64ee94a6091bc4470f8b8640eb3f1507c3a21d804526ee45a8

data/README.md

@@ -119,8 +119,6 @@ All Foreman parameters require a value.
 
 ## TODO
 
-* Add `git` support for the Ansible playbooks.
-* Provide application templates which contains application definition and the required Ansible-playbook.
 * Add Saltstack support to configure the application.
 * Extend the Foreman parameter and value validation.
 

data/app/controllers/ui_acd_controller.rb

@@ -40,13 +40,15 @@ class UiAcdController < ::Api::V2::BaseController
   def collect_foreman_data(hostgroup_id)
     hg = Hostgroup.find(hostgroup_id)
     fdata = OpenStruct.new(
-      :environments => Environment.all,
-      :lifecycle_environments => Katello::KTEnvironment.all,
       :domains => Domain.all,
       :computeprofiles => ComputeProfile.all,
       :hostgroup_id => hg.id,
       :ptables => hg&.operatingsystem&.ptables
     )
+
+    fdata[:environments] = Environment.all if defined?(ForemanPuppet)
+    fdata[:lifecycle_environments] = Katello::KTEnvironment.all if defined?(Katello)
+
     fdata
   end
 

data/app/models/concerns/foreman_acd/host_managed_extensions.rb

@@ -9,6 +9,31 @@ module ForemanAcd
       base.instance_eval do
         before_provision :initiate_acd_app_configurator_after_host_deployment, :if => :deployed_via_acd?
         before_destroy :check_deletable, :prepend => true, :if => :deployed_via_acd?
+
+        has_many :app_instances, :through => :foreman_hosts, :class_name => 'ForemanAcd::AppInstance'
+
+        scoped_search :relation => :app_instances,
+                      :on => :name,
+                      :rename => :acd_app_instance,
+                      :only_explicit => true,
+                      :complete_value => true,
+                      :operators => ['= '],
+                      :ext_method => :find_by_acd_app_instance_name
+      end
+
+      base.singleton_class.prepend ClassMethods
+    end
+
+    # New class methods for Host::Managed
+    module ClassMethods
+      def find_by_acd_app_instance_name(_key, operator, acd_instance_name)
+        cond = sanitize_sql_for_conditions(["acd_app_instances.name #{operator} ?", value_to_sql(operator, acd_instance_name)])
+        hosts = ForemanAcd::AppInstance.where(cond).joins(:foreman_hosts).pluck(:host_id)
+        if hosts.empty?
+          { :condition => '1=0' }
+        else
+          { :conditions => Host::Managed.arel_table[:id].in(hosts).to_sql }
+        end
       end
     end
 

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_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/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'
 
@@ -120,7 +120,7 @@ Foreman::Plugin.register :foreman_acd do
                :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] },

data/lib/foreman_acd/version.rb

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

data/package.json

@@ -1,42 +1,28 @@
 {
   "name": "foreman_acd",
-  "version": "0.3.0",
+  "version": "0.9.0",
   "description": "foreman application centric deployment",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "@theforeman/vendor": "^1.7.0",
+    "@theforeman/vendor": "^4.14.0",
     "react-intl": "^2.8.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": "^4.14.0",
+    "@theforeman/vendor-dev": "^4.14.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/__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

@@ -57,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,
@@ -194,6 +194,7 @@ class ApplicationDefinition extends React.Component {
       ansiblePlaybook,
       services,
       ansibleVarsAll,
+      supportedPlugins,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -207,6 +208,7 @@ class ApplicationDefinition extends React.Component {
       ansiblePlaybook,
       services,
       columns,
+      hiddenForemanParameterTypes,
       addApplicationDefinitionService,
       confirmEditApplicationDefinitionService,
       cancelEditApplicationDefinitionService,
@@ -308,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 }
@@ -377,6 +380,7 @@ ApplicationDefinition.defaultProps = {
   ansibleVarsAll: [],
   parametersData: {},
   columns: [],
+  hiddenForemanParameterTypes: [],
   editParamsOfRowId: null,
   paramEditMode: false,
 }
@@ -391,6 +395,7 @@ ApplicationDefinition.propTypes = {
   services: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
   columns: PropTypes.array,
+  hiddenForemanParameterTypes: PropTypes.array,
   closeAlertModal: PropTypes.func,
   addApplicationDefinitionService: PropTypes.func,
   deleteApplicationDefinitionService: PropTypes.func,

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -34,6 +34,10 @@ import {
   APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
+import {
+  supportedPluginsToHiddenParameterTypes,
+} from '../../helper';
+
 import {
   transformAnsiblePlaybook,
 } from './ApplicationDefinitionHelper';
@@ -42,6 +46,7 @@ export const initApplicationDefinition = (
   ansiblePlaybook,
   services,
   ansibleVarsAll,
+  supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -168,6 +173,7 @@ export const initApplicationDefinition = (
   }
   initialState.services = services;
   initialState.ansibleVarsAll = ansibleVarsAll;
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
 
   dispatch({
     type: APPLICATION_DEFINITION_INIT,

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -7,6 +7,7 @@ export const selectEditMode = state => applicationDefinitionConf(state).editMode
 export const selectAnsiblePlaybook = state => applicationDefinitionConf(state).ansiblePlaybook;
 export const selectServices = state => applicationDefinitionConf(state).services;
 export const selectColumns = state => applicationDefinitionConf(state).columns;
+export const selectHiddenForemanParameterTypes = state => applicationDefinitionConf(state).hiddenForemanParameterTypes;
 export const selectParametersData = state => applicationDefinitionConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationDefinitionConf(state).ansibleVarsAll;
 export const selectParamEditMode = state => applicationDefinitionConf(state).paramEditMode;

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

@@ -1,10 +1,14 @@
 import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAnsiblePlaybook,
   selectServices,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectParametersData,
   selectAnsibleVarsAll,
   selectParamEditMode,
@@ -21,6 +25,12 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
+  'should return showAlertModal from applicationDefinitionConfData_1 fixtures': () =>
+    selectShowAlertModal(stateFactory(applicationDefinitionConfData_1)),
+  'should return alertModalText from applicationDefinitionConfData_1 fixtures': () =>
+    selectAlertModalText(stateFactory(applicationDefinitionConfData_1)),
+  'should return alertModalTitle from applicationDefinitionConfData_1 fixtures': () =>
+    selectAlertModalTitle(stateFactory(applicationDefinitionConfData_1)),
   'should return editMode from applicationDefinitionConfData_1 fixtures': () =>
     selectEditMode(stateFactory(applicationDefinitionConfData_1)),
   'should return ansiblePlaybook from applicationDefinitionConfData_1 fixtures': () =>
@@ -31,6 +41,8 @@ const fixtures = {
     selectParametersData(stateFactory(applicationDefinitionConfData_1)),
   'should return columns from applicationDefinitionConfData_1 fixtures': () =>
     selectColumns(stateFactory(applicationDefinitionConfData_1)),
+  'should return hiddenForemanParameterTypes from applicationDefinitionConfData_1 fixtures': () =>
+    selectHiddenForemanParameterTypes(stateFactory(applicationDefinitionConfData_1)),
   'should return ansibleVarsAll from applicationDefinitionConfData_1 fixtures': () =>
     selectAnsibleVarsAll(stateFactory(applicationDefinitionConfData_1)),
   'should return ParamEditMode from applicationDefinitionConfData_1 fixtures': () =>

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

@@ -134,6 +134,7 @@ exports[`ApplicationDefinition should render application definition 1`] = `
       <Connect(ParameterSelection)
         data={Object {}}
         editModeCallback={[Function]}
+        hiddenParameterTypes={Array []}
         location="Default Location"
         organization="Default Organization"
         paramDataUrl="url/does/not/exist"

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

@@ -2,6 +2,10 @@
 
 exports[`ApplicationDefinitionSelectors should return ParamEditMode from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationDefinitionSelectors should return alertModalText from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationDefinitionSelectors should return alertModalTitle from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationDefinitionSelectors should return ansiblePlaybook from applicationDefinitionConfData_1 fixtures 1`] = `
 Object {
   "groups": Object {
@@ -214,6 +218,8 @@ Array [
 
 exports[`ApplicationDefinitionSelectors should return editMode from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationDefinitionSelectors should return hiddenForemanParameterTypes from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationDefinitionSelectors should return parametersData from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;
 
 exports[`ApplicationDefinitionSelectors should return services from applicationDefinitionConfData_1 fixtures 1`] = `
@@ -297,3 +303,5 @@ Array [
   },
 ]
 `;
+
+exports[`ApplicationDefinitionSelectors should return showAlertModal from applicationDefinitionConfData_1 fixtures 1`] = `undefined`;

data/webpack/components/ApplicationDefinition/index.js

@@ -13,6 +13,7 @@ import {
   selectAnsiblePlaybook,
   selectServices,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectParametersData,
   selectAnsibleVarsAll,
   selectParamEditMode,
@@ -26,6 +27,7 @@ const mapStateToProps = state => ({
   ansiblePlaybook: selectAnsiblePlaybook(state),
   services: selectServices(state),
   columns: selectColumns(state),
+  hiddenForemanParameterTypes: selectHiddenForemanParameterTypes(state),
   parametersData: selectParametersData(state),
   ansibleVarsAll: selectAnsibleVarsAll(state),
   paramEditMode: selectParamEditMode(state),

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportActions.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { API, actionTypeGenerator } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
 

data/webpack/components/ApplicationInstance/ApplicationInstance.js

@@ -92,7 +92,7 @@ class ApplicationInstance extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, appDefinition, hosts, ansibleVarsAll, appDefinitionUrl },
+      data: { mode, appDefinition, hosts, ansibleVarsAll, appDefinitionUrl, supportedPlugins },
       initApplicationInstance,
       addApplicationInstanceHost,
       deleteApplicationInstanceHost,
@@ -244,6 +244,7 @@ class ApplicationInstance extends React.Component {
       appDefinition,
       hosts,
       ansibleVarsAll,
+      supportedPlugins,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -258,6 +259,7 @@ class ApplicationInstance extends React.Component {
       services,
       hosts,
       columns,
+      hiddenForemanParameterTypes,
       addApplicationInstanceHost,
       confirmEditApplicationInstanceHost,
       cancelEditApplicationInstanceHost,
@@ -385,6 +387,7 @@ class ApplicationInstance extends React.Component {
               <ParameterSelection
                 editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
+                hiddenParameterTypes={ hiddenForemanParameterTypes }
                 location={ location }
                 organization={ organization }
                 paramDataUrl= { foremanDataUrl }
@@ -483,6 +486,7 @@ ApplicationInstance.defaultProps = {
   ansibleVarsAll: [],
   parametersData: {},
   columns: [],
+  hiddenForemanParameterTypes: [],
   editParamsOfRowId: null,
   paramEditMode: false,
 }
@@ -496,6 +500,7 @@ ApplicationInstance.propTypes = {
   services: PropTypes.array,
   appDefinition: PropTypes.object,
   columns: PropTypes.array,
+  hiddenForemanParameterTypes: PropTypes.array,
   hosts: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
   closeAlertModal: PropTypes.func,

data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js

@@ -36,10 +36,15 @@ import {
   APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
+import {
+  supportedPluginsToHiddenParameterTypes,
+} from '../../helper';
+
 export const initApplicationInstance = (
   appDefinition,
   hosts,
   ansibleVarsAll,
+  supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -116,6 +121,7 @@ export const initApplicationInstance = (
   initialState.appDefinition = appDefinition;
   initialState.hosts = hosts;
   initialState.ansibleVarsAll = ansibleVarsAll;
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
 
   dispatch({
     type: APPLICATION_INSTANCE_INIT,

data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js

@@ -7,6 +7,7 @@ export const selectEditMode = state => applicationInstanceConf(state).editMode;
 export const selectAppDefinition = state => applicationInstanceConf(state).appDefinition;
 export const selectHosts = state => applicationInstanceConf(state).hosts;
 export const selectColumns = state => applicationInstanceConf(state).columns;
+export const selectHiddenForemanParameterTypes = state => applicationInstanceConf(state).hiddenForemanParameterTypes;
 export const selectServices = state => applicationInstanceConf(state).services;
 export const selectParametersData = state => applicationInstanceConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationInstanceConf(state).ansibleVarsAll;

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceSelectors.test.js

@@ -1,10 +1,14 @@
 import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 
 import {
+  selectShowAlertModal,
+  selectAlertModalText,
+  selectAlertModalTitle,
   selectEditMode,
   selectAppDefinition,
   selectHosts,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectServices,
   selectParametersData,
   selectAnsibleVarsAll,
@@ -22,6 +26,12 @@ const stateFactory = obj => ({
 });
 
 const fixtures = {
+  'should return showAlertModal from applicationInstanceConfData_1 fixtures': () =>
+    selectShowAlertModal(stateFactory(applicationInstanceConfData_1)),
+  'should return alertModalText from applicationInstanceConfData_1 fixtures': () =>
+    selectAlertModalText(stateFactory(applicationInstanceConfData_1)),
+  'should return alertModalTitle from applicationInstanceConfData_1 fixtures': () =>
+    selectAlertModalTitle(stateFactory(applicationInstanceConfData_1)),
   'should return editMode from applicationInstanceConfData_1 fixtures': () =>
     selectEditMode(stateFactory(applicationInstanceConfData_1)),
   'should return appDefinition from applicationInstanceConfData_1 fixtures': () =>
@@ -30,6 +40,8 @@ const fixtures = {
     selectHosts(stateFactory(applicationInstanceConfData_1)),
   'should return columns from applicationInstanceConfData_1 fixtures': () =>
     selectColumns(stateFactory(applicationInstanceConfData_1)),
+  'should return hiddenForemanParameterTypes from applicationInstanceConfData_1 fixtures': () =>
+    selectHiddenForemanParameterTypes(stateFactory(applicationInstanceConfData_1)),
   'should return services from applicationInstanceConfData_1 fixtures': () =>
     selectServices(stateFactory(applicationInstanceConfData_1)),
   'should return parametersData from applicationInstanceConfData_1 fixtures': () =>

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

@@ -165,6 +165,7 @@ exports[`ApplicationInstance should render application instance 1`] = `
       <Connect(ParameterSelection)
         data={Object {}}
         editModeCallback={[Function]}
+        hiddenParameterTypes={Array []}
         location="Default Location"
         organization="Default Organization"
         paramType="PARAMETER_SELECTION_PARAM_TYPE_FOREMAN"

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceSelectors.test.js.snap

@@ -2,6 +2,10 @@
 
 exports[`ApplicationInstanceSelectors should return ParamEditMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationInstanceSelectors should return alertModalText from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return alertModalTitle from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationInstanceSelectors should return ansibleVarsAll from applicationInstanceConfData_1 fixtures 1`] = `
 Array [
   Object {
@@ -117,6 +121,8 @@ Array [
 
 exports[`ApplicationInstanceSelectors should return editMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
 
+exports[`ApplicationInstanceSelectors should return hiddenForemanParameterTypes from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
 exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceConfData_1 fixtures 1`] = `
 Array [
   Object {
@@ -274,3 +280,5 @@ Array [
   },
 ]
 `;
+
+exports[`ApplicationInstanceSelectors should return showAlertModal from applicationInstanceConfData_1 fixtures 1`] = `undefined`;

data/webpack/components/ApplicationInstance/index.js

@@ -14,6 +14,7 @@ import {
   selectHosts,
   selectServices,
   selectColumns,
+  selectHiddenForemanParameterTypes,
   selectParametersData,
   selectAnsibleVarsAll,
   selectParamEditMode,
@@ -28,6 +29,7 @@ const mapStateToProps = state => ({
   hosts: selectHosts(state),
   services: selectServices(state),
   columns: selectColumns(state),
+  hiddenForemanParameterTypes: selectHiddenForemanParameterTypes(state),
   parametersData: selectParametersData(state),
   ansibleVarsAll: selectAnsibleVarsAll(state),
   paramEditMode: selectParamEditMode(state),

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -95,6 +95,7 @@ class ParameterSelection extends React.Component {
       organization,
       paramType,
       paramDataUrl,
+      hiddenParameterTypes,
       initParameterSelection,
       sortParameter,
       deleteParameter,
@@ -306,6 +307,7 @@ class ParameterSelection extends React.Component {
       paramType,
       paramDefinition,
       parameters,
+      hiddenParameterTypes,
       useDefaultValue,
       allowNameAdjustment,
       allowDescriptionAdjustment,
@@ -463,6 +465,7 @@ ParameterSelection.defaultProps = {
   paramData: {},
   parameters: [],
   columns: [],
+  hiddenParameterTypes: [],
   sortingColumns: {},
   editParamsRowIndex: [],
   editModeCallback: undefined,
@@ -481,6 +484,8 @@ ParameterSelection.propTypes = {
   editMode: PropTypes.bool.isRequired,
   loading: PropTypes.bool.isRequired,
   paramData: PropTypes.object.isRequired,
+  hiddenParameterTypes: PropTypes.array.isRequired,
+  allowedParameterTypes: PropTypes.object,
   parameterTypes: PropTypes.object,
   parameters: PropTypes.array,
   sortingColumns: PropTypes.object,

data/webpack/components/ParameterSelection/ParameterSelectionActions.js

@@ -17,7 +17,7 @@ import {
 } from 'foremanReact/common/helpers';
 
 import {
-  filterUsedParameterTypes,
+  filterParameterTypes,
 } from './ParameterSelectionHelper';
 
 import {
@@ -49,6 +49,7 @@ export const initParameterSelection = (
   paramType,
   paramDefinition,
   parameters,
+  hiddenParameterTypes,
   useDefaultValue,
   allowNameAdjustment,
   allowDescriptionAdjustment,
@@ -181,7 +182,14 @@ export const initParameterSelection = (
   initialState.parameters = parameters;
 
   if ((paramType == PARAMETER_SELECTION_PARAM_TYPE_FOREMAN) && (parameters)) {
-    initialState.parameterTypes = filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters);
+    let pTypes = PARAMETER_SELECTION_TYPES;
+
+    // filter hidden parameters
+    hiddenParameterTypes.forEach(item => delete pTypes[item]);
+    initialState.allowedParameterTypes = pTypes;
+
+    // filter already used parameter types
+    initialState.parameterTypes = filterParameterTypes(pTypes, parameters);
   }
 
   initialState.paramType = paramType;

data/webpack/components/ParameterSelection/ParameterSelectionHelper.js

@@ -11,10 +11,14 @@ export const transformForemanData = (fdata) => {
   return (result);
 }
 
-export const filterUsedParameterTypes = (options, parameters) => {
+export const filterParameterTypes = (options, parameters) => {
   const newOptions = cloneDeep(options);
+
   // hostparam can be used multiple times
   const alreadyUsed = parameters.map(item => item["type"]).filter(item => item != 'hostparam');
+
+  // remove already used items
   alreadyUsed.forEach(item => delete newOptions[item])
+
   return newOptions;
 }

data/webpack/components/ParameterSelection/ParameterSelectionReducer.js

@@ -7,7 +7,7 @@ import {
 } from 'lodash';
 
 import {
-  filterUsedParameterTypes,
+  filterParameterTypes,
 } from './ParameterSelectionHelper';
 
 import * as sort from 'sortabular';
@@ -83,7 +83,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
       const parameters = state.parameters.filter(v => v.id !== payload.rowData.id);
       return state.merge({
         parameters: parameters,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
+        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
       })
     }
     case PARAMETER_SELECTION_EDIT_ACTIVATE: {
@@ -106,7 +106,7 @@ const parameterSelectionParameters = (state = initialState, action) => {
 
       return state.merge({
         editMode: false,
-        parameterTypes: filterUsedParameterTypes(PARAMETER_SELECTION_TYPES, parameters),
+        parameterTypes: filterParameterTypes(state.allowedParameterTypes, parameters),
         parameters: parameters
       });
     }

data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js

@@ -3,6 +3,7 @@ const parameterState = state => state.foremanAcd.parameterSelectionParameters;
 export const selectLoading = state => parameterState(state).loading;
 export const selectEditMode = state => parameterState(state).editMode;
 export const selectParamData = state => parameterState(state).paramData;
+export const selectAllowedParameterTypes = state => parameterState(state).allowedParameterTypes;
 export const selectParameterTypes = state => parameterState(state).parameterTypes;
 export const selectParameters = state => parameterState(state).parameters;
 export const selectSortingColumns = state => parameterState(state).sortingColumns;

data/webpack/components/ParameterSelection/__fixtures__/parameterSelectionData_1.fixtures.js

@@ -215,6 +215,14 @@ export const parameterSelectionData_1 = {
       value: '1'
     }
   ],
+  allowedParameterTypes: [
+    'domain',
+    'hostparam',
+    'ip',
+    'ptable',
+    'puppetenv',
+    'password',
+  ],
   parameterTypes: {
     domain: 'Domain',
     hostparam: 'Host parameter',

data/webpack/components/ParameterSelection/__tests__/ParameterSelectionSelectors.test.js

@@ -4,12 +4,14 @@ import {
   selectLoading,
   selectEditMode,
   selectParamData,
+  selectAllowedParameterTypes,
   selectParameterTypes,
   selectParameters,
   selectSortingColumns,
   selectColumns,
   selectParamDefinition,
   selectHostgroupId,
+  selectEditParamsRowIndex,
 } from '../ParameterSelectionSelectors';
 
 import {
@@ -29,6 +31,8 @@ const fixtures = {
     selectEditMode(stateFactory(parameterSelectionData_1)),
   'should return paramData from parameterSelectionData_1 fixtures': () =>
     selectParamData(stateFactory(parameterSelectionData_1)),
+  'should return allowedParameterTypes from parameterSelectionData_1 fixtures': () =>
+    selectAllowedParameterTypes(stateFactory(parameterSelectionData_1)),
   'should return parameterTypes from parameterSelectionData_1 fixtures': () =>
     selectParameterTypes(stateFactory(parameterSelectionData_1)),
   'should return parameters from parameterSelectionData_1 fixtures': () =>
@@ -41,6 +45,8 @@ const fixtures = {
     selectParamDefinition(stateFactory(parameterSelectionData_1)),
   'should return hostgroupId from parameterSelectionData_1 fixtures': () =>
     selectHostgroupId(stateFactory(parameterSelectionData_1)),
+  'should return editParamsRowIndex from parameterSelectionData_1 fixtures': () =>
+    selectEditParamsRowIndex(stateFactory(parameterSelectionData_1)),
 };
 
 describe('ParameterSelectionSelectors', () =>

data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionReducer.test.js.snap

@@ -2,6 +2,14 @@
 
 exports[`ParameterSelectionReducer should activate edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -240,6 +248,14 @@ Object {
 
 exports[`ParameterSelectionReducer should add a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -490,6 +506,14 @@ Object {
 
 exports[`ParameterSelectionReducer should cancel edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -719,6 +743,14 @@ Object {
 
 exports[`ParameterSelectionReducer should change edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -957,6 +989,14 @@ Object {
 
 exports[`ParameterSelectionReducer should confirm edit parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1149,14 +1189,14 @@ Object {
     "id": 1,
     "name": "web",
   },
-  "parameterTypes": Object {
-    "domain": "Domain",
-    "hostparam": "Host parameter",
-    "ip": "IP",
-    "password": "Root password",
-    "ptable": "Partition table",
-    "puppetenv": "Puppet environment",
-  },
+  "parameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "parameters": Array [
     Object {
       "description": "",
@@ -1186,6 +1226,14 @@ Object {
 
 exports[`ParameterSelectionReducer should delete a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1378,15 +1426,14 @@ Object {
     "id": 1,
     "name": "web",
   },
-  "parameterTypes": Object {
-    "domain": "Domain",
-    "hostparam": "Host parameter",
-    "ip": "IP",
-    "lifecycleenv": "Lifecycle environment",
-    "password": "Root password",
-    "ptable": "Partition table",
-    "puppetenv": "Puppet environment",
-  },
+  "parameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "parameters": Array [
     Object {
       "description": "",
@@ -1408,6 +1455,14 @@ Object {
 
 exports[`ParameterSelectionReducer should initialize component 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1645,6 +1700,14 @@ Object {
 
 exports[`ParameterSelectionReducer should load param data be erroneous 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -1870,6 +1933,14 @@ Object {
 
 exports[`ParameterSelectionReducer should load param data be successful 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2099,6 +2170,14 @@ Object {
 
 exports[`ParameterSelectionReducer should lock a parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2328,6 +2407,14 @@ Object {
 
 exports[`ParameterSelectionReducer should request load param data 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {
@@ -2568,6 +2655,14 @@ Object {
 
 exports[`ParameterSelectionReducer should sort parameter 1`] = `
 Object {
+  "allowedParameterTypes": Array [
+    "domain",
+    "hostparam",
+    "ip",
+    "ptable",
+    "puppetenv",
+    "password",
+  ],
   "columns": Array [
     Object {
       "cell": Object {

data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionSelectors.test.js.snap

@@ -8,6 +8,17 @@ Object {
 }
 `;
 
+exports[`ParameterSelectionSelectors should return allowedParameterTypes from parameterSelectionData_1 fixtures 1`] = `
+Array [
+  "domain",
+  "hostparam",
+  "ip",
+  "ptable",
+  "puppetenv",
+  "password",
+]
+`;
+
 exports[`ParameterSelectionSelectors should return columns from parameterSelectionData_1 fixtures 1`] = `
 Array [
   Object {
@@ -146,6 +157,8 @@ Array [
 
 exports[`ParameterSelectionSelectors should return editMode from parameterSelectionData_1 fixtures 1`] = `false`;
 
+exports[`ParameterSelectionSelectors should return editParamsRowIndex from parameterSelectionData_1 fixtures 1`] = `undefined`;
+
 exports[`ParameterSelectionSelectors should return hostgroupId from parameterSelectionData_1 fixtures 1`] = `1`;
 
 exports[`ParameterSelectionSelectors should return loading from parameterSelectionData_1 fixtures 1`] = `false`;

data/webpack/components/ParameterSelection/index.js

@@ -9,6 +9,7 @@ import {
   selectLoading,
   selectEditMode,
   selectParamData,
+  selectAllowedParameterTypes,
   selectParameterTypes,
   selectParameters,
   selectSortingColumns,
@@ -21,6 +22,7 @@ const mapStateToProps = state => ({
   loading: selectLoading(state),
   editMode: selectEditMode(state),
   paramData: selectParamData(state),
+  allowedParameterTypes: selectAllowedParameterTypes(state),
   parameterTypes: selectParameterTypes(state),
   parameters: selectParameters(state),
   sortingColumns: selectSortingColumns(state),

data/webpack/components/SyncGitRepo/SyncGitRepoActions.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { API, actionTypeGenerator } from 'foremanReact/redux/API';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { addToast } from 'foremanReact/redux/actions/toasts';
+import { addToast } from 'foremanReact/components/ToastsList';
 
 import {
   SYNC_GIT_REPO_INIT,

data/webpack/helper.js

@@ -31,9 +31,24 @@ function EasyHeaderFormatter(value, { column }) {
   );
 }
 
+function supportedPluginsToHiddenParameterTypes(supportedPlugins) {
+  let hiddenParameterTypes = [];
+
+  if (supportedPlugins['puppet'] == false) {
+    hiddenParameterTypes.push("puppetenv");
+  }
+
+  if (supportedPlugins['katello'] == false) {
+    hiddenParameterTypes.push("lifecycleenv");
+  }
+
+  return hiddenParameterTypes;
+}
+
 export {
   arrayToObject,
   arrayToObjectObj,
   shortHostname,
-  EasyHeaderFormatter
+  EasyHeaderFormatter,
+  supportedPluginsToHiddenParameterTypes
 };

data/webpack/helper.test.js

@@ -2,6 +2,7 @@ import {
   arrayToObject,
   arrayToObjectObj,
   EasyHeaderFormatter,
+  supportedPluginsToHiddenParameterTypes,
 } from './helper';
 
 describe('helper', () => {
@@ -30,8 +31,26 @@ describe('helper', () => {
     );
   });
 
-  it('creates a object from an array', () => {
+  it('formats a nice, easy header', () => {
     expect(EasyHeaderFormatter('MyValue', { column: { header: { label: 'TheLabel', props: { p1: '1' } } } })).toMatchSnapshot();
   });
+
+  it('creates hidden parameter definition by supported plugins 1', () => {
+    expect(supportedPluginsToHiddenParameterTypes({ puppet: false})).toEqual(
+      ['puppetenv']
+    );
+  });
+
+  it('creates hidden parameter definition by supported plugins 2', () => {
+    expect(supportedPluginsToHiddenParameterTypes({ puppet: true})).toEqual(
+      []
+    );
+  });
+
+  it('creates hidden parameter definition by supported plugins 3', () => {
+    expect(supportedPluginsToHiddenParameterTypes({})).toEqual(
+      []
+    );
+  });
 });
 

data/webpack/test_setup.js

@@ -1,5 +1,3 @@
-import 'babel-polyfill';
-
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_acd
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop