foreman_templates 7.0.5 → 9.0.1

data/webpack/components/TemplateSyncResult/__fixtures__/templateSyncResult.fixtures.js

@@ -24,7 +24,7 @@ export const exportTemplates = [
 export const noName = {
   name: null,
   templateFile: 'random_template.erb',
-  additionalErrors: 'No "name" found in metadata',
+  additionalErrors: ['No "name" found in metadata'],
   errors: null,
 };
 
@@ -55,7 +55,7 @@ export const filteredOut = {
   name: 'CoreOS default',
   templateFile: 'coreos_default.erb',
   additionalErrors: null,
-  additionalInfo: 'Skipping, this template was filtered out.',
+  additionalInfo: ['Skipping, this template was filtered out.'],
   errors: {},
   snippet: false,
   locked: false,

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

@@ -55,7 +55,9 @@ exports[`TemplateSyncResult should render import result 1`] = `
   templates={
     Array [
       Object {
-        "additionalErrors": "No \\"name\\" found in metadata",
+        "additionalErrors": Array [
+          "No \\"name\\" found in metadata",
+        ],
         "errors": null,
         "name": null,
         "templateFile": "random_template.erb",

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

@@ -33,7 +33,9 @@ Object {
   "resultAction": "import",
   "templates": Array [
     Object {
-      "additionalErrors": "No \\"name\\" found in metadata",
+      "additionalErrors": Array [
+        "No \\"name\\" found in metadata",
+      ],
       "errors": null,
       "name": null,
       "templateFile": "random_template.erb",

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

@@ -7,8 +7,8 @@ import EmptyInfoItem from './EmptyInfoItem';
 import StringInfoItem from './StringInfoItem';
 import LinkInfoItem from './LinkInfoItem';
 
-export const itemIteratorId = (template, attr) =>
-  `${template.templateFile}-${attr}`;
+export const itemIteratorId = (template, ...rest) =>
+  `${template.templateFile}-${rest.join('-')}`;
 
 export const additionalInfo = (template, editPath) => {
   const infoAttrs = [
@@ -72,7 +72,12 @@ export const additionalInfo = (template, editPath) => {
         );
       case 'name':
         return (
-          <LinkInfoItem template={template} editPath={editPath} attr={attr} />
+          <LinkInfoItem
+            template={template}
+            editPath={editPath}
+            attr={attr}
+            key={key}
+          />
         );
       default:
         return '';
@@ -91,11 +96,16 @@ export const itemLeftContentIcon = template => {
 
 export const expandableContent = template => {
   if (Object.keys(aggregatedMessages(template)).length !== 0) {
-    const res = Object.keys(aggregatedMessages(template)).map(key => (
-      <li key={itemIteratorId(template, key)}>
-        {formatError(key, aggregatedMessages(template)[key])}
-      </li>
-    ));
+    const msgs = aggregatedMessages(template);
+
+    const res = Object.keys(msgs).map(key => {
+      const errorMsgs = aggregatedMessages(template)[key];
+      return errorMsgs.map((errValue, idx) => (
+        <li key={itemIteratorId(template, key, idx)}>
+          {formatError(key, errValue)}
+        </li>
+      ));
+    });
     return <ul>{res}</ul>;
   }
   return <span>There were no errors.</span>;
@@ -104,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;
@@ -113,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.reduce((memo, item) => memo || key === item, false)) {
+  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,10 +7,12 @@ exports[`SyncResultList should render 1`] = `
   <ListViewHeader />
   <SyncedTemplate
     editPath=""
-    key="null"
+    key="0"
     template={
       Object {
-        "additionalErrors": "No \\"name\\" found in metadata",
+        "additionalErrors": Array [
+          "No \\"name\\" found in metadata",
+        ],
         "errors": null,
         "name": null,
         "templateFile": "random_template.erb",
@@ -19,7 +21,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="EPEL"
+    key="1"
     template={
       Object {
         "additionalErrors": null,
@@ -40,7 +42,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="CoreOS default"
+    key="2"
     template={
       Object {
         "additionalErrors": null,
@@ -56,7 +58,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="null"
+    key="3"
     template={
       Object {
         "additionalErrors": "No \\"model\\" found in metadata",
@@ -68,7 +70,7 @@ exports[`SyncResultList should render 1`] = `
   />
   <SyncedTemplate
     editPath=""
-    key="Kickstart fake"
+    key="4"
     template={
       Object {
         "additionalErrors": null,

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

@@ -11,7 +11,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -27,7 +29,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -43,7 +47,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -61,7 +67,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -78,7 +86,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -96,7 +106,9 @@ exports[`SyncedTemplate should render skipped template 1`] = `
         template={
           Object {
             "additionalErrors": null,
-            "additionalInfo": "Skipping, this template was filtered out.",
+            "additionalInfo": Array [
+              "Skipping, this template was filtered out.",
+            ],
             "className": "Ptable",
             "errors": Object {},
             "humanizedClassName": "Ptable",
@@ -132,7 +144,7 @@ exports[`SyncedTemplate should render skipped template 1`] = `
 >
   <ul>
     <li
-      key="coreos_default.erb-info"
+      key="coreos_default.erb-info-0"
     >
       Skipping, this template was filtered out.
     </li>
@@ -149,7 +161,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         attr="name"
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -160,7 +174,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         attr="locked"
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -171,7 +187,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         attr="snippet"
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -182,7 +200,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         attr="humanizedClassName"
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -193,7 +213,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         attr="kind"
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -206,7 +228,9 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
         mapAttr={[Function]}
         template={
           Object {
-            "additionalErrors": "No \\"name\\" found in metadata",
+            "additionalErrors": Array [
+              "No \\"name\\" found in metadata",
+            ],
             "errors": null,
             "name": null,
             "templateFile": "random_template.erb",
@@ -238,7 +262,7 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
 >
   <ul>
     <li
-      key="random_template.erb-additional"
+      key="random_template.erb-additional-0"
     >
       No "name" found in metadata
     </li>
@@ -409,7 +433,7 @@ exports[`SyncedTemplate should render template with validation errors 1`] = `
 >
   <ul>
     <li
-      key="epel.erb-base"
+      key="epel.erb-base-0"
     >
       This template is locked
     </li>

data/webpack/testSetup.js

@@ -1,4 +1,5 @@
-import 'babel-polyfill';
+import 'core-js/shim';
+import 'regenerator-runtime/runtime';
 
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 9.0.1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -88,6 +88,7 @@ files:
 - app/views/ui_template_syncs/template_import_result.json.rabl
 - app/views/ui_template_syncs/template_import_results.json.rabl
 - config/routes.rb
+- db/migrate/20180627134929_change_lock_setting.rb
 - lib/foreman_templates.rb
 - lib/foreman_templates/engine.rb
 - lib/foreman_templates/version.rb
@@ -96,9 +97,10 @@ 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/Form.js
+- webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
 - webpack/__mocks__/foremanReact/components/common/forms/TextField.js
 - webpack/__mocks__/foremanReact/redux/actions/common/forms.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
@@ -118,11 +120,8 @@ 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/NewTemplateSyncFormConstants.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/NewTemplateSyncFormSelectors.js
-- webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncForm.test.js
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/NewTemplateSyncFormSelectors.test.js
-- webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/__snapshots__/NewTemplateSyncForm.test.js.snap
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/__tests__/__snapshots__/NewTemplateSyncFormSelectors.test.js.snap
 - webpack/components/NewTemplateSync/components/NewTemplateSyncForm/index.js
 - webpack/components/NewTemplateSync/components/SyncSettingField.js
@@ -166,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
@@ -197,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman