katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/Subscriptions/Manifest/ManifestHistoryReducer.js

@@ -6,6 +6,7 @@ import {
   MANIFEST_HISTORY_FAILURE,
   UPLOAD_MANIFEST_SUCCESS,
   DELETE_MANIFEST_SUCCESS,
+  REFRESH_MANIFEST_SUCCESS,
 } from './ManifestConstants';
 
 const initialState = Immutable({ loading: true, results: [] });
@@ -36,6 +37,9 @@ export default (state = initialState, action) => {
     case DELETE_MANIFEST_SUCCESS:
       return state.set('taskDetails', action.response);
 
+    case REFRESH_MANIFEST_SUCCESS:
+      return state.set('taskDetails', action.response);
+
     default:
       return state;
   }

data/webpack/scenes/Subscriptions/Manifest/ManifestHistoryTableSchema.js

@@ -1,3 +1,4 @@
+import { translate as __ } from 'foremanReact/common/I18n';
 import { headerFormatter, cellFormatter } from '../../../move_to_foreman/components/common/table';
 
 export const columns = [

data/webpack/scenes/Subscriptions/Manifest/__tests__/ManageManifestModal.test.js

@@ -12,9 +12,9 @@ describe('manage manifest modal', () => {
 
   it('should render', async () => {
     const page = shallow(<ManageManifestModal
-      uploadManifest={noop}
-      refreshManifest={noop}
-      deleteManifest={noop}
+      upload={noop}
+      refresh={noop}
+      delete={noop}
       loadManifestHistory={noop}
       organization={organization}
       loadOrganization={noop}

data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap

@@ -193,9 +193,18 @@ exports[`manage manifest modal should render 1`] = `
                 tooltipText=""
               />
               <TooltipButton
-                disabled={true}
-                onClick={[Function]}
-                title="Delete"
+                renderedButton={
+                  <Button
+                    active={false}
+                    block={false}
+                    bsClass="btn"
+                    bsStyle="danger"
+                    disabled={true}
+                    onClick={[Function]}
+                  >
+                    Delete
+                  </Button>
+                }
                 tooltipId="delete-manifest-button-tooltip"
                 tooltipPlacement="top"
                 tooltipText="This is disabled because no manifest exists"

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash';
 import api, { orgId } from '../../services/api';
 import { propsToSnakeCase } from '../../services/index';
 
@@ -11,9 +12,13 @@ import {
   UPDATE_QUANTITY_REQUEST,
   UPDATE_QUANTITY_SUCCESS,
   UPDATE_QUANTITY_FAILURE,
+  UPDATE_SUBSCRIPTION_COLUMNS,
   DELETE_SUBSCRIPTIONS_REQUEST,
   DELETE_SUBSCRIPTIONS_SUCCESS,
   DELETE_SUBSCRIPTIONS_FAILURE,
+  SUBSCRIPTION_TABLE_COLUMNS,
+  SUBSCRIPTION_TABLE_DEFAULT_COLUMNS,
+  SUBSCRIPTIONS_COLUMNS_REQUEST,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
@@ -76,6 +81,27 @@ export const updateQuantity = (quantities = {}) => (dispatch) => {
     .catch(result => dispatch(apiError(UPDATE_QUANTITY_FAILURE, result)));
 };
 
+export const loadTableColumns = selectedColumns => (dispatch) => {
+  const enabledColumns = (isEmpty(selectedColumns) ?
+    SUBSCRIPTION_TABLE_DEFAULT_COLUMNS : selectedColumns.columns);
+  dispatch({
+    type: UPDATE_SUBSCRIPTION_COLUMNS,
+    payload: { enabledColumns },
+  });
+
+  const tableColumns = SUBSCRIPTION_TABLE_COLUMNS.map((option) => {
+    const currentOption = option;
+    currentOption.value = enabledColumns.includes(option.key);
+
+    return currentOption;
+  });
+
+  dispatch({
+    type: SUBSCRIPTIONS_COLUMNS_REQUEST,
+    payload: { tableColumns },
+  });
+};
+
 export const deleteSubscriptions = poolIds => (dispatch) => {
   dispatch({ type: DELETE_SUBSCRIPTIONS_REQUEST });
 

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -1,3 +1,5 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
 export const SUBSCRIPTIONS_REQUEST = 'SUBSCRIPTIONS_REQUEST';
 export const SUBSCRIPTIONS_SUCCESS = 'SUBSCRIPTIONS_SUCCESS';
 export const SUBSCRIPTIONS_FAILURE = 'SUBSCRIPTIONS_FAILURE';
@@ -14,6 +16,9 @@ export const DELETE_SUBSCRIPTIONS_REQUEST = 'DELETE_SUBSCRIPTIONS_REQUEST';
 export const DELETE_SUBSCRIPTIONS_SUCCESS = 'DELETE_SUBSCRIPTIONS_SUCCESS';
 export const DELETE_SUBSCRIPTIONS_FAILURE = 'DELETE_SUBSCRIPTIONS_FAILURE';
 
+export const SUBSCRIPTIONS_COLUMNS_REQUEST = 'SUBSCRIPTIONS_COLUMNS_REQUEST';
+export const UPDATE_SUBSCRIPTION_COLUMNS = 'UPDATE_SUBSCRIPTION_COLUMNS';
+
 export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::Organization::ManifestImport',
   'Actions::Katello::Organization::ManifestRefresh',
@@ -26,3 +31,54 @@ export const BLOCKING_FOREMAN_TASK_TYPES = [
 
 export const MANIFEST_TASKS_BULK_SEARCH_ID = 'activeManifestTasksSearch';
 export const BULK_TASK_SEARCH_INTERVAL = 10000;
+export const SUBSCRIPTION_TABLE_NAME = 'Katello::Subscriptions';
+export const SUBSCRIPTION_TABLE_COLUMNS = [
+  {
+    key: 'id',
+    label: __('Name'),
+    value: false,
+  },
+  {
+    key: 'product_id',
+    label: __('SKU'),
+    value: false,
+  },
+  {
+    key: 'contract_number',
+    label: __('Contract'),
+    value: false,
+  },
+  {
+    key: 'start_date',
+    label: __('Start Date'),
+    value: false,
+  },
+  {
+    key: 'end_date',
+    label: __('End Date'),
+    value: false,
+  },
+  {
+    key: 'virt_who',
+    label: __('Requires Virt-Who'),
+    value: false,
+  },
+  {
+    key: 'consumed',
+    label: __('Consumed'),
+    value: false,
+  },
+  {
+    key: 'quantity',
+    label: __('Entitlements'),
+    value: false,
+  },
+];
+
+export const SUBSCRIPTION_TABLE_DEFAULT_COLUMNS = [
+  'id',
+  'product_id',
+  'contract_number',
+  'start_date',
+  'end_date',
+];

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -1,7 +1,6 @@
-import find from 'lodash/find';
 import Immutable from 'seamless-immutable';
 import { initialApiState } from '../../services/api';
-import { TASK_BULK_SEARCH_SUCCESS } from '../Tasks/TaskConstants';
+import { TASK_BULK_SEARCH_SUCCESS, RESET_TASKS, GET_TASK_SUCCESS } from '../Tasks/TaskConstants';
 
 import {
   SUBSCRIPTIONS_REQUEST,
@@ -10,13 +9,14 @@ import {
   SUBSCRIPTIONS_QUANTITIES_REQUEST,
   SUBSCRIPTIONS_QUANTITIES_SUCCESS,
   SUBSCRIPTIONS_QUANTITIES_FAILURE,
+  SUBSCRIPTIONS_COLUMNS_REQUEST,
+  UPDATE_SUBSCRIPTION_COLUMNS,
   UPDATE_QUANTITY_REQUEST,
   UPDATE_QUANTITY_SUCCESS,
   UPDATE_QUANTITY_FAILURE,
   DELETE_SUBSCRIPTIONS_REQUEST,
   DELETE_SUBSCRIPTIONS_SUCCESS,
   DELETE_SUBSCRIPTIONS_FAILURE,
-  MANIFEST_TASKS_BULK_SEARCH_ID,
 } from './SubscriptionConstants';
 import { GET_SETTING_SUCCESS } from '../../move_to_foreman/Settings/SettingsConstants';
 
@@ -25,6 +25,8 @@ const initialState = Immutable({
   quantitiesLoading: false,
   availableQuantities: null,
   tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
 });
 
 const mapQuantities = (pools) => {
@@ -46,7 +48,12 @@ export default (state = initialState, action) => {
     case UPDATE_QUANTITY_REQUEST:
     case DELETE_SUBSCRIPTIONS_REQUEST:
       return state.set('loading', true);
-
+    case SUBSCRIPTIONS_COLUMNS_REQUEST:
+      return state
+        .set('tableColumns', action.payload.tableColumns);
+    case UPDATE_SUBSCRIPTION_COLUMNS:
+      return state
+        .set('selectedTableColumns', action.payload.enabledColumns);
     case SUBSCRIPTIONS_SUCCESS: {
       const {
         page, per_page, subtotal, results, // eslint-disable-line camelcase
@@ -105,15 +112,23 @@ export default (state = initialState, action) => {
     }
 
     case TASK_BULK_SEARCH_SUCCESS: {
-      let tasks;
+      const tasks = action.response.results;
+      const prevTasksSize = state.tasks.length;
+      const shouldInitTasks = prevTasksSize === 0 && tasks.length > 0;
+      const isTaskFinished = prevTasksSize > 0 && !state.tasks[0].pending;
 
-      const search = find(action.response, bulkSearch =>
-        bulkSearch.search_params.search_id === MANIFEST_TASKS_BULK_SEARCH_ID);
-
-      if (search && search.results.length > 0) {
-        tasks = search.results;
+      if (shouldInitTasks || isTaskFinished) {
+        return state.set('tasks', tasks);
       }
-      return state.set('tasks', tasks);
+      return state;
+    }
+
+    case GET_TASK_SUCCESS: {
+      return state.set('tasks', [action.response]);
+    }
+
+    case RESET_TASKS: {
+      return state.set('tasks', []);
     }
 
     case GET_SETTING_SUCCESS: {

data/webpack/scenes/Subscriptions/SubscriptionValidations.js

@@ -1,3 +1,4 @@
+import { translate as __ } from 'foremanReact/common/I18n';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
 
 export const validateQuantity = (quantity, availableQuantity) => {

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -1,21 +1,27 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { isEmpty, isEqual } from 'lodash';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Grid, Row, Col, Form, FormGroup } from 'react-bootstrap';
 import { Button } from 'patternfly-react';
 import TooltipButton from 'react-bootstrap-tooltip-button';
-import { renderTaskFinishedToast } from '../Tasks/helpers';
+import OptionTooltip from '../../move_to_pf/OptionTooltip';
+import { renderTaskFinishedToast, renderTaskStartedToast } from '../Tasks/helpers';
 import ModalProgressBar from '../../move_to_foreman/components/common/ModalProgressBar';
 import ManageManifestModal from './Manifest/';
 import { SubscriptionsTable } from './components/SubscriptionsTable';
 import { manifestExists } from './SubscriptionHelpers';
 import Search from '../../components/Search/index';
 import api, { orgId } from '../../services/api';
+
+
 import { createSubscriptionParams } from './SubscriptionActions.js';
 import {
   BLOCKING_FOREMAN_TASK_TYPES,
-  MANIFEST_TASKS_BULK_SEARCH_ID,
   BULK_TASK_SEARCH_INTERVAL,
+  SUBSCRIPTION_TABLE_NAME,
 } from './SubscriptionConstants';
 
 import './SubscriptionsPage.scss';
@@ -23,6 +29,7 @@ import './SubscriptionsPage.scss';
 class SubscriptionsPage extends Component {
   constructor(props) {
     super(props);
+
     this.state = {
       manifestModalOpen: false,
       subscriptionDeleteModalOpen: false,
@@ -30,41 +37,56 @@ class SubscriptionsPage extends Component {
       showTaskModal: false,
       searchQuery: '',
     };
+    this.uploadManifest = this.uploadManifest.bind(this);
+    this.deleteManifest = this.deleteManifest.bind(this);
+    this.refreshManifest = this.refreshManifest.bind(this);
   }
 
   componentDidMount() {
-    this.loadData();
-  }
-
-  static getDerivedStateFromProps(nextProps, prevState) {
-    const { tasks = [] } = nextProps;
-    const nextTaskId = tasks[0] && tasks[0].id;
-
-    if (tasks.length === 0 && prevState.polledTask != null) {
-      return { showTaskModal: false, polledTask: undefined };
-    } else if (tasks.length > 0 && nextTaskId !== prevState.polledTask) {
-      return {
-        showTaskModal: true,
-        manifestModalOpen: false,
-        polledTask: nextTaskId,
-      };
-    }
-    return null;
+    this.props.resetTasks();
+    this.props.loadSetting('content_disconnected');
+    this.props.loadSubscriptions();
   }
 
   componentDidUpdate(prevProps) {
-    const { tasks = [] } = this.props;
+    const { tasks = [], organization } = this.props;
     const { tasks: prevTasks = [] } = prevProps;
-
+    const currentOrg = Number(orgId());
     const numberOfTasks = tasks.length;
     const numberOfPrevTasks = prevTasks.length;
-    let task;
+    const [task] = tasks;
 
     if (numberOfTasks > 0) {
-      if (numberOfPrevTasks === 0 || prevTasks[0].id !== tasks[0].id) {
-        [task] = tasks;
-        this.handleDoneTask(task);
+      if (currentOrg === task.input.organization.id) {
+        if (!this.state.showTaskModal) {
+        // eslint-disable-next-line
+        this.setState({
+            showTaskModal: true,
+          });
+        }
       }
+
+      if (numberOfPrevTasks === 0 || prevTasks[0].id !== task.id) {
+        if (currentOrg === task.input.organization.id) {
+          this.handleDoneTask(task);
+        } else if (this.state.showTaskModal) {
+          // eslint-disable-next-line
+            this.setState({
+            showTaskModal: false,
+          });
+        }
+      }
+    }
+
+    if (numberOfTasks === 0) {
+      if (this.state.showTaskModal && !this.state.pollingATask) {
+        // eslint-disable-next-line
+        this.setState({ showTaskModal: false });
+      }
+    }
+
+    if (!isEqual(organization.owner_details, prevProps.organization.owner_details)) {
+      this.pollTasks();
     }
   }
 
@@ -86,42 +108,75 @@ class SubscriptionsPage extends Component {
     return disabledReason;
   }
 
-  loadData() {
-    this.props.pollBulkSearch({
-      search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
-      type: 'all',
-      active_only: true,
-      action_types: BLOCKING_FOREMAN_TASK_TYPES,
-    }, BULK_TASK_SEARCH_INTERVAL);
+  pollTasks() {
+    const { pollBulkSearch, organization } = this.props;
+
+    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();
+    this.props.loadTables().then(() => {
+      const { subscriptionTableSettings, loadTableColumns } = this.props;
+      loadTableColumns(subscriptionTableSettings);
+    });
   }
 
   handleDoneTask(taskToPoll) {
     const POLL_TASK_INTERVAL = 5000;
-    const { pollTaskUntilDone, loadSubscriptions } = this.props;
+    const { pollTaskUntilDone, loadSubscriptions, organization } = this.props;
 
-    pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL)
+    pollTaskUntilDone(taskToPoll.id, {}, POLL_TASK_INTERVAL, organization.id)
       .then((task) => {
         renderTaskFinishedToast(task);
         loadSubscriptions();
+        this.setState({ pollingATask: false });
       });
   }
 
+  manifestAction(callback, file = undefined) {
+    this.setState({
+      showTaskModal: true,
+      pollingATask: true,
+    });
+    callback(file)
+      .then(() => renderTaskStartedToast(this.props.taskDetails))
+      .then(() =>
+        setTimeout(() => this.props.bulkSearch({
+          action: `organization '${this.props.organization.owner_details.displayName}'`,
+          result: 'pending',
+          label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
+        })), 100);
+  }
+  uploadManifest = (file) => {
+    this.manifestAction(this.props.uploadManifest, file);
+  };
+
+  deleteManifest = () => {
+    this.manifestAction(this.props.deleteManifest);
+  };
+
+  refreshManifest = () => {
+    this.manifestAction(this.props.refreshManifest);
+  };
+
   render() {
-    const { tasks = [], subscriptions, organization } = this.props;
     const currentOrg = orgId();
+    const {
+      tasks = [], subscriptions, organization, subscriptionTableSettings,
+    } = this.props;
     const { disconnected } = subscriptions;
     const taskInProgress = tasks.length > 0;
     const disableManifestActions = taskInProgress || disconnected;
-
     let task = null;
 
     if (taskInProgress) {
       [task] = tasks;
     }
-
+    const tableColumns = Immutable.asMutable(subscriptions.tableColumns, { deep: true });
     const onSearch = (search) => {
       this.props.loadSubscriptions({ search });
     };
@@ -165,7 +220,35 @@ class SubscriptionsPage extends Component {
 
 
     const csvParams = createSubscriptionParams({ search: this.state.searchQuery });
+    const getEnabledColumns = (columns) => {
+      const enabledColumns = [];
+      columns.forEach((column) => {
+        if (column.value) {
+          enabledColumns.push(column.key);
+        }
+      });
+
+      return enabledColumns;
+    };
+    const toolTipOnclose = (columns) => {
+      const enabledColumns = getEnabledColumns(columns);
+      const { loadTableColumns, createColumns, updateColumns } = this.props;
+      loadTableColumns({ columns: enabledColumns });
+
+      if (isEmpty(subscriptionTableSettings)) {
+        createColumns({ name: SUBSCRIPTION_TABLE_NAME, columns: enabledColumns });
+      } else {
+        const options = { ...subscriptionTableSettings };
+        options.columns = enabledColumns;
+        updateColumns(options);
+      }
+    };
+    const toolTipOnChange = (columns) => {
+      const { loadTableColumns } = this.props;
 
+      loadTableColumns({ columns: getEnabledColumns(columns) });
+    };
+    const columns = subscriptions.selectedTableColumns;
     const emptyStateData = {
       header: __('There are no Subscriptions to display'),
       description: __('Import a Manifest to manage your Entitlements.'),
@@ -191,7 +274,9 @@ class SubscriptionsPage extends Component {
                       updateSearchQuery={updateSearchQuery}
                     />
                   </FormGroup>
-
+                  <div className="option-tooltip-container">
+                    <OptionTooltip options={tableColumns} icon="fa-columns" id="subscriptionTableTooltip" onChange={toolTipOnChange} onClose={toolTipOnclose} />
+                  </div>
                   <div className="toolbar-pf-action-right">
                     <FormGroup>
                       <LinkContainer
@@ -240,11 +325,15 @@ class SubscriptionsPage extends Component {
               disableManifestActions={disableManifestActions}
               disabledReason={this.getDisabledReason()}
               onClose={onManageManifestModalClose}
+              upload={this.uploadManifest}
+              delete={this.deleteManifest}
+              refresh={this.refreshManifest}
             />
 
             <div id="subscriptions-table" className="modal-container">
               <SubscriptionsTable
                 loadSubscriptions={this.props.loadSubscriptions}
+                tableColumns={columns}
                 updateQuantity={this.props.updateQuantity}
                 emptyState={emptyStateData}
                 subscriptions={this.props.subscriptions}
@@ -270,20 +359,36 @@ class SubscriptionsPage extends Component {
 
 SubscriptionsPage.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
+  uploadManifest: PropTypes.func.isRequired,
+  deleteManifest: PropTypes.func.isRequired,
+  resetTasks: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
+  loadTableColumns: PropTypes.func.isRequired,
+  taskDetails: PropTypes.shape({}),
   subscriptions: PropTypes.shape({}).isRequired,
-  organization: PropTypes.shape({}).isRequired,
+  organization: PropTypes.shape({
+    owner_details: PropTypes.shape({
+      displayName: PropTypes.string,
+    }),
+  }),
   pollBulkSearch: PropTypes.func.isRequired,
   bulkSearch: PropTypes.func,
   pollTaskUntilDone: PropTypes.func.isRequired,
   loadSetting: PropTypes.func.isRequired,
+  loadTables: PropTypes.func.isRequired,
+  createColumns: PropTypes.func.isRequired,
+  updateColumns: PropTypes.func.isRequired,
+  subscriptionTableSettings: PropTypes.shape({}).isRequired,
   tasks: PropTypes.arrayOf(PropTypes.shape({})),
   deleteSubscriptions: PropTypes.func.isRequired,
+  refreshManifest: PropTypes.func.isRequired,
 };
 
 SubscriptionsPage.defaultProps = {
   tasks: [],
   bulkSearch: undefined,
+  taskDetails: {},
+  organization: undefined,
 };
 
 export default SubscriptionsPage;