katello 3.8.1 → 3.9.0.rc1

data/webpack/scenes/Subscriptions/SubscriptionsPage.scss

@@ -36,3 +36,10 @@
     }
   }
 }
+
+.option-tooltip-container {
+  display: inline-block;
+  margin-left: 10px;
+  margin-top: 3px;
+  width: 10px;
+}

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

@@ -1,11 +1,12 @@
 import React, { Component } from 'react';
 import ReactDOMServer from 'react-dom/server';
 import _ from 'lodash';
+import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Grid, Row, Col } from 'react-bootstrap';
-import { bindMethods, Button } from 'patternfly-react';
 import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
+import { Button } from 'patternfly-react';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
 import helpers from '../../../move_to_foreman/common/helpers';
@@ -19,19 +20,13 @@ class UpstreamSubscriptionsPage extends Component {
     this.state = {
       selectedRows: [],
     };
-
-    bindMethods(this, [
-      'onChange',
-      'saveUpstreamSubscriptions',
-      'quantityValidationInput',
-    ]);
   }
 
   componentDidMount() {
     this.loadData();
   }
 
-  onChange(value, rowData) {
+  onChange = (value, rowData) => {
     const { selectedRows } = this.state;
     const pool = {
       ...rowData,
@@ -54,7 +49,7 @@ class UpstreamSubscriptionsPage extends Component {
     }
 
     this.setState({ selectedRows });
-  }
+  };
 
   // eslint-disable-next-line class-methods-use-this
   quantityValidation(pool) {
@@ -84,21 +79,20 @@ class UpstreamSubscriptionsPage extends Component {
     );
   }
 
-  quantityValidationInput(pool) {
+
+  quantityValidationInput = (pool) => {
     if (!pool || pool.updatedQuantity === undefined) return null;
     if (this.quantityValidation(pool)[0]) {
       return 'success';
     }
     return 'error';
-  }
+  };
 
-  validateSelectedRows() {
-    return Array.isArray(this.state.selectedRows) &&
+  validateSelectedRows = () => Array.isArray(this.state.selectedRows) &&
            this.state.selectedRows.length &&
            this.state.selectedRows.every(pool => this.quantityValidation(pool)[0]);
-  }
 
-  saveUpstreamSubscriptions() {
+  saveUpstreamSubscriptions = () => {
     const updatedPools = _.map(
       this.state.selectedRows,
       pool => ({ ...pool, quantity: parseInt(pool.updatedQuantity, 10) }),
@@ -124,7 +118,7 @@ class UpstreamSubscriptionsPage extends Component {
         this.props.history.push('/subscriptions');
       }
     });
-  }
+  };
 
   loadData() {
     this.props.loadUpstreamSubscriptions();

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
+import { translate as __ } from 'foremanReact/common/I18n';
 import helpers from '../../../move_to_foreman/common/helpers';
 import {
   headerFormatter,

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

@@ -10,6 +10,7 @@ jest.mock('foremanReact/components/BreadcrumbBar');
 
 describe('upstream subscriptions page', () => {
   let shallowWrapper;
+  const mockHistory = { push: () => {} };
   beforeEach(() => {
     shallowWrapper = shallow(<UpstreamSubscriptionsPage
       upstreamSubscriptions={successState}
@@ -18,7 +19,6 @@ describe('upstream subscriptions page', () => {
       history={mockHistory}
     />);
   });
-  const mockHistory = { push: () => {} };
 
   it('should render', async () => {
     expect(toJson(shallowWrapper)).toMatchSnapshot();

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

@@ -14,8 +14,9 @@ import {
   loadQuantitiesFailureActions,
   loadQuantitiesSuccessActions,
   quantitiesRequestSuccessResponse,
+  loadTableColumnsSuccessAction,
 } from './subscriptions.fixtures';
-import { loadSubscriptions, updateQuantity, loadAvailableQuantities } from '../SubscriptionActions';
+import { loadSubscriptions, updateQuantity, loadAvailableQuantities, loadTableColumns } from '../SubscriptionActions';
 
 const mockStore = configureMockStore([thunk]);
 const store = mockStore({ subscriptions: Immutable({}) });
@@ -123,4 +124,13 @@ describe('subscription actions', () => {
       },
     );
   });
+  describe('loadTableColumns', () => {
+    it(
+      'loads table columns',
+      () => {
+        store.dispatch(loadTableColumns());
+        expect(store.getActions()).toEqual(loadTableColumnsSuccessAction);
+      },
+    );
+  });
 });

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

@@ -2,11 +2,15 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import SubscriptionsPage from '../SubscriptionsPage';
-import { successState } from './subscriptions.fixtures';
-import { loadSubscriptions, updateQuantity } from '../SubscriptionActions';
+import { successState, settingsSuccessState } from './subscriptions.fixtures';
+import { loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
 import { loadSetting } from '../../../move_to_foreman/Settings/SettingsActions';
+import { createColumns, updateColumns } from '../../../scenes/Settings/Tables/TableActions';
 
 jest.mock('../../../move_to_foreman/foreman_toast_notifications');
+const loadTables = () => new Promise((resolve) => {
+  resolve();
+});
 
 describe('subscriptions page', () => {
   const noop = () => {};
@@ -16,12 +20,21 @@ describe('subscriptions page', () => {
     const page = shallow(<SubscriptionsPage
       organization={organization}
       subscriptions={successState}
+      subscriptionTableSettings={settingsSuccessState}
       loadSetting={loadSetting}
+      loadTables={loadTables}
+      loadTableColumns={loadTableColumns}
+      createColumns={createColumns}
+      updateColumns={updateColumns}
       loadSubscriptions={loadSubscriptions}
       updateQuantity={updateQuantity}
       pollTaskUntilDone={noop}
       pollBulkSearch={noop}
       deleteSubscriptions={() => {}}
+      resetTasks={noop}
+      uploadManifest={noop}
+      deleteManifest={noop}
+      refreshManifest={noop}
     />);
     expect(toJson(page)).toMatchSnapshot();
   });

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

@@ -10,6 +10,8 @@ import {
   successState,
   errorState,
   quantitiesErrorState,
+  loadingColumnsState,
+  tableColumns,
 } from './subscriptions.fixtures';
 import reducer from '../SubscriptionReducer';
 
@@ -70,4 +72,14 @@ describe('subscriptions reducer', () => {
       },
     })).toEqual(quantitiesErrorState);
   });
+
+  it('should load table columns on a SUBSCRIPTIONS_COLUMNS_REQUEST', () => {
+    const successTableColumnsState = { ...successState };
+    successTableColumnsState.tableColumns = tableColumns;
+
+    expect(reducer(loadingColumnsState, {
+      type: types.SUBSCRIPTIONS_COLUMNS_REQUEST,
+      payload: { tableColumns },
+    })).toEqual(successTableColumnsState);
+  });
 });

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -41,10 +41,23 @@ exports[`subscriptions page should render 1`] = `
             >
               <Search
                 getAutoCompleteParams={[Function]}
+                initialInputValue=""
                 onSearch={[Function]}
                 updateSearchQuery={[Function]}
               />
             </FormGroup>
+            <div
+              className="option-tooltip-container"
+            >
+              <OptionTooltip
+                icon="fa-columns"
+                id="subscriptionTableTooltip"
+                onChange={[Function]}
+                onClose={[Function]}
+                options={Array []}
+                rootClose={true}
+              />
+            </div>
             <div
               className="toolbar-pf-action-right"
             >
@@ -102,10 +115,13 @@ exports[`subscriptions page should render 1`] = `
         </Col>
       </Row>
       <Connect(ManageManifestModal)
+        delete={[Function]}
         disabledReason={null}
         onClose={[Function]}
+        refresh={[Function]}
         showModal={false}
         taskInProgress={false}
+        upload={[Function]}
       />
       <div
         className="modal-container"
@@ -192,9 +208,12 @@ exports[`subscriptions page should render 1`] = `
               ],
               "search": undefined,
               "searchIsActive": false,
+              "selectedTableColumns": Array [],
+              "tableColumns": Array [],
               "tasks": Array [],
             }
           }
+          tableColumns={Array []}
           task={null}
           toggleDeleteButton={[Function]}
           updateQuantity={[Function]}

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -12,6 +12,8 @@ export const initialState = Immutable({
   quantitiesLoading: false,
   availableQuantities: null,
   tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
 });
 
 export const loadingState = Immutable({
@@ -245,6 +247,24 @@ export const successState = Immutable({
   quantitiesLoading: false,
   availableQuantities: null,
   tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
+});
+export const settingsSuccessState = Immutable({
+  tables: {
+    loading: false,
+    id: 22,
+    name: 'Katello::Subscriptions',
+    columns: [
+      'id',
+      'product_id',
+      'contract_number',
+      'start_date',
+      'end_date',
+    ],
+    created_at: '2018-06-12 17:05:03 -0600',
+    updated_at: '2018-06-20 13:55:42 -0600',
+  },
 });
 
 export const errorState = Immutable({
@@ -258,6 +278,8 @@ export const errorState = Immutable({
   quantitiesLoading: false,
   availableQuantities: null,
   tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
 });
 
 export const quantitiesSuccessState = Immutable({
@@ -359,3 +381,68 @@ export const loadQuantitiesSuccessActions = [
     response: quantitiesRequestSuccessResponse,
   },
 ];
+export const tableColumns = [
+  {
+    key: 'id',
+    label: 'Name',
+    value: true,
+  },
+  {
+    key: 'product_id',
+    label: 'SKU',
+    value: true,
+  },
+  {
+    key: 'contract_number',
+    label: 'Contract',
+    value: true,
+  },
+  {
+    key: 'start_date',
+    label: 'Start Date',
+    value: true,
+  },
+  {
+    key: 'end_date',
+    label: 'End Date',
+    value: true,
+  },
+  {
+    key: 'virt_who',
+    label: 'Requires Virt-Who',
+    value: false,
+  },
+  {
+    key: 'consumed',
+    label: 'Consumed',
+    value: false,
+  },
+  {
+    key: 'quantity',
+    label: 'Entitlements',
+    value: false,
+  },
+];
+export const loadTableColumnsSuccessAction = [
+  {
+    type: 'UPDATE_SUBSCRIPTION_COLUMNS',
+    payload: {
+      enabledColumns: [
+        'id',
+        'product_id',
+        'contract_number',
+        'start_date',
+        'end_date',
+      ],
+    },
+  },
+  {
+    payload: {
+      tableColumns,
+    },
+    type: 'SUBSCRIPTIONS_COLUMNS_REQUEST',
+  },
+];
+export const loadingColumnsState = Immutable({
+  ...successState,
+});

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/EntitlementsInlineEditFormatter.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { sprintf } from 'jed';
+import { sprintf } from 'foremanReact/common/I18n';
 import { Table, FormControl, FormGroup, HelpBlock, Spinner } from 'patternfly-react';
 import { validateQuantity } from '../../SubscriptionValidations';
 import { KEY_CODES } from '../../../../move_to_foreman/common/helpers';

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionTypeFormatter.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import helpers from '../../../../move_to_foreman/common/helpers';
+
+export const subscriptionTypeFormatter = (value, { rowData }) => {
+  let cellContent;
+
+  if (rowData.virt_only === false) {
+    cellContent = __('Physical');
+  } else if (rowData.hypervisor) {
+    cellContent = (
+      <span>
+        {__('Guests of')}
+        {' '}
+        <Link to={helpers.urlBuilder('content_hosts', '', rowData.hypervisor.id)}>{rowData.hypervisor.name}</Link>
+      </span>
+    );
+  } else if (rowData.unmapped_guest) {
+    cellContent = __('Temporary');
+  } else {
+    cellContent = __('Virtual');
+  }
+
+  return (
+    <td>
+      {cellContent}
+    </td>
+  );
+};
+
+export default subscriptionTypeFormatter;

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { sprintf } from 'jed';
+import { sprintf } from 'foremanReact/common/I18n';
 import { cloneDeep, findIndex, isEqual } from 'lodash';
 import { Table } from 'patternfly-react';
 import { LoadingState } from '../../../../move_to_pf/LoadingState';
@@ -12,10 +12,7 @@ import { recordsValid } from '../../SubscriptionValidations';
 import { createSubscriptionsTableSchema } from './SubscriptionsTableSchema';
 import { buildTableRows, groupSubscriptionsByProductId, buildPools } from './SubscriptionsTableHelpers';
 import { renderTaskStartedToast } from '../../../Tasks/helpers';
-import {
-  BLOCKING_FOREMAN_TASK_TYPES,
-  MANIFEST_TASKS_BULK_SEARCH_ID,
-} from '../../SubscriptionConstants';
+import { BLOCKING_FOREMAN_TASK_TYPES } from '../../SubscriptionConstants';
 
 class SubscriptionsTable extends Component {
   constructor(props) {
@@ -112,10 +109,9 @@ class SubscriptionsTable extends Component {
       this.props.updateQuantity(buildPools(this.state.updatedQuantity))
         .then(() =>
           this.props.bulkSearch({
-            search_id: MANIFEST_TASKS_BULK_SEARCH_ID,
-            type: 'all',
-            active_only: true,
-            action_types: BLOCKING_FOREMAN_TASK_TYPES,
+            action: `organization '${this.props.organization.owner_details.displayName}'`,
+            result: 'pending',
+            label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
           }))
         .then(() => renderTaskStartedToast(this.props.task));
     }
@@ -140,7 +136,7 @@ class SubscriptionsTable extends Component {
   }
 
   render() {
-    const { subscriptions, emptyState } = this.props;
+    const { subscriptions, emptyState, tableColumns } = this.props;
     const { groupedSubscriptions } = this.state;
     const allSubscriptionResults = subscriptions.results;
 
@@ -235,11 +231,13 @@ class SubscriptionsTable extends Component {
       bodyMessage = __('No subscriptions match your search criteria.');
     }
 
+    const alwaysDisplayColumns = ['select'];
     const columnsDefinition = createSubscriptionsTableSchema(
       inlineEditController,
       selectionController,
       groupingController,
-    );
+    ).filter(column => tableColumns.includes(column.property) ||
+    alwaysDisplayColumns.includes(column.property));
 
     return (
       <LoadingState loading={subscriptions.loading} loadingText={__('Loading')}>
@@ -329,6 +327,7 @@ class SubscriptionsTable extends Component {
 }
 
 SubscriptionsTable.propTypes = {
+  tableColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
   emptyState: PropTypes.shape({}).isRequired,
@@ -341,11 +340,17 @@ SubscriptionsTable.propTypes = {
   toggleDeleteButton: PropTypes.func.isRequired,
   task: PropTypes.shape({}),
   bulkSearch: PropTypes.func,
+  organization: PropTypes.shape({
+    owner_details: PropTypes.shape({
+      displayName: PropTypes.string,
+    }),
+  }),
 };
 
 SubscriptionsTable.defaultProps = {
   task: { humanized: {} },
   bulkSearch: undefined,
+  organization: undefined,
 };
 
 export default SubscriptionsTable;