foreman_templates 7.0.7 → 8.0.0

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

@@ -15,6 +15,7 @@ exports[`SyncSettingFields should show export settings 1`] = `
         "value": "",
       }
     }
+    syncType="export"
   />
   <SyncSettingField
     disabled={false}
@@ -29,6 +30,7 @@ exports[`SyncSettingFields should show export settings 1`] = `
         "value": false,
       }
     }
+    syncType="export"
   />
   <SyncSettingField
     disabled={false}
@@ -41,12 +43,10 @@ exports[`SyncSettingFields should show export settings 1`] = `
         "name": "repo",
         "required": true,
         "settingsType": "string",
-        "validate": Array [
-          [Function],
-        ],
         "value": "https://github.com/theforeman/community-templates.git",
       }
     }
+    syncType="export"
   />
 </Fragment>
 `;
@@ -80,6 +80,7 @@ exports[`SyncSettingFields should show import settings 1`] = `
         "value": "new",
       }
     }
+    syncType="import"
   />
   <SyncSettingField
     disabled={false}
@@ -94,6 +95,7 @@ exports[`SyncSettingFields should show import settings 1`] = `
         "value": false,
       }
     }
+    syncType="import"
   />
 </Fragment>
 `;

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

@@ -1,112 +1,29 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TextButtonField should render checkbox item 1`] = `
-<Field
-  blank={Object {}}
-  buttonAttrs={
-    Object {
-      "buttonAction": [Function],
-      "buttonText": "Button",
-    }
-  }
-  component={[Function]}
-  disabled={false}
-  fieldRequired={false}
-  fieldSelector={[Function]}
-  item={
-    Object {
-      "type": "checkbox",
-    }
-  }
-  label="Checkbox"
+<FormikConnect(FieldInner)
   name="Checkbox field"
-  tooltipHelp={null}
+  render={[Function]}
 />
 `;
 
 exports[`TextButtonField should render select item with custom blank opt 1`] = `
-<Field
-  blank={
-    Object {
-      "label": "Bare Metal",
-      "value": "bareMetal",
-    }
-  }
-  buttonAttrs={
-    Object {
-      "buttonAction": [Function],
-      "buttonText": "Button",
-    }
-  }
-  component={[Function]}
-  disabled={false}
-  fieldRequired={false}
-  fieldSelector={[Function]}
-  item={
-    Object {
-      "selection": Array [
-        Object {
-          "label": "A",
-          "value": "a",
-        },
-        Object {
-          "label": "B",
-          "value": "b",
-        },
-        Object {
-          "label": "C",
-          "value": "c",
-        },
-      ],
-      "type": "select",
-    }
-  }
-  label="Select"
+<FormikConnect(FieldInner)
   name="select field"
-  tooltipHelp={null}
+  render={[Function]}
 />
 `;
 
 exports[`TextButtonField should render text field without field selector 1`] = `
-<Field
-  blank={Object {}}
-  buttonAttrs={
-    Object {
-      "buttonAction": [Function],
-      "buttonText": "Button",
-    }
-  }
-  component={[Function]}
-  disabled={false}
-  fieldRequired={false}
-  fieldSelector={[Function]}
-  item={Object {}}
-  label="Text field"
+<FormikConnect(FieldInner)
   name="no selector"
-  tooltipHelp={null}
+  render={[Function]}
 />
 `;
 
 exports[`TextButtonField should render text item 1`] = `
-<Field
-  blank={Object {}}
-  buttonAttrs={
-    Object {
-      "buttonAction": [Function],
-      "buttonText": "Button",
-    }
-  }
-  component={[Function]}
-  disabled={false}
-  fieldRequired={false}
-  fieldSelector={[Function]}
-  item={
-    Object {
-      "type": "text",
-    }
-  }
-  label="Text"
+<FormikConnect(FieldInner)
   name="Text field"
-  tooltipHelp={null}
+  render={[Function]}
 />
 `;

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/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>;
@@ -120,7 +130,7 @@ const aggregatedMessages = template => {
 
 const formatError = (key, value) => {
   const omitKeys = ['base', 'additional', 'info'];
-  if (omitKeys.reduce((memo, item) => memo || key === item, false)) {
+  if (omitKeys.filter(item => key === item)) {
     return value;
   }
 

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

@@ -10,7 +10,9 @@ exports[`SyncResultList should render 1`] = `
     key="null"
     template={
       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/__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.7
+  version: 8.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-02-20 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,10 +97,9 @@ 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
@@ -119,11 +119,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