foreman-tasks 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc833d42aeafa9f146457f33ffe29db5f4ddc374a372511a384f05d6932754e
-  data.tar.gz: eda50a6c4a0e2c1257fd72c5764c5eed7df097beb230579304ccf1943a472477
+  metadata.gz: 619dcecc5e332cffdf42333007062050274669c3f4e9c312e99ef7ea5c34bf4c
+  data.tar.gz: 9af4ff95aff9ceaefc7b0cf18cfa63aea31636771b76ad32b87b20e847ef0edf
 SHA512:
-  metadata.gz: cbbb4c98796edf5e91c2f7b3fd731a40162c6865b94e5c262f61865a5f4b18f939e38a76920756b9f6919501a72ba47b02653ba27fec54ad035e461d33df60bd
-  data.tar.gz: 868cbea935b39e9dd74ff7a616983e1e68d89355716134f493fd29485280c0cc2e4f01ea015358c1285ac82f3ece89c9234c5cac5a73add22edb6213cfbacd43
+  metadata.gz: f9e7f4627493ff41d015766564442406357820b4f29a678eb47d26d41f540926c9ddd0050e569ca6e08a555c18b995a9e4c0daf8d32167619c1ce408689bc38e
+  data.tar.gz: 9a758f517b217ae729c3442aeb0d8808bad99b29cbe329e2ab833473a99152d24734109780cb195f8ed92f3db5bee3ec3ceac607f8e62ee7274d28a051371280

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.17.1'.freeze
+  VERSION = '0.17.2'.freeze
 end

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetailsSelectors.js

@@ -29,7 +29,9 @@ export const selectErrors = state => {
 };
 
 export const selectProgress = state =>
-  selectTaskDetails(state).progress * 100 || 0;
+  selectTaskDetails(state).progress
+    ? selectTaskDetails(state).progress.toFixed(4) * 100
+    : 0;
 
 export const selectUsername = state =>
   selectTaskDetails(state).username || null;

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

@@ -4,7 +4,7 @@ exports[`TaskDetails rendering render without Props 1`] = `
 <div
   className="task-details-react well"
 >
-  <Uncontrolled(Tabs)
+  <ForwardRef
     animation={false}
     defaultActiveKey={1}
     id="task-details-tabs"
@@ -94,6 +94,6 @@ exports[`TaskDetails rendering render without Props 1`] = `
         startedAt=""
       />
     </Tab>
-  </Uncontrolled(Tabs)>
+  </ForwardRef>
 </div>
 `;

data/webpack/ForemanTasks/Components/TaskDetails/index.js

@@ -71,7 +71,4 @@ const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 export const reducers = { taskDetails: reducer };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TaskDetails);
+export default connect(mapStateToProps, mapDispatchToProps)(TaskDetails);

data/webpack/ForemanTasks/Components/TasksDashboard/index.js

@@ -19,7 +19,4 @@ const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 export const reducers = { tasksDashboard: reducer };
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TasksDashboard);
+export default connect(mapStateToProps, mapDispatchToProps)(TasksDashboard);

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

@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Modal, Button } from 'patternfly-react';
+
+export const ActionConfirmation = ({
+  showModal,
+  closeModal,
+  title,
+  message,
+  onClick,
+  confirmAction,
+  abortAction,
+}) => (
+  <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-warning-sign" />
+        {` ${title}`}
+      </Modal.Title>
+    </Modal.Header>
+    <Modal.Body>{message}</Modal.Body>
+    <Modal.Footer>
+      <Button onClick={closeModal}>{abortAction}</Button>
+      <Button bsStyle="primary" onClick={onClick}>
+        {confirmAction}
+      </Button>
+    </Modal.Footer>
+  </Modal>
+);
+
+ActionConfirmation.propTypes = {
+  showModal: PropTypes.bool.isRequired,
+  title: PropTypes.string.isRequired,
+  message: PropTypes.string.isRequired,
+  confirmAction: PropTypes.string.isRequired,
+  abortAction: PropTypes.string.isRequired,
+  closeModal: PropTypes.func.isRequired,
+  onClick: PropTypes.func.isRequired,
+};
+
+export default ActionConfirmation;

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

@@ -0,0 +1,37 @@
+import React from 'react';
+import { DropdownButton, MenuItem } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const ActionSelectButton = ({ onCancel, onResume, disabled }) => (
+  <DropdownButton
+    title={__('Select Action')}
+    disabled={disabled}
+    id="selcted-action-type"
+  >
+    <MenuItem
+      title={__('Cancel selected tasks')}
+      onClick={onCancel}
+      eventKey="1"
+    >
+      {__('Cancel Selected')}
+    </MenuItem>
+    <MenuItem
+      title={__('Resume selected tasks')}
+      onClick={onResume}
+      eventKey="2"
+    >
+      {__('Resume Selected')}
+    </MenuItem>
+  </DropdownButton>
+);
+
+ActionSelectButton.propTypes = {
+  disabled: PropTypes.bool,
+  onCancel: PropTypes.func.isRequired,
+  onResume: PropTypes.func.isRequired,
+};
+
+ActionSelectButton.defaultProps = {
+  disabled: false,
+};

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

@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { sprintf, translate as __ } from 'foremanReact/common/I18n';
+import { ActionConfirmation } from './ActionConfirmation';
+import { CANCEL, RESUME, CLOSED } from '../TasksTableConstants';
+
+export const CancelResumeConfirm = ({
+  closeModal,
+  modalStatus,
+  action,
+  selected,
+  selectedRowsLen,
+}) => (
+  <ActionConfirmation
+    showModal={modalStatus !== CLOSED}
+    closeModal={closeModal}
+    title={`${modalStatus === CANCEL ? __('Cancel') : __('Resume')} ${__(
+      'Selected Tasks'
+    )}`}
+    message={sprintf(
+      __(
+        `This will ${
+          modalStatus === CANCEL ? 'stop' : 'resume'
+        } %s tasks, putting them in the ${
+          modalStatus === CANCEL ? 'canceled' : 'running'
+        } state.  Are you sure?`
+      ),
+      selectedRowsLen
+    )}
+    onClick={() => {
+      if (modalStatus === CANCEL) {
+        action(CANCEL, selected);
+      } else if (modalStatus === RESUME) {
+        action(RESUME, selected);
+      }
+      closeModal();
+    }}
+    confirmAction={__('Yes')}
+    abortAction={__('No')}
+  />
+);
+
+CancelResumeConfirm.propTypes = {
+  closeModal: PropTypes.func.isRequired,
+  modalStatus: PropTypes.oneOf([CANCEL, RESUME, CLOSED]).isRequired,
+  selectedRowsLen: PropTypes.number.isRequired,
+  action: PropTypes.func.isRequired,
+  selected: PropTypes.array.isRequired,
+};
+
+export default CancelResumeConfirm;

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

@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Table } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { noop } from 'foremanReact/common/helpers';
+
+const TableSelectionCell = ({ id, label, checked, onChange, ...props }) => (
+  <Table.SelectionCell>
+    <Table.Checkbox
+      id={id}
+      label={label}
+      checked={checked}
+      onChange={onChange}
+      {...props}
+    />
+  </Table.SelectionCell>
+);
+
+TableSelectionCell.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string,
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+};
+
+TableSelectionCell.defaultProps = {
+  label: __('Select row'),
+  checked: false,
+  onChange: noop,
+};
+
+export default TableSelectionCell;

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

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Table } from 'patternfly-react';
+import { noop } from 'foremanReact/common/helpers';
+
+const TableSelectionHeaderCell = ({
+  id,
+  label,
+  checked,
+  onChange,
+  ...props
+}) => (
+  <Table.SelectionHeading aria-label={label}>
+    <Table.Checkbox
+      id={id}
+      label={label}
+      checked={checked}
+      onChange={onChange}
+      {...props}
+    />
+  </Table.SelectionHeading>
+);
+
+TableSelectionHeaderCell.propTypes = {
+  id: PropTypes.string,
+  label: PropTypes.string,
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+};
+
+TableSelectionHeaderCell.defaultProps = {
+  id: 'selectAll',
+  label: '',
+  checked: false,
+  onChange: noop,
+};
+
+export default TableSelectionHeaderCell;

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

@@ -0,0 +1,18 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import { ActionConfirmation } from '../ActionConfirmation';
+
+const fixtures = {
+  'renders ActionConfirmation': {
+    showModal: true,
+    title: 'title',
+    message: 'message',
+    confirmAction: 'confirmAction',
+    abortAction: 'abortAction',
+    closeModal: () => null,
+    onClick: () => null,
+  },
+};
+
+describe('ActionConfirmation', () =>
+  testComponentSnapshotsWithFixtures(ActionConfirmation, fixtures));

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import { ActionSelectButton } from '../ActionSelectButton';
+
+const fixtures = {
+  'renders with minimal props': {
+    onCancel: jest.fn(),
+    onResume: jest.fn(),
+  },
+};
+
+describe('ActionSelectButton', () =>
+  testComponentSnapshotsWithFixtures(ActionSelectButton, fixtures));

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

@@ -0,0 +1,28 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import { CancelResumeConfirm } from '../CancelResumeConfirm';
+import { CANCEL, RESUME, CLOSED } from '../../TasksTableConstants';
+
+const baseProps = {
+  closeModal: () => null,
+  selectedRowsLen: 3,
+  action: () => null,
+  selected: [1, 2, 3],
+};
+const fixtures = {
+  'renders CANCEL modal': {
+    ...baseProps,
+    modalStatus: CANCEL,
+  },
+  'renders RESUME modal': {
+    ...baseProps,
+    modalStatus: RESUME,
+  },
+  'renders CLOSED modal': {
+    ...baseProps,
+    modalStatus: CLOSED,
+  },
+};
+
+describe('CancelResumeConfirm', () =>
+  testComponentSnapshotsWithFixtures(CancelResumeConfirm, fixtures));

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

@@ -0,0 +1,15 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import TableSelectionCell from '../TableSelectionCell';
+
+const fixtures = {
+  'renders TableSelectionCell': {
+    id: 'some id',
+    label: 'some label',
+    checked: true,
+    onChange: jest.fn(),
+  },
+};
+
+describe('TableSelectionCell', () =>
+  testComponentSnapshotsWithFixtures(TableSelectionCell, fixtures));

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

@@ -0,0 +1,15 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import TableSelectionHeaderCell from '../TableSelectionHeaderCell';
+
+const fixtures = {
+  'renders TableSelectionHeaderCell': {
+    id: 'some id',
+    label: 'some label',
+    checked: true,
+    onChange: jest.fn(),
+  },
+};
+
+describe('TableSelectionHeaderCell', () =>
+  testComponentSnapshotsWithFixtures(TableSelectionHeaderCell, fixtures));

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionConfirmation.test.js.snap

@@ -0,0 +1,89 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ActionConfirmation renders ActionConfirmation 1`] = `
+<Modal
+  animation={true}
+  autoFocus={true}
+  backdrop={true}
+  bsClass="modal"
+  dialogComponentClass={[Function]}
+  enforceFocus={true}
+  keyboard={true}
+  manager={
+    ModalManager {
+      "add": [Function],
+      "containers": Array [],
+      "data": Array [],
+      "handleContainerOverflow": true,
+      "hideSiblingNodes": true,
+      "isTopModal": [Function],
+      "modals": Array [],
+      "remove": [Function],
+    }
+  }
+  onHide={[Function]}
+  renderBackdrop={[Function]}
+  restoreFocus={true}
+  show={true}
+>
+  <ModalHeader
+    bsClass="modal-header"
+    closeButton={false}
+    closeLabel="Close"
+  >
+    <Button
+      active={false}
+      aria-hidden="true"
+      aria-label="Close"
+      block={false}
+      bsClass="btn"
+      bsStyle="default"
+      className="close"
+      disabled={false}
+      onClick={[Function]}
+    >
+      ×
+    </Button>
+    <ModalTitle
+      bsClass="modal-title"
+      componentClass="h4"
+    >
+      <span
+        className="glyphicon glyphicon-warning-sign"
+      />
+       title
+    </ModalTitle>
+  </ModalHeader>
+  <ModalBody
+    bsClass="modal-body"
+    componentClass="div"
+  >
+    message
+  </ModalBody>
+  <ModalFooter
+    bsClass="modal-footer"
+    componentClass="div"
+  >
+    <Button
+      active={false}
+      block={false}
+      bsClass="btn"
+      bsStyle="default"
+      disabled={false}
+      onClick={[Function]}
+    >
+      abortAction
+    </Button>
+    <Button
+      active={false}
+      block={false}
+      bsClass="btn"
+      bsStyle="primary"
+      disabled={false}
+      onClick={[Function]}
+    >
+      confirmAction
+    </Button>
+  </ModalFooter>
+</Modal>
+`;