foreman_templates 8.0.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0dbc6a618a7c30af0547757f78e6548ae69c5b61112d14ae51dcdad8195d3ae
-  data.tar.gz: 8660614fbc2a7ba17f5f778bf9e6f65a2f3ce5fe3a01bbb83212762d6c07afa3
+  metadata.gz: 20a8db347037219c9d8b4c09906b703e7c9370a1c5fd9775ce7d2261f82f690f
+  data.tar.gz: 5bea2c74fb7d677dca8d203607ef51ade2de42e26b8e458c739e80240c3cd7bf
 SHA512:
-  metadata.gz: d1f7dabefd106226e7a11fa7bcf0d7314945c7955b50476c466d7cd21fdb5d562f2b4eff1977cb418d0f0e2a86c10889a4c2df81aedd8919b948558ad080aef1
-  data.tar.gz: 0bdb20444ed985d3862de5785d14a542cd294fe2365d137f9c4030be725db6642aee70f4e0c60df091bcb37599a2c956bf828e85f431994d4169c37d9a325729
+  metadata.gz: 40eab594f513b94c2deec58e35c4f03030379598db6a482bc201838b227bcfafd6f85e5c16eefab830da3d4950109b09d67a9a9032971a7059a1fcb87f3b0fee
+  data.tar.gz: 4ca1502b153c698da0461087a1e8976ac1429def1d5532012639abf5724a6c010682161b0c1d8606f6d21eebd9df997dc0e1288abc4f3638f60edbd37124666b

data/app/views/template_syncs/index.html.erb

@@ -1,5 +1,9 @@
-<%= webpacked_plugins_js_for :foreman_templates %>
-<%= webpacked_plugins_css_for :foreman_templates %>
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_templates %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_templates %>
+<% end %>
 
 <div id="foreman-templates"/>
 

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '8.0.0'.freeze
+  VERSION = '9.0.0'.freeze
 end

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

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

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { compose } from 'redux';
 
 import ForemanForm from 'foremanReact/components/common/forms/ForemanForm';
 import * as Yup from 'yup';
@@ -96,8 +97,20 @@ class NewTemplateSyncForm extends React.Component {
       importUrl,
       exportUrl,
       initialValues,
+      currentLocation,
+      currentOrganization,
     } = this.props;
 
+    const addTaxParams = (key, currentTax) => params => {
+      if (currentTax.id) {
+        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);
 
@@ -107,7 +120,10 @@ class NewTemplateSyncForm extends React.Component {
           const url = this.state.syncType === 'import' ? importUrl : exportUrl;
           return submitForm({
             url,
-            values: values[this.state.syncType],
+            values: compose(
+              addLocParams,
+              addOrgParams
+            )(values[this.state.syncType]),
             message: `Templates were ${this.state.syncType}ed.`,
             item: 'TemplateSync',
           }).then(args => {
@@ -150,6 +166,8 @@ 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/index.js

@@ -2,6 +2,8 @@ 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 {
@@ -22,6 +24,8 @@ const mapStateToProps = (state, ownProps) => {
     initialValues: { ...initialFormValues },
     importSettings,
     exportSettings,
+    currentOrganization: selectLayout(state).currentOrganization,
+    currentLocation: selectLayout(state).currentLocation,
   };
 };
 

data/webpack/components/TemplateSyncResult/components/SyncResultList.js

@@ -11,10 +11,10 @@ import ListViewHeader from './ListViewHeader';
 const SyncResultList = ({ pagination, pageChange, templates, editPaths }) => (
   <ListView>
     <ListViewHeader />
-    {templatesPage(templates, pagination).map(template => (
+    {templatesPage(templates, pagination).map((template, idx) => (
       <SyncedTemplate
         template={template}
-        key={template.name}
+        key={idx}
         editPath={editPaths[template.className]}
       />
     ))}

data/webpack/components/TemplateSyncResult/components/SyncedTemplate/__snapshots__/helpers.test.js.snap

@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`expandableContent should return additional error 1`] = `
+<ul>
+  <li>
+    These are additional errors
+  </li>
+</ul>
+`;
+
+exports[`expandableContent should return additional info 1`] = `
+<ul>
+  <li>
+    This is additional info
+  </li>
+</ul>
+`;
+
+exports[`expandableContent should return attribute errors 1`] = `
+<ul>
+  <li>
+    could not be processed
+  </li>
+  <li>
+    name: can't be blank
+  </li>
+  <li>
+    name: has invalid format
+  </li>
+</ul>
+`;
+
+exports[`expandableContent should return no errors 1`] = `
+<span>
+  There were no errors.
+</span>
+`;

data/webpack/components/TemplateSyncResult/components/SyncedTemplate/helpers.js

@@ -114,7 +114,7 @@ export const expandableContent = template => {
 const aggregatedErrors = template => {
   const err = { ...template.errors } || {};
   if (template.additionalErrors) {
-    err.additional = template.additionalErrors;
+    err.additional = [template.additionalErrors];
   }
 
   return err;
@@ -123,14 +123,14 @@ const aggregatedErrors = template => {
 const aggregatedMessages = template => {
   const errors = aggregatedErrors(template);
   if (template.additionalInfo) {
-    errors.info = template.additionalInfo;
+    errors.info = [template.additionalInfo];
   }
   return errors;
 };
 
 const formatError = (key, value) => {
   const omitKeys = ['base', 'additional', 'info'];
-  if (omitKeys.filter(item => key === item)) {
+  if (omitKeys.includes(key)) {
     return value;
   }
 

data/webpack/components/TemplateSyncResult/components/SyncedTemplate/helpers.test.js

@@ -0,0 +1,21 @@
+import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+
+import { expandableContent } from './helpers';
+
+const fixtures = {
+  'should return no errors': () => expandableContent({}),
+  'should return additional info': () =>
+    expandableContent({ additionalInfo: 'This is additional info' }),
+  'should return additional error': () =>
+    expandableContent({ additionalErrors: 'These are additional errors' }),
+  'should return attribute errors': () =>
+    expandableContent({
+      errors: {
+        base: ['could not be processed'],
+        name: ["can't be blank", 'has invalid format'],
+      },
+    }),
+};
+
+describe('expandableContent', () =>
+  testSelectorsSnapshotWithFixtures(fixtures));

data/webpack/components/TemplateSyncResult/components/__tests__/__snapshots__/SyncResultList.test.js.snap

@@ -7,7 +7,7 @@ exports[`SyncResultList should render 1`] = `
   <ListViewHeader />
   <SyncedTemplate
     editPath=""
-    key="null"
+    key="0"
     template={
       Object {
         "additionalErrors": Array [
@@ -21,7 +21,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="EPEL"
+    key="1"
     template={
       Object {
         "additionalErrors": null,
@@ -42,7 +42,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="CoreOS default"
+    key="2"
     template={
       Object {
         "additionalErrors": null,
@@ -58,7 +58,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="null"
+    key="3"
     template={
       Object {
         "additionalErrors": "No \\"model\\" found in metadata",
@@ -70,7 +70,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="Kickstart fake"
+    key="4"
     template={
       Object {
         "additionalErrors": null,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -97,6 +97,7 @@ files:
 - webpack/ForemanTemplates.js
 - webpack/Routes.js
 - webpack/__mocks__/foremanReact/common/helpers.js
+- webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/forms/CommonForm.js
 - webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
@@ -164,7 +165,9 @@ files:
 - webpack/components/TemplateSyncResult/components/SyncedTemplate/InfoItem.js
 - webpack/components/TemplateSyncResult/components/SyncedTemplate/LinkInfoItem.js
 - webpack/components/TemplateSyncResult/components/SyncedTemplate/StringInfoItem.js
+- webpack/components/TemplateSyncResult/components/SyncedTemplate/__snapshots__/helpers.test.js.snap
 - webpack/components/TemplateSyncResult/components/SyncedTemplate/helpers.js
+- webpack/components/TemplateSyncResult/components/SyncedTemplate/helpers.test.js
 - webpack/components/TemplateSyncResult/components/SyncedTemplate/index.js
 - webpack/components/TemplateSyncResult/components/__tests__/SyncResultList.test.js
 - webpack/components/TemplateSyncResult/components/__tests__/SyncedTemplate.test.js
@@ -195,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman