foreman_templates 9.2.0 → 9.4.0

data/webpack/__tests__/helpers.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import withProtectedView from '../withProtectedView';
 
 const ProtectedComponent = () => <div>Protected component</div>;

data/webpack/components/NewTemplateSync/NewTemplateSync.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { LoadingState } from 'patternfly-react';
-import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import PropTypes from 'prop-types';
+import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import NewTemplateSyncForm from './components/NewTemplateSyncForm';
 import './NewTemplateSync.scss';

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import NewTemplateSync from '../NewTemplateSync';
 

data/webpack/components/NewTemplateSync/__tests__/NewTemplateSyncReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import reducer, { initialState } from '../NewTemplateSyncReducer';
 

data/webpack/components/NewTemplateSync/__tests__/NewTemplateSyncSelectors.test.js

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   importSettings,

data/webpack/components/NewTemplateSync/components/ButtonTooltip.js

@@ -1,20 +1,14 @@
 import React from 'react';
-import { Tooltip, Icon, OverlayTrigger } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
+import { RedoIcon } from '@patternfly/react-icons';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
-const ButtonTooltip = props => {
-  const tooltip = (
-    <Tooltip id={`${props.tooltipId}-tooltip-id`}>
-      <span>Use default value from settings</span>
-    </Tooltip>
-  );
-
-  return (
-    <OverlayTrigger overlay={tooltip} trigger={['hover', 'focus']}>
-      <Icon type="fa" name="refresh" />
-    </OverlayTrigger>
-  );
-};
+const ButtonTooltip = ({ tooltipId }) => (
+  <Tooltip id={tooltipId} content={__('Use default value from settings')}>
+    <RedoIcon />
+  </Tooltip>
+);
 
 ButtonTooltip.propTypes = {
   tooltipId: PropTypes.string.isRequired,

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

@@ -7,6 +7,7 @@ import {
   useForemanLocation,
   useForemanOrganization,
 } from 'foremanReact/Root/Context/ForemanContext';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import SyncSettingsFields from '../SyncSettingFields';
 import SyncTypeRadios from '../SyncTypeRadios';
@@ -28,8 +29,8 @@ const NewTemplateSyncForm = ({
     currentUserPermissions[radioAttrs.permission];
 
   const radioButtons = [
-    { label: 'Import', value: 'import', permission: 'import' },
-    { label: 'Export', value: 'export', permission: 'export' },
+    { label: __('Import'), value: 'import', permission: 'import' },
+    { label: __('Export'), value: 'export', permission: 'export' },
   ];
 
   const [syncType, setSyncType] = useState(
@@ -99,7 +100,7 @@ const NewTemplateSyncForm = ({
     >
       <SyncTypeRadios
         name="syncType"
-        controlLabel="Action type"
+        controlLabel={__('Action type')}
         radios={initRadioButtons(syncType)}
       />
       <SyncSettingsFields

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   stateFactory,

data/webpack/components/NewTemplateSync/components/SyncSettingField.js

@@ -1,12 +1,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FieldLevelHelp } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import TextButtonField from './TextButtonField';
 import ButtonTooltip from './ButtonTooltip';
 
 const SyncSettingField = ({ setting, resetField, disabled, syncType }) => {
-  const label = settingObj => `${settingObj.fullName} `;
+  const label = settingObj => `${__(settingObj.fullName)} `;
 
   const fieldSelector = settingObj => {
     if (settingObj.settingsType === 'boolean') {
@@ -23,7 +24,7 @@ const SyncSettingField = ({ setting, resetField, disabled, syncType }) => {
   const tooltipContent = (
     <div
       dangerouslySetInnerHTML={{
-        __html: setting.description,
+        __html: __(setting.description),
       }}
     />
   );

data/webpack/components/NewTemplateSync/components/__tests__/SyncSettingField.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import SyncSettingField from '../SyncSettingField';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import SyncSettingFields from '../SyncSettingFields';
 

data/webpack/components/NewTemplateSync/components/__tests__/SyncTypeRadios.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import SyncTypeRadios from '../SyncTypeRadios';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import TextButtonField from '../TextButtonField';
 

data/webpack/components/PageNotFound.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { EmptyStatePattern as EmptyState } from 'foremanReact/components/common/EmptyState';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 const PageNotFound = props => (
   <EmptyState

data/webpack/components/PermissionDenied.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { translate as __ } from 'foremanReact/common/I18n';
 import { EmptyStatePattern as EmptyState } from 'foremanReact/components/common/EmptyState';
 
 const PermissionDenied = props => {

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import {
   importTemplates,

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

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import reducer, { initialState } from '../TemplateSyncResultReducer';
 import { importTemplates } from '../__fixtures__/templateSyncResult.fixtures';

data/webpack/components/TemplateSyncResult/components/FinishedSyncResult.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { capitalize } from 'lodash';
+import { LinkContainer } from 'react-router-bootstrap';
+import { Button } from 'patternfly-react';
 
+import { translate as __ } from 'foremanReact/common/I18n';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
-import { LinkContainer } from 'react-router-bootstrap';
 
-import { Button } from 'patternfly-react';
 import SyncResultList from './SyncResultList';
 
 const titleString = (type, repo, branch, gitUser, fileRepoStartWith) => {

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

@@ -1,17 +1,13 @@
 import React from 'react';
-import { ListView, OverlayTrigger, Tooltip } from 'patternfly-react';
+import { ListView } from 'patternfly-react';
+import { Tooltip } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 
 const InfoItem = ({ itemId, children, tooltipText }) => {
   const overlay = (
-    <OverlayTrigger
-      overlay={tooltipText ? <Tooltip id={itemId}>{tooltipText}</Tooltip> : ''}
-      placement="top"
-      trigger={['hover', 'focus']}
-      rootClose={false}
-    >
+    <Tooltip content={tooltipText || ''} id={itemId}>
       {children}
-    </OverlayTrigger>
+    </Tooltip>
   );
   return (
     <ListView.InfoItem key={itemId} className="additional-info-wide">

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

@@ -5,19 +5,8 @@ import PropTypes from 'prop-types';
 import InfoItem from './InfoItem';
 import { itemIteratorId } from './helpers';
 
-const StringInfoItem = ({
-  template,
-  attr,
-  tooltipText,
-  translate,
-  mapAttr,
-  elipsed,
-}) => {
-  const inner = (
-    <span>
-      {translate ? __(mapAttr(template, attr)) : mapAttr(template, attr)}
-    </span>
-  );
+const StringInfoItem = ({ template, attr, tooltipText, mapAttr, elipsed }) => {
+  const inner = <span>{mapAttr(template, attr)}</span>;
   const innerContent = elipsed ? (
     <EllipsisWithTooltip placement="top">{inner}</EllipsisWithTooltip>
   ) : (
@@ -35,13 +24,11 @@ StringInfoItem.propTypes = {
   template: PropTypes.object.isRequired,
   attr: PropTypes.string.isRequired,
   tooltipText: PropTypes.string,
-  translate: PropTypes.bool,
   mapAttr: PropTypes.func,
   elipsed: PropTypes.bool,
 };
 
 StringInfoItem.defaultProps = {
-  translate: false,
   mapAttr: (template, attr) => template[attr],
   elipsed: false,
   tooltipText: undefined,

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

@@ -55,7 +55,6 @@ export const additionalInfo = (template, editPath) => {
           <StringInfoItem
             template={template}
             attr={attr}
-            translate
             mapAttr={(templateObj, attribute) =>
               classNameMap[templateObj[attribute]]
                 ? classNameMap[templateObj[attribute]]

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

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 
 import { expandableContent } from './helpers';
 

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import SyncResultList from '../SyncResultList';
 import { importTemplates } from '../../__fixtures__/templateSyncResult.fixtures';

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

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 import SyncedTemplate from '../SyncedTemplate';
 import {
   noName,

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

@@ -79,7 +79,6 @@ exports[`SyncedTemplate should render skipped template 1`] = `
             "templateFile": "coreos_default.erb",
           }
         }
-        translate={true}
       />,
       <EmptyInfoItem
         attr="kind"
@@ -118,7 +117,6 @@ exports[`SyncedTemplate should render skipped template 1`] = `
             "templateFile": "coreos_default.erb",
           }
         }
-        translate={false}
       />,
     ]
   }
@@ -236,7 +234,6 @@ exports[`SyncedTemplate should render template with invalid metadata 1`] = `
             "templateFile": "random_template.erb",
           }
         }
-        translate={false}
       />,
     ]
   }
@@ -361,7 +358,6 @@ exports[`SyncedTemplate should render template with validation errors 1`] = `
             "templateFile": "epel.erb",
           }
         }
-        translate={true}
       />,
       <StringInfoItem
         attr="kind"
@@ -384,7 +380,6 @@ exports[`SyncedTemplate should render template with validation errors 1`] = `
             "templateFile": "epel.erb",
           }
         }
-        translate={false}
       />,
       <StringInfoItem
         attr="templateFile"
@@ -407,7 +402,6 @@ exports[`SyncedTemplate should render template with validation errors 1`] = `
             "templateFile": "epel.erb",
           }
         }
-        translate={false}
       />,
     ]
   }
@@ -508,7 +502,6 @@ exports[`SyncedTemplate should render template without errros 1`] = `
             "templateFile": "coreos_default.erb",
           }
         }
-        translate={true}
       />,
       <EmptyInfoItem
         attr="kind"
@@ -541,7 +534,6 @@ exports[`SyncedTemplate should render template without errros 1`] = `
             "templateFile": "coreos_default.erb",
           }
         }
-        translate={false}
       />,
     ]
   }

data/webpack/testSetup.js

@@ -1,7 +1,7 @@
 import 'core-js/shim';
 import 'regenerator-runtime/runtime';
 
-import { configure } from 'enzyme';
+import { configure } from '@theforeman/test';
 import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Engine to synchronise provisioning templates from GitHub
 email: gsutclif@redhat.com
 executables: []
@@ -63,6 +77,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/foreman_templates/locale/cs_CZ/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/de/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/en_GB/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/es/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/fr/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/gl/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/it/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/ja/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/ka/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/ko/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/pt_BR/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/ru/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/sv_SE/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/zh_CN/foreman_templates.js
+- app/assets/javascripts/foreman_templates/locale/zh_TW/foreman_templates.js
 - app/controllers/api/v2/template_controller.rb
 - app/controllers/concerns/foreman/controller/parameters/template_params.rb
 - app/controllers/template_syncs_controller.rb
@@ -93,10 +122,41 @@ files:
 - lib/foreman_templates/engine.rb
 - lib/foreman_templates/version.rb
 - lib/tasks/foreman_templates_tasks.rake
+- locale/cs_CZ/LC_MESSAGES/foreman_templates.mo
+- locale/cs_CZ/foreman_templates.po
+- locale/de/LC_MESSAGES/foreman_templates.mo
+- locale/de/foreman_templates.po
+- locale/en_GB/LC_MESSAGES/foreman_templates.mo
+- locale/en_GB/foreman_templates.po
+- locale/es/LC_MESSAGES/foreman_templates.mo
+- locale/es/foreman_templates.po
+- locale/fr/LC_MESSAGES/foreman_templates.mo
+- locale/fr/foreman_templates.po
+- locale/gl/LC_MESSAGES/foreman_templates.mo
+- locale/gl/foreman_templates.po
+- locale/it/LC_MESSAGES/foreman_templates.mo
+- locale/it/foreman_templates.po
+- locale/ja/LC_MESSAGES/foreman_templates.mo
+- locale/ja/foreman_templates.po
+- locale/ka/LC_MESSAGES/foreman_templates.mo
+- locale/ka/foreman_templates.po
+- locale/ko/LC_MESSAGES/foreman_templates.mo
+- locale/ko/foreman_templates.po
+- locale/pt_BR/LC_MESSAGES/foreman_templates.mo
+- locale/pt_BR/foreman_templates.po
+- locale/ru/LC_MESSAGES/foreman_templates.mo
+- locale/ru/foreman_templates.po
+- locale/sv_SE/LC_MESSAGES/foreman_templates.mo
+- locale/sv_SE/foreman_templates.po
+- locale/zh_CN/LC_MESSAGES/foreman_templates.mo
+- locale/zh_CN/foreman_templates.po
+- locale/zh_TW/LC_MESSAGES/foreman_templates.mo
+- locale/zh_TW/foreman_templates.po
 - package.json
 - webpack/ForemanTemplates.js
 - webpack/Routes.js
 - webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
+- webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutSelectors.js
 - webpack/__mocks__/foremanReact/components/Pagination/index.js
@@ -200,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Template-syncing engine for Foreman