katello 3.15.0.rc1.3 → 3.15.0.rc2

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -3,11 +3,10 @@ import PropTypes from 'prop-types';
 import Immutable from 'seamless-immutable';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
-import { isEmpty, isEqual } from 'lodash';
+import { isEmpty } from 'lodash';
 import { Grid, Row, Col, Alert } from 'patternfly-react';
 import ModalProgressBar from 'foremanReact/components/common/ModalProgressBar';
 import PermissionDenied from 'foremanReact/components/PermissionDenied';
-import { renderTaskFinishedToast, renderTaskStartedToast } from '../Tasks/helpers';
 import ManageManifestModal from './Manifest/';
 import { MANAGE_MANIFEST_MODAL_ID } from './Manifest/ManifestConstants';
 import { SubscriptionsTable } from './components/SubscriptionsTable';
@@ -17,11 +16,8 @@ import api, { orgId } from '../../services/api';
 
 import { createSubscriptionParams } from './SubscriptionActions.js';
 import {
-  BLOCKING_FOREMAN_TASK_TYPES,
-  BULK_TASK_SEARCH_INTERVAL,
   SUBSCRIPTION_TABLE_NAME,
 } from './SubscriptionConstants';
-import { POLL_TASK_INTERVAL } from '../Tasks/TaskConstants';
 import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
@@ -34,64 +30,41 @@ class SubscriptionsPage extends Component {
 
   componentDidMount() {
     this.props.resetTasks();
-    this.props.loadSetting('content_disconnected');
-    this.props.loadSubscriptions();
+
+    const { id } = this.props.organization;
+    if (id) { // navigating from another react page
+      this.loadData();
+    }
   }
 
   componentDidUpdate(prevProps) {
     const {
-      tasks = [], organization, taskModalOpened, openTaskModal, closeTaskModal,
+      organization, task, handleTask,
     } = this.props;
-    const { tasks: prevTasks = [] } = prevProps;
-    const currentOrg = Number(orgId());
-    const numberOfTasks = tasks.length;
-    const numberOfPrevTasks = prevTasks.length;
-    const [task] = tasks;
-
-    if (numberOfTasks > 0) {
-      if (currentOrg === task.input.current_organization_id) {
-        if (!taskModalOpened) {
-          openTaskModal();
-        }
-      }
 
-      if (numberOfPrevTasks === 0 || prevTasks[0].id !== task.id) {
-        if (currentOrg === task.input.current_organization_id) {
-          this.handleDoneTask(task);
-        } else if (taskModalOpened) {
-          closeTaskModal();
-        }
-      }
+    if (task) {
+      handleTask(task);
     }
 
-    if (numberOfTasks === 0) {
-      if (taskModalOpened && !this.state.pollingATask) {
-        closeTaskModal();
+    if (organization) {
+      if (!prevProps.organization || prevProps.organization.id !== organization.id) {
+        this.loadData();
       }
     }
+  }
 
-    const getOrgInfo = (org) => {
-      // remove the loading attribute so the action isn't called when org starts loading
-      const { loading, ...info } = org;
-      return info;
-    };
-
-    const currentOrgInfo = getOrgInfo(organization);
-    const prevOrgInfo = getOrgInfo(prevProps.organization);
-
-    if (!isEqual(currentOrgInfo, prevOrgInfo)) {
-      this.pollTasks();
-    }
+  componentWillUnmount() {
+    this.props.cancelPollTasks();
   }
 
   getDisabledReason(deleteButton) {
-    const { tasks = [], subscriptions, organization } = this.props;
+    const { task, subscriptions, organization } = this.props;
     const { disconnected } = subscriptions;
     let disabledReason = null;
 
     if (disconnected) {
       disabledReason = __('This is disabled because disconnected mode is enabled.');
-    } else if (tasks.length > 0) {
+    } else if (task) {
       disabledReason = __('This is disabled because a manifest related task is in progress.');
     } else if (deleteButton && !disabledReason) {
       disabledReason = __('This is disabled because no subscriptions are selected.');
@@ -106,75 +79,30 @@ class SubscriptionsPage extends Component {
     this.setState({ selectedRows });
   };
 
-  async pollTasks() {
-    const { pollBulkSearch, organization } = this.props;
-
-    if (organization && organization.owner_details) {
-      pollBulkSearch({
-        action: `organization '${organization.owner_details.displayName}'`,
-        result: 'pending',
-        label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
-      }, BULK_TASK_SEARCH_INTERVAL, organization.id);
-    }
-
-    this.props.loadSetting('content_disconnected');
-    this.props.loadSubscriptions();
-    await this.props.loadTables();
-    const { subscriptionTableSettings, loadTableColumns } = this.props;
-    loadTableColumns(subscriptionTableSettings);
-  }
-
-  async handleDoneTask(taskToPoll) {
-    const { pollTaskUntilDone, loadSubscriptions, organization } = this.props;
+  async loadData() {
+    const {
+      loadSetting,
+      loadSubscriptions,
+      loadTableColumns,
+      loadTables,
+      pollTasks,
+      subscriptionTableSettings,
+    } = this.props;
 
-    const task = await pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL, organization.id);
-    renderTaskFinishedToast(task);
+    pollTasks();
+    loadSetting('content_disconnected');
     loadSubscriptions();
-    this.setState({ pollingATask: false });
+    await loadTables();
+    loadTableColumns(subscriptionTableSettings);
   }
 
-  startManifestTask = () => {
-    this.props.openTaskModal();
-    this.setState({
-      pollingATask: true,
-    });
-  };
-
-  cleanUpManifestTask = async () => {
-    await renderTaskStartedToast(this.props.taskDetails);
-    setTimeout(() => this.props.bulkSearch({
-      action: `organization '${this.props.organization.owner_details.displayName}'`,
-      result: 'pending',
-      label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
-    }), 100);
-  };
-
-  uploadManifest = async (file) => {
-    this.startManifestTask();
-    await this.props.uploadManifest(file);
-    this.cleanUpManifestTask();
-  };
-
-  deleteManifest = async () => {
-    this.startManifestTask();
-    await this.props.deleteManifest();
-    this.cleanUpManifestTask();
-  };
-
-  refreshManifest = async () => {
-    this.startManifestTask();
-    await this.props.refreshManifest();
-    this.cleanUpManifestTask();
-  };
-
   render() {
     const currentOrg = orgId();
     const {
       deleteModalOpened, openDeleteModal, closeDeleteModal,
       deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
-      searchQuery, updateSearchQuery,
-      taskModalOpened, simpleContentAccess,
-      tasks = [], activePermissions, subscriptions, organization, subscriptionTableSettings,
+      searchQuery, updateSearchQuery, simpleContentAccess,
+      task, activePermissions, subscriptions, organization, subscriptionTableSettings,
     } = this.props;
     // Basic permissions - should we even show this page?
     if (subscriptions.missingPermissions && subscriptions.missingPermissions.length > 0) {
@@ -189,15 +117,10 @@ class SubscriptionsPage extends Component {
       canEditOrganizations,
     } = permissions;
     const { disconnected } = subscriptions;
-    const taskInProgress = tasks.length > 0;
-    const disableManifestActions = taskInProgress || disconnected;
-    let task = null;
+    const disableManifestActions = !!task || disconnected;
 
     const openManageManifestModal = () => this.props.setModalOpen({ id: MANAGE_MANIFEST_MODAL_ID });
 
-    if (taskInProgress) {
-      [task] = tasks;
-    }
     const tableColumns = Immutable.asMutable(subscriptions.tableColumns, { deep: true });
     const onSearch = (search) => {
       this.props.loadSubscriptions({ search });
@@ -212,7 +135,6 @@ class SubscriptionsPage extends Component {
     });
 
     const onDeleteSubscriptions = (selectedRows) => {
-      this.startManifestTask();
       this.props.deleteSubscriptions(selectedRows);
       this.handleSelectedRowsChange([]);
       closeDeleteModal();
@@ -221,7 +143,6 @@ class SubscriptionsPage extends Component {
     const toggleDeleteButton = rowsSelected =>
       (rowsSelected ? enableDeleteButton() : disableDeleteButton());
 
-
     const csvParams = createSubscriptionParams({ search: searchQuery });
     const getEnabledColumns = (columns) => {
       const enabledColumns = [];
@@ -289,12 +210,12 @@ class SubscriptionsPage extends Component {
               canImportManifest={canImportManifest}
               canDeleteManifest={canDeleteManifest}
               canEditOrganizations={canEditOrganizations}
-              taskInProgress={taskInProgress}
+              taskInProgress={!!task}
               disableManifestActions={disableManifestActions}
               disabledReason={this.getDisabledReason()}
-              upload={this.uploadManifest}
-              delete={this.deleteManifest}
-              refresh={this.refreshManifest}
+              upload={this.props.uploadManifest}
+              delete={this.props.deleteManifest}
+              refresh={this.props.refreshManifest}
             />
 
             <div id="subscriptions-table" className="modal-container">
@@ -317,12 +238,11 @@ class SubscriptionsPage extends Component {
                 onDeleteSubscriptions={onDeleteSubscriptions}
                 toggleDeleteButton={toggleDeleteButton}
                 task={task}
-                bulkSearch={this.props.bulkSearch}
                 selectedRows={this.state.selectedRows}
                 onSelectedRowsChange={this.handleSelectedRowsChange}
               />
               <ModalProgressBar
-                show={taskModalOpened}
+                show={!!task}
                 container={document.getElementById('subscriptions-table')}
                 title={task ? task.humanized.action : null}
                 progress={task ? Math.round(task.progress * 100) : 0}
@@ -342,7 +262,6 @@ SubscriptionsPage.propTypes = {
   resetTasks: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
   loadTableColumns: PropTypes.func.isRequired,
-  taskDetails: PropTypes.shape({}),
   simpleContentAccess: PropTypes.bool,
   subscriptions: PropTypes.shape({
     disconnected: PropTypes.bool,
@@ -357,18 +276,29 @@ SubscriptionsPage.propTypes = {
   organization: PropTypes.shape({
     id: PropTypes.number,
     owner_details: PropTypes.shape({
-      displayName: PropTypes.string,
+      upstreamConsumer: PropTypes.shape({
+        name: PropTypes.string,
+        webUrl: PropTypes.string,
+        uuid: PropTypes.string,
+      }),
+    }),
+  }),
+  task: PropTypes.shape({
+    id: PropTypes.string,
+    progress: PropTypes.number,
+    humanized: PropTypes.shape({
+      action: PropTypes.string,
     }),
+    pending: PropTypes.bool,
   }),
-  pollBulkSearch: PropTypes.func.isRequired,
-  bulkSearch: PropTypes.func,
-  pollTaskUntilDone: PropTypes.func.isRequired,
+  pollTasks: PropTypes.func.isRequired,
+  cancelPollTasks: PropTypes.func.isRequired,
+  handleTask: PropTypes.func.isRequired,
   loadSetting: PropTypes.func.isRequired,
   loadTables: PropTypes.func.isRequired,
   createColumns: PropTypes.func.isRequired,
   updateColumns: PropTypes.func.isRequired,
   subscriptionTableSettings: PropTypes.shape({}),
-  tasks: PropTypes.arrayOf(PropTypes.shape({})),
   deleteSubscriptions: PropTypes.func.isRequired,
   refreshManifest: PropTypes.func.isRequired,
   searchQuery: PropTypes.string,
@@ -377,22 +307,16 @@ SubscriptionsPage.propTypes = {
   deleteModalOpened: PropTypes.bool,
   openDeleteModal: PropTypes.func.isRequired,
   closeDeleteModal: PropTypes.func.isRequired,
-  taskModalOpened: PropTypes.bool,
-  openTaskModal: PropTypes.func.isRequired,
-  closeTaskModal: PropTypes.func.isRequired,
   deleteButtonDisabled: PropTypes.bool,
   disableDeleteButton: PropTypes.func.isRequired,
   enableDeleteButton: PropTypes.func.isRequired,
 };
 
 SubscriptionsPage.defaultProps = {
-  tasks: [],
-  bulkSearch: undefined,
-  taskDetails: {},
+  task: undefined,
   organization: undefined,
   searchQuery: '',
   deleteModalOpened: false,
-  taskModalOpened: false,
   deleteButtonDisabled: true,
   subscriptionTableSettings: {},
   simpleContentAccess: false,

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -7,17 +7,14 @@ export const selectSearchQuery = state =>
 export const selectDeleteModalOpened = state =>
   selectSubscriptionsState(state).deleteModalOpened;
 
-export const selectTaskModalOpened = state =>
-  selectSubscriptionsState(state).taskModalOpened;
-
 export const selectDeleteButtonDisabled = state =>
   selectSubscriptionsState(state).deleteButtonDisabled;
 
 export const selectActivePermissions = state =>
   selectSubscriptionsState(state).activePermissions;
 
-export const selectSubscriptionsTasks = state =>
-  selectSubscriptionsState(state).tasks;
+export const selectSubscriptionsTask = state =>
+  selectSubscriptionsState(state).task;
 
 export const selectTableSettings = (state, tableName) =>
   state.katello.settings.tables[tableName] || undefined;

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js

@@ -265,7 +265,7 @@ UpstreamSubscriptionsPage.propTypes = {
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     task: PropTypes.shape({
-      id: PropTypes.number,
+      id: PropTypes.string,
     }),
   }).isRequired,
   history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsActions.test.js

@@ -18,6 +18,10 @@ import {
   loadTableColumnsSuccessAction,
 } from './subscriptions.fixtures';
 import {
+  handleTask,
+  pollTasks,
+  cancelPollTasks,
+  resetTasks,
   loadSubscriptions,
   updateQuantity,
   loadAvailableQuantities,
@@ -25,14 +29,24 @@ import {
   updateSearchQuery,
   openDeleteModal,
   closeDeleteModal,
-  openTaskModal,
-  closeTaskModal,
   disableDeleteButton,
   enableDeleteButton,
 } from '../SubscriptionActions';
 
+import { getTaskPendingResponse, getTaskSuccessResponse } from '../../Tasks/__tests__/task.fixtures';
+
 const mockStore = configureMockStore([thunk]);
-const store = mockStore({ subscriptions: Immutable({}) });
+const store = mockStore(Immutable({
+  intervals: {
+    SUBSCRIPTIONS_TASK_SEARCH: 5,
+  },
+  katello: {
+    subscriptions: {},
+    organization: {
+      id: 1,
+    },
+  },
+}));
 
 afterEach(() => {
   store.clearActions();
@@ -145,6 +159,64 @@ describe('subscription actions', () => {
     );
   });
 
+  describe('handleTask', () => {
+    describe('when not polling a task', () => {
+      it('starts polling the task', async () => {
+        await store.dispatch(handleTask(getTaskSuccessResponse));
+
+        expect(store.getActions()).toMatchSnapshot();
+      });
+    });
+
+    it('does nothing if already polling and task is pending', async () => {
+      const pollStore = configureMockStore([thunk])({
+        intervals: {
+          SUBSCRIPTIONS_POLL_TASK: 5,
+        },
+      });
+
+      await pollStore.dispatch(handleTask(getTaskPendingResponse));
+
+      expect(pollStore.getActions()).toMatchSnapshot();
+    });
+
+    it('handles a finished task', async () => {
+      const pollStore = configureMockStore([thunk])({
+        intervals: {
+          SUBSCRIPTIONS_POLL_TASK: 5,
+        },
+      });
+
+      await pollStore.dispatch(handleTask(getTaskSuccessResponse));
+
+      expect(pollStore.getActions()).toMatchSnapshot();
+    });
+  });
+
+  describe('pollTasks', () => testActionSnapshotWithFixtures({
+    'can search tasks': () => store.dispatch(pollTasks()),
+  }));
+
+  describe('cancelPollTasks', () => {
+    it('cancels the tasks search', async () => {
+      await store.dispatch(cancelPollTasks());
+
+      expect(store.getActions()).toMatchSnapshot();
+    });
+
+    it('does nothing if not already polling', async () => {
+      const pollStore = configureMockStore([thunk])({});
+
+      await pollStore.dispatch(cancelPollTasks());
+
+      expect(pollStore.getActions()).toMatchSnapshot();
+    });
+  });
+
+  describe('resetTasks', () => testActionSnapshotWithFixtures({
+    'resets the task state': () => resetTasks(),
+  }));
+
   describe('deleteModal', () => testActionSnapshotWithFixtures({
     'it should open delete modal': () => openDeleteModal(),
     'it should close delete modal': () => closeDeleteModal(),
@@ -154,11 +226,6 @@ describe('subscription actions', () => {
     'it should update the search-query': () => updateSearchQuery('some-query'),
   }));
 
-  describe('taskModal', () => testActionSnapshotWithFixtures({
-    'it should open task modal': () => openTaskModal(),
-    'it should close task modal': () => closeTaskModal(),
-  }));
-
   describe('deleteButtonDisabled', () => testActionSnapshotWithFixtures({
     'it should disable the delete button': () => disableDeleteButton(),
     'it should enable the delete button': () => enableDeleteButton(),