foreman_templates 9.0.2 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43c3bbc33be62b6f39ce0abfaa0475f9635d2230f4a7f6bb551e66cf7f7fb0b
-  data.tar.gz: 3fdf3c192b4e639bc0fdc0a98deef65f344e1be65853dbeebb876bde4592405c
+  metadata.gz: 3b520577905d85f390af67f22635c98defb339c3177cfc9b7ecfb8039b3999c2
+  data.tar.gz: ae67963f134f9b53fe2f4520c028cd8426474e3aa10dc01733a292bbf1bb8284
 SHA512:
-  metadata.gz: 20d726f2cb66074badb1779ad8b49613ad0f2e899fd3d8db9559a9590cec9224f98d7b2828072b4dd046cf053b5799a7cfcfeafb99723efa867cb9625ac33aa9
-  data.tar.gz: 2a2e07c0374ce30e0ecf900262f41e33d16f0a5a494841e5a00eaf3c5c00cbec90df3cd6d785cc68c99916783245f640af3628b7d47cc365bbf8a659416643ba
+  metadata.gz: 763f1cd44a8a5a91bad924c0c6eb50950b7cd552b762bc767c188eeae9f78d66ecb9f4f15d81012092683a2fff263c19bf2230e622167ec235557fac64244ea7
+  data.tar.gz: e48d8b9ac3b46195afec1d2913a4ad4a6558dc2a7ea2d325e8f6566b7697ca8780e450ced74b7604d709940660dbdd54a438c6590b4c08fd66b7fa3bdd189f88

data/app/services/foreman_templates/template_exporter.rb

@@ -94,7 +94,7 @@ module ForemanTemplates
     def templates_to_dump
       find_templates.each do |template|
         if filter.present?
-          exportable = template.name =~ /#{filter}/i ? !negate : negate
+          exportable = /#{filter}/i.match?(template.name) ? !negate : negate
           result = ExportResult.new(template, exportable)
           next @result_lines << result.matching_filter unless exportable
 

data/app/services/foreman_templates/template_importer.rb

@@ -70,7 +70,7 @@ module ForemanTemplates
           @result_lines << parse_result.check_for_errors
         rescue NameError => e
           @result_lines << parse_result.name_error(e, metadata['model'])
-        rescue => e
+        rescue StandardError => e
           @result_lines << parse_result.add_exception(e)
         end
       end

data/app/views/ui_template_syncs/template_attrs.json.rabl

@@ -11,7 +11,7 @@ node(:class_name) do |template|
 end
 
 node(:humanized_class_name) do |template|
-  template.class.name.underscore.split('_').map { |part| part.capitalize }.join(' ')
+  template.class.name.underscore.split('_').map(&:capitalize).join(' ')
 end
 
 node(:can_edit) do |template|

data/lib/foreman_templates/engine.rb

@@ -49,11 +49,11 @@ module ForemanTemplates
         add_all_permissions_to_default_roles
 
         menu :top_menu, :template_sync,
-             :url_hash => { :controller => :template_syncs, :action => :index },
-             :caption => N_('Sync Templates'),
-             :parent => :hosts_menu,
-             :before => :ptables,
-             :turbolinks => false
+          :url_hash => { :controller => :template_syncs, :action => :index },
+          :caption => N_('Sync Templates'),
+          :parent => :hosts_menu,
+          :before => :ptables,
+          :turbolinks => false
       end
     end
 

data/lib/foreman_templates/version.rb

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

data/lib/tasks/foreman_templates_tasks.rake

@@ -20,14 +20,14 @@ namespace :templates do
     verbose = ENV['verbose']
 
     results = ForemanTemplates::TemplateImporter.new({
-      verbose:   verbose,
-      repo:      ENV['repo'],
-      branch:    ENV['branch'],
-      prefix:    ENV['prefix'],
-      dirname:   ENV['dirname'],
-      filter:    ENV['filter'],
+      verbose: verbose,
+      repo: ENV['repo'],
+      branch: ENV['branch'],
+      prefix: ENV['prefix'],
+      dirname: ENV['dirname'],
+      filter: ENV['filter'],
       associate: ENV['associate'],
-      lock:      ENV['lock'],
+      lock: ENV['lock'],
     }).import!
     pp(results[:results].map { |result| result.to_h(verbose) })
   end
@@ -58,8 +58,8 @@ namespace :templates do
       # * negate  => negate query [false]
       # * prefix  => The string all templates to purge should ( or not ) begin with [Community ]
       # * verbose => Print extra information during the run [false]
-      negate:  ENV['negate'],
-      prefix:  ENV['prefix'],
+      negate: ENV['negate'],
+      prefix: ENV['prefix'],
       verbose: ENV['verbose'],
     }).purge!
   end
@@ -89,6 +89,7 @@ namespace :foreman_templates do
     begin
       require 'rubocop/rake_task'
       RuboCop::RakeTask.new(:rubocop_foreman_templates) do |task|
+        task.options = ['--config', ForemanTemplates::Engine.root.join('.rubocop.yml').to_s]
         task.patterns = ["#{ForemanTemplates::Engine.root}/app/**/*.rb",
                          "#{ForemanTemplates::Engine.root}/lib/**/*.rb",
                          "#{ForemanTemplates::Engine.root}/test/**/*.rb"]

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js

@@ -0,0 +1,2 @@
+export const useForemanOrganization = () => {};
+export const useForemanLocation = () => {};

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

@@ -1,159 +1,116 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
 
 import ForemanForm from 'foremanReact/components/common/forms/ForemanForm';
-import * as Yup from 'yup';
+import {
+  useForemanLocation,
+  useForemanOrganization,
+} from 'foremanReact/Root/Context/ForemanContext';
+
 import SyncSettingsFields from '../SyncSettingFields';
 import SyncTypeRadios from '../SyncTypeRadios';
-
-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;
-    },
-    {}
+import { redirectToResult, syncFormSchema } from './NewTemplateSyncFormHelpers';
+
+const NewTemplateSyncForm = ({
+  error,
+  submitForm,
+  importSettings,
+  exportSettings,
+  history,
+  validationData,
+  importUrl,
+  exportUrl,
+  initialValues,
+  userPermissions,
+}) => {
+  const allowedSyncType = (currentUserPermissions, radioAttrs) =>
+    currentUserPermissions[radioAttrs.permission];
+
+  const radioButtons = [
+    { label: 'Import', value: 'import', permission: 'import' },
+    { label: 'Export', value: 'export', permission: 'export' },
+  ];
+
+  const [syncType, setSyncType] = useState(
+    radioButtons.find(radioAttrs =>
+      allowedSyncType(userPermissions, radioAttrs)
+    ).value
   );
 
-  return Yup.object().shape({
-    [syncType]: Yup.object().shape(schema),
-  });
-};
-
-class NewTemplateSyncForm extends React.Component {
-  allowedSyncType = (userPermissions, radioAttrs) =>
-    this.props.userPermissions[radioAttrs.permission];
-
-  constructor(props) {
-    super(props);
-
-    this.radioButtons = [
-      { label: 'Import', value: 'import', permission: 'import' },
-      { label: 'Export', value: 'export', permission: 'export' },
-    ];
-
-    this.state = {
-      syncType: this.radioButtons.find(radioAttrs =>
-        this.allowedSyncType(props.userPermissions, radioAttrs)
-      ).value,
-    };
-  }
-
-  updateSyncType = event => {
-    this.setState({ syncType: event.target.value });
+  const updateSyncType = event => {
+    setSyncType(event.target.value);
   };
 
-  permitRadioButtons = buttons =>
+  const permitRadioButtons = buttons =>
     buttons.filter(buttonAttrs =>
-      this.allowedSyncType(this.props.userPermissions, buttonAttrs)
+      allowedSyncType(userPermissions, buttonAttrs)
     );
 
-  initRadioButtons = syncType =>
-    this.permitRadioButtons(this.radioButtons).map(buttonAttrs => ({
+  const initRadioButtons = templateSyncType =>
+    permitRadioButtons(radioButtons).map(buttonAttrs => ({
       get checked() {
-        return this.value === syncType;
+        return buttonAttrs.value === templateSyncType;
       },
-      onChange: this.updateSyncType,
+      onChange: updateSyncType,
       ...buttonAttrs,
     }));
 
-  render() {
-    const {
-      error,
-      submitForm,
-      importSettings,
-      exportSettings,
-      history,
-      validationData,
-      importUrl,
-      exportUrl,
-      initialValues,
-      currentLocation,
-      currentOrganization,
-    } = this.props;
-
-    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 (
-      <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)}
-        error={error}
-      >
-        <SyncTypeRadios
-          name="syncType"
-          controlLabel="Action type"
-          radios={this.initRadioButtons(this.state.syncType)}
-        />
-        <SyncSettingsFields
-          importSettings={importSettings}
-          exportSettings={exportSettings}
-          syncType={this.state.syncType}
-          resetField={resetToDefault}
-        />
-      </ForemanForm>
-    );
-  }
-}
+  const addTaxParams = (key, currentTax) => params => {
+    if (currentTax && currentTax.id) {
+      return { ...params, [key]: [currentTax.id] };
+    }
+    return params;
+  };
+
+  const addOrgParams = addTaxParams(
+    'organization_ids',
+    useForemanOrganization()
+  );
+  const addLocParams = addTaxParams('location_ids', useForemanLocation());
+
+  const resetToDefault = (fieldName, fieldValue) => resetFn =>
+    resetFn(fieldName, fieldValue);
+
+  const handleSubmit = (values, actions) => {
+    const url = syncType === 'import' ? importUrl : exportUrl;
+    return submitForm({
+      url,
+      values: compose(addLocParams, addOrgParams)(values[syncType]),
+      message: `Templates were ${syncType}ed.`,
+      item: 'TemplateSync',
+      actions,
+      successCallback: () =>
+        history.replace({ pathname: '/template_syncs/result' }),
+    });
+  };
+
+  return (
+    <ForemanForm
+      onSubmit={handleSubmit}
+      initialValues={initialValues}
+      validationSchema={syncFormSchema(
+        syncType,
+        { import: importSettings, export: exportSettings },
+        validationData
+      )}
+      onCancel={redirectToResult(history)}
+      error={error}
+    >
+      <SyncTypeRadios
+        name="syncType"
+        controlLabel="Action type"
+        radios={initRadioButtons(syncType)}
+      />
+      <SyncSettingsFields
+        importSettings={importSettings}
+        exportSettings={exportSettings}
+        syncType={syncType}
+        resetField={resetToDefault}
+      />
+    </ForemanForm>
+  );
+};
 
 NewTemplateSyncForm.propTypes = {
   importSettings: PropTypes.array,
@@ -166,8 +123,6 @@ NewTemplateSyncForm.propTypes = {
   exportUrl: PropTypes.string.isRequired,
   importUrl: PropTypes.string.isRequired,
   submitForm: PropTypes.func.isRequired,
-  currentLocation: PropTypes.object.isRequired,
-  currentOrganization: PropTypes.object.isRequired,
 };
 
 NewTemplateSyncForm.defaultProps = {

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

@@ -0,0 +1,43 @@
+import * as Yup from 'yup';
+
+export 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;
+};
+
+export 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),
+  });
+};

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

@@ -2,8 +2,6 @@ import { connect } from 'react-redux';
 
 import * as FormActions from 'foremanReact/redux/actions/common/forms';
 
-import { selectLayout } from 'foremanReact/components/Layout/LayoutSelectors';
-
 import NewTemplateSyncForm from './NewTemplateSyncForm';
 
 import {
@@ -24,8 +22,6 @@ const mapStateToProps = (state, ownProps) => {
     initialValues: { ...initialFormValues },
     importSettings,
     exportSettings,
-    currentOrganization: selectLayout(state).currentOrganization,
-    currentLocation: selectLayout(state).currentLocation,
   };
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.1.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -96,6 +96,7 @@ files:
 - package.json
 - webpack/ForemanTemplates.js
 - webpack/Routes.js
+- webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
@@ -120,6 +121,7 @@ files:
 - webpack/components/NewTemplateSync/__tests__/__snapshots__/NewTemplateSyncSelectors.test.js.snap
 - webpack/components/NewTemplateSync/components/ButtonTooltip.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncForm.js
+- webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncFormHelpers.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncFormSelectors.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncFormSelectors.test.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/__snapshots__/NewTemplateSyncFormSelectors.test.js.snap