foreman_acd 0.9.7 → 0.10.0

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImport.js

@@ -1,58 +1,35 @@
-import React, { useState } from 'react';
-import {
-  cloneDeep,
-} from 'lodash';
+import React from 'react';
 import PropTypes from 'prop-types';
 import {
   Icon,
   Button,
   MessageDialog,
+  Table,
+  inlineEditFormatterFactory,
 } from 'patternfly-react';
 import * as resolve from 'table-resolver';
+import { translate as __ } from 'foremanReact/common/I18n';
 import Select from 'foremanReact/components/common/forms/Select';
 import CommonForm from 'foremanReact/components/common/forms/CommonForm';
-import AddTableEntry from '../common/AddTableEntry';
-import DeleteTableEntry from '../common/DeleteTableEntry';
 import RailsData from '../common/RailsData';
 import { EasyHeaderFormatter } from '../../helper';
-import { translate as __ } from 'foremanReact/common/I18n';
-
-import {
-  Table,
-  FormControl,
-  inlineEditFormatterFactory,
-} from 'patternfly-react';
 
 class ApplicationDefinitionImport extends React.Component {
-
-  constructor(props) {
-    super(props);
-  }
-
   onFileChange = event => {
     // Update the state
     this.setState({ selectedFile: event.target.files[0] });
-
   };
 
-  isEditing({rowData}) {
-    return (rowData.backup !== undefined);
-  }
-
-  setAnsiblePlaybookServices() {
-    this.setState({ansiblePlaybookServices: this.props.ansiblePlaybookServices});
+  static isEditing({ rowData }) {
+    return rowData.backup !== undefined;
   }
 
   componentDidMount() {
-    const {
-      mode,
-      ansiblePlaybookServices,
-      hostgroups, } = this.props;
+    const { ansiblePlaybookServices, hostgroups } = this.props;
 
     const {
       initApplicationDefinitionImport,
       changeEditApplicationDefinitionImportService,
-      handleImportAnsiblePlaybook,
     } = this.props;
 
     this.headerFormatter = EasyHeaderFormatter;
@@ -67,50 +44,56 @@ class ApplicationDefinitionImport extends React.Component {
         <td className="editing">
           <Select
             value={value.toString()}
-            onChange={e => changeEditApplicationDefinitionImportService(e.target.value, additionalData) }
+            onChange={e =>
+              changeEditApplicationDefinitionImportService(
+                e.target.value,
+                additionalData
+              )
+            }
             options={options}
             allowClear
             key="key"
           />
         </td>
-      )
+      ),
     };
 
     const inlineEditFormatter = inlineEditFormatterFactory({
-      isEditing: additionalData => this.isEditing(additionalData),
+      isEditing: additionalData => this.constructor.isEditing(additionalData),
       renderValue: (value, additionalData) => {
         let prettyValue = value;
-        if (additionalData.property == 'hostgroup') {
+        if (additionalData.property === 'hostgroup') {
           prettyValue = hostgroups[value];
         }
-        return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
+        return inlineEditFormatterImpl.renderValue(prettyValue, additionalData);
       },
       renderEdit: (value, additionalData) => {
-        if (additionalData.property == 'hostgroup') {
+        if (additionalData.property === 'hostgroup') {
           if (additionalData.rowData) {
-            return inlineEditFormatterImpl.renderEditSelect(value, additionalData, hostgroups);
+            return inlineEditFormatterImpl.renderEditSelect(
+              value,
+              additionalData,
+              hostgroups
+            );
           }
-          return inlineEditFormatterImpl.renderValue(hostgroups[value], additionalData)
+          return inlineEditFormatterImpl.renderValue(
+            hostgroups[value],
+            additionalData
+          );
         }
         return inlineEditFormatterImpl.renderValue(value, additionalData);
-      }
+      },
     });
     this.inlineEditFormatter = inlineEditFormatter;
 
     initApplicationDefinitionImport(
       ansiblePlaybookServices,
       this.headerFormatter,
-      this.inlineEditFormatter,
+      this.inlineEditFormatter
     );
-  };
+  }
 
   render() {
-    const {
-      organization,
-      location,
-      foremanDataUrl,
-      mode,} = this.props;
-
     const {
       showAlertModal,
       alertModalText,
@@ -120,95 +103,98 @@ class ApplicationDefinitionImport extends React.Component {
       columns,
       handleImportAnsiblePlaybook,
     } = this.props;
-    let ansibleServices;
 
     return (
       <span>
-      {ansibleServices = this.setAnsiblePlaybookServices}
-      {ansibleServices}
-      <MessageDialog
+        <MessageDialog
           show={showAlertModal}
           onHide={closeAlertModal}
           primaryAction={closeAlertModal}
           primaryActionButtonContent={__('OK')}
-          primaryActionButtonBsStyle={"danger"}
+          primaryActionButtonBsStyle="danger"
           icon={<Icon type="pf" name="error-circle-o" />}
           title={alertModalTitle}
           primaryContent={alertModalText}
         />
-      <div>
-        <CommonForm label="Application Definition file" className="custom-file-upload">
-        <input
-          type="file"
-          onChange={this.onFileChange}
-        />
-        </CommonForm>
-        <CommonForm>
-        <Button
-          bsStyle="default"
-          onClick={e => handleImportAnsiblePlaybook(this.state.selectedFile, e)}
+        <div>
+          <CommonForm
+            label="Application Definition file"
+            className="custom-file-upload"
           >
-          {__('Import')} </Button>
-        </CommonForm>
+            <input type="file" onChange={this.onFileChange} />
+          </CommonForm>
+          <CommonForm>
+            <Button
+              bsStyle="default"
+              onClick={e =>
+                handleImportAnsiblePlaybook(this.state.selectedFile, e)
+              }
+            >
+              {__('Import')}{' '}
+            </Button>
+          </CommonForm>
         </div>
 
-        {(Object.keys(this.props.ansiblePlaybookServices).length > 0) ? (
+        {ansiblePlaybookServices.length > 0 ? (
           <div className="form-group">
-          <Table.PfProvider
-            striped
-            bordered
-            hover
-            dataTable
-            columns={columns}
-            components={{
-              body: {
-                cell: cellProps => cellProps.children
-              }
-            }}
-          >
-            <Table.Header headerRows={resolve.headerRows({ columns })} />
-            <Table.Body
-              rows={this.props.ansiblePlaybookServices}
-              rowKey="id"
-              onRow={(rowData, { rowIndex }) => ({
-                role: 'row',
-                isEditing: () => this.isEditing({ rowData }),
-                last: rowIndex === this.props.ansiblePlaybookServices.length - 1
-              })}
-            />
-          </Table.PfProvider>
-        </div>) : null }
+            <Table.PfProvider
+              striped
+              bordered
+              hover
+              dataTable
+              columns={columns}
+              components={{
+                body: {
+                  cell: cellProps => cellProps.children,
+                },
+              }}
+            >
+              <Table.Header headerRows={resolve.headerRows({ columns })} />
+              <Table.Body
+                rows={ansiblePlaybookServices}
+                rowKey="id"
+                onRow={(rowData, { rowIndex }) => ({
+                  role: 'row',
+                  isEditable: () => this.isEditing({ rowData }),
+                  last: ansiblePlaybookServices.length - 1,
+                })}
+              />
+            </Table.PfProvider>
+          </div>
+        ) : null}
         <RailsData
-          key='applications_definition_import'
-          view='app_definition_import'
-          parameter='services'
-          value={JSON.stringify(this.props.ansiblePlaybookServices)}
+          key="applications_definition_import"
+          view="app_definition_import"
+          parameter="services"
+          value={JSON.stringify(ansiblePlaybookServices)}
         />
       </span>
-    )};
+    );
+  }
 }
 
 ApplicationDefinitionImport.defaultProps = {
-  error: {},
+  // error: {},
   showAlertModal: false,
   alertModalText: '',
   alertModalTitle: '',
-  editMode: false,
   columns: [],
-  ansiblePlaybookServices: {},
-  editParamsOfRowId: null,
-}
+  ansiblePlaybookServices: [],
+};
 
 ApplicationDefinitionImport.propTypes = {
-  initApplicationDefinitionImport: PropTypes.func,
-  editMode: PropTypes.bool.isRequired,
+  hostgroups: PropTypes.object.isRequired,
+  // error: PropTypes.object,
+  ansiblePlaybookServices: PropTypes.array,
+  // editMode: PropTypes.bool.isRequired,
   columns: PropTypes.array,
   showAlertModal: PropTypes.bool,
   alertModalText: PropTypes.string,
   alertModalTitle: PropTypes.string,
-  closeAlertModal: PropTypes.func,
-  handleImportAnsiblePlaybook: PropTypes.func,
-  changeEditApplicationDefinitionImportService: PropTypes.func,
+  changeEditApplicationDefinitionImportService: PropTypes.func.isRequired,
+  closeAlertModal: PropTypes.func.isRequired,
+  handleImportAnsiblePlaybook: PropTypes.func.isRequired,
+  initApplicationDefinitionImport: PropTypes.func.isRequired,
 };
 
 export default ApplicationDefinitionImport;

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportActions.js

@@ -1,23 +1,7 @@
-import React from 'react';
-import { API, actionTypeGenerator } from 'foremanReact/redux/API';
+import { API } from 'foremanReact/redux/API';
 import { addToast } from 'foremanReact/components/ToastsList';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
-
-import {
-  setModalOpen,
-  setModalClosed,
-} from 'foremanReact/components/ForemanModal/ForemanModalActions';
-
-import {
-  actionHeaderCellFormatter,
-} from 'patternfly-react';
-
-import {
-  propsToSnakeCase,
-  propsToCamelCase,
-} from 'foremanReact/common/helpers';
-
 import {
   APPLICATION_DEFINITION_IMPORT_INIT,
   APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL,
@@ -27,11 +11,10 @@ import {
   APPLICATION_DEFINITION_IMPORT_FILE_FAILURE,
 } from './ApplicationDefinitionImportConstants';
 
-
 export const initApplicationDefinitionImport = (
   ansiblePlaybookServices,
   headerFormatter,
-  inlineEditFormatter,
+  inlineEditFormatter
 ) => dispatch => {
   const initialState = {};
 
@@ -44,16 +27,16 @@ export const initApplicationDefinitionImport = (
         props: {
           index: 0,
           style: {
-            width: '20%'
-          }
+            width: '20%',
+          },
         },
       },
       cell: {
         props: {
-              index: 0,
-            },
-        formatters: [inlineEditFormatter]
-      }
+          index: 0,
+        },
+        formatters: [inlineEditFormatter],
+      },
     },
     {
       property: 'hostgroup',
@@ -63,17 +46,17 @@ export const initApplicationDefinitionImport = (
         props: {
           index: 1,
           style: {
-            width: '20%'
-          }
+            width: '20%',
+          },
         },
       },
       cell: {
         props: {
-              index: 1,
-            },
-        formatters: [inlineEditFormatter]
-      }
-    }
+          index: 1,
+        },
+        formatters: [inlineEditFormatter],
+      },
+    },
   ];
 
   initialState.ansiblePlaybookServices = ansiblePlaybookServices;
@@ -84,21 +67,15 @@ export const initApplicationDefinitionImport = (
   });
 };
 
-
-const errorHandler = (msg, err) => {
-  const error = {
-    errorMsg: __('Failed to fetch data from server.'),
-    statusText: err,
-  };
-  return { type: msg, payload: { error } };
-};
-
 export const closeAlertModal = () => ({
   type: APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL,
-  payload: {}
+  payload: {},
 });
 
-export const changeEditApplicationDefinitionImportService = (value, additionalData) => ({
+export const changeEditApplicationDefinitionImportService = (
+  value,
+  additionalData
+) => ({
   type: APPLICATION_DEFINITION_IMPORT_SERVICE_EDIT_CHANGE,
   payload: {
     value,
@@ -106,56 +83,54 @@ export const changeEditApplicationDefinitionImportService = (value, additionalDa
   },
 });
 
-
-export const handleImportAnsiblePlaybook = (
-  file, e,) => async dispatch => {
+export const handleImportAnsiblePlaybook = (file, e) => async dispatch => {
   e.preventDefault();
   dispatch({
     type: APPLICATION_DEFINITION_IMPORT_FILE_REQUEST,
     payload: {
       app_definition_file: file,
-    }});
+    },
+  });
   try {
     const formData = new FormData();
 
     // Update the formData object
-    formData.append(
-      "app_definition_file",
-      file,
-      file.name
-    );
+    formData.append('app_definition_file', file, file.name);
     const { data } = await API.post(
-      '/acd/app_definitions/handle_file_upload', formData);
+      '/acd/app_definitions/handle_file_upload',
+      formData
+    );
     dispatch(
-        addToast({
-          type: 'success',
-          message: sprintf(
-            __('Sucessfully synced imported app template')
-          ),
-          key: APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS,
-        })
-      );
-      return dispatch({
-        type: APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS,
-        payload: {
-          ansiblePlaybookServices: data,
-        },
-        response: data,
-      });
-    } catch (error) {
-      dispatch(
-        addToast({
-          type: 'error',
-          message: sprintf(__('Error occurred while importing app template: %s'), error.response.data.message),
-          key: APPLICATION_DEFINITION_IMPORT_FILE_FAILURE,
-        })
-      );
-      return dispatch({
-        type: APPLICATION_DEFINITION_IMPORT_FILE_FAILURE,
-        payload: {
-          error: error,
-        },
-        response: error,
-      });
-    }
+      addToast({
+        type: 'success',
+        message: sprintf(__('Sucessfully synced imported app template')),
+        key: APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS,
+      })
+    );
+    return dispatch({
+      type: APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS,
+      payload: {
+        ansiblePlaybookServices: data,
+      },
+      response: data,
+    });
+  } catch (error) {
+    dispatch(
+      addToast({
+        type: 'error',
+        message: sprintf(
+          __('Error occurred while importing app template: %s'),
+          error.response.data.message
+        ),
+        key: APPLICATION_DEFINITION_IMPORT_FILE_FAILURE,
+      })
+    );
+    return dispatch({
+      type: APPLICATION_DEFINITION_IMPORT_FILE_FAILURE,
+      payload: {
+        error,
+      },
+      response: error,
+    });
+  }
 };

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportConstants.js

@@ -1,6 +1,12 @@
-export const APPLICATION_DEFINITION_IMPORT_INIT = 'INIT_APPLICATION_DEFINITION_IMPORT_INIT';
-export const APPLICATION_DEFINITION_IMPORT_SERVICE_EDIT_CHANGE = 'APPLICATION_DEFINITION_IMPORT_SERVICE_EDIT_CHANGE';
-export const APPLICATION_DEFINITION_IMPORT_FILE_FAILURE = 'APPLICATION_DEFINITION_IMPORT_FILE_FAILURE';
-export const APPLICATION_DEFINITION_IMPORT_FILE_REQUEST = 'APPLICATION_DEFINITION_IMPORT_FILE_REQUEST';
-export const APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS = 'APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS';
-export const APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL = 'APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL';
+export const APPLICATION_DEFINITION_IMPORT_INIT =
+  'INIT_APPLICATION_DEFINITION_IMPORT_INIT';
+export const APPLICATION_DEFINITION_IMPORT_SERVICE_EDIT_CHANGE =
+  'APPLICATION_DEFINITION_IMPORT_SERVICE_EDIT_CHANGE';
+export const APPLICATION_DEFINITION_IMPORT_FILE_FAILURE =
+  'APPLICATION_DEFINITION_IMPORT_FILE_FAILURE';
+export const APPLICATION_DEFINITION_IMPORT_FILE_REQUEST =
+  'APPLICATION_DEFINITION_IMPORT_FILE_REQUEST';
+export const APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS =
+  'APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS';
+export const APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL =
+  'APPLICATION_DEFINITION_IMPORT_CLOSE_ALERT_MODAL';

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportReducer.js

@@ -1,12 +1,6 @@
 import Immutable from 'seamless-immutable';
 
-import {
-  cloneDeep,
-  findIndex,
-  findLastIndex,
-} from 'lodash';
-
-import { translate as __ } from 'foremanReact/common/I18n';
+import { cloneDeep, findIndex } from 'lodash';
 
 import {
   APPLICATION_DEFINITION_IMPORT_INIT,
@@ -48,29 +42,29 @@ const applicationDefinitionImportConf = (state = initialState, action) => {
     }
 
     case APPLICATION_DEFINITION_IMPORT_FILE_FAILURE: {
-       return state.merge({ error: payload.error, loading: false });
-     }
-     case APPLICATION_DEFINITION_IMPORT_FILE_REQUEST: {
-       return state.set('loading', true);
-     }
-     case APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS: {
-       let newState = {};
-       let ansibleServices = [];
-       const ansiblePlaybookServices = payload.ansiblePlaybookServices['ansible_services'];
+      return state.merge({ error: payload.error, loading: false });
+    }
+    case APPLICATION_DEFINITION_IMPORT_FILE_REQUEST: {
+      return state.set('loading', true);
+    }
+    case APPLICATION_DEFINITION_IMPORT_FILE_SUCCESS: {
+      let newState = {};
+      const ansibleServices = [];
+      const ansiblePlaybookServices =
+        payload.ansiblePlaybookServices.ansible_services;
 
-       for (var ind in ansiblePlaybookServices) {
-         const value = ansiblePlaybookServices[ind];
-         const newRow = { id: value['id'], name: value['value'], hostgroup: '' };
-         newRow.backup = cloneDeep(newRow);
-         ansibleServices.push(newRow);
-       }
+      ansiblePlaybookServices.forEach(value => {
+        const newRow = { id: value.id, name: value.value, hostgroup: '' };
+        newRow.backup = cloneDeep(newRow);
+        ansibleServices.push(newRow);
+      });
 
-       newState = {
-         ansiblePlaybookServices: ansibleServices,
-       };
+      newState = {
+        ansiblePlaybookServices: ansibleServices,
+      };
 
-       return state.merge(newState);
-     }
+      return state.merge(newState);
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportSelectors.js

@@ -1,8 +1,15 @@
-const applicationDefinitionImportConf = state => state.foremanAcd.applicationDefinitionImportConf;
+const applicationDefinitionImportConf = state =>
+  state.foremanAcd.applicationDefinitionImportConf;
 
-export const selectEditMode = state => applicationDefinitionImportConf(state).editMode;
-export const selectColumns = state => applicationDefinitionImportConf(state).columns;
-export const selectAnsiblePlaybookServices = state => applicationDefinitionImportConf(state).ansiblePlaybookServices;
-export const selectShowAlertModal = state => applicationDefinitionImportConf(state).showAlertModal;
-export const selectAlertModalText = state => applicationDefinitionImportConf(state).alertModalText;
-export const selectAlertModalTitle = state => applicationDefinitionImportConf(state).alertModalTitle;
+export const selectEditMode = state =>
+  applicationDefinitionImportConf(state).editMode;
+export const selectColumns = state =>
+  applicationDefinitionImportConf(state).columns;
+export const selectAnsiblePlaybookServices = state =>
+  applicationDefinitionImportConf(state).ansiblePlaybookServices;
+export const selectShowAlertModal = state =>
+  applicationDefinitionImportConf(state).showAlertModal;
+export const selectAlertModalText = state =>
+  applicationDefinitionImportConf(state).alertModalText;
+export const selectAlertModalTitle = state =>
+  applicationDefinitionImportConf(state).alertModalTitle;