foreman_templates 9.2.0 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda8e472a4ae76b0f1480738e9059423a249c4156842deebc385baa2f3c2a5ca
-  data.tar.gz: bb04b38ce6791e62f90fcea5a177d38ca62402e6c3037e7f3ed85c416f91696c
+  metadata.gz: d10e7500d6a4e3b0c4334823c306d9464f8b90ecbc24f350fdaa7efbecca2541
+  data.tar.gz: f4aa56a7a5642b61db628ae173015d7055c0e43c83333b65451d3bdb69df542b
 SHA512:
-  metadata.gz: 3c35d3ca52df290a50a3e1788ea654a0588067ab02278a5b77829bfaec46d8c855ae36f554a608eaf8e9c5797b650d5be1a95ed4e7f8486c905e601068180fc5
-  data.tar.gz: b58a200b8374f22481e1397949cc4126315234b6238ce08895acedb628c826515ce9ab514b85942b8388350f0e8939b0d088ccc6641fc4b3b84a1fc65ef16961
+  metadata.gz: e6aa838a9f67873f841e301c6e990cf9203e514c559682d07fddcfa295b159790832089b2c1ec4c922bbdb282dee0c10a6441907d883a62edd12fe2421bc833d
+  data.tar.gz: 1ce8a6c5337db333e2cac800f77cab2ed01ae2a5a418db714ee42b231cd1ab20a09a571a2347e03bbecfb1788aceb87c536e11b6405962287fd49b33a29a0c9b

data/db/migrate/20211122154929_templates_settings_category_to_dsl.rb

@@ -1,5 +1,5 @@
 class TemplatesSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::TemplateSync').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::TemplateSync').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_templates/engine.rb

@@ -24,7 +24,7 @@ module ForemanTemplates
 
     initializer 'foreman_templates.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_templates do
-        requires_foreman '>= 3.2'
+        requires_foreman '>= 3.3'
 
         apipie_documented_controllers ["#{ForemanTemplates::Engine.root}/app/controllers/api/v2/*.rb"]
 

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '9.2.0'.freeze
+  VERSION = "9.3.1".freeze
 end

data/package.json

@@ -7,8 +7,8 @@
     "test": "test"
   },
   "scripts": {
-    "test": "node node_modules/.bin/jest webpack",
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/"
+    "test": "tfm-test --plugin",
+    "lint": "tfm-lint --plugin -d /webpack"
   },
   "repository": {
     "type": "git",
@@ -21,45 +21,19 @@
   },
   "homepage": "https://github.com/theforeman/foreman_templates",
   "peerDependencies": {
-    "@theforeman/vendor": ">= 3.3.2"
+    "@theforeman/vendor": "^10.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/env": "^3.3.2",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.3.2",
+    "@theforeman/builder": "^10.1.0",
+    "@theforeman/eslint-plugin-foreman": "^10.1.0",
+    "@theforeman/vendor-dev": "^10.1.0",
+    "@theforeman/test": "^10.1.0",
+    "@theforeman/stories": "^10.1.0",
     "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.9.0",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
     "eslint": "^6.8.0",
-    "eslint-plugin-patternfly-react": "^0.3.0",
+    "eslint-plugin-patternfly-react": "0.2.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.1",
-    "react-redux-test-utils": "^0.1.1"
-  },
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules",
-      "webpack"
-    ],
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/testSetup.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(css|scss)$": "identity-obj-proxy"
-    }
+    "prettier": "^1.19.1"
   }
 }

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1 @@
+export const translate = s => s;

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/__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/__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

@@ -1,6 +1,7 @@
 import React from 'react';
 import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import InfoItem from './InfoItem';
 import { itemIteratorId } from './helpers';

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/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.3.1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2023-06-19 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: []
@@ -97,6 +111,7 @@ files:
 - 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 +215,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