foreman_webhooks 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11967cfaa258f41f6eb8da34eff7cac3ffd49a0cab95c91e238f8c65945f4fbc
-  data.tar.gz: f843b1328b7468d718346008d107ae4fb3792a3d72cce7cdcc36ed9c9a38f310
+  metadata.gz: 9acc94d42d1da3f77bd90c0383a6f22ed44ece4fd1dbdadff575a56983dcbd22
+  data.tar.gz: 5b4dfd3d9b5f224182fdd6ab3d320df4ed8fbb2fc1030f5abf823c1e01cf8343
 SHA512:
-  metadata.gz: 399113aecc0426b5755fea689c673aeb6168b87243558581bbe16ffaff3653d7c7db41ed0c4bb5f8ac775c61242d49528e824633c8ce134566de8fa1a79ff0ff
-  data.tar.gz: 8e6143ca148607b43998723d0d1592ba90bc8592842bc1bf7c7ed02ad162e9b152a44de90736c1eb5d050b633eb460941aa7f1861396e73053b7007c4d17878b
+  metadata.gz: 824471769ea8d3cf27a8fc14bf8d1780a456cedb3013630636416a89fa0b2405b96b3d8674a290e66b0163636467a0773d23f574a70ec64222ba9a4d43f67dff
+  data.tar.gz: 25c3cc1fc29b99de2eb08ec6e7bdb9b36024d6c2c323e797611c569429822557a103fc4ac9ad839cee01c1ce6c40ff7a5f9ae4294b08195acd2cc1f370d60e7d

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

@@ -10,15 +10,10 @@ attributes :target_url,
            :http_content_type,
            :enabled,
            :verify_ssl,
-           :proxy_authorization,
            :http_headers,
            :ssl_ca_certs,
            :user
 
-node :password_set do |webhook|
-  webhook.password.present?
-end
-
 child :webhook_template do
   extends 'api/v2/webhook_templates/base'
 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.0'
 
         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.3'
+  VERSION = '3.0.0'
 end

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/ForemanFormikField.js

@@ -21,8 +21,6 @@ const ForemanFormikField = ({
   placeholder,
   options,
   isLoading,
-  disabled,
-  setDisabled,
 }) => (
   <FormikField name={name}>
     {({
@@ -34,15 +32,6 @@ const ForemanFormikField = ({
 
         return filter(initialOptions, o => o.value === fieldValue);
       };
-      const passwordInput = (
-        <input
-          {...field}
-          placeholder={disabled ? '********' : ''}
-          type={type}
-          disabled={disabled}
-          className="form-control"
-        />
-      );
       let content = null;
       switch (type) {
         case 'textarea':
@@ -67,30 +56,10 @@ const ForemanFormikField = ({
               onChange={selected =>
                 setFieldValue(field.name, selected[0]?.value)
               }
+              // onBlur={e => setFieldTouched(field.name, true)}
             />
           );
           break;
-        case 'password':
-          content = setDisabled ? (
-            <div className="input-group">
-              {passwordInput}
-              <span className="input-group-btn">
-                <button
-                  className="btn btn-default"
-                  onClick={e => {
-                    e.preventDefault();
-                    setDisabled(!disabled);
-                  }}
-                  title={__('Change the password')}
-                >
-                  <span className="pficon pficon-edit" />
-                </button>
-              </span>
-            </div>
-          ) : (
-            passwordInput
-          );
-          break;
         default:
           content = (
             <input
@@ -132,8 +101,6 @@ ForemanFormikField.propTypes = {
   placeholder: PropTypes.string,
   options: PropTypes.array,
   isLoading: PropTypes.bool,
-  disabled: PropTypes.bool,
-  setDisabled: PropTypes.func,
 };
 
 ForemanFormikField.defaultProps = {
@@ -145,8 +112,6 @@ ForemanFormikField.defaultProps = {
   placeholder: '',
   options: null,
   isLoading: false,
-  disabled: false,
-  setDisabled: undefined,
 };
 
 export default ForemanFormikField;

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.js

@@ -18,8 +18,6 @@ const WebhookFormTabs = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
-  isPasswordDisabled,
-  setIsPasswordDisabled,
 }) => (
   <Tabs activeKey={activeTab} onSelect={handleTabClick} isFilled>
     <Tab
@@ -92,8 +90,6 @@ const WebhookFormTabs = ({
           type="password"
           label={__('Password')}
           labelHelp={__('Authentication credentials')}
-          disabled={isPasswordDisabled}
-          setDisabled={setIsPasswordDisabled}
         />
         <ForemanFormikField
           name="verify_ssl"
@@ -157,15 +153,11 @@ WebhookFormTabs.propTypes = {
   availableEvents: PropTypes.array.isRequired,
   isTemplatesLoading: PropTypes.bool.isRequired,
   isEventsLoading: PropTypes.bool.isRequired,
-  isPasswordDisabled: PropTypes.bool,
-  setIsPasswordDisabled: PropTypes.func,
 };
 
 WebhookFormTabs.defaultProps = {
   disabled: false,
   formProps: {},
-  isPasswordDisabled: false,
-  setIsPasswordDisabled: undefined,
 };
 
 export default WebhookFormTabs;

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookForm.js

@@ -25,8 +25,6 @@ const WebhookForm = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
-  isPasswordDisabled,
-  setIsPasswordDisabled,
 }) => {
   const webhookTemplates = templates.map(t => ({ value: t.id, label: t.name }));
 
@@ -53,8 +51,6 @@ const WebhookForm = ({
         availableEvents={availableEvents}
         isEventsLoading={isEventsLoading}
         isTemplatesLoading={isTemplatesLoading}
-        isPasswordDisabled={isPasswordDisabled}
-        setIsPasswordDisabled={setIsPasswordDisabled}
       />
     </ForemanForm>
   );
@@ -68,13 +64,6 @@ WebhookForm.propTypes = {
   availableEvents: PropTypes.array.isRequired,
   isEventsLoading: PropTypes.bool.isRequired,
   isTemplatesLoading: PropTypes.bool.isRequired,
-  isPasswordDisabled: PropTypes.bool,
-  setIsPasswordDisabled: PropTypes.func,
-};
-
-WebhookForm.defaultProps = {
-  isPasswordDisabled: false,
-  setIsPasswordDisabled: undefined,
 };
 
 export default WebhookForm;

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

@@ -241,7 +241,6 @@ exports[`WebhookForm rendering should render for edit page 1`] = `
       ]
     }
     isEventsLoading={false}
-    isPasswordDisabled={false}
     isTemplatesLoading={false}
     webhookTemplates={
       Array [
@@ -493,7 +492,6 @@ exports[`WebhookForm rendering should render for new page 1`] = `
       ]
     }
     isEventsLoading={false}
-    isPasswordDisabled={false}
     isTemplatesLoading={false}
     webhookTemplates={
       Array [

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/index.js

@@ -24,13 +24,7 @@ import {
 
 const params = { page: 1, search: 'snippet = false', per_page: 'all' };
 
-const ConnectedWebhookForm = ({
-  onCancel,
-  handleSubmit,
-  initialValues,
-  isPasswordDisabled,
-  setIsPasswordDisabled,
-}) => {
+const ConnectedWebhookForm = ({ onCancel, handleSubmit, initialValues }) => {
   const dispatch = useDispatch();
 
   const templates = useSelector(selectWebhookTemplates);
@@ -66,8 +60,6 @@ const ConnectedWebhookForm = ({
       initialValues={initialValues}
       isTemplatesLoading={isTemplatesLoading}
       isEventsLoading={isEventsLoading}
-      isPasswordDisabled={isPasswordDisabled}
-      setIsPasswordDisabled={setIsPasswordDisabled}
     />
   );
 };
@@ -76,13 +68,6 @@ ConnectedWebhookForm.propTypes = {
   onCancel: PropTypes.func.isRequired,
   handleSubmit: PropTypes.func.isRequired,
   initialValues: PropTypes.object.isRequired,
-  isPasswordDisabled: PropTypes.bool,
-  setIsPasswordDisabled: PropTypes.func,
-};
-
-ConnectedWebhookForm.defaultProps = {
-  isPasswordDisabled: false,
-  setIsPasswordDisabled: undefined,
 };
 
 export default ConnectedWebhookForm;

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Modal } from 'patternfly-react';
 import { useDispatch } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -48,12 +47,11 @@ const WebhookCreateModal = ({ onSuccess, onCancel }) => {
   return (
     <ForemanModal
       id={WEBHOOK_CREATE_MODAL_ID}
+      title={__('Create Webhook')}
       backdrop="static"
       className="webhooks-modal"
     >
-      <Modal.Header>
-        <Modal.Title>{__('Create Webhook')}</Modal.Title>
-      </Modal.Header>
+      <ForemanModal.Header />
       <ConnectedWebhookForm
         handleSubmit={handleSubmit}
         initialValues={initialWebhookValues}

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

@@ -1,5 +1,4 @@
-import React, { useEffect, useState } from 'react';
-import { Modal } from 'patternfly-react';
+import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 
@@ -30,11 +29,22 @@ import './WebhookModal.scss';
 const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
   const dispatch = useDispatch();
 
-  const [isPasswordDisabled, setIsPasswordDisabled] = useState(false);
   const id = toEdit;
 
+  const handleSubmit = (values, actions) =>
+    dispatch(
+      submitForm({
+        url: foremanUrl(`/api${WEBHOOKS_PATH}/${id}`),
+        values: { ...values, controller: 'webhooks' },
+        item: 'Webhook',
+        message: __('Webhook was successfully updated.'),
+        method: 'put',
+        successCallback: onSuccess,
+        actions,
+      })
+    );
+
   const isLoading = useSelector(selectIsLoading);
-  const isPasswordSet = useSelector(selectWebhookValues).passwordSet;
   const initialWebhookValues = {
     id: useSelector(selectWebhookValues).id,
     name: useSelector(selectWebhookValues).name,
@@ -52,27 +62,6 @@ const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
     proxy_authorization: useSelector(selectWebhookValues).proxyAuthorization,
   };
 
-  useEffect(() => {
-    setIsPasswordDisabled(isPasswordSet);
-  }, [isPasswordSet]);
-
-  const handleSubmit = (values, actions) => {
-    if (isPasswordDisabled) {
-      delete values.password;
-    }
-    dispatch(
-      submitForm({
-        url: foremanUrl(`/api${WEBHOOKS_PATH}/${id}`),
-        values: { ...values, controller: 'webhooks' },
-        item: 'Webhook',
-        message: __('Webhook was successfully updated.'),
-        method: 'put',
-        successCallback: onSuccess,
-        actions,
-      })
-    );
-  };
-
   useEffect(() => {
     if (id) {
       dispatch(
@@ -84,31 +73,21 @@ const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
     }
   }, [id, dispatch]);
 
-  const onEditCancel = () => {
-    if (isPasswordSet) setIsPasswordDisabled(true);
-    onCancel();
-  };
-
   return (
     <ForemanModal
       id={WEBHOOK_EDIT_MODAL_ID}
+      title={`${__('Edit')} ${initialWebhookValues.name}`}
       backdrop="static"
       className="webhooks-modal"
     >
-      <Modal.Header>
-        <Modal.Title>
-          {`${__('Edit')} ${initialWebhookValues.name}`}
-        </Modal.Title>
-      </Modal.Header>
+      <ForemanModal.Header />
       {isLoading ? (
         <Loading />
       ) : (
         <ConnectedWebhookForm
           handleSubmit={handleSubmit}
           initialValues={initialWebhookValues}
-          onCancel={onEditCancel}
-          isPasswordDisabled={isPasswordDisabled}
-          setIsPasswordDisabled={setIsPasswordDisabled}
+          onCancel={onCancel}
         />
       )}
     </ForemanModal>

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

@@ -29,7 +29,6 @@ exports[`WebhooksTable rendering should render when loading 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;
 
@@ -68,7 +67,6 @@ exports[`WebhooksTable rendering should render with error 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={Array []}
 />
 `;
 
@@ -101,7 +99,6 @@ exports[`WebhooksTable rendering should render with no data 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
-  toasts={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.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/test_setup.js

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -186,7 +186,7 @@ homepage: https://github.com/theforeman/foreman_webhooks
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +201,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Configure webhooks for Foreman.
 test_files:
@@ -213,14 +213,14 @@ test_files:
 - test/factories/webhook_template.rb
 - test/jobs/foreman_webhooks/deliver_webhook_job_test.rb
 - test/models/webhook_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
+- test/test_plugin_helper.rb
 - 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__/integration.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.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