foreman_templates 7.0.6 → 9.0.2

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '7.0.6'.freeze
+  VERSION = '9.0.2'.freeze
 end

data/package.json

@@ -20,33 +20,24 @@
     "url": "https://projects.theforeman.org"
   },
   "homepage": "https://github.com/theforeman/foreman_templates",
-  "dependencies": {
-    "@theforeman/vendor": "^1.7.0"
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 3.3.2"
   },
   "devDependencies": {
-    "@theforeman/vendor-dev": "^1.7.0",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.1",
-    "babel-loader": "^7.1.1",
-    "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",
+    "@babel/core": "^7.7.0",
+    "@theforeman/env": "^3.3.2",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/vendor-dev": "^3.3.2",
+    "babel-eslint": "^10.0.0",
+    "babel-jest": "^24.9.0",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
     "enzyme-to-json": "^3.3.5",
-    "eslint": "^4.18.1",
-    "eslint-config-airbnb": "^16.0.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-patternfly-react": "^0.3.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^23.6.0",
-    "prettier": "^1.16.4",
+    "jest": "^24.9.0",
+    "prettier": "^1.19.1",
     "react-redux-test-utils": "^0.1.1"
   },
   "jest": {
@@ -56,6 +47,9 @@
       "node_modules",
       "webpack"
     ],
+    "transform": {
+      "^.+\\.js$": "babel-jest"
+    },
     "setupFiles": [
       "raf/polyfill",
       "./webpack/testSetup.js"

data/webpack/ForemanTemplates.js

@@ -4,26 +4,30 @@ import PropTypes from 'prop-types';
 
 import Routes from './Routes';
 
-const ForemanTemplates = ({ data }) => (
+const ForemanTemplates = ({
+  apiUrls,
+  validationData,
+  fileRepoStartWith,
+  userPermissions,
+  editPaths,
+}) => (
   <Router>
     <Routes
-      apiUrls={data.apiUrls}
-      validationData={data.validationData}
-      editPaths={data.editPaths}
-      fileRepoStartWith={data.fileRepoStartWith}
-      userPermissions={data.userPermissions}
+      apiUrls={apiUrls}
+      validationData={validationData}
+      editPaths={editPaths}
+      fileRepoStartWith={fileRepoStartWith}
+      userPermissions={userPermissions}
     />
   </Router>
 );
 
 ForemanTemplates.propTypes = {
-  data: PropTypes.shape({
-    apiUrls: PropTypes.object,
-    validationData: PropTypes.object,
-    editPaths: PropTypes.object,
-    userPermissions: PropTypes.object,
-    fileRepoStartWith: PropTypes.array,
-  }).isRequired,
+  apiUrls: PropTypes.object.isRequired,
+  validationData: PropTypes.object.isRequired,
+  editPaths: PropTypes.object.isRequired,
+  userPermissions: PropTypes.object.isRequired,
+  fileRepoStartWith: PropTypes.array.isRequired,
 };
 
 export default ForemanTemplates;

data/webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js

@@ -0,0 +1,4 @@
+export const selectLayout = jest.fn(() => ({
+  currentOrganization: {},
+  currentLocation: {},
+}));

data/webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js

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

data/webpack/components/NewTemplateSync/__fixtures__/templateSyncSettings.fixtures.js

@@ -1,5 +1,7 @@
 import Immutable from 'seamless-immutable';
 
+import { transformInitialValues } from '../components/NewTemplateSyncForm/NewTemplateSyncFormSelectors';
+
 export const associateSetting = Immutable({
   id: 45,
   value: 'new',
@@ -65,10 +67,8 @@ export const registeredExportSettings = {
 };
 
 export const initialValues = {
-  initial: importSettings.concat(exportSettings).reduce((memo, item) => {
-    memo[item.name] = item.value;
-    return memo;
-  }, {}),
+  import: transformInitialValues(importSettings),
+  export: transformInitialValues(exportSettings),
 };
 
 export const stateFactory = obj => ({

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

@@ -12,7 +12,7 @@ exports[`NewTemplateSync should render when loaded 1`] = `
     header="Import or Export Templates"
     searchable={false}
   >
-    <Connect(ReduxForm)
+    <Connect(NewTemplateSyncForm)
       history={Object {}}
       userPermissions={
         Object {
@@ -38,7 +38,7 @@ exports[`NewTemplateSync should render when loading 1`] = `
     header="Import or Export Templates"
     searchable={false}
   >
-    <Connect(ReduxForm)
+    <Connect(NewTemplateSyncForm)
       history={Object {}}
       userPermissions={
         Object {

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncForm.js

@@ -1,37 +1,54 @@
 import React from 'react';
-import { change } from 'redux-form';
 import PropTypes from 'prop-types';
+import { compose } from 'redux';
 
-import Form from 'foremanReact/components/common/forms/Form';
-
+import ForemanForm from 'foremanReact/components/common/forms/ForemanForm';
+import * as Yup from 'yup';
 import SyncSettingsFields from '../SyncSettingFields';
 import SyncTypeRadios from '../SyncTypeRadios';
-import { NEW_TEMPLATE_SYNC_FORM_NAME } from './NewTemplateSyncFormConstants';
-
-const submit = syncType => (formValues, dispatch, props) => {
-  const { submitForm, importUrl, exportUrl, history, currentFields } = props;
-  const url = syncType === 'import' ? importUrl : exportUrl;
-  const currentFieldNames = Object.keys(currentFields);
-  const postValues = Object.keys(formValues).reduce((memo, key) => {
-    if (currentFieldNames.includes(key)) {
-      memo[key] = formValues[key];
-    }
-    return memo;
-  }, {});
-
-  return submitForm({
-    url,
-    values: postValues,
-    message: `Templates were ${syncType}ed.`,
-    item: 'TemplateSync',
-  }).then(args => {
-    history.replace({ pathname: '/template_syncs/result' });
-  });
-};
 
 const redirectToResult = history => () =>
   history.push({ pathname: '/template_syncs/result' });
 
+const repoFormat = formatAry => value => {
+  if (value === undefined) {
+    return true;
+  }
+
+  const valid = formatAry
+    .map(item => value.startsWith(item))
+    .reduce((memo, item) => item || memo, false);
+
+  return value && valid;
+};
+
+const syncFormSchema = (syncType, settingsObj, validationData) => {
+  const schema = (settingsObj[syncType].asMutable() || []).reduce(
+    (memo, setting) => {
+      if (setting.name === 'repo') {
+        return {
+          ...memo,
+          repo: Yup.string()
+            .test(
+              'repo-format',
+              `Invalid repo format, must start with one of: ${validationData.repo.join(
+                ', '
+              )}`,
+              repoFormat(validationData.repo)
+            )
+            .required("can't be blank"),
+        };
+      }
+      return memo;
+    },
+    {}
+  );
+
+  return Yup.object().shape({
+    [syncType]: Yup.object().shape(schema),
+  });
+};
+
 class NewTemplateSyncForm extends React.Component {
   allowedSyncType = (userPermissions, radioAttrs) =>
     this.props.userPermissions[radioAttrs.permission];
@@ -71,50 +88,69 @@ class NewTemplateSyncForm extends React.Component {
 
   render() {
     const {
-      submitting,
       error,
-      handleSubmit,
+      submitForm,
       importSettings,
       exportSettings,
-      dispatch,
       history,
       validationData,
-      valid,
+      importUrl,
+      exportUrl,
+      initialValues,
+      currentLocation,
+      currentOrganization,
     } = this.props;
 
-    const resetToDefault = ((dispatchFn, changeFn, nameOfForm) => (
-      fieldName,
-      value
-    ) => {
-      dispatchFn(changeFn(nameOfForm, fieldName, value));
-    })(dispatch, change, NEW_TEMPLATE_SYNC_FORM_NAME);
+    const addTaxParams = (key, currentTax) => params => {
+      if (currentTax && currentTax.id) {
+        return { ...params, [key]: [currentTax.id] };
+      }
+      return params;
+    };
+
+    const addOrgParams = addTaxParams('organization_ids', currentOrganization);
+    const addLocParams = addTaxParams('location_ids', currentLocation);
+
+    const resetToDefault = (fieldName, fieldValue) => resetFn =>
+      resetFn(fieldName, fieldValue);
 
     return (
-      <Form
-        onSubmit={handleSubmit(submit(this.state.syncType))}
-        disabled={submitting || (!valid && !error)}
-        submitting={submitting}
-        error={error}
+      <ForemanForm
+        onSubmit={(values, actions) => {
+          const url = this.state.syncType === 'import' ? importUrl : exportUrl;
+          return submitForm({
+            url,
+            values: compose(
+              addLocParams,
+              addOrgParams
+            )(values[this.state.syncType]),
+            message: `Templates were ${this.state.syncType}ed.`,
+            item: 'TemplateSync',
+          }).then(args => {
+            history.replace({ pathname: '/template_syncs/result' });
+          });
+        }}
+        initialValues={initialValues}
+        validationSchema={syncFormSchema(
+          this.state.syncType,
+          { import: importSettings, export: exportSettings },
+          validationData
+        )}
         onCancel={redirectToResult(history)}
-        errorTitle={
-          error && error.severity === 'danger' ? __('Error! ') : __('Warning! ')
-        }
+        error={error}
       >
         <SyncTypeRadios
           name="syncType"
           controlLabel="Action type"
           radios={this.initRadioButtons(this.state.syncType)}
-          disabled={submitting}
         />
         <SyncSettingsFields
           importSettings={importSettings}
           exportSettings={exportSettings}
           syncType={this.state.syncType}
           resetField={resetToDefault}
-          disabled={submitting}
-          validationData={validationData}
         />
-      </Form>
+      </ForemanForm>
     );
   }
 }
@@ -123,13 +159,15 @@ NewTemplateSyncForm.propTypes = {
   importSettings: PropTypes.array,
   exportSettings: PropTypes.array,
   userPermissions: PropTypes.object.isRequired,
-  submitting: PropTypes.bool,
   error: PropTypes.object,
-  handleSubmit: PropTypes.func.isRequired,
-  dispatch: PropTypes.func,
   history: PropTypes.object,
   validationData: PropTypes.object,
-  valid: PropTypes.bool.isRequired,
+  initialValues: PropTypes.object.isRequired,
+  exportUrl: PropTypes.string.isRequired,
+  importUrl: PropTypes.string.isRequired,
+  submitForm: PropTypes.func.isRequired,
+  currentLocation: PropTypes.object.isRequired,
+  currentOrganization: PropTypes.object.isRequired,
 };
 
 NewTemplateSyncForm.defaultProps = {
@@ -137,8 +175,6 @@ NewTemplateSyncForm.defaultProps = {
   exportSettings: [],
   validationData: {},
   error: undefined,
-  dispatch: () => {},
-  submitting: false,
   history: {},
 };
 

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncFormSelectors.js

@@ -5,20 +5,17 @@ import {
   selectExportSettings,
 } from '../../NewTemplateSyncSelectors';
 
+export const transformInitialValues = settings =>
+  settings.reduce(
+    (memo, item) => Object.assign(memo, { [item.name]: item.value }),
+    {}
+  );
+
 export const selectInitialFormValues = createSelector(
   selectImportSettings,
   selectExportSettings,
-  (importSettings, exportSettings) =>
-    importSettings
-      .concat(exportSettings)
-      .reduce(
-        (memo, item) => Object.assign(memo, { [item.name]: item.value }),
-        {}
-      )
+  (importSettings, exportSettings) => ({
+    import: transformInitialValues(importSettings),
+    export: transformInitialValues(exportSettings),
+  })
 );
-
-const selectFormState = (formName, state) =>
-  state.form && state.form[formName] ? state.form[formName] : {};
-
-export const selectRegisteredFields = (formName, state) =>
-  selectFormState(formName, state).registeredFields || {};

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncFormSelectors.test.js

@@ -1,35 +1,17 @@
 import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
 
-import { NEW_TEMPLATE_SYNC_FORM_NAME } from '../NewTemplateSyncFormConstants';
 import {
-  registeredImportSettings,
-  initialValues,
   stateFactory,
   importSettings,
   exportSettings,
 } from '../../../__fixtures__/templateSyncSettings.fixtures';
 
-import {
-  selectInitialFormValues,
-  selectRegisteredFields,
-} from '../NewTemplateSyncFormSelectors';
-
-const formStateFactory = obj => ({
-  form: {
-    [NEW_TEMPLATE_SYNC_FORM_NAME]: obj,
-  },
-});
+import { selectInitialFormValues } from '../NewTemplateSyncFormSelectors';
 
 const fixtures = {
-  'should return registered fields': () =>
-    selectRegisteredFields(
-      NEW_TEMPLATE_SYNC_FORM_NAME,
-      formStateFactory(registeredImportSettings)
-    ),
   'should return initial form values': () =>
     selectInitialFormValues({
       ...stateFactory({ importSettings, exportSettings }),
-      ...formStateFactory(initialValues),
     }),
 };
 

data/webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/__snapshots__/NewTemplateSyncFormSelectors.test.js.snap

@@ -2,43 +2,14 @@
 
 exports[`NewTemplateSyncFormSelectors should return initial form values 1`] = `
 Object {
-  "associate": "new",
-  "filter": "",
-  "force": false,
-  "negate": false,
-  "repo": "https://github.com/theforeman/community-templates.git",
-}
-`;
-
-exports[`NewTemplateSyncFormSelectors should return registered fields 1`] = `
-Object {
-  "associate": Object {
-    "description": "Associate templates to OS, organization and location",
-    "id": 45,
-    "name": "associate",
-    "selection": Array [
-      Object {
-        "label": "New",
-        "value": "new",
-      },
-      Object {
-        "label": "Never",
-        "value": "never",
-      },
-      Object {
-        "label": "Always",
-        "value": "always",
-      },
-    ],
-    "settingsType": "string",
-    "value": "new",
+  "export": Object {
+    "filter": "",
+    "negate": false,
+    "repo": "https://github.com/theforeman/community-templates.git",
   },
-  "force": Object {
-    "description": "Should importing overwrite locked templates?",
-    "id": 46,
-    "name": "force",
-    "settingsType": "bool",
-    "value": false,
+  "import": Object {
+    "associate": "new",
+    "force": false,
   },
 }
 `;