foreman-tasks 1.1.3 → 1.2.0

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>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-06-02 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,7 +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/20200611090846_add_task_lock_index_on_resource_type_and_task_id.rb
+- db/migrate/20200517215015_rename_bookmarks_controller.rb
+- db/migrate/20200519093217_drop_dynflow_allow_dangerous_actions_setting.foreman_tasks.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/30-notification_blueprints.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
@@ -267,7 +269,6 @@ files:
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/task_error.rb
 - lib/foreman_tasks/tasks/cleanup.rake
-- lib/foreman_tasks/tasks/dynflow.rake
 - lib/foreman_tasks/tasks/export_tasks.rake
 - lib/foreman_tasks/tasks/generate_task_actions.rake
 - lib/foreman_tasks/test_extensions.rb
@@ -329,6 +330,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
@@ -438,23 +448,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 +475,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 +488,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 +521,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
@@ -545,6 +554,7 @@ 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

data/db/migrate/20200611090846_add_task_lock_index_on_resource_type_and_task_id.rb

@@ -1,9 +0,0 @@
-class AddTaskLockIndexOnResourceTypeAndTaskId < ActiveRecord::Migration[5.2]
-  def change
-    add_index :foreman_tasks_locks, [:task_id, :resource_type, :resource_id], name: 'index_tasks_locks_on_task_id_resource_type_and_resource_id'
-    # These indexes are not needed as they can be gained from partial index lookups
-    [:task_id, :name, :resource_type].each do |index|
-      remove_index :foreman_tasks_locks, index if index_exists?(:foreman_tasks_locks, index)
-    end
-  end
-end

data/lib/foreman_tasks/tasks/dynflow.rake

@@ -1,6 +0,0 @@
-namespace :dynflow do
-  task :client do
-    ::ForemanTasks.dynflow.config.remote = true
-    ::ForemanTasks.dynflow.initialize!
-  end
-end

data/webpack/ForemanTasks/Components/TasksTable/Components/CancelConfirm.js

@@ -1,53 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { Button } from 'patternfly-react';
-import ForemanModal from 'foremanReact/components/ForemanModal';
-import {
-  CANCEL_CONFIRM_MODAL_ID,
-  RESUME_CONFIRM_MODAL_ID,
-  CANCEL_SELECTED_CONFIRM_MODAL_ID,
-  RESUME_SELECTED_CONFIRM_MODAL_ID,
-} from '../TasksTableConstants';
-
-export const CancelConfirm = ({ closeModal, action, selectedRowsLen, id }) => (
-  <ForemanModal title={__('Cancel Selected Tasks')} id={id}>
-    <ForemanModal.Header />
-    {sprintf(
-      __(
-        `This will cancel %s task(s), putting them in the stopped state. Are you sure?`
-      ),
-      selectedRowsLen
-    )}
-    <ForemanModal.Footer>
-      <Button onClick={closeModal}>{__('No')}</Button>
-      <Button
-        bsStyle="primary"
-        onClick={() => {
-          action();
-          closeModal();
-        }}
-      >
-        {__('Yes')}
-      </Button>
-    </ForemanModal.Footer>
-  </ForemanModal>
-);
-
-CancelConfirm.propTypes = {
-  closeModal: PropTypes.func.isRequired,
-  selectedRowsLen: PropTypes.number.isRequired,
-  action: PropTypes.func,
-  id: PropTypes.oneOf([
-    CANCEL_CONFIRM_MODAL_ID,
-    RESUME_CONFIRM_MODAL_ID,
-    CANCEL_SELECTED_CONFIRM_MODAL_ID,
-    RESUME_SELECTED_CONFIRM_MODAL_ID,
-  ]).isRequired,
-};
-
-CancelConfirm.defaultProps = {
-  action: () => null,
-};
-
-export default CancelConfirm;

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmationModals.js

@@ -1,56 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {
-  CANCEL_CONFIRM_MODAL_ID,
-  RESUME_CONFIRM_MODAL_ID,
-  CANCEL_SELECTED_CONFIRM_MODAL_ID,
-  RESUME_SELECTED_CONFIRM_MODAL_ID,
-} from '../TasksTableConstants';
-import { CancelConfirm } from './CancelConfirm';
-import { ResumeConfirm } from './ResumeConfirm';
-
-export const ConfirmationModals = ({
-  modalProps,
-  tasksActions,
-  selectedRowsLen,
-}) => (
-  <React.Fragment>
-    <CancelConfirm
-      closeModal={modalProps.cancelModal.setModalClosed}
-      action={tasksActions.cancelTask}
-      selectedRowsLen={1}
-      id={CANCEL_CONFIRM_MODAL_ID}
-    />
-    <ResumeConfirm
-      closeModal={modalProps.resumeModal.setModalClosed}
-      action={tasksActions.resumeTask}
-      selectedRowsLen={1}
-      id={RESUME_CONFIRM_MODAL_ID}
-    />
-    <CancelConfirm
-      closeModal={modalProps.cancelSelectedModal.setModalClosed}
-      action={tasksActions.cancelSelectedTasks}
-      selectedRowsLen={selectedRowsLen}
-      id={CANCEL_SELECTED_CONFIRM_MODAL_ID}
-    />
-    <ResumeConfirm
-      closeModal={modalProps.resumeSelectedModal.setModalClosed}
-      action={tasksActions.resumeSelectedTasks}
-      selectedRowsLen={selectedRowsLen}
-      id={RESUME_SELECTED_CONFIRM_MODAL_ID}
-    />
-  </React.Fragment>
-);
-
-ConfirmationModals.propTypes = {
-  modalProps: PropTypes.object.isRequired,
-  selectedRowsLen: PropTypes.number.isRequired,
-  tasksActions: PropTypes.shape({
-    cancelTask: PropTypes.func,
-    resumeTask: PropTypes.func,
-    cancelSelectedTasks: PropTypes.func,
-    resumeSelectedTasks: PropTypes.func,
-  }).isRequired,
-};
-
-export default ConfirmationModals;

data/webpack/ForemanTasks/Components/TasksTable/Components/ResumeConfirm.js

@@ -1,52 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { Button } from 'patternfly-react';
-import ForemanModal from 'foremanReact/components/ForemanModal';
-import {
-  CANCEL_CONFIRM_MODAL_ID,
-  RESUME_CONFIRM_MODAL_ID,
-  CANCEL_SELECTED_CONFIRM_MODAL_ID,
-  RESUME_SELECTED_CONFIRM_MODAL_ID,
-} from '../TasksTableConstants';
-
-export const ResumeConfirm = ({ closeModal, action, selectedRowsLen, id }) => (
-  <ForemanModal title={__('Resume Selected Tasks')} id={id}>
-    {sprintf(
-      __(
-        `This will resume %s task(s), putting them in the running state. Are you sure?`
-      ),
-      selectedRowsLen
-    )}
-    <ForemanModal.Footer>
-      <Button onClick={closeModal}>{__('No')}</Button>
-      <Button
-        bsStyle="primary"
-        onClick={() => {
-          action();
-          closeModal();
-        }}
-      >
-        {__('Yes')}
-      </Button>
-    </ForemanModal.Footer>
-  </ForemanModal>
-);
-
-ResumeConfirm.propTypes = {
-  closeModal: PropTypes.func.isRequired,
-  selectedRowsLen: PropTypes.number.isRequired,
-  action: PropTypes.func,
-  id: PropTypes.oneOf([
-    CANCEL_CONFIRM_MODAL_ID,
-    RESUME_CONFIRM_MODAL_ID,
-    CANCEL_SELECTED_CONFIRM_MODAL_ID,
-    RESUME_SELECTED_CONFIRM_MODAL_ID,
-  ]).isRequired,
-};
-
-ResumeConfirm.defaultProps = {
-  action: () => null,
-};
-
-export default ResumeConfirm;

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/CancelConfirm.test.js

@@ -1,26 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import { CancelConfirm } from '../CancelConfirm';
-import {
-  CANCEL_CONFIRM_MODAL_ID,
-  CANCEL_SELECTED_CONFIRM_MODAL_ID,
-} from '../../TasksTableConstants';
-
-const baseProps = {
-  closeModal: () => null,
-  selectedRowsLen: 1,
-  action: () => null,
-};
-const fixtures = {
-  'renders CANCEL modal': {
-    ...baseProps,
-    id: CANCEL_CONFIRM_MODAL_ID,
-  },
-  'renders CANCEL_SELECTED modal': {
-    ...baseProps,
-    id: CANCEL_SELECTED_CONFIRM_MODAL_ID,
-  },
-};
-
-describe('CancelConfirm', () =>
-  testComponentSnapshotsWithFixtures(CancelConfirm, fixtures));

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/ConfirmationModals.test.js

@@ -1,24 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import { ConfirmationModals } from '../ConfirmationModals';
-
-const fixtures = {
-  'renders ConfirmationModals': {
-    modalProps: {
-      cancelSelectedModal: { setModalClosed: jest.fn() },
-      resumeSelectedModal: { setModalClosed: jest.fn() },
-      cancelModal: { setModalClosed: jest.fn() },
-      resumeModal: { setModalClosed: jest.fn() },
-    },
-    selectedRowsLen: 7,
-    tasksActions: {
-      cancelTask: jest.fn(),
-      resumeTask: jest.fn(),
-      cancelSelectedTasks: jest.fn(),
-      resumeSelectedTasks: jest.fn(),
-    },
-  },
-};
-
-describe('ConfirmationModals', () =>
-  testComponentSnapshotsWithFixtures(ConfirmationModals, fixtures));