foreman_webhooks 1.0.0 → 1.1.0

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

@@ -3,7 +3,9 @@ import WebhooksIndexPage from '../WebhooksIndexPage';
 
 const fixtures = {
   'render with minimal props': {
-    fetchAndPush: () => {},
+    fetchAndPush: jest.fn(),
+    reloadWithSearch: jest.fn(),
+    handleCreateSubmit: jest.fn(),
     isLoading: false,
     hasError: false,
     hasData: false,

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

@@ -1,68 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`WebhooksIndexPage redering render with minimal props 1`] = `
-<PageLayout
-  header="Webhooks"
+<WebhooksIndexPage
+  canCreate={true}
+  fetchAndPush={[MockFunction]}
+  handleCreateSubmit={[MockFunction]}
+  hasData={false}
+  hasError={false}
   isLoading={false}
-  onBookmarkClick={[Function]}
-  onSearch={[Function]}
-  searchProps={
+  itemCount={0}
+  message={
     Object {
-      "autocomplete": Object {
-        "id": "searchBar",
-        "searchQuery": "",
-        "url": "webhooks/auto_complete_search",
-        "useKeyShortcuts": true,
-      },
-      "bookmarks": Object {
-        "canCreateBookmarks": true,
-        "documentationUrl": "4.1.5Searching",
-        "url": "/api/bookmarks",
-      },
-      "controller": "webhooks",
+      "text": "Try to create a new Webhook",
+      "type": "empty",
     }
   }
-  searchQuery=""
-  searchable={true}
-  toastNotifications={Array []}
-  toolbarButtons={
-    <ForwardRef
-      to=""
-    >
-      <Button
-        active={false}
-        block={false}
-        bsClass="btn"
-        bsStyle="primary"
-        disabled={false}
-      >
-        Create Webhook
-      </Button>
-    </ForwardRef>
-  }
->
-  <WrappedWebhooksTable
-    fetchAndPush={[Function]}
-    hasData={false}
-    hasError={false}
-    isLoading={false}
-    itemCount={0}
-    message={
-      Object {
-        "text": "Try to create a new Webhook",
-        "type": "empty",
-      }
-    }
-    pagination={
-      Object {
-        "page": null,
-        "perPage": null,
-      }
-    }
-    results={Array []}
-    setToDelete={[Function]}
-    sort={Object {}}
-    toDelete={Object {}}
-  />
-</PageLayout>
+  page={null}
+  perPage={null}
+  reloadWithSearch={[MockFunction]}
+  search=""
+  sort={Object {}}
+  toasts={Array []}
+  webhooks={Array []}
+/>
 `;

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

@@ -0,0 +1,43 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`WebhooksIndexPage - Integration Test should flow: initial state 1`] = `
+Object {
+  "action": Array [
+    Array [
+      Object {
+        "key": "WEBHOOKS",
+        "params": Object {
+          "order": "",
+          "page": 1,
+          "per_page": 20,
+          "search": "",
+        },
+        "type": "get-some-type",
+        "url": "/api/v2/webhooks?include_permissions=true",
+      },
+    ],
+  ],
+  "state": Object {},
+}
+`;
+
+exports[`WebhooksIndexPage - Integration Test should flow: rendered 1`] = `
+Object {
+  "action": Array [
+    Array [
+      Object {
+        "key": "WEBHOOKS",
+        "params": Object {
+          "order": "",
+          "page": 1,
+          "per_page": 20,
+          "search": "",
+        },
+        "type": "get-some-type",
+        "url": "/api/v2/webhooks?include_permissions=true",
+      },
+    ],
+  ],
+  "state": Object {},
+}
+`;

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

@@ -0,0 +1,34 @@
+import React from 'react';
+import { IntegrationTestHelper } from '@theforeman/test';
+import { Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
+
+import ConnectedWebhooksIndexPage from '../index';
+
+import * as selectors from '../../WebhooksPageSelectors';
+import * as editSelectors from '../Components/WebhookEditModalSelectors';
+import { spySelector, spyEditSelector } from './WebhooksIndexPage.fixtures';
+
+spySelector(selectors);
+spyEditSelector(editSelectors);
+
+describe('WebhooksIndexPage - Integration Test', () => {
+  it('should flow', () => {
+    const history = createMemoryHistory();
+    history.push({ pathname: '/webhooks', search: '' });
+
+    const integrationTestHelper = new IntegrationTestHelper();
+
+    const component = integrationTestHelper.mount(
+      <Router history={history}>
+        <ConnectedWebhooksIndexPage history={history} />
+      </Router>
+    );
+    integrationTestHelper.takeStoreAndLastActionSnapshot('rendered');
+
+    expect(component.exists('WebhooksTable')).toEqual(true);
+    expect(component.exists('WebhookCreateModal')).toEqual(true);
+
+    integrationTestHelper.takeStoreAndLastActionSnapshot('initial state');
+  });
+});

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

@@ -49,3 +49,6 @@ export const fetchAndPush = (params = {}) => (dispatch, getState) => {
     search: stringifyParams(query),
   });
 };
+
+export const reloadWithSearch = query =>
+  fetchAndPush({ searchQuery: query, page: 1 });

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

@@ -9,5 +9,15 @@ 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 WEBHOOK_DELETE_MODAL_ID = 'webhookDeleteModal';
 export const WEBHOOKS_API_REQUEST_KEY = 'WEBHOOKS';
+
+export const WEBHOOK_TEMPLATES_API_PATH =
+  '/api/v2/webhook_templates?include_permissions=true';
+export const WEBHOOKS_API_PLAIN_PATH = '/api/v2/webhooks';
+export const WEBHOOK_TEMPLATES_API_REQUEST_KEY = 'WEBHOOK_TEMPLATES';
+export const WEBHOOK_API_REQUEST_KEY = 'WEBHOOK';
+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';

data/webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js

@@ -0,0 +1 @@
+export const useForemanContext = jest.fn(() => {});

data/webpack/__mocks__/foremanReact/common/HOC.js

@@ -1,5 +1,30 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 
 export const withRenderHandler = ({ Component }) => componentProps => (
   <Component {...componentProps} />
 );
+
+export const callOnMount = callback => WrappedComponent => componentProps => {
+  callback(componentProps);
+
+  return <WrappedComponent {...componentProps} />;
+};
+
+export const callOnPopState = callback => WrappedComponent => componentProps => {
+  const didMount = useRef(false);
+  const {
+    history: {
+      action,
+      location: { search },
+    },
+  } = componentProps;
+  useEffect(() => {
+    if (action === 'POP' && didMount.current) {
+      callback(componentProps);
+    } else {
+      didMount.current = true;
+    }
+  }, [search, action, componentProps]);
+
+  return <WrappedComponent {...componentProps} />;
+};

data/webpack/__mocks__/foremanReact/common/urlHelpers.js

@@ -1 +1,8 @@
 export const getURIsearch = () => 'a=b';
+
+export const getParams = () => ({
+  page: 1,
+  perPage: 20,
+  searchQuery: '',
+  sort: {},
+});

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

@@ -10,8 +10,13 @@ ForemanModal.Footer = ({ children }) => (
 );
 
 ForemanModal.propTypes = {
-  children: PropTypes.node.isRequired,
+  children: PropTypes.node,
 };
+
+ForemanModal.defaultProps = {
+  children: [],
+};
+
 ForemanModal.Header.propTypes = ForemanModal.propTypes;
 ForemanModal.Footer.propTypes = ForemanModal.propTypes;
 

data/webpack/__mocks__/foremanReact/components/Loading/Loading.js

@@ -0,0 +1,2 @@
+const Loading = () => jest.fn();
+export default Loading;

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

@@ -0,0 +1,3 @@
+import Loading from './Loading';
+
+export default Loading;

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

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

data/webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js

@@ -0,0 +1,9 @@
+import React from 'react';
+
+const ForemanForm = () => (
+  <React.Fragment>
+    <form />
+  </React.Fragment>
+);
+
+export default ForemanForm;

data/webpack/__mocks__/foremanReact/components/common/forms/FormField.js

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

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

@@ -3,3 +3,24 @@ import React from 'react';
 export const Table = () => <div className="table" />;
 export const createTableReducer = jest.fn(controller => controller);
 export const cellFormatter = cell => cell;
+export const deleteActionCellFormatter = cell => cell;
+export const sortableColumn = jest.fn();
+export const column = (
+  property,
+  label,
+  headFormat,
+  cellFormat,
+  headProps = {},
+  cellProps = {}
+) => ({
+  property,
+  header: {
+    label,
+    props: headProps,
+    formatters: headFormat,
+  },
+  cell: {
+    props: cellProps,
+    formatters: cellFormat,
+  },
+});

data/webpack/__mocks__/foremanReact/history.js

@@ -0,0 +1,3 @@
+import { createMemoryHistory } from 'history';
+
+export const history = createMemoryHistory();

data/webpack/__mocks__/foremanReact/redux/actions/common/forms.js

@@ -0,0 +1 @@
+export const submitForm = jest.fn(() => '');

data/webpack/test_setup.js

@@ -0,0 +1,15 @@
+jest.mock('foremanReact/Root/Context/ForemanContext', () => ({
+  useForemanContext: () => ({ toasts: [] }),
+}));
+jest.mock('foremanReact/history', () => ({
+  history: {
+    action: 'PUSH',
+    listen: jest.fn(),
+    location: {
+      pathname: '/webhooks',
+      search: '',
+    },
+    push: jest.fn(),
+    replace: jest.fn(),
+  },
+}));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -87,10 +87,6 @@ files:
 - app/views/webhook_templates/edit.html.erb
 - app/views/webhook_templates/index.html.erb
 - app/views/webhook_templates/new.html.erb
-- app/views/webhooks/_form.html.erb
-- app/views/webhooks/_templates.html.erb
-- app/views/webhooks/edit.html.erb
-- app/views/webhooks/new.html.erb
 - config/routes.rb
 - db/migrate/20191016100128_create_webhook_targets.rb
 - db/migrate/20200831194208_rename_webhook_targets_to_webhooks.rb
@@ -117,13 +113,28 @@ files:
 - test/test_plugin_helper.rb
 - test/unit/foreman_webhooks/webhook_service_test.rb
 - webpack/ForemanWebhooks/Routes/ForemanWebhooksRoutes.js
-- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/EmptyWebhooksTable/index.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/ForemanFormikField.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.css
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookForm.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookFormSelectors.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js
+- 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/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/enabledCellFormatter.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/index.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/Formatters/nameToEditFormatter.js
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/NameToEditCell.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/EnabledCell.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/Components/__tests__/__snapshots__/EnabledCell.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhooksTable/WebhooksTable.js
@@ -135,6 +146,8 @@ files:
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/__snapshots__/WebhooksIndexPage.test.js.snap
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/__snapshots__/integration.test.js.snap
+- webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/integration.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/index.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageActions.js
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageHelpers.js
@@ -143,6 +156,7 @@ files:
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/__snapshots__/WebhooksPageSelectors.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/constants.js
+- webpack/__mocks__/foremanReact/Root/Context/ForemanContext.js
 - webpack/__mocks__/foremanReact/common/HOC.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
@@ -151,16 +165,23 @@ files:
 - webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalHooks.js
 - webpack/__mocks__/foremanReact/components/ForemanModal/index.js
 - 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/common/EmptyState.js
+- webpack/__mocks__/foremanReact/components/common/forms/ForemanForm.js
+- webpack/__mocks__/foremanReact/components/common/forms/FormField.js
 - webpack/__mocks__/foremanReact/components/common/table.js
 - webpack/__mocks__/foremanReact/constants.js
+- webpack/__mocks__/foremanReact/history.js
 - webpack/__mocks__/foremanReact/redux/API/APISelectors.js
 - webpack/__mocks__/foremanReact/redux/API/index.js
+- webpack/__mocks__/foremanReact/redux/actions/common/forms.js
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/index.js
 - webpack/routes_index.js
+- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman_webhooks
 licenses:
 - GPL-3.0
@@ -199,5 +220,7 @@ test_files:
 - 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/__tests__/WebhooksPageHelpers.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js
+- webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/WebhookForm.test.js