foreman_acd 0.2.1 → 0.7.0

data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReportSelectors.test.js.snap

@@ -0,0 +1,347 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ApplicationInstanceSelectors should return activeHostId from applicationInstanceReportData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceReportData_1 fixtures 1`] = `
+Array [
+  Object {
+    "build": false,
+    "hostUrl": "/hosts/great-web-app-db-1.deploy3.dev.atix",
+    "id": 8,
+    "name": "great-web-app-db-1",
+    "powerStatusUrl": "/api/v2/hosts/great-web-app-db-1.deploy3.dev.atix/power",
+    "progress_report": Array [
+      Object {
+        "created": 1615542728.8466988,
+        "id": "Set up compute instance great-web-app-db-1.deploy3.dev.atix",
+        "name": "Set up compute instance great-web-app-db-1.deploy3.dev.atix",
+        "priority": 3,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:10.190Z",
+      },
+      Object {
+        "created": 1615542728.8474095,
+        "id": "Query instance details for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Query instance details for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 5,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:10.385Z",
+      },
+      Object {
+        "created": 1615542728.0081317,
+        "id": "dhcp_create_192.168.171.103",
+        "name": "Create DHCP Settings for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:10.584Z",
+      },
+      Object {
+        "created": 1615542728.04177,
+        "id": "Create IPv4 DNS record for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Create IPv4 DNS record for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:10.679Z",
+      },
+      Object {
+        "created": 1615542728.0424814,
+        "id": "Create Reverse IPv4 DNS record for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Create Reverse IPv4 DNS record for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:10.798Z",
+      },
+      Object {
+        "created": 1615542728.0881674,
+        "id": "Deploy TFTP PXELinux config for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXELinux config for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:11.178Z",
+      },
+      Object {
+        "created": 1615542728.0883749,
+        "id": "Deploy TFTP PXEGrub2 config for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub2 config for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:11.615Z",
+      },
+      Object {
+        "created": 1615542728.088634,
+        "id": "Deploy TFTP PXEGrub config for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub config for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:11.642Z",
+      },
+      Object {
+        "created": 1615542728.0888274,
+        "id": "Deploy TFTP iPXE config for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Deploy TFTP iPXE config for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:11.874Z",
+      },
+      Object {
+        "created": 1615542728.0894718,
+        "id": "Fetch TFTP boot files for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Fetch TFTP boot files for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 25,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:11.981Z",
+      },
+      Object {
+        "created": 1615542728.8482428,
+        "id": "Power up compute instance great-web-app-db-1.deploy3.dev.atix",
+        "name": "Power up compute instance great-web-app-db-1.deploy3.dev.atix",
+        "priority": 1000,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:12.950Z",
+      },
+      Object {
+        "created": 1615542728.8508224,
+        "id": "Cleanup PuppetCA certificates for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Cleanup PuppetCA certificates for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 51,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:13.390Z",
+      },
+      Object {
+        "created": 1615542728.8514216,
+        "id": "Enable PuppetCA autosigning for great-web-app-db-1.deploy3.dev.atix",
+        "name": "Enable PuppetCA autosigning for great-web-app-db-1.deploy3.dev.atix",
+        "priority": 55,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:13.442Z",
+      },
+    ],
+  },
+  Object {
+    "build": false,
+    "hostUrl": "/hosts/great-web-app-web-1.deploy3.dev.atix",
+    "id": 9,
+    "name": "great-web-app-web-1",
+    "powerStatusUrl": "/api/v2/hosts/great-web-app-web-1.deploy3.dev.atix/power",
+    "progress_report": Array [
+      Object {
+        "created": 1615542733.824889,
+        "id": "Set up compute instance great-web-app-web-1.deploy3.dev.atix",
+        "name": "Set up compute instance great-web-app-web-1.deploy3.dev.atix",
+        "priority": 3,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:14.825Z",
+      },
+      Object {
+        "created": 1615542733.825672,
+        "id": "Query instance details for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Query instance details for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 5,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:15.007Z",
+      },
+      Object {
+        "created": 1615542733.5710943,
+        "id": "dhcp_create_192.168.171.104",
+        "name": "Create DHCP Settings for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:15.181Z",
+      },
+      Object {
+        "created": 1615542733.599793,
+        "id": "Create IPv4 DNS record for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Create IPv4 DNS record for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:15.251Z",
+      },
+      Object {
+        "created": 1615542733.600369,
+        "id": "Create Reverse IPv4 DNS record for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Create Reverse IPv4 DNS record for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:15.328Z",
+      },
+      Object {
+        "created": 1615542733.6356068,
+        "id": "Deploy TFTP PXELinux config for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXELinux config for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:15.681Z",
+      },
+      Object {
+        "created": 1615542733.635817,
+        "id": "Deploy TFTP PXEGrub2 config for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub2 config for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:16.152Z",
+      },
+      Object {
+        "created": 1615542733.6360064,
+        "id": "Deploy TFTP PXEGrub config for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub config for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:16.183Z",
+      },
+      Object {
+        "created": 1615542733.6362345,
+        "id": "Deploy TFTP iPXE config for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Deploy TFTP iPXE config for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:16.417Z",
+      },
+      Object {
+        "created": 1615542733.6365006,
+        "id": "Fetch TFTP boot files for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Fetch TFTP boot files for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 25,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:16.523Z",
+      },
+      Object {
+        "created": 1615542733.8267431,
+        "id": "Power up compute instance great-web-app-web-1.deploy3.dev.atix",
+        "name": "Power up compute instance great-web-app-web-1.deploy3.dev.atix",
+        "priority": 1000,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:17.533Z",
+      },
+      Object {
+        "created": 1615542733.8292165,
+        "id": "Cleanup PuppetCA certificates for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Cleanup PuppetCA certificates for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 51,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:17.944Z",
+      },
+      Object {
+        "created": 1615542733.8294067,
+        "id": "Enable PuppetCA autosigning for great-web-app-web-1.deploy3.dev.atix",
+        "name": "Enable PuppetCA autosigning for great-web-app-web-1.deploy3.dev.atix",
+        "priority": 55,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:17.995Z",
+      },
+    ],
+  },
+  Object {
+    "build": false,
+    "hostUrl": "/hosts/great-web-app-web-2.deploy3.dev.atix",
+    "id": 10,
+    "name": "great-web-app-web-2",
+    "powerStatusUrl": "/api/v2/hosts/great-web-app-web-2.deploy3.dev.atix/power",
+    "progress_report": Array [
+      Object {
+        "created": 1615542738.3446305,
+        "id": "Set up compute instance great-web-app-web-2.deploy3.dev.atix",
+        "name": "Set up compute instance great-web-app-web-2.deploy3.dev.atix",
+        "priority": 3,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:19.221Z",
+      },
+      Object {
+        "created": 1615542738.3449144,
+        "id": "Query instance details for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Query instance details for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 5,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:19.419Z",
+      },
+      Object {
+        "created": 1615542738.1321318,
+        "id": "dhcp_create_192.168.171.105",
+        "name": "Create DHCP Settings for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:19.668Z",
+      },
+      Object {
+        "created": 1615542738.1576574,
+        "id": "Create IPv4 DNS record for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Create IPv4 DNS record for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:19.749Z",
+      },
+      Object {
+        "created": 1615542738.1582346,
+        "id": "Create Reverse IPv4 DNS record for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Create Reverse IPv4 DNS record for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 10,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:19.859Z",
+      },
+      Object {
+        "created": 1615542738.1885784,
+        "id": "Deploy TFTP PXELinux config for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Deploy TFTP PXELinux config for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:20.221Z",
+      },
+      Object {
+        "created": 1615542738.1888642,
+        "id": "Deploy TFTP PXEGrub2 config for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub2 config for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:20.604Z",
+      },
+      Object {
+        "created": 1615542738.1890883,
+        "id": "Deploy TFTP PXEGrub config for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Deploy TFTP PXEGrub config for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:20.636Z",
+      },
+      Object {
+        "created": 1615542738.1892834,
+        "id": "Deploy TFTP iPXE config for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Deploy TFTP iPXE config for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 20,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:20.895Z",
+      },
+      Object {
+        "created": 1615542738.1898031,
+        "id": "Fetch TFTP boot files for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Fetch TFTP boot files for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 25,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:20.992Z",
+      },
+      Object {
+        "created": 1615542738.3453662,
+        "id": "Power up compute instance great-web-app-web-2.deploy3.dev.atix",
+        "name": "Power up compute instance great-web-app-web-2.deploy3.dev.atix",
+        "priority": 1000,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:21.864Z",
+      },
+      Object {
+        "created": 1615542738.34748,
+        "id": "Cleanup PuppetCA certificates for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Cleanup PuppetCA certificates for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 51,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:22.316Z",
+      },
+      Object {
+        "created": 1615542738.3476808,
+        "id": "Enable PuppetCA autosigning for great-web-app-web-2.deploy3.dev.atix",
+        "name": "Enable PuppetCA autosigning for great-web-app-web-2.deploy3.dev.atix",
+        "priority": 55,
+        "status": "completed",
+        "timestamp": "2021-03-12T09:52:22.368Z",
+      },
+    ],
+  },
+]
+`;

data/webpack/components/ApplicationInstanceReport/components/ReportViewer.js

@@ -14,7 +14,7 @@ const ReportViewer= ({
   }
 
   return report.map((task, id) => (
-    <div key={"report_task_"+id} className="report_task">{task.name}</div>
+    <div key={"report_task_"+id} className="report_task">{task.name} -- {task.status}</div>
   ));
 };
 

data/webpack/components/ApplicationInstanceReport/components/__tests__/ReportViewer.test.js

@@ -0,0 +1,24 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import ReportViewer from '../ReportViewer';
+
+const noop = () => {};
+
+const data = [
+  { name: 'report 1', status: 'done' },
+  { name: 'report 2', status: 'pending' }
+];
+
+const fixtures = {
+  'should render the report viewer': {
+    hidden: false,
+    report: data,
+  },
+  'should render the hidden report viewer': {
+    hidden: true,
+    report: data,
+  },
+};
+
+describe('ReportViewer', () =>
+  testComponentSnapshotsWithFixtures(ReportViewer, fixtures));

data/webpack/components/ApplicationInstanceReport/components/__tests__/__snapshots__/ReportViewer.test.js.snap

@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ReportViewer should render the hidden report viewer 1`] = `""`;
+
+exports[`ReportViewer should render the report viewer 1`] = `
+Array [
+  <div
+    className="report_task"
+    key="report_task_0"
+  >
+    report 1
+     -- 
+    done
+  </div>,
+  <div
+    className="report_task"
+    key="report_task_1"
+  >
+    report 2
+     -- 
+    pending
+  </div>,
+]
+`;

data/webpack/components/ApplicationInstanceReport/index.js

@@ -7,13 +7,11 @@ import * as ApplicationInstanceReportActions from './ApplicationInstanceReportAc
 
 import {
   selectHosts,
-  selectReport,
   selectActiveHostId,
 } from './ApplicationInstanceReportSelectors';
 
 const mapStateToProps = state => ({
   hosts: selectHosts(state),
-  report: selectReport(state),
   activeHostId: selectActiveHostId(state),
 });
 

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -6,16 +6,12 @@ import { orderBy } from 'lodash';
 import * as resolve from 'table-resolver';
 import Select from 'foremanReact/components/common/forms/Select';
 import AddTableEntry from '../common/AddTableEntry';
+import EditTableEntry from '../common/EditTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
+import LockTableEntry from '../common/LockTableEntry';
 import ExtSelect from '../common/ExtSelect';
 
 import {
-  isNewDefinition,
-  isEditDefinition,
-  isDefinition,
-  isNewInstance,
-  isEditInstance,
-  isInstance,
   transformForemanData,
 } from './ParameterSelectionHelper';
 
@@ -27,6 +23,8 @@ import {
 
 import {
   PARAMETER_SELECTION_TYPES,
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
 } from './ParameterSelectionConstants';
 
 import {
@@ -60,32 +58,50 @@ class ParameterSelection extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, parameters, serviceDefinition },
+      data: { useDefaultValue, allowRowAdjustment, allowNameAdjustment, allowDescriptionAdjustment, parameters, paramDefinition },
       location,
       organization,
-      loadForemanDataUrl,
+      paramType,
+      paramDataUrl,
       initParameterSelection,
       sortParameter,
       deleteParameter,
+      lockParameter,
       activateEditParameter,
       changeEditParameter,
-      loadForemanData,
+      loadParamData,
     } = this.props;
 
-    loadForemanData(serviceDefinition.hostgroup_id, { url: loadForemanDataUrl, clearParameters: false });
+    if (paramDataUrl !== undefined) {
+      switch (paramType) {
+        case PARAMETER_SELECTION_PARAM_TYPE_FOREMAN: {
+          loadParamData({ paramDefinition: paramDefinition, url: paramDataUrl, dataType: paramType, clearParameters: false });
+          break;
+        }
+        default: { }
+      }
+    }
 
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.props.editMode,
       renderValue: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
-          <Button
-            bsStyle="default"
-            onClick={() => activateEditParameter(additionalData)}
-          >
-            <Icon type="pf" name="edit" />
-          </Button>
+          <EditTableEntry
+            disabled={false}
+            handleLocking={!allowRowAdjustment}
+            onEditTableEntry={() => activateEditParameter(additionalData)}
+            additionalData={additionalData}
+          />
+          &nbsp;
+          <LockTableEntry
+            hidden={!allowRowAdjustment}
+            disabled={!allowRowAdjustment}
+            onLockTableEntry={lockParameter}
+            additionalData={additionalData}
+          />
+          &nbsp;
           <DeleteTableEntry
-            hidden={isInstance(mode)}
+            hidden={!allowRowAdjustment}
             disabled={false}
             onDeleteTableEntry={deleteParameter}
             additionalData={additionalData}
@@ -94,11 +110,21 @@ class ParameterSelection extends React.Component {
       ),
       renderEdit: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
-          <Button bsStyle="default" disabled>
-            <Icon type="pf" name="edit" />
-          </Button>
+          <EditTableEntry
+            disabled={true}
+            onEditTableEntry={() => activateEditParameter(additionalData)}
+            additionalData={additionalData}
+          />
+          &nbsp;
+          <LockTableEntry
+            hidden={!allowRowAdjustment}
+            disabled={true}
+            onLockTableEntry={lockParameter}
+            additionalData={additionalData}
+          />
+          &nbsp;
           <DeleteTableEntry
-            hidden={isInstance(mode)}
+            hidden={!allowRowAdjustment}
             disabled={true}
             onDeleteTableEntry={deleteParameter}
             additionalData={additionalData}
@@ -152,6 +178,8 @@ class ParameterSelection extends React.Component {
       ),
     };
 
+    // TODO: should we differentiate between paramType FOREMAN and ANSIBLE?
+
     const inlineEditFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.isEditing(additionalData),
       renderValue: (value, additionalData) => {
@@ -161,22 +189,25 @@ class ParameterSelection extends React.Component {
         } else if (additionalData.property == 'value') {
           switch (additionalData.rowData.type) {
             case 'computeprofile':
-              prettyValue = transformForemanData(this.props.foremanData['computeprofiles'])[value]
+              prettyValue = transformForemanData(this.props.paramData['computeprofiles'])[value]
               break;
             case 'domain':
-              prettyValue = transformForemanData(this.props.foremanData['domains'])[value]
+              prettyValue = transformForemanData(this.props.paramData['domains'])[value]
               break;
             case 'lifecycleenv':
-              prettyValue = transformForemanData(this.props.foremanData['lifecycle_environments'])[value]
+              prettyValue = transformForemanData(this.props.paramData['lifecycle_environments'])[value]
               break;
             case 'ptable':
-              prettyValue = transformForemanData(this.props.foremanData['ptables'])[value]
+              prettyValue = transformForemanData(this.props.paramData['ptables'])[value]
               break;
             case 'password':
               prettyValue = '****************'
               break;
             case 'puppetenv':
-              prettyValue = transformForemanData(this.props.foremanData['environments'])[value]
+              prettyValue = transformForemanData(this.props.paramData['environments'])[value]
+              break;
+            case 'text':
+              prettyValue = value
               break;
           }
         }
@@ -192,15 +223,15 @@ class ParameterSelection extends React.Component {
           case 'value':
             switch (additionalData.rowData.type) {
               case 'computeprofile':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['computeprofiles']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['computeprofiles']));
               case 'domain':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['domains']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['domains']));
               case 'lifecycleenv':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['lifecycle_environments']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['lifecycle_environments']));
               case 'puppetenv':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['environments']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['environments']));
               case 'ptable':
-                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['ptables']));
+                return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.paramData['ptables']));
               case 'password':
                 return inlineEditFormatterImpl.renderEditText(value, additionalData, 'password');
               case 'text':
@@ -215,9 +246,12 @@ class ParameterSelection extends React.Component {
     this.inlineEditFormatter = inlineEditFormatter;
 
     initParameterSelection(
-      mode,
-      serviceDefinition,
+      paramType,
+      paramDefinition,
       parameters,
+      useDefaultValue,
+      allowNameAdjustment,
+      allowDescriptionAdjustment,
       this.sortingFormatter,
       this.sortableTransform,
       this.inlineEditFormatter,
@@ -230,10 +264,9 @@ class ParameterSelection extends React.Component {
 
   render() {
     const {
-      data: { mode, applications },
+      data: { allowRowAdjustment, applications },
       location,
       organization,
-      loadForemanDataUrl,
       parameters,
       columns,
       sortingColumns,
@@ -241,8 +274,7 @@ class ParameterSelection extends React.Component {
       addParameter,
       confirmEditParameter,
       cancelEditParameter,
-      loadForemanData,
-      serviceDefinition,
+      editModeCallback,
     } = this.props;
 
     let sortedParameters;
@@ -274,15 +306,16 @@ class ParameterSelection extends React.Component {
       )(parameters);
     }
 
+    // Make sure that the component which includes the
+    // ParameterSelection is aware of the current editMode state
+    if (editModeCallback !== undefined) {
+      editModeCallback(this.props.editMode);
+    }
+
     return(
       <div>
         <div className="clearfix">
           <div className="form-group">
-            <AddTableEntry
-               hidden={isInstance(mode)}
-               disabled={ this.props.editMode }
-               onAddTableEntry={ addParameter }
-            />
             <Table.PfProvider
               striped
               bordered
@@ -319,7 +352,7 @@ class ParameterSelection extends React.Component {
               />
             </Table.PfProvider>
             <AddTableEntry
-               hidden={isInstance(mode)}
+               hidden={!allowRowAdjustment}
                disabled={ this.props.editMode }
                onAddTableEntry={ addParameter }
             />
@@ -334,39 +367,41 @@ ParameterSelection.defaultProps = {
   error: {},
   editMode: false,
   loading: false,
-  foremanData: {},
+  paramData: {},
   parameters: [],
   columns: [],
   sortingColumns: {},
+  editModeCallback: undefined,
 };
 
 ParameterSelection.propTypes = {
   data: PropTypes.shape({
-    mode: PropTypes.string.isRequired,
     parameters: PropTypes.array,
-    serviceDefinition: PropTypes.object,
+    paramDefinition: PropTypes.object,
     applications: PropTypes.object,
   }).isRequired,
   location: PropTypes.string.isRequired,
   organization: PropTypes.string.isRequired,
-  loadForemanDataUrl: PropTypes.string,
+  paramDataUrl: PropTypes.string,
   initParameterSelection: PropTypes.func,
   editMode: PropTypes.bool.isRequired,
   loading: PropTypes.bool.isRequired,
-  foremanData: PropTypes.object.isRequired,
+  paramData: PropTypes.object.isRequired,
   parameterTypes: PropTypes.object,
   parameters: PropTypes.array,
   sortingColumns: PropTypes.object,
+  editModeCallback: PropTypes.func,
   columns: PropTypes.array,
   sortParameter: PropTypes.func,
   addParameter: PropTypes.func,
   deleteParameter: PropTypes.func,
+  lockParameter: PropTypes.func,
   activateEditParameter: PropTypes.func,
   confirmEditParameter: PropTypes.func,
   cancelEditParameter: PropTypes.func,
   changeEditParameter: PropTypes.func,
-  loadForemanData: PropTypes.func,
-  serviceDefinition: PropTypes.object,
+  loadParamData: PropTypes.func,
+  paramDefinition: PropTypes.object,
 };
 
 export default ParameterSelection;