foreman_acd 0.0.2 → 0.2.1

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportSelectors.js

@@ -0,0 +1,5 @@
+const applicationInstanceReport = state => state.foremanAcd.applicationInstanceReport;
+
+export const selectHosts = state => applicationInstanceReport(state).hosts;
+export const selectReport = state => applicationInstanceReport(state).report;
+export const selectActiveHostId = state => applicationInstanceReport(state).activeHostId;

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

@@ -0,0 +1,26 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const ReportViewer= ({
+  hidden,
+  report,
+}) =>{
+  if (hidden) {
+    return null;
+  }
+
+  if (report === undefined) {
+    return null;
+  }
+
+  return report.map((task, id) => (
+    <div key={"report_task_"+id} className="report_task">{task.name}</div>
+  ));
+};
+
+ReportViewer.propTypes = {
+  hidden: PropTypes.bool,
+  report: PropTypes.array,
+};
+
+export default ReportViewer;

data/webpack/components/ApplicationInstanceReport/index.js

@@ -0,0 +1,27 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import './ApplicationInstanceReport.scss';
+import ApplicationInstanceReport from './ApplicationInstanceReport';
+import * as ApplicationInstanceReportActions from './ApplicationInstanceReportActions';
+
+import {
+  selectHosts,
+  selectReport,
+  selectActiveHostId,
+} from './ApplicationInstanceReportSelectors';
+
+const mapStateToProps = state => ({
+  hosts: selectHosts(state),
+  report: selectReport(state),
+  activeHostId: selectActiveHostId(state),
+});
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(ApplicationInstanceReportActions, dispatch);
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ApplicationInstanceReport);
+

data/webpack/components/ParameterSelection/ParameterSelection.js

@@ -5,6 +5,9 @@ import * as sort from 'sortabular';
 import { orderBy } from 'lodash';
 import * as resolve from 'table-resolver';
 import Select from 'foremanReact/components/common/forms/Select';
+import AddTableEntry from '../common/AddTableEntry';
+import DeleteTableEntry from '../common/DeleteTableEntry';
+import ExtSelect from '../common/ExtSelect';
 
 import {
   isNewDefinition,
@@ -22,9 +25,8 @@ import {
   cloneDeep,
 } from 'lodash';
 
-
 import {
-  PARAMETER_TYPES,
+  PARAMETER_SELECTION_TYPES,
 } from './ParameterSelectionConstants';
 
 import {
@@ -43,86 +45,12 @@ const theme = {
   base00: 'rgba(0, 0, 0, 0)',
 };
 
-
 class ParameterSelection extends React.Component {
 
   constructor(props) {
     super(props);
   }
 
-  renderAddButton(mode, addParameter) {
-    if (isInstance(mode))
-      return null;
-
-    return (
-      <Button bsStyle="default" disabled={ this.props.editMode || this.props.hostgroupId <= 0 } onClick={() => addParameter()}>
-        <Icon type="fa" name="plus" />
-      </Button>
-    );
-  }
-
-  renderDeleteButton(mode, deleteParameter, additionalData, disabled=false) {
-    if (isInstance(mode))
-      return null;
-
-    return (
-      <span>
-      &nbsp;
-      <Button
-        bsStyle="default"
-        disabled={disabled}
-        onClick={() => window.confirm("Are you sure you wish to delete this item?") && deleteParameter(additionalData) }
-      >
-        <Icon type="pf" name="delete" />
-      </Button>
-      </span>
-    );
-  }
-
-  renderSelectApplication(applications, url, loadParameterSelection, appDefinition) {
-    return (
-      <Select
-         value={appDefinition.id.toString()}
-         onChange={e => loadParameterSelection(url, e.target.value) }
-         options={applications}
-         allowClear
-         key="key"
-      />
-    );
-  }
-
-  renderSelectHostgroup(hostgroups, url, loadForemanData, hostgroupId) {
-    return (
-      <Select
-         value={hostgroupId.toString()}
-         onChange={e => loadForemanData(url, e.target.value, true) }
-         options={hostgroups}
-         allowClear
-         key="key"
-      />
-    );
-  }
-
-  renderRailsInputHidden(view, parameter, value) {
-    var id = "foreman_acd_"+ view +"_"+ parameter;
-    var name = "foreman_acd_"+ view +"["+ parameter +"]";
-
-    return (
-      <input
-        id={id}
-        name={name}
-        value={value}
-        type="hidden"
-      />
-    );
-  }
-
-  renderShowDivText(text) {
-    return (
-      <div>{text}</div>
-    );
-  }
-
   isEditing({rowData}) {
     return (rowData.backup !== undefined);
   }
@@ -130,17 +58,12 @@ class ParameterSelection extends React.Component {
   // enables our custom header formatters extensions to reactabular
   customHeaderFormatters = customHeaderFormattersDefinition;
 
-  validateRows() {
-    var result = (this.props.rows.map(e => e.value).filter(i => i == "").length == 0);
-    if (result === false) {
-      window.alert("All parameters need to have a value!");
-    }
-    return result;
-  }
-
   componentDidMount() {
     const {
-      data: { mode, appDefinition, location, organization, loadForemanDataUrl, parameters },
+      data: { mode, parameters, serviceDefinition },
+      location,
+      organization,
+      loadForemanDataUrl,
       initParameterSelection,
       sortParameter,
       deleteParameter,
@@ -149,13 +72,7 @@ class ParameterSelection extends React.Component {
       loadForemanData,
     } = this.props;
 
-    if (isEditDefinition(mode) || isEditInstance(mode)) {
-       loadForemanData(loadForemanDataUrl, appDefinition.hostgroup_id);
-    }
-
-    if (isInstance(mode)) {
-      $('input[type="submit"][name="commit"]').on('click', () => this.validateRows());
-    }
+    loadForemanData(serviceDefinition.hostgroup_id, { url: loadForemanDataUrl, clearParameters: false });
 
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.props.editMode,
@@ -167,7 +84,12 @@ class ParameterSelection extends React.Component {
           >
             <Icon type="pf" name="edit" />
           </Button>
-          {this.renderDeleteButton(mode, deleteParameter, additionalData)}
+          <DeleteTableEntry
+            hidden={isInstance(mode)}
+            disabled={false}
+            onDeleteTableEntry={deleteParameter}
+            additionalData={additionalData}
+          />
         </td>
       ),
       renderEdit: (value, additionalData) => (
@@ -175,7 +97,12 @@ class ParameterSelection extends React.Component {
           <Button bsStyle="default" disabled>
             <Icon type="pf" name="edit" />
           </Button>
-          {this.renderDeleteButton(mode, deleteParameter, additionalData, true)}
+          <DeleteTableEntry
+            hidden={isInstance(mode)}
+            disabled={true}
+            onDeleteTableEntry={deleteParameter}
+            additionalData={additionalData}
+          />
         </td>
       )
     });
@@ -228,9 +155,9 @@ class ParameterSelection extends React.Component {
     const inlineEditFormatter = inlineEditFormatterFactory({
       isEditing: additionalData => this.isEditing(additionalData),
       renderValue: (value, additionalData) => {
-        var prettyValue = value;
+        let prettyValue = value;
         if (additionalData.property == 'type') {
-          prettyValue = PARAMETER_TYPES[value];
+          prettyValue = PARAMETER_SELECTION_TYPES[value];
         } else if (additionalData.property == 'value') {
           switch (additionalData.rowData.type) {
             case 'computeprofile':
@@ -245,6 +172,9 @@ class ParameterSelection extends React.Component {
             case 'ptable':
               prettyValue = transformForemanData(this.props.foremanData['ptables'])[value]
               break;
+            case 'password':
+              prettyValue = '****************'
+              break;
             case 'puppetenv':
               prettyValue = transformForemanData(this.props.foremanData['environments'])[value]
               break;
@@ -258,7 +188,7 @@ class ParameterSelection extends React.Component {
             if (additionalData.rowData.newEntry === true) {
               return inlineEditFormatterImpl.renderEditSelect(value, additionalData, this.props.parameterTypes);
             }
-            return inlineEditFormatterImpl.renderValue(PARAMETER_TYPES[value], additionalData)
+            return inlineEditFormatterImpl.renderValue(PARAMETER_SELECTION_TYPES[value], additionalData)
           case 'value':
             switch (additionalData.rowData.type) {
               case 'computeprofile':
@@ -271,6 +201,8 @@ class ParameterSelection extends React.Component {
                 return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['environments']));
               case 'ptable':
                 return inlineEditFormatterImpl.renderEditSelect(value, additionalData, transformForemanData(this.props.foremanData['ptables']));
+              case 'password':
+                return inlineEditFormatterImpl.renderEditText(value, additionalData, 'password');
               case 'text':
               default:
                 return inlineEditFormatterImpl.renderEditText(value, additionalData);
@@ -284,7 +216,7 @@ class ParameterSelection extends React.Component {
 
     initParameterSelection(
       mode,
-      appDefinition,
+      serviceDefinition,
       parameters,
       this.sortingFormatter,
       this.sortableTransform,
@@ -298,84 +230,59 @@ class ParameterSelection extends React.Component {
 
   render() {
     const {
-      data: { mode, applications, hostgroups, loadParameterSelectionUrl, loadForemanDataUrl },
-      rows,
+      data: { mode, applications },
+      location,
+      organization,
+      loadForemanDataUrl,
+      parameters,
       columns,
       sortingColumns,
       loading,
       addParameter,
       confirmEditParameter,
       cancelEditParameter,
-      loadParameterSelection,
       loadForemanData,
-      appDefinition,
-      hostgroupId,
+      serviceDefinition,
     } = this.props;
 
-    var sortedRows;
-    var newEntryIndex = findIndex(rows, 'newEntry');
+    let sortedParameters;
+    const newEntryIndex = findIndex(parameters, 'newEntry');
 
     if (newEntryIndex >= 0) {
-      let newEntry = rows[newEntryIndex];
+      const newEntry = parameters[newEntryIndex];
       // sort all elements, besides the newEntry which will be
       // added to the end of the Array
-      var tmpRows = cloneDeep(rows);
-      tmpRows.splice(newEntryIndex, 1);
-      sortedRows = this.compose(
+      const tmpParameters = cloneDeep(parameters);
+      tmpParameters.splice(newEntryIndex, 1);
+      sortedParameters = this.compose(
         sort.sorter({
           columns,
           sortingColumns,
           sort: orderBy,
           strategy: sort.strategies.byProperty
         })
-      )(tmpRows);
-      sortedRows.push(newEntry);
+      )(tmpParameters);
+      sortedParameters.push(newEntry);
     } else {
-      sortedRows = this.compose(
+      sortedParameters = this.compose(
         sort.sorter({
           columns,
           sortingColumns,
           sort: orderBy,
           strategy: sort.strategies.byProperty
         })
-      )(rows);
+      )(parameters);
     }
 
     return(
       <div>
-        {isDefinition(mode) ? (
-        <div className="clearfix">
-          <div className="form-group">
-            <label className="col-md-2 control-label">Host Group</label>
-            <div className="col-md-4">
-              {isNewDefinition(mode) && this.renderSelectHostgroup(hostgroups, loadForemanDataUrl, loadForemanData, hostgroupId) }
-              {isEditDefinition(mode) && this.renderShowDivText(hostgroups[hostgroupId]) }
-              {this.renderRailsInputHidden('app_definition', 'hostgroup_id', hostgroupId) }
-            </div>
-          </div>
-        </div>
-        ) : (
-        <div className="clearfix">
-          <div className="form-group">
-            <label className="col-md-2 control-label">Application Definition</label>
-            <div className="col-md-4">
-              {isNewInstance(mode) && this.renderSelectApplication(applications, loadParameterSelectionUrl, loadParameterSelection, appDefinition)}
-              {isEditInstance(mode) && this.renderShowDivText(appDefinition.name)}
-              {isInstance(mode) && this.renderRailsInputHidden('app_instance', 'app_definition_id', appDefinition.id)}
-            </div>
-          </div>
-        </div>
-        )}
-        <div className="clearfix">
-          <div className="form-group">
-            <label className="col-md-1 control-label">Application parameters</label>
-            <div className="col-md-5">&nbsp;</div>
-          </div>
-        </div>
-
         <div className="clearfix">
           <div className="form-group">
-            {this.renderAddButton(mode, addParameter)}
+            <AddTableEntry
+               hidden={isInstance(mode)}
+               disabled={ this.props.editMode }
+               onAddTableEntry={ addParameter }
+            />
             <Table.PfProvider
               striped
               bordered
@@ -400,20 +307,23 @@ class ParameterSelection extends React.Component {
             >
               <Table.Header headerRows={resolve.headerRows({ columns })} />
               <Table.Body
-                rows={sortedRows}
+                rows={sortedParameters}
                 rowKey="id"
                 onRow={(rowData, { rowIndex }) => ({
                   role: 'row',
                   isEditing: () => this.isEditing({ rowData }),
                   onCancel: () => cancelEditParameter({ rowData, rowIndex }),
                   onConfirm: () => confirmEditParameter({ rowData, rowIndex }),
-                  last: rowIndex === sortedRows.length - 1
+                  last: rowIndex === sortedParameters.length - 1
                 })}
               />
             </Table.PfProvider>
-            {this.renderAddButton(mode, addParameter)}
+            <AddTableEntry
+               hidden={isInstance(mode)}
+               disabled={ this.props.editMode }
+               onAddTableEntry={ addParameter }
+            />
           </div>
-          {this.renderRailsInputHidden(isDefinition(mode) ? 'app_definition' : 'app_instance', 'parameters', JSON.stringify(this.props.rows))}
         </div>
       </div>
     );
@@ -425,31 +335,27 @@ ParameterSelection.defaultProps = {
   editMode: false,
   loading: false,
   foremanData: {},
-  rows: [],
+  parameters: [],
   columns: [],
   sortingColumns: {},
-  appDefinition: { "id": '', "name": '', "hostgroup_id": '', "parameters": [] },
-  hostgroupId: -1,
 };
 
 ParameterSelection.propTypes = {
   data: PropTypes.shape({
     mode: PropTypes.string.isRequired,
-    location: PropTypes.string.isRequired,
-    organization: PropTypes.string.isRequired,
     parameters: PropTypes.array,
-    appDefinition: PropTypes.object,
+    serviceDefinition: PropTypes.object,
     applications: PropTypes.object,
-    hostgroups: PropTypes.object,
-    loadParameterSelectionUrl: PropTypes.string,
-    loadForemanDataUrl: PropTypes.string,
   }).isRequired,
+  location: PropTypes.string.isRequired,
+  organization: PropTypes.string.isRequired,
+  loadForemanDataUrl: PropTypes.string,
   initParameterSelection: PropTypes.func,
   editMode: PropTypes.bool.isRequired,
   loading: PropTypes.bool.isRequired,
   foremanData: PropTypes.object.isRequired,
   parameterTypes: PropTypes.object,
-  rows: PropTypes.array,
+  parameters: PropTypes.array,
   sortingColumns: PropTypes.object,
   columns: PropTypes.array,
   sortParameter: PropTypes.func,
@@ -459,10 +365,8 @@ ParameterSelection.propTypes = {
   confirmEditParameter: PropTypes.func,
   cancelEditParameter: PropTypes.func,
   changeEditParameter: PropTypes.func,
-  loadParameterSelection: PropTypes.func,
   loadForemanData: PropTypes.func,
-  appDefinition: PropTypes.object,
-  hostgroupId: PropTypes.number,
+  serviceDefinition: PropTypes.object,
 };
 
 export default ParameterSelection;