foreman_webhooks 3.0.0 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9acc94d42d1da3f77bd90c0383a6f22ed44ece4fd1dbdadff575a56983dcbd22
-  data.tar.gz: 5b4dfd3d9b5f224182fdd6ab3d320df4ed8fbb2fc1030f5abf823c1e01cf8343
+  metadata.gz: 1334f49eb8f7f4e7459b9be38c441530ded5f9bf3c9ec4e3b81486d10790966f
+  data.tar.gz: 17d3ed3b1aada4e91b227a59c2f0aaed8530bf9ff574cb9356373c7b45a27508
 SHA512:
-  metadata.gz: 824471769ea8d3cf27a8fc14bf8d1780a456cedb3013630636416a89fa0b2405b96b3d8674a290e66b0163636467a0773d23f574a70ec64222ba9a4d43f67dff
-  data.tar.gz: 25c3cc1fc29b99de2eb08ec6e7bdb9b36024d6c2c323e797611c569429822557a103fc4ac9ad839cee01c1ce6c40ff7a5f9ae4294b08195acd2cc1f370d60e7d
+  metadata.gz: a49b1de24a65d38bec45c490ef8d88e7a04fbc682b990f09832f6de36450557bbccf9a306de1bd0c6032f594ca7e45512de4b3cdf3872c74e59e1b7b119abfe5
+  data.tar.gz: 107303f91d79b0590ac2d304adc0a36bf6f616bde6d7c6427744a5b71f2a9e696a61776e497433cb5a4db46dc6774464934c4256245a09e32ef4d96e1e018510

data/app/controllers/api/v2/webhooks_controller.rb

@@ -25,8 +25,14 @@ module Api
           param :target_url, String, required: true
           param :http_method, Webhook::ALLOWED_HTTP_METHODS
           param :http_content_type, String
-          events = Webhook.available_events.sort.map { |e| e.delete_suffix(Webhook::EVENT_POSTFIX) }
-          param :event, events, required: true
+          # If you need to have the list of the events documented, you can run:
+          # $ apipie:cache RAILS_ENV=production
+          if Rails.env.development?
+            param :event, String, required: true
+          else
+            events = Webhook.available_events.sort.map { |e| e.delete_suffix(Webhook::EVENT_POSTFIX) }
+            param :event, events, required: true
+          end
           param :webhook_template_id, :identifier
           param :enabled, :boolean
           param :verify_ssl, :boolean

data/app/views/api/v2/webhooks/show.json.rabl

@@ -10,6 +10,7 @@ attributes :target_url,
            :http_content_type,
            :enabled,
            :verify_ssl,
+           :proxy_authorization,
            :http_headers,
            :ssl_ca_certs,
            :user

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 '>= 3.0'
+        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 = '3.0.0'
+  VERSION = '3.0.3'
 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": ">= 0",
+    "@theforeman/stories": ">= 0",
+    "@theforeman/test": ">= 0",
+    "@theforeman/vendor-dev": ">= 0",
+    "@theforeman/eslint-plugin-foreman": ">= 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__/__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"
@@ -55,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"
@@ -87,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"
@@ -119,7 +119,7 @@ exports[`WebhooksTable rendering should render with webhooks 1`] = `
       "perPage": 20,
     }
   }
-  perPage={42}
+  per_page={42}
   reloadWithSearch={[MockFunction]}
   results={
     Array [

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

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.3
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-01 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-06-03 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,8 +157,9 @@ files:
 homepage: https://github.com/theforeman/foreman_webhooks
 licenses:
 - GPL-3.0
-metadata: {}
-post_install_message:
+metadata:
+  is_foreman_plugin: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Configure webhooks for Foreman.
 test_files:
@@ -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__/integration.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.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;