foreman_webhooks 3.1.1 → 3.2.0

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

@@ -0,0 +1,20 @@
+import React from 'react';
+import { cellFormatter } from 'foremanReact/components/common/table';
+import { ActionButton } from '../ActionButtons/ActionButton';
+
+const actionCellFormatter = webhookActions => (
+  _,
+  { rowData: { id, name, canEdit, canDelete } }
+) =>
+  cellFormatter(
+    canEdit && (
+      <ActionButton
+        canDelete={canDelete}
+        id={id}
+        name={name}
+        webhookActions={webhookActions}
+      />
+    )
+  );
+
+export default actionCellFormatter;

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

@@ -1,2 +1,3 @@
 export { default as enabledCellFormatter } from './enabledCellFormatter';
 export { default as nameToEditFormatter } from './nameToEditFormatter';
+export { default as actionCellFormatter } from './actionCellFormatter';

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

@@ -10,6 +10,7 @@ import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanMod
 
 import WebhookDeleteModal from '../WebhookDeleteModal';
 import WebhookEditModal from '../WebhookEditModal';
+import WebhookTestModal from '../WebhookTestModal';
 import EmptyWebhooksTable from './Components/EmptyWebhooksTable';
 
 import createWebhooksTableSchema from './WebhooksTableSchema';
@@ -32,10 +33,11 @@ import {
 const WebhooksTable = ({
   fetchAndPush,
   toDelete,
-  onDeleteClick,
+  toTest,
   toEdit,
   onEditClick,
   reloadWithSearch,
+  webhookActions,
 }) => {
   const webhooks = useSelector(selectWebhooks);
   const page = useSelector(selectPage);
@@ -75,13 +77,14 @@ const WebhooksTable = ({
         }}
         onCancel={setEditModalClosed}
       />
+      <WebhookTestModal toTest={toTest} />
       <Table
         key="webhooks-table"
         columns={createWebhooksTableSchema(
           fetchAndPush,
           sort.by,
           sort.order,
-          onDeleteClick,
+          webhookActions,
           onEditClick
         )}
         rows={webhooks}
@@ -94,11 +97,12 @@ const WebhooksTable = ({
 
 WebhooksTable.propTypes = {
   fetchAndPush: PropTypes.func.isRequired,
-  onDeleteClick: PropTypes.func.isRequired,
   onEditClick: PropTypes.func.isRequired,
   toDelete: PropTypes.object.isRequired,
+  toTest: PropTypes.object.isRequired,
   toEdit: PropTypes.number.isRequired,
   reloadWithSearch: PropTypes.func.isRequired,
+  webhookActions: PropTypes.object.isRequired,
 };
 
 export default WebhooksTable;

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

@@ -3,13 +3,12 @@ import {
   column,
   sortableColumn,
   headerFormatterWithProps,
-  deleteActionCellFormatter,
-  cellFormatter,
 } from 'foremanReact/components/common/table';
 
 import {
   enabledCellFormatter,
   nameToEditFormatter,
+  actionCellFormatter,
 } from './Components/Formatters';
 
 const sortControllerFactory = (apiCall, sortBy, sortOrder) => ({
@@ -24,7 +23,7 @@ const createWebhooksTableSchema = (
   apiCall,
   by,
   order,
-  onDeleteClick,
+  webhookActions,
   onEditClick
 ) => {
   const sortController = sortControllerFactory(apiCall, by, order);
@@ -41,7 +40,7 @@ const createWebhooksTableSchema = (
       'actions',
       __('Actions'),
       [headerFormatterWithProps],
-      [deleteActionCellFormatter(onDeleteClick), cellFormatter]
+      [actionCellFormatter(webhookActions)]
     ),
   ];
 };

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

@@ -11,6 +11,7 @@ const props = {
   onDeleteClick: jest.fn(),
   setToDelete: jest.fn(),
   setToEdit: jest.fn(),
+  setToTest: jest.fn(),
   reloadWithSearch: jest.fn(),
   itemCount: 0,
   canCreate: true,
@@ -20,6 +21,7 @@ const props = {
     perPage: 20,
   },
   toDelete: {},
+  toTest: {},
   toEdit: 0,
 };
 

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

@@ -10,6 +10,7 @@ exports[`WebhooksTable rendering should render when loading 1`] = `
   itemCount={0}
   onDeleteClick={[MockFunction]}
   onEditClick={[Function]}
+  onTestClick={[Function]}
   page={5}
   pagination={
     Object {
@@ -29,6 +30,13 @@ exports[`WebhooksTable rendering should render when loading 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
+  toTest={Object {}}
+  webhookActions={
+    Object {
+      "deleteWebhook": [Function],
+      "testWebhook": [Function],
+    }
+  }
 />
 `;
 
@@ -48,6 +56,7 @@ exports[`WebhooksTable rendering should render with error 1`] = `
   }
   onDeleteClick={[MockFunction]}
   onEditClick={[Function]}
+  onTestClick={[Function]}
   page={5}
   pagination={
     Object {
@@ -67,6 +76,13 @@ exports[`WebhooksTable rendering should render with error 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
+  toTest={Object {}}
+  webhookActions={
+    Object {
+      "deleteWebhook": [Function],
+      "testWebhook": [Function],
+    }
+  }
 />
 `;
 
@@ -80,6 +96,7 @@ exports[`WebhooksTable rendering should render with no data 1`] = `
   itemCount={0}
   onDeleteClick={[MockFunction]}
   onEditClick={[Function]}
+  onTestClick={[Function]}
   page={5}
   pagination={
     Object {
@@ -99,6 +116,13 @@ exports[`WebhooksTable rendering should render with no data 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
+  toTest={Object {}}
+  webhookActions={
+    Object {
+      "deleteWebhook": [Function],
+      "testWebhook": [Function],
+    }
+  }
 />
 `;
 
@@ -112,6 +136,7 @@ exports[`WebhooksTable rendering should render with webhooks 1`] = `
   itemCount={2}
   onDeleteClick={[MockFunction]}
   onEditClick={[Function]}
+  onTestClick={[Function]}
   page={5}
   pagination={
     Object {
@@ -150,5 +175,12 @@ exports[`WebhooksTable rendering should render with webhooks 1`] = `
   }
   toDelete={Object {}}
   toEdit={0}
+  toTest={Object {}}
+  webhookActions={
+    Object {
+      "deleteWebhook": [Function],
+      "testWebhook": [Function],
+    }
+  }
 />
 `;

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

@@ -7,6 +7,7 @@ import WebhooksTable from './WebhooksTable';
 import {
   WEBHOOK_DELETE_MODAL_ID,
   WEBHOOK_EDIT_MODAL_ID,
+  WEBHOOK_TEST_MODAL_ID,
 } from '../../../constants';
 
 const WrappedWebhooksTable = props => {
@@ -18,7 +19,11 @@ const WrappedWebhooksTable = props => {
     id: WEBHOOK_EDIT_MODAL_ID,
   });
 
-  const { setToDelete, setToEdit, ...rest } = props;
+  const { setModalOpen: setTestModalOpen } = useForemanModal({
+    id: WEBHOOK_TEST_MODAL_ID,
+  });
+
+  const { setToDelete, setToEdit, setToTest, ...rest } = props;
 
   const onDeleteClick = rowData => {
     setToDelete(rowData);
@@ -30,10 +35,25 @@ const WrappedWebhooksTable = props => {
     setEditModalOpen();
   };
 
+  const onTestClick = rowData => {
+    setToTest(rowData);
+    setTestModalOpen();
+  };
+
+  const webhookActions = {
+    deleteWebhook: (id, name) => {
+      onDeleteClick({ id, name });
+    },
+    testWebhook: (id, name) => {
+      onTestClick({ id, name });
+    },
+  };
+
   return (
     <WebhooksTable
-      onDeleteClick={onDeleteClick}
       onEditClick={onEditClick}
+      onTestClick={onTestClick}
+      webhookActions={webhookActions}
       {...rest}
     />
   );
@@ -42,6 +62,7 @@ const WrappedWebhooksTable = props => {
 WrappedWebhooksTable.propTypes = {
   setToDelete: PropTypes.func.isRequired,
   setToEdit: PropTypes.func.isRequired,
+  setToTest: PropTypes.func.isRequired,
 };
 
 export default WrappedWebhooksTable;

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

@@ -24,6 +24,7 @@ const WebhooksIndexPage = () => {
   const search = useSelector(selectSearch);
 
   const [toDelete, setToDelete] = useState({});
+  const [toTest, setToTest] = useState({});
   const [toEdit, setToEdit] = useState(0);
 
   const {
@@ -55,6 +56,8 @@ const WebhooksIndexPage = () => {
           setToDelete={setToDelete}
           toEdit={toEdit}
           setToEdit={setToEdit}
+          toTest={toTest}
+          setToTest={setToTest}
           reloadWithSearch={query => dispatch(reloadWithSearch(query))}
         />
       </TableIndexPage>

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

@@ -18,3 +18,4 @@ export const WEBHOOK_EVENTS_API_REQUEST_KEY = 'WEBHOOK_EVENTS';
 export const WEBHOOK_CREATE_MODAL_ID = 'webhookCreateModal';
 export const WEBHOOK_EDIT_MODAL_ID = 'webhookEditModal';
 export const WEBHOOK_DELETE_MODAL_ID = 'webhookDeleteModal';
+export const WEBHOOK_TEST_MODAL_ID = 'webhookTestModal';

data/webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const ActionButtons = () => <div />;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,12 +48,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/foreman_webhooks/locale/ca/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/cs_CZ/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/de/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/en/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/en_GB/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/es/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/fr/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/it/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/ja/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/ka/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/ko/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/pl/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/pt_BR/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/ru/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/zh_CN/foreman_webhooks.js
+- app/assets/javascripts/foreman_webhooks/locale/zh_TW/foreman_webhooks.js
 - app/controllers/api/v2/webhook_templates_controller.rb
 - app/controllers/api/v2/webhooks_controller.rb
 - app/controllers/concerns/foreman_webhooks/controller/parameters/webhook.rb
 - app/controllers/concerns/foreman_webhooks/controller/parameters/webhook_template.rb
 - app/controllers/webhook_templates_controller.rb
 - app/controllers/webhooks_controller.rb
+- app/graphql/foreman_webhooks/types/webhook.rb
+- app/graphql/foreman_webhooks/types/webhook_template.rb
 - app/jobs/foreman_webhooks/deliver_webhook_job.rb
 - app/lib/foreman_webhooks/renderer/scope/webhook_template.rb
 - app/models/concerns/foreman_webhooks/taxonomy_extensions.rb
@@ -102,12 +120,47 @@ files:
 - lib/foreman_webhooks/engine.rb
 - lib/foreman_webhooks/version.rb
 - lib/tasks/foreman_webhooks_tasks.rake
+- locale/ca/LC_MESSAGES/foreman_webhooks.mo
+- locale/ca/foreman_webhooks.po
+- locale/cs_CZ/LC_MESSAGES/foreman_webhooks.mo
+- locale/cs_CZ/foreman_webhooks.po
+- locale/de/LC_MESSAGES/foreman_webhooks.mo
+- locale/de/foreman_webhooks.po
+- locale/en/LC_MESSAGES/foreman_webhooks.mo
+- locale/en/foreman_webhooks.po
+- locale/en_GB/LC_MESSAGES/foreman_webhooks.mo
+- locale/en_GB/foreman_webhooks.po
+- locale/es/LC_MESSAGES/foreman_webhooks.mo
+- locale/es/foreman_webhooks.po
+- locale/fr/LC_MESSAGES/foreman_webhooks.mo
+- locale/fr/foreman_webhooks.po
+- locale/it/LC_MESSAGES/foreman_webhooks.mo
+- locale/it/foreman_webhooks.po
+- locale/ja/LC_MESSAGES/foreman_webhooks.mo
+- locale/ja/foreman_webhooks.po
+- locale/ka/LC_MESSAGES/foreman_webhooks.mo
+- locale/ka/foreman_webhooks.po
+- locale/ko/LC_MESSAGES/foreman_webhooks.mo
+- locale/ko/foreman_webhooks.po
+- locale/pl/LC_MESSAGES/foreman_webhooks.mo
+- locale/pl/foreman_webhooks.po
+- locale/pt_BR/LC_MESSAGES/foreman_webhooks.mo
+- locale/pt_BR/foreman_webhooks.po
+- locale/ru/LC_MESSAGES/foreman_webhooks.mo
+- locale/ru/foreman_webhooks.po
+- locale/zh_CN/LC_MESSAGES/foreman_webhooks.mo
+- locale/zh_CN/foreman_webhooks.po
+- locale/zh_TW/LC_MESSAGES/foreman_webhooks.mo
+- locale/zh_TW/foreman_webhooks.po
 - package.json
 - test/controllers/api/v2/webhook_templates_controller_test.rb
 - test/controllers/api/v2/webhooks_controller_test.rb
 - test/factories/webhook.rb
-- test/factories/webhook_target.rb
 - test/factories/webhook_template.rb
+- test/graphql/foreman_webhooks/queries/webhook_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhook_template_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhook_templates_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhooks_query_test.rb
 - test/jobs/foreman_webhooks/deliver_webhook_job_test.rb
 - test/models/webhook_test.rb
 - test/test_plugin_helper.rb
@@ -127,10 +180,13 @@ files:
 - 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/WebhookTestModal.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/ActionButtons/ActionButton.js
 - 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
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/actionCellFormatter.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/enabledCellFormatter.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/index.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/nameToEditFormatter.js
@@ -169,6 +225,7 @@ files:
 - 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/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
 - webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
 - webpack/__mocks__/foremanReact/components/common/forms/FormField.js
@@ -211,12 +268,15 @@ test_files:
 - test/controllers/api/v2/webhook_templates_controller_test.rb
 - test/controllers/api/v2/webhooks_controller_test.rb
 - test/factories/webhook.rb
-- test/factories/webhook_target.rb
 - 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
+- test/graphql/foreman_webhooks/queries/webhook_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhook_template_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhook_templates_query_test.rb
+- test/graphql/foreman_webhooks/queries/webhooks_query_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

data/test/factories/webhook_target.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :webhook_target do
-    sequence(:name) { |n| "Webhook Target #{n}" }
-    target_url { 'https://hook.example.com/api/callback' }
-    events { ['subnet_created.event.foreman'] }
-  end
-end