foreman_webhooks 3.0.2 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e166211db618a40dd56da367296ff84e3ea3e43e1d7407cac3840a17eaac22ea
-  data.tar.gz: cbfe61067b37c0172bcb02f516d28a582349c0a383b18e6b26406e58069253b5
+  metadata.gz: 35481704f9612f66d175bb0ad80ae7b7d09ff1ab5440cb1f8a0095e048192bb0
+  data.tar.gz: d2c446a00baabd248360cba079d3881c51f5041333d5d1289aaac26d5bbe66ef
 SHA512:
-  metadata.gz: 537b2c507e961c15383bec14b3bf5e22bb13093a501310e1ba9fee8595ac4ff789d4afd8c4ac4e91832b60502f8daee14104dab87eb9b2771bd4b4ae518ba3dd
-  data.tar.gz: 2c224320a96b0a9b55f9942152074e5063d4a5b9e5c84aca5f0d43823ce8fd8ebd91f45a595ccc694d5d09e70859eca3dc9481b4b113716bfc24971021fda39f
+  metadata.gz: 362b6a4ce67927ac55080d400a5fed50cd97427a4f07f71eceec9f33b3f03327cd01598ec0037eded63849b8cdf24eb007ca0bd2572c7238c1e4d66291d2356e
+  data.tar.gz: b49a3118a26cec78f9d4ba4856a3aba18f6af0cbfcd80fb362e9551d0a279481b858bc7a9cac1f636348385d56333d2d659e2a540f50c9eac0ecd49f24a0af95

data/app/models/webhook.rb

@@ -79,7 +79,10 @@ class Webhook < ApplicationRecord
 
   def ca_certs_store
     store = OpenSSL::X509::Store.new
-    return store if ssl_ca_certs.blank?
+    if ssl_ca_certs.blank?
+      store.set_default_paths
+      return store
+    end
 
     ssl_ca_certs.split(/(?=-----BEGIN)/).each do |cert|
       store.add_cert(OpenSSL::X509::Certificate.new(cert))

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

@@ -15,6 +15,10 @@ attributes :target_url,
            :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 '>= 3.2'
+        requires_foreman '>= 3.3'
 
         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.2'
+  VERSION = '3.0.5'
 end

data/package.json

@@ -25,11 +25,11 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@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",
+    "@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",

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

@@ -21,6 +21,8 @@ const ForemanFormikField = ({
   placeholder,
   options,
   isLoading,
+  disabled,
+  setDisabled,
 }) => (
   <FormikField name={name}>
     {({
@@ -32,6 +34,15 @@ 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':
@@ -56,10 +67,30 @@ 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
@@ -101,6 +132,8 @@ ForemanFormikField.propTypes = {
   placeholder: PropTypes.string,
   options: PropTypes.array,
   isLoading: PropTypes.bool,
+  disabled: PropTypes.bool,
+  setDisabled: PropTypes.func,
 };
 
 ForemanFormikField.defaultProps = {
@@ -112,6 +145,8 @@ 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,6 +18,8 @@ const WebhookFormTabs = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
 }) => (
   <Tabs activeKey={activeTab} onSelect={handleTabClick} isFilled>
     <Tab
@@ -90,6 +92,8 @@ const WebhookFormTabs = ({
           type="password"
           label={__('Password')}
           labelHelp={__('Authentication credentials')}
+          disabled={isPasswordDisabled}
+          setDisabled={setIsPasswordDisabled}
         />
         <ForemanFormikField
           name="verify_ssl"
@@ -153,11 +157,15 @@ 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,6 +25,8 @@ const WebhookForm = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
 }) => {
   const webhookTemplates = templates.map(t => ({ value: t.id, label: t.name }));
 
@@ -51,6 +53,8 @@ const WebhookForm = ({
         availableEvents={availableEvents}
         isEventsLoading={isEventsLoading}
         isTemplatesLoading={isTemplatesLoading}
+        isPasswordDisabled={isPasswordDisabled}
+        setIsPasswordDisabled={setIsPasswordDisabled}
       />
     </ForemanForm>
   );
@@ -64,6 +68,13 @@ 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,6 +241,7 @@ exports[`WebhookForm rendering should render for edit page 1`] = `
       ]
     }
     isEventsLoading={false}
+    isPasswordDisabled={false}
     isTemplatesLoading={false}
     webhookTemplates={
       Array [
@@ -492,6 +493,7 @@ 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,7 +24,13 @@ import {
 
 const params = { page: 1, search: 'snippet = false', per_page: 'all' };
 
-const ConnectedWebhookForm = ({ onCancel, handleSubmit, initialValues }) => {
+const ConnectedWebhookForm = ({
+  onCancel,
+  handleSubmit,
+  initialValues,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
+}) => {
   const dispatch = useDispatch();
 
   const templates = useSelector(selectWebhookTemplates);
@@ -60,6 +66,8 @@ const ConnectedWebhookForm = ({ onCancel, handleSubmit, initialValues }) => {
       initialValues={initialValues}
       isTemplatesLoading={isTemplatesLoading}
       isEventsLoading={isEventsLoading}
+      isPasswordDisabled={isPasswordDisabled}
+      setIsPasswordDisabled={setIsPasswordDisabled}
     />
   );
 };
@@ -68,6 +76,13 @@ 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,5 +1,6 @@
 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';
@@ -47,11 +48,12 @@ const WebhookCreateModal = ({ onSuccess, onCancel }) => {
   return (
     <ForemanModal
       id={WEBHOOK_CREATE_MODAL_ID}
-      title={__('Create Webhook')}
       backdrop="static"
       className="webhooks-modal"
     >
-      <ForemanModal.Header />
+      <Modal.Header>
+        <Modal.Title>{__('Create Webhook')}</Modal.Title>
+      </Modal.Header>
       <ConnectedWebhookForm
         handleSubmit={handleSubmit}
         initialValues={initialWebhookValues}

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

@@ -1,4 +1,5 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
+import { Modal } from 'patternfly-react';
 import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 
@@ -29,22 +30,11 @@ 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,
@@ -62,6 +52,27 @@ 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(
@@ -73,21 +84,31 @@ 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"
     >
-      <ForemanModal.Header />
+      <Modal.Header>
+        <Modal.Title>
+          {`${__('Edit')} ${initialWebhookValues.name}`}
+        </Modal.Title>
+      </Modal.Header>
       {isLoading ? (
         <Loading />
       ) : (
         <ConnectedWebhookForm
           handleSubmit={handleSubmit}
           initialValues={initialWebhookValues}
-          onCancel={onCancel}
+          onCancel={onEditCancel}
+          isPasswordDisabled={isPasswordDisabled}
+          setIsPasswordDisabled={setIsPasswordDisabled}
         />
       )}
     </ForemanModal>

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import DefaultEmptyState from 'foremanReact/components/common/EmptyState';
+
+const EmptyWebhooksTable = ({ message: { type, text } }) => (
+  <DefaultEmptyState
+    icon={type === 'error' ? 'error-circle-o' : 'add-circle-o'}
+    header={type === 'error' ? __('Error') : __('No Results')}
+    description={text}
+    documentation={null}
+  />
+);
+
+EmptyWebhooksTable.propTypes = {
+  message: PropTypes.shape({
+    type: PropTypes.oneOf(['empty', 'error']),
+    text: PropTypes.string,
+  }),
+};
+
+EmptyWebhooksTable.defaultProps = {
+  message: {
+    type: 'empty',
+    text: __('Try to create a new webhook'),
+  },
+};
+
+export default EmptyWebhooksTable;

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

@@ -1,33 +1,56 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import { isEmpty } from 'lodash';
 
 import { Table } from 'foremanReact/components/common/table';
 import Pagination from 'foremanReact/components/Pagination';
+import Loading from 'foremanReact/components/Loading';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 
 import WebhookDeleteModal from '../WebhookDeleteModal';
 import WebhookEditModal from '../WebhookEditModal';
+import EmptyWebhooksTable from './Components/EmptyWebhooksTable';
 
 import createWebhooksTableSchema from './WebhooksTableSchema';
 
 import { WEBHOOK_EDIT_MODAL_ID } from '../../../constants';
 
+import {
+  selectWebhooks,
+  selectPage,
+  selectPerPage,
+  selectSearch,
+  selectSort,
+  selectHasData,
+  selectHasError,
+  selectIsLoading,
+  selectSubtotal,
+  selectMessage,
+} from '../../../WebhooksPageSelectors';
+
 const WebhooksTable = ({
   fetchAndPush,
-  itemCount,
-  results,
-  sort,
-  pagination,
   toDelete,
   onDeleteClick,
   toEdit,
   onEditClick,
   reloadWithSearch,
-  search,
 }) => {
+  const webhooks = useSelector(selectWebhooks);
+  const page = useSelector(selectPage);
+  const perPage = useSelector(selectPerPage);
+  const search = useSelector(selectSearch);
+  const sort = useSelector(selectSort);
+  const isLoading = useSelector(selectIsLoading);
+  const hasData = useSelector(selectHasData);
+  const hasError = useSelector(selectHasError);
+  const itemCount = useSelector(selectSubtotal);
+  const message = useSelector(selectMessage);
+
   const onDeleteSuccess = () => {
-    const currentPage = pagination.page;
-    const maxPage = Math.ceil((itemCount - 1) / pagination.perPage);
+    const currentPage = page;
+    const maxPage = Math.ceil((itemCount - 1) / perPage);
     fetchAndPush({ page: maxPage < currentPage ? maxPage : currentPage });
   };
 
@@ -35,6 +58,12 @@ const WebhooksTable = ({
     id: WEBHOOK_EDIT_MODAL_ID,
   });
 
+  if (isLoading && !hasError) return <Loading />;
+
+  if (!isLoading && !hasData && isEmpty(search)) {
+    return <EmptyWebhooksTable message={message} />;
+  }
+
   return (
     <React.Fragment>
       <WebhookDeleteModal toDelete={toDelete} onSuccess={onDeleteSuccess} />
@@ -55,7 +84,7 @@ const WebhooksTable = ({
           onDeleteClick,
           onEditClick
         )}
-        rows={results}
+        rows={webhooks}
         id="webhooks-table"
       />
       <Pagination itemCount={itemCount} onChange={fetchAndPush} />
@@ -64,22 +93,12 @@ const WebhooksTable = ({
 };
 
 WebhooksTable.propTypes = {
-  results: PropTypes.array.isRequired,
   fetchAndPush: PropTypes.func.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
   onEditClick: PropTypes.func.isRequired,
-  itemCount: PropTypes.number.isRequired,
-  sort: PropTypes.object,
-  pagination: PropTypes.object.isRequired,
   toDelete: PropTypes.object.isRequired,
   toEdit: PropTypes.number.isRequired,
   reloadWithSearch: PropTypes.func.isRequired,
-  search: PropTypes.string,
-};
-
-WebhooksTable.defaultProps = {
-  sort: { by: '', order: '' },
-  search: '',
 };
 
 export default WebhooksTable;

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

@@ -1,33 +1,28 @@
 import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'patternfly-react';
+import { useSelector, useDispatch } from 'react-redux';
 
+import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableIndexPage';
 import { translate as __ } from 'foremanReact/common/I18n';
-import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
-import { withRenderHandler } from 'foremanReact/common/HOC';
 
-import { WEBHOOKS_SEARCH_PROPS, WEBHOOK_CREATE_MODAL_ID } from '../constants';
+import {
+  WEBHOOKS_API_PATH,
+  WEBHOOKS_API_REQUEST_KEY,
+  WEBHOOK_CREATE_MODAL_ID,
+} from '../constants';
+
+import { selectSearch } from '../WebhooksPageSelectors';
 
 import WebhooksTable from './Components/WebhooksTable';
 import WebhookCreateModal from './Components/WebhookCreateModal';
-import EmptyWebhooksIndexPage from './Components/EmptyWebhooksIndexPage';
 
-const WebhooksIndexPage = ({
-  fetchAndPush,
-  search,
-  isLoading,
-  hasData,
-  webhooks,
-  page,
-  perPage,
-  sort,
-  hasError,
-  itemCount,
-  message,
-  canCreate,
-  reloadWithSearch,
-}) => {
+import { reloadWithSearch, fetchAndPush } from '../WebhooksPageActions';
+
+const WebhooksIndexPage = () => {
+  const dispatch = useDispatch();
+
+  const search = useSelector(selectSearch);
+
   const [toDelete, setToDelete] = useState({});
   const [toEdit, setToEdit] = useState(0);
 
@@ -38,76 +33,33 @@ const WebhooksIndexPage = ({
     id: WEBHOOK_CREATE_MODAL_ID,
   });
 
-  const createBtn = (
-    <Button onClick={setCreateModalOpen} bsStyle="primary">
-      {__('Create Webhook')}
-    </Button>
-  );
-
   return (
     <>
       <WebhookCreateModal
         onSuccess={() => {
           setCreateModalClosed();
-          reloadWithSearch(search);
+          dispatch(reloadWithSearch(search));
         }}
         onCancel={setCreateModalClosed}
       />
-      <PageLayout
+      <TableIndexPage
         header={__('Webhooks')}
-        searchable={!isLoading}
-        searchProps={WEBHOOKS_SEARCH_PROPS}
-        searchQuery={search}
-        isLoading={isLoading && hasData}
-        onSearch={reloadWithSearch}
-        onBookmarkClick={reloadWithSearch}
-        toolbarButtons={canCreate && createBtn}
+        controller="webhooks"
+        apiUrl={WEBHOOKS_API_PATH}
+        apiOptions={{ key: WEBHOOKS_API_REQUEST_KEY }}
+        customCreateAction={() => setCreateModalOpen}
       >
         <WebhooksTable
-          results={webhooks}
-          fetchAndPush={fetchAndPush}
-          pagination={{ page, perPage }}
-          itemCount={itemCount}
-          sort={sort}
+          fetchAndPush={params => dispatch(fetchAndPush(params))}
           toDelete={toDelete}
           setToDelete={setToDelete}
-          hasData={hasData}
-          hasError={hasError}
-          isLoading={isLoading}
           toEdit={toEdit}
           setToEdit={setToEdit}
-          reloadWithSearch={reloadWithSearch}
+          reloadWithSearch={query => dispatch(reloadWithSearch(query))}
         />
-      </PageLayout>
+      </TableIndexPage>
     </>
   );
 };
 
-WebhooksIndexPage.propTypes = {
-  fetchAndPush: PropTypes.func.isRequired,
-  search: PropTypes.string,
-  isLoading: PropTypes.bool.isRequired,
-  hasData: PropTypes.bool.isRequired,
-  webhooks: PropTypes.array.isRequired,
-  page: PropTypes.number,
-  perPage: PropTypes.number,
-  sort: PropTypes.object.isRequired,
-  hasError: PropTypes.bool.isRequired,
-  itemCount: PropTypes.number.isRequired,
-  message: PropTypes.object,
-  canCreate: PropTypes.bool.isRequired,
-  reloadWithSearch: PropTypes.func.isRequired,
-};
-
-WebhooksIndexPage.defaultProps = {
-  page: null,
-  perPage: null,
-  search: '',
-  message: { type: 'empty', text: __('Try to create a new Webhook') },
-};
-
-export default withRenderHandler({
-  Component: WebhooksIndexPage,
-  EmptyComponent: EmptyWebhooksIndexPage,
-  ErrorComponent: EmptyWebhooksIndexPage,
-});
+export default WebhooksIndexPage;

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

@@ -1,4 +1,8 @@
+import React from 'react';
 import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
+import { Provider } from 'react-redux';
+import { createStore } from 'redux';
+
 import WebhooksIndexPage from '../WebhooksIndexPage';
 
 const fixtures = {
@@ -17,6 +21,12 @@ const fixtures = {
 };
 
 describe('WebhooksIndexPage', () => {
-  describe('redering', () =>
-    testComponentSnapshotsWithFixtures(WebhooksIndexPage, fixtures));
+  describe('redering', () => {
+    const webhooksPage = () => (
+      <Provider store={createStore((state = [], action) => state)}>
+        <WebhooksIndexPage />
+      </Provider>
+    );
+    testComponentSnapshotsWithFixtures(webhooksPage, fixtures);
+  });
 });

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

@@ -1,25 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`WebhooksIndexPage redering render with minimal props 1`] = `
-<WebhooksIndexPage
-  canCreate={true}
-  fetchAndPush={[MockFunction]}
-  handleCreateSubmit={[MockFunction]}
-  hasData={false}
-  hasError={false}
-  isLoading={false}
-  itemCount={0}
-  message={
+<Provider
+  store={
     Object {
-      "text": "Try to create a new Webhook",
-      "type": "empty",
+      "dispatch": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+      Symbol(Symbol.observable): [Function],
     }
   }
-  page={null}
-  perPage={null}
-  reloadWithSearch={[MockFunction]}
-  search=""
-  sort={Object {}}
-  webhooks={Array []}
-/>
+>
+  <WebhooksIndexPage />
+</Provider>
 `;

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

@@ -5,15 +5,9 @@ Object {
   "action": Array [
     Array [
       Object {
-        "key": "WEBHOOKS",
-        "params": Object {
-          "order": "",
-          "page": 1,
-          "per_page": 20,
-          "search": "",
-        },
+        "key": "WEBHOOK_EVENTS",
         "type": "get-some-type",
-        "url": "/api/v2/webhooks?include_permissions=true",
+        "url": "",
       },
     ],
   ],
@@ -26,15 +20,9 @@ Object {
   "action": Array [
     Array [
       Object {
-        "key": "WEBHOOKS",
-        "params": Object {
-          "order": "",
-          "page": 1,
-          "per_page": 20,
-          "search": "",
-        },
+        "key": "WEBHOOK_EVENTS",
         "type": "get-some-type",
-        "url": "/api/v2/webhooks?include_permissions=true",
+        "url": "",
       },
     ],
   ],

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

@@ -1,43 +1,3 @@
-import { connect } from 'react-redux';
-import { compose, bindActionCreators } from 'redux';
-
-import { callOnMount, callOnPopState } from 'foremanReact/common/HOC';
-
 import WebhooksIndexPage from './WebhooksIndexPage';
-import * as actions from '../WebhooksPageActions';
-
-import {
-  selectWebhooks,
-  selectPage,
-  selectPerPage,
-  selectSearch,
-  selectSort,
-  selectHasData,
-  selectHasError,
-  selectIsLoading,
-  selectSubtotal,
-  selectMessage,
-  selectCanCreate,
-} from '../WebhooksPageSelectors';
-
-const mapStateToProps = state => ({
-  webhooks: selectWebhooks(state),
-  page: selectPage(state),
-  perPage: selectPerPage(state),
-  search: selectSearch(state),
-  sort: selectSort(state),
-  isLoading: selectIsLoading(state),
-  hasData: selectHasData(state),
-  hasError: selectHasError(state),
-  itemCount: selectSubtotal(state),
-  message: selectMessage(state),
-  canCreate: selectCanCreate(state),
-});
-
-const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
-export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
-  callOnMount(({ initializeWebhooks }) => initializeWebhooks()),
-  callOnPopState(({ fetchWebhooks }) => fetchWebhooks())
-)(WebhooksIndexPage);
+export default WebhooksIndexPage;

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

@@ -1,6 +1,6 @@
 import history from 'foremanReact/history';
 import { get } from 'foremanReact/redux/API';
-import { stringifyParams, getParams } from 'foremanReact/common/urlHelpers';
+import { stringifyParams } from 'foremanReact/common/urlHelpers';
 
 import { buildQuery } from './WebhooksPageHelpers';
 import {
@@ -9,17 +9,6 @@ import {
   WEBHOOKS_API_REQUEST_KEY,
 } from './constants';
 
-export const initializeWebhooks = () => dispatch => {
-  const params = getParams();
-  dispatch(fetchWebhooks({ per_page: params.perPage, ...params }));
-  if (!history.action === 'POP') {
-    history.replace({
-      pathname: WEBHOOKS_PATH,
-      search: stringifyParams(params),
-    });
-  }
-};
-
 export const fetchWebhooks = (
   /* eslint-disable-next-line camelcase */
   { page, per_page, searchQuery, sort },

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

@@ -1,12 +1,9 @@
-import { getControllerSearchProps } from 'foremanReact/constants';
-
 export const WEBHOOKS_PAGE_DATA_RESOLVED = 'WEBHOOKS_PAGE_DATA_RESOLVED';
 export const WEBHOOKS_PAGE_DATA_FAILED = 'WEBHOOKS_PAGE_DATA_FAILED';
 export const WEBHOOKS_PAGE_HIDE_LOADING = 'WEBHOOKS_PAGE_HIDE_LOADING';
 export const WEBHOOKS_PAGE_SHOW_LOADING = 'WEBHOOKS_PAGE_SHOW_LOADING';
 export const WEBHOOKS_PAGE_CLEAR_ERROR = 'WEBHOOKS_PAGE_CLEAR_ERROR';
 
-export const WEBHOOKS_SEARCH_PROPS = getControllerSearchProps('webhooks');
 export const WEBHOOKS_API_PATH = '/api/v2/webhooks?include_permissions=true';
 export const WEBHOOKS_PATH = '/webhooks';
 export const WEBHOOKS_API_REQUEST_KEY = 'WEBHOOKS';

data/webpack/__mocks__/foremanReact/components/PF4/TableIndexPage/TableIndexPage.js

@@ -0,0 +1,10 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const TableIndexPage = ({ children }) => <div>{children}</div>;
+
+TableIndexPage.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default TableIndexPage;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.5
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that allows to configure Webhooks.
 email:
@@ -94,12 +94,12 @@ files:
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/__snapshots__/WebhookForm.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/constants.js
 - webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/index.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/EmptyWebhooksIndexPage/index.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookCreateModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookDeleteModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookEditModal.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookEditModalSelectors.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookModal.scss
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/EmptyWebhooksTable/index.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/EnabledCell.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/__snapshots__/enabledCellFormatter.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/__tests__/enabledCellFormatter.test.js
@@ -139,6 +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/PF4/TableIndexPage/TableIndexPage.js
 - webpack/__mocks__/foremanReact/components/Pagination/index.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
 - webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js

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

@@ -1,63 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { translate as __ } from 'foremanReact/common/I18n';
-import DefaultEmptyState from 'foremanReact/components/common/EmptyState';
-
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
-
-import WebhookCreateModal from '../WebhookCreateModal';
-import { WEBHOOK_CREATE_MODAL_ID } from '../../../constants';
-
-const EmptyWebhooksIndexPage = ({
-  search,
-  reloadWithSearch,
-  message: { type, text },
-}) => {
-  const {
-    setModalOpen: setCreateModalOpen,
-    setModalClosed: setCreateModalClosed,
-  } = useForemanModal({
-    id: WEBHOOK_CREATE_MODAL_ID,
-  });
-
-  return (
-    <>
-      <WebhookCreateModal
-        onSuccess={() => {
-          setCreateModalClosed();
-          reloadWithSearch(search);
-        }}
-        onCancel={setCreateModalClosed}
-      />
-      <DefaultEmptyState
-        icon={type === 'error' ? 'error-circle-o' : 'add-circle-o'}
-        header={type === 'error' ? __('Error') : __('No Results')}
-        description={text}
-        documentation={null}
-        action={{
-          title: __('Create Webhook'),
-          onClick: () => setCreateModalOpen(),
-        }}
-      />
-    </>
-  );
-};
-
-EmptyWebhooksIndexPage.propTypes = {
-  message: PropTypes.shape({
-    type: PropTypes.oneOf(['empty', 'error']),
-    text: PropTypes.string,
-  }),
-  search: PropTypes.string,
-  reloadWithSearch: PropTypes.func.isRequired,
-};
-
-EmptyWebhooksIndexPage.defaultProps = {
-  message: {
-    type: 'empty',
-    text: __('Try to create a new Webhook'),
-  },
-  search: '',
-};
-
-export default EmptyWebhooksIndexPage;