foreman-tasks 1.1.2 → 2.0.2

data/webpack/ForemanTasks/Components/common/ClickConfirmation/ClickConfirmation.test.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import { testComponentSnapshotsWithFixtures, mount } from '@theforeman/test';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { ClickConfirmation } from './';
+
+const fixtures = {
+  render: {
+    title: 'some-title',
+    confirmType: 'danger',
+    body: 'some-body',
+    confirmationMessage: 'some-message',
+    id: 'some-id',
+    confirmAction: 'some-confirm',
+    onClick: jest.fn(),
+  },
+};
+
+describe('ClickConfirmation', () => {
+  testComponentSnapshotsWithFixtures(ClickConfirmation, fixtures);
+  it('enable button on checkbox click', () => {
+    const component = mount(<ClickConfirmation {...fixtures.render} />);
+    const getButton = () => component.find('.confirm-button').at(0);
+    expect(getButton().props().disabled).toBeTruthy();
+    const checkbox = component.find('input').at(0);
+    checkbox.simulate('change', { target: { checked: true } });
+    expect(getButton().props().disabled).toBeFalsy();
+  });
+
+  it('click test', () => {
+    const setModalClosed = jest.fn();
+    useForemanModal.mockImplementation(id => ({
+      setModalClosed: () => setModalClosed(id),
+    }));
+    const onClick = jest.fn();
+    const props = { ...fixtures.render, onClick };
+    const component = mount(<ClickConfirmation {...props} />);
+    const getButton = () => component.find('.confirm-button').at(0);
+    const checkbox = component.find('input').at(0);
+    checkbox.simulate('change', { target: { checked: true } });
+    getButton().simulate('click');
+    expect(onClick).toBeCalled();
+    expect(setModalClosed).toBeCalledWith({ id: fixtures.render.id });
+  });
+});

data/webpack/ForemanTasks/Components/common/ClickConfirmation/__snapshots__/ClickConfirmation.test.js.snap

@@ -0,0 +1,52 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ClickConfirmation render 1`] = `
+<ForemanModal
+  id="some-id"
+>
+  <Component>
+    <span
+      className="glyphicon glyphicon-exclamation-sign"
+    />
+     some-title
+  </Component>
+  <span>
+    some-body
+  </span>
+  <div
+    className="confirmation-check"
+  >
+    <input
+      checked={false}
+      onChange={[Function]}
+      type="checkbox"
+    />
+    <span>
+       some-message
+    </span>
+  </div>
+  <Component>
+    <Button
+      active={false}
+      block={false}
+      bsClass="btn"
+      bsStyle="danger"
+      className="confirm-button"
+      disabled={true}
+      onClick={[Function]}
+    >
+      some-confirm
+    </Button>
+    <Button
+      active={false}
+      block={false}
+      bsClass="btn"
+      bsStyle="default"
+      disabled={false}
+      onClick={[MockFunction]}
+    >
+      Cancel
+    </Button>
+  </Component>
+</ForemanModal>
+`;

data/webpack/ForemanTasks/Components/common/ClickConfirmation/index.js

@@ -1,82 +1,75 @@
-import { Modal, Button } from 'patternfly-react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import React from 'react';
+import { Button } from 'patternfly-react';
+import ForemanModal from 'foremanReact/components/ForemanModal';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import './ClickConfirmation.scss';
 
-export class ClickConfirmation extends React.Component {
-  state = { disableConfirm: true };
-  render() {
-    const { disableConfirm } = this.state;
-    const {
-      title,
-      body,
-      confirmationMessage,
-      confirmAction,
-      path,
-      confirmType,
-      closeModal,
-      showModal,
-    } = this.props;
-    const icon = confirmType === 'warning' ? confirmType : 'exclamation';
-    return (
-      <Modal show={showModal} onHide={closeModal}>
-        <Modal.Header>
-          <Button
-            className="close"
-            onClick={closeModal}
-            aria-hidden="true"
-            aria-label="Close"
-          >
-            &times;
-          </Button>
-          <Modal.Title>
-            <span className={`glyphicon glyphicon-${icon}-sign`} />
-            {` ${title}`}
-          </Modal.Title>
-        </Modal.Header>
-        <Modal.Body>
-          {body}
-          <div>
-            <input
-              onChange={e => {
-                this.setState({
-                  disableConfirm: !e.target.checked,
-                });
-              }}
-              type="checkbox"
-            />
-            {` ${confirmationMessage}`}
-          </div>
-        </Modal.Body>
-        <Modal.Footer>
-          <Button onClick={closeModal}>{__('Cancel')}</Button>
-          <Button
-            href={path}
-            data-method="post"
-            bsStyle={confirmType}
-            disabled={disableConfirm}
-          >
-            {confirmAction}
-          </Button>
-        </Modal.Footer>
-      </Modal>
-    );
-  }
-}
+export const ClickConfirmation = ({
+  title,
+  confirmType,
+  body,
+  confirmationMessage,
+  id,
+  confirmAction,
+  onClick,
+}) => {
+  const [isConfirmed, setConfirm] = useState(false);
+  const { setModalClosed, modalOpen } = useForemanModal({
+    id,
+  });
+  useEffect(() => {
+    setConfirm(false);
+  }, [modalOpen]);
+  const icon = confirmType === 'warning' ? confirmType : 'exclamation';
+
+  return (
+    <ForemanModal id={id}>
+      <ForemanModal.Header>
+        <span className={`glyphicon glyphicon-${icon}-sign`} />
+        {` ${title}`}
+      </ForemanModal.Header>
+      <span>{body}</span>
+      <div className="confirmation-check">
+        <input
+          onChange={e => {
+            setConfirm(e.target.checked);
+          }}
+          checked={isConfirmed}
+          type="checkbox"
+        />
+        <span>{` ${confirmationMessage}`}</span>
+      </div>
+      <ForemanModal.Footer>
+        <Button
+          className="confirm-button"
+          onClick={() => {
+            onClick();
+            setModalClosed();
+          }}
+          bsStyle={confirmType}
+          disabled={!isConfirmed}
+        >
+          {confirmAction}
+        </Button>
+        <Button onClick={setModalClosed}>{__('Cancel')}</Button>
+      </ForemanModal.Footer>
+    </ForemanModal>
+  );
+};
 
 ClickConfirmation.propTypes = {
-  showModal: PropTypes.bool,
   title: PropTypes.string.isRequired,
   body: PropTypes.string.isRequired,
   confirmationMessage: PropTypes.string.isRequired,
   confirmAction: PropTypes.string.isRequired,
-  path: PropTypes.string.isRequired,
+  onClick: PropTypes.func.isRequired,
   confirmType: PropTypes.oneOf(['warning', 'danger']),
-  closeModal: PropTypes.func.isRequired,
+  id: PropTypes.string.isRequired,
 };
 
 ClickConfirmation.defaultProps = {
-  showModal: false,
   confirmType: 'warning',
 };
 

data/webpack/ForemanTasks/Components/common/ToastsHelpers/index.js

@@ -0,0 +1,15 @@
+import { TOAST_TYPES } from './ToastTypesConstants';
+
+export const successToastData = message => ({
+  type: TOAST_TYPES.SUCCESS,
+  message,
+});
+export const errorToastData = message => ({ type: TOAST_TYPES.ERROR, message });
+export const warningToastData = message => ({
+  type: TOAST_TYPES.WARNING,
+  message,
+});
+export const infoToastData = message => ({
+  type: TOAST_TYPES.INFO,
+  message,
+});

data/webpack/ForemanTasks/ForemanTasksReducers.js

@@ -2,12 +2,14 @@ import { combineReducers } from 'redux';
 import { reducers as tasksDashboardReducers } from './Components/TasksDashboard';
 import { reducers as taskDetailsReducers } from './Components/TaskDetails';
 import { reducers as tasksTableReducers } from './Components/TasksTable';
+import { reducers as confirmModalReducers } from './Components/TasksTable/Components/ConfirmModal';
 
 const reducers = {
   foremanTasks: combineReducers({
     ...tasksDashboardReducers,
     ...taskDetailsReducers,
     ...tasksTableReducers,
+    ...confirmModalReducers,
   }),
 };
 

data/webpack/ForemanTasks/Routes/ForemanTasksRoutes.test.js

@@ -6,7 +6,8 @@ import ForemanTasksRoutes from './ForemanTasksRoutes';
 describe('ForemanTasksRoutes', () => {
   it('should create routes', () => {
     Object.entries(ForemanTasksRoutes).forEach(([key, Route]) => {
-      const component = shallow(<Route.render history={{}} some="props" />);
+      const RouteRender = Route.render;
+      const component = shallow(<RouteRender history={{}} some="props" />);
       Route.renderResult = component;
     });
 

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

@@ -2,9 +2,9 @@ const modalOpen = true;
 const setModalOpen = jest.fn();
 const setModalClosed = jest.fn();
 
-export const useForemanModal = () => ({
+export const useForemanModal = jest.fn(() => ({
   modalOpen,
   setModalOpen,
   setModalClosed,
-});
+}));
 export default useForemanModal;

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

@@ -1,4 +1,18 @@
-const ForemanModal = () => jest.fn();
-ForemanModal.Header = () => jest.fn();
-ForemanModal.Footer = () => jest.fn();
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const ForemanModal = ({ children }) => <div className="modal">{children}</div>;
+ForemanModal.Header = ({ children }) => (
+  <div className="modal-header">{children}</div>
+);
+ForemanModal.Footer = ({ children }) => (
+  <div className="modal-footer">{children}</div>
+);
+
+ForemanModal.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+ForemanModal.Header.propTypes = ForemanModal.propTypes;
+ForemanModal.Footer.propTypes = ForemanModal.propTypes;
+
 export default ForemanModal;

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

@@ -0,0 +1,3 @@
+import React from 'react';
+
+export const ActionButtons = props => <button>{JSON.stringify(props)}</button>;

data/webpack/__mocks__/foremanReact/{API.js → redux/API.js}

@@ -1,4 +1,4 @@
-export default {
+export const API = {
   get: jest.fn(),
   put: jest.fn(),
   post: jest.fn(),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -200,6 +200,7 @@ files:
 - app/services/ui_notifications/tasks.rb
 - app/services/ui_notifications/tasks/task_bulk_cancel.rb
 - app/services/ui_notifications/tasks/task_bulk_resume.rb
+- app/services/ui_notifications/tasks/task_bulk_stop.rb
 - app/services/ui_notifications/tasks/task_paused_admin.rb
 - app/services/ui_notifications/tasks/task_paused_owner.rb
 - app/views/common/_trigger_form.html.erb
@@ -245,6 +246,8 @@ files:
 - db/migrate/20180927120509_add_user_id.foreman_tasks.rb
 - db/migrate/20181019135324_add_remote_task_operation.rb
 - db/migrate/20190318153925_add_task_state_updated_at.foreman_tasks.rb
+- db/migrate/20200517215015_rename_bookmarks_controller.rb
+- db/migrate/20200519093217_drop_dynflow_allow_dangerous_actions_setting.foreman_tasks.rb
 - db/migrate/20200611090846_add_task_lock_index_on_resource_type_and_task_id.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/30-notification_blueprints.rb
@@ -280,7 +283,14 @@ files:
 - locale/en/LC_MESSAGES/foreman_tasks.mo
 - locale/en/foreman_tasks.po
 - locale/foreman_tasks.pot
+- locale/fr/LC_MESSAGES/foreman_tasks.mo
+- locale/fr/foreman_tasks.po
+- locale/ja/LC_MESSAGES/foreman_tasks.mo
+- locale/ja/foreman_tasks.po
+- locale/zh_CN/LC_MESSAGES/foreman_tasks.mo
+- locale/zh_CN/foreman_tasks.po
 - package.json
+- script/npm_link_foreman_js.sh
 - script/rails
 - script/travis_run_js_tests.sh
 - test/controllers/api/recurring_logics_controller_test.rb
@@ -329,6 +339,15 @@ files:
 - test/unit/troubleshooting_help_generator_test.rb
 - test/unit/ui_notifications_test.rb
 - webpack/ForemanTasks/Components/Chart/Chart.js
+- webpack/ForemanTasks/Components/TaskActions/TaskAction.test.js
+- webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js
+- webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.test.js
+- webpack/ForemanTasks/Components/TaskActions/TaskActionsConstants.js
+- webpack/ForemanTasks/Components/TaskActions/UnlockModals.js
+- webpack/ForemanTasks/Components/TaskActions/UnlockModals.test.js
+- webpack/ForemanTasks/Components/TaskActions/__snapshots__/TaskAction.test.js.snap
+- webpack/ForemanTasks/Components/TaskActions/__snapshots__/UnlockModals.test.js.snap
+- webpack/ForemanTasks/Components/TaskActions/index.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Errors.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Raw.js
@@ -357,6 +376,7 @@ files:
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetailsReducer.js
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js
 - webpack/ForemanTasks/Components/TaskDetails/TasksDetailsHelper.js
+- webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.fixtures.js
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetails.test.js
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsActions.test.js
 - webpack/ForemanTasks/Components/TaskDetails/__tests__/TaskDetailsReducer.test.js
@@ -438,23 +458,26 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionSelectButton.js
-- webpack/ForemanTasks/Components/TasksTable/Components/CancelConfirm.js
-- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmationModals.js
-- webpack/ForemanTasks/Components/TasksTable/Components/ResumeConfirm.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModal.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModalActions.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModalReducer.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModalSelectors.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModal.test.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModalActions.test.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModalReducer.test.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/ConfirmModalSelectors.test.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/__snapshots__/ConfirmModal.test.js.snap
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/__snapshots__/ConfirmModalReducer.test.js.snap
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/__test__/__snapshots__/ConfirmModalSelectors.test.js.snap
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js
 - webpack/ForemanTasks/Components/TasksTable/Components/TableSelectionCell.js
 - webpack/ForemanTasks/Components/TasksTable/Components/TableSelectionHeaderCell.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/ActionSelectButton.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/CancelConfirm.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/ConfirmationModals.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/ResumeConfirm.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/SelectAllAlert.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/TableSelectionCell.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/TableSelectionHeaderCell.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionSelectButton.test.js.snap
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/CancelConfirm.test.js.snap
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ConfirmationModals.test.js.snap
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ResumeConfirm.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/SelectAllAlert.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/TableSelectionCell.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/TableSelectionHeaderCell.test.js.snap
@@ -462,7 +485,6 @@ files:
 - webpack/ForemanTasks/Components/TasksTable/TasksBulkActions.js
 - webpack/ForemanTasks/Components/TasksTable/TasksIndexPage.js
 - webpack/ForemanTasks/Components/TasksTable/TasksTable.js
-- webpack/ForemanTasks/Components/TasksTable/TasksTableActionHelpers.js
 - webpack/ForemanTasks/Components/TasksTable/TasksTableActions.js
 - webpack/ForemanTasks/Components/TasksTable/TasksTableConstants.js
 - webpack/ForemanTasks/Components/TasksTable/TasksTableHelpers.js
@@ -476,7 +498,6 @@ files:
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksIndexPage.test.js
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTable.fixtures.js
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTable.test.js
-- webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTableActionHelpers.test.js
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTableActions.test.js
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTableHelpers.test.js
 - webpack/ForemanTasks/Components/TasksTable/__tests__/TasksTablePage.test.js
@@ -510,15 +531,13 @@ files:
 - webpack/ForemanTasks/Components/TasksTable/index.js
 - webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js
 - webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js
-- webpack/ForemanTasks/Components/common/ActionButtons/CancelButton.js
-- webpack/ForemanTasks/Components/common/ActionButtons/CancelButton.test.js
-- webpack/ForemanTasks/Components/common/ActionButtons/ResumeButton.js
-- webpack/ForemanTasks/Components/common/ActionButtons/ResumeButton.test.js
 - webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ActionButton.test.js.snap
-- webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/CancelButton.test.js.snap
-- webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ResumeButton.test.js.snap
+- webpack/ForemanTasks/Components/common/ClickConfirmation/ClickConfirmation.scss
+- webpack/ForemanTasks/Components/common/ClickConfirmation/ClickConfirmation.test.js
+- webpack/ForemanTasks/Components/common/ClickConfirmation/__snapshots__/ClickConfirmation.test.js.snap
 - webpack/ForemanTasks/Components/common/ClickConfirmation/index.js
-- webpack/ForemanTasks/Components/common/ToastTypesConstants.js
+- webpack/ForemanTasks/Components/common/ToastsHelpers/ToastTypesConstants.js
+- webpack/ForemanTasks/Components/common/ToastsHelpers/index.js
 - webpack/ForemanTasks/ForemanTasks.js
 - webpack/ForemanTasks/ForemanTasks.test.js
 - webpack/ForemanTasks/ForemanTasksReducers.js
@@ -536,7 +555,6 @@ files:
 - webpack/ForemanTasks/Routes/__snapshots__/ForemanTasksRoutes.test.js.snap
 - webpack/ForemanTasks/__snapshots__/ForemanTasks.test.js.snap
 - webpack/ForemanTasks/index.js
-- webpack/__mocks__/foremanReact/API.js
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/common/urlHelpers.js
@@ -545,12 +563,14 @@ files:
 - webpack/__mocks__/foremanReact/components/ForemanModal/index.js
 - webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
+- webpack/__mocks__/foremanReact/components/common/ActionButtons/ActionButtons.js
 - webpack/__mocks__/foremanReact/components/common/MessageBox.js
 - webpack/__mocks__/foremanReact/components/common/dates/LongDateTime.js
 - webpack/__mocks__/foremanReact/components/common/dates/RelativeDateTime.js
 - webpack/__mocks__/foremanReact/components/common/table.js
 - webpack/__mocks__/foremanReact/components/common/table/actionsHelpers/actionTypeCreator.js
 - webpack/__mocks__/foremanReact/constants.js
+- webpack/__mocks__/foremanReact/redux/API.js
 - webpack/__mocks__/foremanReact/redux/actions/toasts.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
 - webpack/__mocks__/foremanReact/routes/common/PageLayout/components/ExportButton/ExportButton.js