foreman_webhooks 2.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a3a4ed0dd48b24eff5ad505def967db53ce75d7fc2028931e1d2e3dd296bc82
-  data.tar.gz: 4967cc533c7643041e6c7a533a4b38f2897d605dc5327b79bc80c8fa13759399
+  metadata.gz: 523d26d6ef7f9d27e8f07192fccc3d0070118e92aca3e1198259feca505f3915
+  data.tar.gz: a5b860468afc572d9bd102b2fcf098d79f71bf65144b01d927c7e542bf57265c
 SHA512:
-  metadata.gz: c329d395342ed2d557f8d9d8e0229a1be906b502fd4314afb308ecb1b6a535db68f3b074515ea830bfb215a3d7e78bfb02271248b1129b00c768549ee6ad1b78
-  data.tar.gz: fdb4584f33e2e1de069b5c780372280bd0e8200e7d7c80f788d4c024f2bd0f14b7c3460b607a13a021dc13f8d833fb3bc54ca1e2264e64bab933f82de4b18507
+  metadata.gz: 62cc925323c67e043abae9dd3d7145142b916c07d4c70880fb984d4aabec00860a1d10ea3be5137264d4a5588a06768fb5f7fc7dca89468749d7439877a067fa
+  data.tar.gz: e34dd831d90bfda959ec89d7d5179c8cf6e47bb9f351040acf8c0bbda3fb2502e6b56bcdf361913435c349250218063550414c5aa5da6bd65d2cf97a492a92ce

data/app/models/webhook_template.rb

@@ -56,4 +56,8 @@ class WebhookTemplate < Template
   def support_single_host_render?
     false
   end
+
+  def support_preview?
+    false
+  end
 end

data/lib/foreman_webhooks/engine.rb

@@ -15,7 +15,7 @@ module ForemanWebhooks
 
     initializer 'foreman_webhooks.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_webhooks do
-        requires_foreman '>= 2.5'
+        requires_foreman '>= 3.2'
 
         apipie_documented_controllers ["#{ForemanWebhooks::Engine.root}/app/controllers/api/v2/*.rb"]
         ApipieDSL.configuration.sections += ['webhooks']

data/lib/foreman_webhooks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWebhooks
-  VERSION = '2.0.0'
+  VERSION = '3.0.1'
 end

data/package.json

@@ -21,25 +21,22 @@
     "url": "https://projects.theforeman.org/projects/webhooks/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 8.4.1"
+    "@theforeman/vendor": "^8.15.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^8.4.1",
-    "@theforeman/stories": "^8.4.1",
-    "@theforeman/test": "^8.4.1",
-    "@theforeman/vendor-dev": "^8.4.1",
-    "@theforeman/eslint-plugin-foreman": "^8.4.1",
+    "@theforeman/builder": "^8.15.0",
+    "@theforeman/stories": "^8.15.0",
+    "@theforeman/test": "^8.15.0",
+    "@theforeman/vendor-dev": "^8.15.0",
+    "@theforeman/eslint-plugin-foreman": "^8.15.0",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "eslint-plugin-spellcheck": "^0.0.17",
+    "jed": "^1.1.1",
     "prettier": "^1.13.5",
     "stylelint": "^9.3.0",
     "stylelint-config-standard": "^18.0.0",
     "surge": "^0.20.3"
-  },
-  "dependencies": {
-    "jed": "^1.1.1",
-    "react-intl": "^2.8.0"
   }
 }

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/WebhooksTable.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { Table } from 'foremanReact/components/common/table';
-import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
+import Pagination from 'foremanReact/components/Pagination';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 
 import WebhookDeleteModal from '../WebhookDeleteModal';
@@ -57,15 +57,8 @@ const WebhooksTable = ({
         )}
         rows={results}
         id="webhooks-table"
-        style={{ marginBottom: -6 }}
-      />
-      <Pagination
-        viewType="list"
-        itemCount={itemCount}
-        pagination={pagination}
-        onChange={fetchAndPush}
-        dropdownButtonId="webhooks-page-pagination-dropdown"
       />
+      <Pagination itemCount={itemCount} onChange={fetchAndPush} />
     </React.Fragment>
   );
 };

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/WebhooksTable.test.js

@@ -29,14 +29,12 @@ const fixtures = {
     isLoading: true,
     hasData: false,
     hasError: false,
-    toasts: [],
   }),
   'should render with no data': propsFactory({
     ...props,
     isLoading: false,
     hasData: false,
     hasError: false,
-    toasts: [],
   }),
   'should render with error': propsFactory({
     isLoading: false,
@@ -47,14 +45,12 @@ const fixtures = {
       text: 'this is error',
     },
     ...props,
-    toasts: [],
   }),
   'should render with webhooks': propsFactory({
     ...props,
     isLoading: false,
     hasError: false,
     hasData: true,
-    toasts: [],
     results: webhooks,
     itemCount: webhooks.length,
   }),

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/__snapshots__/WebhooksTable.test.js.snap

@@ -17,7 +17,7 @@ exports[`WebhooksTable rendering should render when loading 1`] = `
       "perPage": 20,
     }
   }
-  perPage={42}
+  per_page={42}
   reloadWithSearch={[MockFunction]}
   results={Array []}
   search="name=foo"
@@ -29,7 +29,6 @@ exports[`WebhooksTable rendering should render when loading 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;
 
@@ -56,7 +55,7 @@ exports[`WebhooksTable rendering should render with error 1`] = `
       "perPage": 20,
     }
   }
-  perPage={42}
+  per_page={42}
   reloadWithSearch={[MockFunction]}
   results={Array []}
   search="name=foo"
@@ -68,7 +67,6 @@ exports[`WebhooksTable rendering should render with error 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;
 
@@ -89,7 +87,7 @@ exports[`WebhooksTable rendering should render with no data 1`] = `
       "perPage": 20,
     }
   }
-  perPage={42}
+  per_page={42}
   reloadWithSearch={[MockFunction]}
   results={Array []}
   search="name=foo"
@@ -101,7 +99,6 @@ exports[`WebhooksTable rendering should render with no data 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;
 
@@ -122,7 +119,7 @@ exports[`WebhooksTable rendering should render with webhooks 1`] = `
       "perPage": 20,
     }
   }
-  perPage={42}
+  per_page={42}
   reloadWithSearch={[MockFunction]}
   results={
     Array [
@@ -153,6 +150,5 @@ exports[`WebhooksTable rendering should render with webhooks 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/WebhooksIndexPage.js

@@ -26,7 +26,6 @@ const WebhooksIndexPage = ({
   itemCount,
   message,
   canCreate,
-  toasts,
   reloadWithSearch,
 }) => {
   const [toDelete, setToDelete] = useState({});
@@ -62,7 +61,6 @@ const WebhooksIndexPage = ({
         isLoading={isLoading && hasData}
         onSearch={reloadWithSearch}
         onBookmarkClick={reloadWithSearch}
-        toastNotifications={toasts}
         toolbarButtons={canCreate && createBtn}
       >
         <WebhooksTable
@@ -98,7 +96,6 @@ WebhooksIndexPage.propTypes = {
   itemCount: PropTypes.number.isRequired,
   message: PropTypes.object,
   canCreate: PropTypes.bool.isRequired,
-  toasts: PropTypes.array.isRequired,
   reloadWithSearch: PropTypes.func.isRequired,
 };
 

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js

@@ -17,7 +17,7 @@ export const querySort = {
 
 const pageParams = {
   page: 5,
-  perPage: 42,
+  per_page: 42,
 };
 
 const stateParams = {

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js

@@ -13,7 +13,6 @@ const fixtures = {
     canCreate: true,
     sort: {},
     webhooks: [],
-    toasts: [],
   },
 };
 

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/__snapshots__/WebhooksIndexPage.test.js.snap

@@ -20,7 +20,6 @@ exports[`WebhooksIndexPage redering render with minimal props 1`] = `
   reloadWithSearch={[MockFunction]}
   search=""
   sort={Object {}}
-  toasts={Array []}
   webhooks={Array []}
 />
 `;

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/index.js

@@ -1,9 +1,7 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { compose, bindActionCreators } from 'redux';
 
 import { callOnMount, callOnPopState } from 'foremanReact/common/HOC';
-import { useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 
 import WebhooksIndexPage from './WebhooksIndexPage';
 import * as actions from '../WebhooksPageActions';
@@ -38,14 +36,8 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
-const callWithToastsContext = Component => props => {
-  const { toasts } = useForemanContext();
-  return <Component {...props} toasts={toasts} />;
-};
-
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
-  callWithToastsContext,
   callOnMount(({ initializeWebhooks }) => initializeWebhooks()),
   callOnPopState(({ fetchWebhooks }) => fetchWebhooks())
 )(WebhooksIndexPage);

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageActions.js

@@ -11,7 +11,7 @@ import {
 
 export const initializeWebhooks = () => dispatch => {
   const params = getParams();
-  dispatch(fetchWebhooks(params));
+  dispatch(fetchWebhooks({ per_page: params.perPage, ...params }));
   if (!history.action === 'POP') {
     history.replace({
       pathname: WEBHOOKS_PATH,
@@ -21,7 +21,8 @@ export const initializeWebhooks = () => dispatch => {
 };
 
 export const fetchWebhooks = (
-  { page, perPage, searchQuery, sort },
+  /* eslint-disable-next-line camelcase */
+  { page, per_page, searchQuery, sort },
   url = WEBHOOKS_API_PATH
 ) => async dispatch => {
   const sortString =
@@ -33,7 +34,7 @@ export const fetchWebhooks = (
       url,
       params: {
         page,
-        per_page: perPage,
+        per_page,
         search: searchQuery,
         order: sortString,
       },
@@ -46,7 +47,7 @@ export const fetchAndPush = (params = {}) => (dispatch, getState) => {
   dispatch(fetchWebhooks(query));
   history.push({
     pathname: WEBHOOKS_PATH,
-    search: stringifyParams(query),
+    search: stringifyParams({ perPage: query.per_page, ...query }),
   });
 };
 

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageHelpers.js

@@ -12,7 +12,7 @@ export const buildQuery = (query, state) => {
 
   return {
     page: query.page || selectPage(state),
-    perPage: query.perPage || selectPerPage(state),
+    per_page: query.per_page || selectPerPage(state),
     searchQuery:
       query.searchQuery === undefined ? selectSearch(state) : query.searchQuery,
     ...(querySort && { sort: querySort }),

data/webpack/__mocks__/foremanReact/components/Pagination/index.js

@@ -0,0 +1,4 @@
+import React from 'react';
+
+const Pagination = () => <></>;
+export default Pagination;

data/webpack/test_setup.js

@@ -1,6 +1,3 @@
-jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
-  useForemanContext: () => ({ toasts: [] }),
-}));
 jest.mock('foremanReact/history', () => ({
   history: {
     action: 'PUSH',

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
-dependencies:
-- !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'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.71.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.71.0
+date: 2022-03-07 00:00:00.000000000 Z
+dependencies: []
 description: Plugin for Foreman that allows to configure Webhooks.
 email:
 - mail@timogoebel.name
@@ -167,7 +139,7 @@ files:
 - webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
 - webpack/__mocks__/foremanReact/components/Loading/Loading.js
 - webpack/__mocks__/foremanReact/components/Loading/index.js
-- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
+- webpack/__mocks__/foremanReact/components/Pagination/index.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
 - webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
 - webpack/__mocks__/foremanReact/components/common/forms/FormField.js
@@ -185,7 +157,8 @@ files:
 homepage: https://github.com/theforeman/foreman_webhooks
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  is_foreman_plugin: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -201,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Configure webhooks for Foreman.
@@ -213,14 +186,14 @@ test_files:
 - test/factories/webhook_template.rb
 - test/jobs/foreman_webhooks/deliver_webhook_job_test.rb
 - test/models/webhook_test.rb
-- test/unit/foreman_webhooks/webhook_service_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_webhooks/webhook_service_test.rb
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/EnabledCell.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/__tests__/WebhooksTable.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/integration.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageHelpers.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -1,4 +0,0 @@
-import React from 'react';
-
-const PaginationWrapper = () => <></>;
-export default PaginationWrapper;