foreman-tasks 1.0.0 → 1.0.1

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

@@ -12,7 +12,7 @@ import {
   selectSort,
   selectActionName,
   selectSelectedRows,
-  selectModalStatus,
+  selectClicked,
 } from './TasksTableSelectors';
 
 const mapStateToProps = state => ({
@@ -24,8 +24,9 @@ const mapStateToProps = state => ({
   itemCount: selectItemCount(state),
   actionName: selectActionName(state),
   selectedRows: selectSelectedRows(state),
-  modalStatus: selectModalStatus(state),
+  clicked: selectClicked(state),
 });
+
 const mapDispatchToProps = dispatch => bindActionCreators(actions, dispatch);
 
 export const reducers = { tasksTable: reducer };

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.js

@@ -10,7 +10,7 @@ export const ActionButton = ({ id, name, availableActions, taskActions }) => {
       <ResumeButton
         id={id}
         name={name}
-        onClick={taskActions.resume}
+        onClick={taskActions.resumeTask}
         disabled={false}
       />
     );
@@ -20,7 +20,7 @@ export const ActionButton = ({ id, name, availableActions, taskActions }) => {
       id={id}
       name={name}
       disabled={!availableActions.cancellable}
-      onClick={taskActions.cancel}
+      onClick={taskActions.cancelTask}
     />
   );
 };
@@ -33,7 +33,7 @@ ActionButton.propTypes = {
     resumable: PropTypes.bool,
   }).isRequired,
   taskActions: PropTypes.shape({
-    cancel: PropTypes.func,
-    resume: PropTypes.func,
+    cancelTask: PropTypes.func,
+    resumeTask: PropTypes.func,
   }).isRequired,
 };

data/webpack/ForemanTasks/Components/common/ActionButtons/ActionButton.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import { ActionButton } from './ActionButton';
 

data/webpack/ForemanTasks/Components/common/ActionButtons/CancelButton.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
-import { shallow } from 'enzyme';
+import { testComponentSnapshotsWithFixtures, shallow } from '@theforeman/test';
 import { CancelButton } from './CancelButton';
 
 const fixtures = {

data/webpack/ForemanTasks/Components/common/ActionButtons/ResumeButton.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
-import { shallow } from 'enzyme';
+import { testComponentSnapshotsWithFixtures, shallow } from '@theforeman/test';
+
 import { ResumeButton } from './ResumeButton';
 
 const fixtures = {

data/webpack/ForemanTasks/Components/common/ActionButtons/__snapshots__/ActionButton.test.js.snap

@@ -5,7 +5,7 @@ exports[`ActionButton render with cancellable false props 1`] = `
   disabled={true}
   id="id"
   name="some-name"
-  onClick={[MockFunction]}
+  onClick={[Function]}
 />
 `;
 
@@ -14,7 +14,7 @@ exports[`ActionButton render with cancellable true props 1`] = `
   disabled={false}
   id="id"
   name="some-name"
-  onClick={[MockFunction]}
+  onClick={[Function]}
 />
 `;
 
@@ -23,6 +23,6 @@ exports[`ActionButton render with resumable true props 1`] = `
   disabled={false}
   id="id"
   name="some-name"
-  onClick={[MockFunction]}
+  onClick={[Function]}
 />
 `;

data/webpack/ForemanTasks/ForemanTasks.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ForemanTasks from './ForemanTasks';
 

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ForemanTasksRouter from './ForemanTasksRouter';
 

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
+import { shallow } from '@theforeman/test';
 
 import ForemanTasksRoutes from './ForemanTasksRoutes';
 
@@ -8,7 +7,7 @@ describe('ForemanTasksRoutes', () => {
   it('should create routes', () => {
     Object.entries(ForemanTasksRoutes).forEach(([key, Route]) => {
       const component = shallow(<Route.render history={{}} some="props" />);
-      Route.renderResult = toJson(component);
+      Route.renderResult = component;
     });
 
     expect(ForemanTasksRoutes).toMatchSnapshot();

data/webpack/ForemanTasks/Routes/ShowTask/__tests__/ShowTask.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ShowTask from '../ShowTask';
 

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

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

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

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

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

@@ -0,0 +1,4 @@
+const ForemanModal = () => jest.fn();
+ForemanModal.Header = () => jest.fn();
+ForemanModal.Footer = () => jest.fn();
+export default ForemanModal;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -107,15 +107,11 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".babelrc.js"
 - ".eslintrc"
 - ".gitignore"
 - ".prettierrc"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".storybook/addons.js"
-- ".storybook/config.js"
-- ".storybook/webpack.config.js"
 - ".stylelintrc"
 - ".travis.yml"
 - ".tx/config"
@@ -208,6 +204,7 @@ files:
 - app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
 - app/views/foreman_tasks/tasks/show.html.erb
+- babel.config.js
 - bin/dynflow-executor
 - bin/foreman-tasks
 - config/foreman-tasks.yaml.example
@@ -392,7 +389,7 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/TasksLabelsRow.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksLabelsRow/__snapshots__/TasksLabelsRow.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.js
-- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.stories.js
+- webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.stories.mdx
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/__snapshots__/TimeDropDown.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/TasksTimeRow.js
@@ -419,19 +416,22 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardReducer.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
-- webpack/ForemanTasks/Components/TasksTable/Components/ActionConfirmation.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionSelectButton.js
-- webpack/ForemanTasks/Components/TasksTable/Components/CancelResumeConfirm.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/TableSelectionCell.js
 - webpack/ForemanTasks/Components/TasksTable/Components/TableSelectionHeaderCell.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/ActionConfirmation.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/ActionSelectButton.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/CancelResumeConfirm.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__/TableSelectionCell.test.js
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/TableSelectionHeaderCell.test.js
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionConfirmation.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/ActionSelectButton.test.js.snap
-- webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/CancelResumeConfirm.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__/TableSelectionCell.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/TableSelectionHeaderCell.test.js.snap
 - webpack/ForemanTasks/Components/TasksTable/SubTasksPage.js
@@ -510,6 +510,9 @@ 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/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/MessageBox.js
@@ -524,9 +527,6 @@ files:
 - webpack/index.js
 - webpack/stories/decorators/index.js
 - webpack/stories/decorators/withCardsDecorator.js
-- webpack/stories/index.js
-- webpack/stories/index.scss
-- webpack/test_setup.js
 homepage: https://github.com/theforeman/foreman-tasks
 licenses: []
 metadata: {}

data/.storybook/addons.js

@@ -1,2 +0,0 @@
-import '@storybook/addon-actions/register';
-import '@storybook/addon-knobs/register';

data/.storybook/config.js

@@ -1,7 +0,0 @@
-import { configure } from '@storybook/react';
-
-function loadStories() {
-  require('../webpack/stories');
-}
-
-configure(loadStories, module);

data/.storybook/webpack.config.js

@@ -1,84 +0,0 @@
-const babelOptions = require('../.babelrc.js');
-let path = require('path');
-
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        options: babelOptions,
-      },
-      {
-        test: /(\.png|\.gif)$/,
-        loader: 'url-loader?limit=32767',
-      },
-      {
-        test: /\.css$/,
-        loaders: ['style-loader', 'css-loader'],
-      },
-      {
-        test: /\.scss$/,
-        loaders: [
-          'style-loader',
-          'css-loader',
-          {
-            loader: 'sass-loader',
-            options: {
-              includePaths: [
-                // teach webpack to resolve patternfly dependencies
-                path.resolve(
-                  __dirname,
-                  '..',
-                  'node_modules',
-                  'patternfly',
-                  'dist',
-                  'sass'
-                ),
-                path.resolve(
-                  __dirname,
-                  '..',
-                  'node_modules',
-                  'bootstrap-sass',
-                  'assets',
-                  'stylesheets'
-                ),
-                path.resolve(
-                  __dirname,
-                  '..',
-                  'node_modules',
-                  'font-awesome-sass',
-                  'assets',
-                  'stylesheets'
-                ),
-              ],
-            },
-          },
-        ],
-      },
-      {
-        test: /\.md$/,
-        loaders: ['raw-loader'],
-      },
-      {
-        test: /(\.ttf|\.woff|\.woff2|\.eot|\.svg|\.jpg)$/,
-        loaders: ['url-loader'],
-      },
-    ],
-  },
-
-  resolve: {
-    alias: {
-      foremanReact: path.join(
-        __dirname,
-        '../../foreman/webpack/assets/javascripts/react_app'
-      ),
-    },
-    modules: [
-      path.join(__dirname, '..', 'webpack'),
-      path.join(__dirname, '..', 'node_modules'),
-      'node_modules/',
-    ],
-  },
-};

data/webpack/ForemanTasks/Components/TasksDashboard/Components/TasksTimeRow/Components/TimeDropDown/TimeDropDown.stories.js

@@ -1,23 +0,0 @@
-import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs, select } from '@storybook/addon-knobs';
-import { action } from '@storybook/addon-actions';
-import { withCardsDecorator } from '../../../../../../../stories/decorators';
-
-import { TASKS_DASHBOARD_AVAILABLE_TIMES } from '../../../../TasksDashboardConstants';
-import TimeDropDown from './TimeDropDown';
-
-storiesOf('TasksDashboard/TasksTimeRow', module)
-  .addDecorator(withKnobs)
-  .addDecorator(withCardsDecorator)
-  .add('TimeDropDown', () => (
-    <TimeDropDown
-      id="time-period-dropdown"
-      selectedTime={select(
-        'selectedTime',
-        TASKS_DASHBOARD_AVAILABLE_TIMES,
-        TASKS_DASHBOARD_AVAILABLE_TIMES.H24
-      )}
-      onChange={action('onChange')}
-    />
-  ));

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

@@ -1,49 +0,0 @@
-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/CancelResumeConfirm.js

@@ -1,51 +0,0 @@
-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;