foreman-tasks 11.0.5 → 11.0.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 11.0.5
+  version: 11.0.7
 platform: ruby
 authors:
 - Ivan Nečas
@@ -396,10 +396,7 @@ files:
 - 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
@@ -423,7 +420,6 @@ files:
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Raw.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/RunningSteps.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/Task.test.js.snap
-- webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskButtons.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskInfo.test.js.snap
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js
 - webpack/ForemanTasks/Components/TaskDetails/TaskDetails.scss
@@ -504,17 +500,13 @@ 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/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/GenericConfirmModal.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/__test__/index.test.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/createBulkTaskModal.js
+- webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/createTaskModal.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js
 - webpack/ForemanTasks/Components/TasksTable/Components/TableSelectionCell.js
@@ -578,9 +570,7 @@ files:
 - webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js
 - webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js
 - webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ActionButton.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/ToastsHelpers/ToastTypesConstants.js
 - webpack/ForemanTasks/Components/common/ToastsHelpers/index.js
@@ -605,9 +595,6 @@ files:
 - webpack/__mocks__/foremanReact/common/I18n.js
 - webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/common/urlHelpers.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js
-- 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/Pagination/index.js
 - webpack/__mocks__/foremanReact/components/ToastsList/index.js
@@ -642,7 +629,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users
 test_files:

data/webpack/ForemanTasks/Components/TaskActions/UnlockModals.js

@@ -1,60 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { translate as __, sprintf } from 'foremanReact/common/I18n';
-import { ClickConfirmation } from '../common/ClickConfirmation';
-import { UNLOCK_MODAL, FORCE_UNLOCK_MODAL } from './TaskActionsConstants';
-
-const confirmationMessage = __(
-  'I understand that this may cause harm and have working database backups of all backend services.'
-);
-
-export const UnlockModal = ({ onClick, id }) => (
-  <ClickConfirmation
-    id={id}
-    title={__('Unlock')}
-    body={__(
-      "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-    )}
-    confirmationMessage={confirmationMessage}
-    confirmAction={__('Unlock')}
-    onClick={onClick}
-    confirmType="warning"
-  />
-);
-
-export const ForceUnlockModal = ({ onClick, id, selectedRowsLen }) => (
-  <ClickConfirmation
-    id={id}
-    title={__('Force Unlock')}
-    body={sprintf(
-      __(
-        `Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck.`
-      ),
-      selectedRowsLen
-    )}
-    confirmationMessage={confirmationMessage}
-    confirmAction={__('Force Unlock')}
-    onClick={onClick}
-    confirmType="danger"
-  />
-);
-
-UnlockModal.propTypes = {
-  onClick: PropTypes.func.isRequired,
-  id: PropTypes.string,
-};
-
-ForceUnlockModal.propTypes = {
-  onClick: PropTypes.func.isRequired,
-  id: PropTypes.string,
-  selectedRowsLen: PropTypes.number,
-};
-
-UnlockModal.defaultProps = {
-  id: UNLOCK_MODAL,
-};
-
-ForceUnlockModal.defaultProps = {
-  id: FORCE_UNLOCK_MODAL,
-  selectedRowsLen: 1,
-};

data/webpack/ForemanTasks/Components/TaskActions/UnlockModals.test.js

@@ -1,14 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-
-import { UnlockModal, ForceUnlockModal } from './UnlockModals';
-
-const fixtures = {
-  render: { taskID: 'some-id', onClick: jest.fn() },
-};
-
-describe('UnlockModal', () => {
-  testComponentSnapshotsWithFixtures(UnlockModal, fixtures);
-});
-describe('ForceUnlockModal', () => {
-  testComponentSnapshotsWithFixtures(ForceUnlockModal, fixtures);
-});

data/webpack/ForemanTasks/Components/TaskActions/__snapshots__/UnlockModals.test.js.snap

@@ -1,25 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ForceUnlockModal render 1`] = `
-<ClickConfirmation
-  body="Resources for 1 task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
-  confirmAction="Force Unlock"
-  confirmType="danger"
-  confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-  id="forceUnlockModal"
-  onClick={[MockFunction]}
-  title="Force Unlock"
-/>
-`;
-
-exports[`UnlockModal render 1`] = `
-<ClickConfirmation
-  body="This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
-  confirmAction="Unlock"
-  confirmType="warning"
-  confirmationMessage="I understand that this may cause harm and have working database backups of all backend services."
-  id="unlockModal"
-  onClick={[MockFunction]}
-  title="Unlock"
-/>
-`;

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskButtons.test.js.snap

@@ -1,212 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Task rendering render with minimal Props 1`] = `
-<Col
-  bsClass="col"
-  componentClass="div"
-  xs={12}
->
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="reload-button"
-    disabled={false}
-    onClick={[MockFunction]}
-  >
-    <span
-      className="glyphicon glyphicon-refresh "
-    />
-    Start auto-reloading
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="dynflow-button"
-    disabled={true}
-    href="/foreman_tasks/dynflow/"
-    rel="noopener noreferrer"
-    target="_blank"
-  >
-    <span
-      data-original-title="dynflow_enable_console Setting is off"
-      title="dynflow_enable_console Setting is off"
-    >
-      Dynflow console
-    </span>
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="resume-button"
-    data-original-title="You do not have permission"
-    disabled={true}
-    onClick={[Function]}
-    title="You do not have permission"
-  >
-    Resume
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="cancel-button"
-    data-original-title="You do not have permission"
-    disabled={true}
-    onClick={[Function]}
-    title="You do not have permission"
-  >
-    Cancel
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="unlock-button"
-    data-original-title="You do not have permission"
-    disabled={true}
-    onClick={[MockFunction]}
-    title="You do not have permission"
-  >
-    Unlock
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="force-unlock-button"
-    data-original-title="You do not have permission"
-    disabled={true}
-    onClick={[MockFunction]}
-    title="You do not have permission"
-  >
-    Force Unlock
-  </Button>
-</Col>
-`;
-
-exports[`Task rendering render with some Props 1`] = `
-<Col
-  bsClass="col"
-  componentClass="div"
-  xs={12}
->
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="reload-button"
-    disabled={false}
-    onClick={[MockFunction]}
-  >
-    <span
-      className="glyphicon glyphicon-refresh spin"
-    />
-    Stop auto-reloading
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="dynflow-button"
-    disabled={false}
-    href="/foreman_tasks/dynflow/"
-    rel="noopener noreferrer"
-    target="_blank"
-  >
-    <span>
-      Dynflow console
-    </span>
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="resume-button"
-    disabled={true}
-    onClick={[Function]}
-  >
-    Resume
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="cancel-button"
-    disabled={true}
-    onClick={[Function]}
-  >
-    Cancel
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="parent-button"
-    disabled={false}
-    href="/foreman_tasks/tasks/parent-id"
-  >
-    Parent task
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="subtask-button"
-    disabled={false}
-    href="/foreman_tasks/tasks/test/sub_tasks"
-  >
-    Sub tasks
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="unlock-button"
-    disabled={false}
-    onClick={[MockFunction]}
-  >
-    Unlock
-  </Button>
-  <Button
-    active={false}
-    block={false}
-    bsClass="btn"
-    bsSize="small"
-    bsStyle="default"
-    className="force-unlock-button"
-    disabled={false}
-    onClick={[MockFunction]}
-  >
-    Force Unlock
-  </Button>
-</Col>
-`;

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

@@ -1,83 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { startCase } from 'lodash';
-import { sprintf, translate as __ } from 'foremanReact/common/I18n';
-import { Button } from 'patternfly-react';
-import ForemanModal from 'foremanReact/components/ForemanModal';
-import { FORCE_UNLOCK_MODAL } from '../../../TaskActions/TaskActionsConstants';
-import { FORCE_UNLOCK_SELECTED_MODAL } from '../../TasksTableConstants';
-import { ForceUnlockModal } from '../../../TaskActions/UnlockModals';
-
-export const ConfirmModal = ({
-  actionText,
-  actionState,
-  actionType,
-  selectedRowsLen,
-  id,
-  parentTaskID,
-  url,
-  uriQuery: query,
-  setModalClosed,
-  ...props
-}) => {
-  if ([FORCE_UNLOCK_MODAL, FORCE_UNLOCK_SELECTED_MODAL].includes(actionType)) {
-    return (
-      <ForceUnlockModal
-        onClick={() => {
-          props[actionType]({ url, query, parentTaskID });
-          setModalClosed();
-        }}
-        id={id}
-        selectedRowsLen={selectedRowsLen}
-      />
-    );
-  }
-  return (
-    <ForemanModal
-      title={sprintf(__('%s Selected Tasks'), startCase(actionText))}
-      id={id}
-    >
-      {sprintf(
-        __(
-          `This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?`
-        ),
-        { action: actionText, number: selectedRowsLen, state: actionState }
-      )}
-      <ForemanModal.Footer>
-        <Button onClick={setModalClosed}>{__('No')}</Button>
-        <Button
-          className="confirm-button"
-          bsStyle="primary"
-          onClick={() => {
-            props[actionType]({ url, query, parentTaskID });
-            setModalClosed();
-          }}
-        >
-          {__('Yes')}
-        </Button>
-      </ForemanModal.Footer>
-    </ForemanModal>
-  );
-};
-
-ConfirmModal.propTypes = {
-  actionText: PropTypes.string,
-  actionState: PropTypes.string,
-  selectedRowsLen: PropTypes.number.isRequired,
-  actionType: PropTypes.string,
-  id: PropTypes.string.isRequired,
-  parentTaskID: PropTypes.string,
-  url: PropTypes.string.isRequired,
-  uriQuery: PropTypes.object,
-  setModalClosed: PropTypes.func.isRequired,
-};
-
-ConfirmModal.defaultProps = {
-  actionType: '',
-  actionText: '',
-  actionState: '',
-  parentTaskID: '',
-  uriQuery: {},
-};
-
-export default ConfirmModal;

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModalActions.js

@@ -1,106 +0,0 @@
-import {
-  resumeTask,
-  cancelTask,
-  forceCancelTask,
-} from '../../TasksTableActions';
-import {
-  bulkCancelBySearch,
-  bulkCancelById,
-  bulkResumeBySearch,
-  bulkResumeById,
-  bulkForceCancelBySearch,
-  bulkForceCancelById,
-} from '../../TasksBulkActions';
-import { selectClicked, selectSelectedTasks } from './ConfirmModalSelectors';
-import { selectAllRowsSelected } from '../../TasksTableSelectors';
-import {
-  CANCEL_MODAL,
-  RESUME_MODAL,
-  CANCEL_SELECTED_MODAL,
-  RESUME_SELECTED_MODAL,
-  FORCE_UNLOCK_SELECTED_MODAL,
-} from '../../TasksTableConstants';
-import { FORCE_UNLOCK_MODAL } from '../../../TaskActions/TaskActionsConstants';
-
-export default {
-  [CANCEL_SELECTED_MODAL]: ({ url, query, parentTaskID }) => (
-    dispatch,
-    getState
-  ) => {
-    if (selectAllRowsSelected(getState())) {
-      return dispatch(bulkCancelBySearch({ query, parentTaskID }));
-    }
-    return dispatch(
-      bulkCancelById({
-        selected: selectSelectedTasks(getState()),
-        url,
-        parentTaskID,
-      })
-    );
-  },
-  [CANCEL_MODAL]: ({ url, parentTaskID }) => (dispatch, getState) => {
-    const { taskId, taskName } = selectClicked(getState());
-    return dispatch(
-      cancelTask({
-        taskId,
-        taskName,
-        url,
-        parentTaskID,
-      })
-    );
-  },
-  [RESUME_SELECTED_MODAL]: ({ url, query, parentTaskID }) => (
-    dispatch,
-    getState
-  ) => {
-    if (selectAllRowsSelected(getState())) {
-      return dispatch(bulkResumeBySearch({ query, parentTaskID }));
-    }
-    return dispatch(
-      bulkResumeById({
-        selected: selectSelectedTasks(getState()),
-        url,
-        parentTaskID,
-      })
-    );
-  },
-
-  [RESUME_MODAL]: ({ url, parentTaskID }) => (dispatch, getState) => {
-    const { taskId, taskName } = selectClicked(getState());
-    return dispatch(
-      resumeTask({
-        taskId,
-        taskName,
-        url,
-        parentTaskID,
-      })
-    );
-  },
-
-  [FORCE_UNLOCK_MODAL]: ({ url, parentTaskID }) => (dispatch, getState) => {
-    const { taskId, taskName } = selectClicked(getState());
-    return dispatch(
-      forceCancelTask({
-        taskId,
-        taskName,
-        url,
-        parentTaskID,
-      })
-    );
-  },
-  [FORCE_UNLOCK_SELECTED_MODAL]: ({ url, query, parentTaskID }) => (
-    dispatch,
-    getState
-  ) => {
-    if (selectAllRowsSelected(getState())) {
-      return dispatch(bulkForceCancelBySearch({ query, parentTaskID }));
-    }
-    return dispatch(
-      bulkForceCancelById({
-        selected: selectSelectedTasks(getState()),
-        url,
-        parentTaskID,
-      })
-    );
-  },
-};

data/webpack/ForemanTasks/Components/TasksTable/Components/ConfirmModal/ConfirmModalReducer.js

@@ -1,38 +0,0 @@
-import Immutable from 'seamless-immutable';
-import {
-  UPDATE_MODAL,
-  CANCEL_SELECTED_MODAL,
-  RESUME_SELECTED_MODAL,
-  RESUME_MODAL,
-  CANCEL_MODAL,
-} from '../../TasksTableConstants';
-
-const initialState = Immutable({});
-
-export const ConfirmModalReducer = (state = initialState, action) => {
-  const { type, payload } = action;
-  switch (type) {
-    case UPDATE_MODAL:
-      switch (payload.modalID) {
-        case CANCEL_SELECTED_MODAL:
-        case CANCEL_MODAL:
-          return state.merge({
-            actionText: 'cancel',
-            actionState: 'stopped',
-            actionType: payload.modalID,
-          });
-        case RESUME_SELECTED_MODAL:
-        case RESUME_MODAL:
-          return state.merge({
-            actionText: 'resume',
-            actionState: 'running',
-            actionType: payload.modalID,
-          });
-        default:
-          return state.set('actionType', payload.modalID);
-      }
-    default:
-      return state;
-  }
-};
-export default ConfirmModalReducer;

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

@@ -1,36 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
-import { ConfirmModal } from '../ConfirmModal';
-import { RESUME_SELECTED_MODAL } from '../../../TasksTableConstants';
-import { FORCE_UNLOCK_MODAL } from '../../../../TaskActions/TaskActionsConstants';
-
-const fixtures = {
-  'renders ConfirmModal': {
-    actionType: RESUME_SELECTED_MODAL,
-    actionText: 'some text',
-    actionState: 'some state',
-    selectedRowsLen: 1,
-    id: 'modalID',
-    parentTaskID: 'parent-id',
-    allRowsSelected: true,
-    url: 'some-url',
-    uriQuery: { state: 'stopped' },
-    setModalClosed: jest.fn(),
-  },
-
-  'renders ConfirmModal for unlock ': {
-    actionType: FORCE_UNLOCK_MODAL,
-    actionText: 'some text',
-    actionState: 'some state',
-    selectedRowsLen: 1,
-    id: 'modalID',
-    parentTaskID: 'parent-id',
-    allRowsSelected: true,
-    url: 'some-url',
-    uriQuery: { state: 'stopped' },
-    setModalClosed: jest.fn(),
-  },
-};
-
-describe('ConfirmModal', () => {
-  testComponentSnapshotsWithFixtures(ConfirmModal, fixtures);
-});