katello 3.13.4 → 3.14.0.rc1

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

@@ -39,20 +39,6 @@ exports[`upstream subscriptions page should render 1`] = `
         <Table
           columns={
             Array [
-              Object {
-                "cell": Object {
-                  "formatters": Array [
-                    [Function],
-                  ],
-                },
-                "header": Object {
-                  "formatters": Array [
-                    [Function],
-                  ],
-                  "label": "Select all rows",
-                },
-                "property": "select",
-              },
               Object {
                 "cell": Object {
                   "formatters": Array [
@@ -204,6 +190,12 @@ exports[`upstream subscriptions page should render 1`] = `
           bsStyle="primary"
           disabled={true}
           onClick={[Function]}
+          style={
+            Object {
+              "marginRight": "5px",
+              "marginTop": "10px",
+            }
+          }
           type="submit"
         >
           Submit
@@ -213,6 +205,11 @@ exports[`upstream subscriptions page should render 1`] = `
           exact={false}
           replace={false}
           strict={false}
+          style={
+            Object {
+              "marginTop": "10px",
+            }
+          }
           to="/subscriptions"
         >
           <Button

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

@@ -45,37 +45,35 @@ describe('subscription actions', () => {
   describe('loadSubscriptions', () => {
     it(
       'creates SUBSCRIPTIONS_REQUEST and then fails with 422',
-      () => {
+      async () => {
         mockErrorRequest({
           url: '/katello/api/v2/subscriptions',
           status: 422,
         });
-        return store.dispatch(loadSubscriptions())
-          .then(() => expect(store.getActions()).toEqual(failureActions));
+        await store.dispatch(loadSubscriptions());
+        expect(store.getActions()).toEqual(failureActions);
       },
     );
     it(
       'creates SUBSCRIPTIONS_REQUEST and ends with success',
-      () => {
+      async () => {
         mockRequest({
           url: '/katello/api/v2/subscriptions',
           response: requestSuccessResponse,
         });
-        return store.dispatch(loadSubscriptions())
-          .then(() => expect(store.getActions()).toEqual(successActions));
+        await store.dispatch(loadSubscriptions());
+        expect(store.getActions()).toEqual(successActions);
       },
     );
     it(
       'creates SUBSCRIPTIONS_REQUEST and triggers loadAvailableQuantities when there is some RH subscription',
-      () => {
+      async () => {
         mockRequest({
           url: '/katello/api/v2/subscriptions',
           response: requestSuccessResponseWithRHSubscriptions,
         });
-        return store.dispatch(loadSubscriptions())
-          .then(() =>
-            expect(store.getActions())
-              .toEqual(successActionsWithQuantityLoad));
+        await store.dispatch(loadSubscriptions());
+        expect(store.getActions()).toEqual(successActionsWithQuantityLoad);
       },
     );
   });
@@ -83,28 +81,28 @@ describe('subscription actions', () => {
   describe('updateQuantity', () => {
     it(
       'creates UPDATE_QUANTITY_REQUEST and then fails with 422',
-      () => {
+      async () => {
         mockErrorRequest({
           method: 'PUT',
           url: '/katello/api/v2/organizations/1/upstream_subscriptions',
           data: { pools: poolsUpdate },
           status: 422,
         });
-        return store.dispatch(updateQuantity(poolsUpdate))
-          .then(() => expect(store.getActions()).toEqual(updateQuantityFailureActions));
+        await store.dispatch(updateQuantity(poolsUpdate));
+        expect(store.getActions()).toEqual(updateQuantityFailureActions);
       },
     );
     it(
       'creates UPDATE_QUANTITY_REQUEST and ends with success',
-      () => {
+      async () => {
         mockRequest({
           method: 'PUT',
           url: '/katello/api/v2/organizations/1/upstream_subscriptions',
           data: { pools: poolsUpdate },
           response: requestSuccessResponse,
         });
-        return store.dispatch(updateQuantity(poolsUpdate))
-          .then(() => expect(store.getActions()).toEqual(updateQuantitySuccessActions));
+        await store.dispatch(updateQuantity(poolsUpdate));
+        expect(store.getActions()).toEqual(updateQuantitySuccessActions);
       },
     );
   });
@@ -114,28 +112,28 @@ describe('subscription actions', () => {
 
     it(
       'creates SUBSCRIPTIONS_QUANTITIES_REQUEST and then fails with 500',
-      () => {
+      async () => {
         mockErrorRequest({
           method: 'GET',
           url: '/katello/api/v2/organizations/1/upstream_subscriptions',
           data,
           status: 500,
         });
-        return store.dispatch(loadAvailableQuantities())
-          .then(() => expect(store.getActions()).toEqual(loadQuantitiesFailureActions));
+        await store.dispatch(loadAvailableQuantities());
+        expect(store.getActions()).toEqual(loadQuantitiesFailureActions);
       },
     );
     it(
       'creates SUBSCRIPTIONS_QUANTITIES_REQUEST and ends with success',
-      () => {
+      async () => {
         mockRequest({
           method: 'GET',
           url: '/katello/api/v2/organizations/1/upstream_subscriptions',
           data,
           response: quantitiesRequestSuccessResponse,
         });
-        return store.dispatch(loadAvailableQuantities())
-          .then(() => expect(store.getActions()).toEqual(loadQuantitiesSuccessActions));
+        await store.dispatch(loadAvailableQuantities());
+        expect(store.getActions()).toEqual(loadQuantitiesSuccessActions);
       },
     );
   });

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

@@ -3,10 +3,11 @@ import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { loadSetting } from 'foremanReact/components/Settings/SettingsActions';
 import SubscriptionsPage from '../SubscriptionsPage';
-import { successState, settingsSuccessState } from './subscriptions.fixtures';
+import { successState, settingsSuccessState, permissionDeniedState } from './subscriptions.fixtures';
 import { loadSubscriptions, updateQuantity, loadTableColumns } from '../SubscriptionActions';
 import { createColumns, updateColumns } from '../../../scenes/Settings/Tables/TableActions';
 
+jest.mock('foremanReact/components/PermissionDenied');
 jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 
 const loadTables = () => new Promise((resolve) => {
@@ -45,10 +46,43 @@ describe('subscriptions page', () => {
     enableDeleteButton={noop}
   />);
 
+  const permissionDeniedPage = shallow(<SubscriptionsPage
+    organization={organization}
+    subscriptions={permissionDeniedState}
+    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}
+    updateSearchQuery={noop}
+    openManageManifestModal={noop}
+    closeManageManifestModal={noop}
+    openDeleteModal={noop}
+    closeDeleteModal={noop}
+    openTaskModal={noop}
+    closeTaskModal={noop}
+    disableDeleteButton={noop}
+    enableDeleteButton={noop}
+  />);
+
   it('should render', async () => {
     expect(toJson(page)).toMatchSnapshot();
   });
 
+  it('should render <PermissionDenied /> when permissions are missing', async () => {
+    expect(toJson(permissionDeniedPage)).toMatchSnapshot();
+  });
+
   it('should poll tasks when org changes', async () => {
     jest.spyOn(page.instance(), 'pollTasks');
 

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

@@ -1,5 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`subscriptions page should render <PermissionDenied /> when permissions are missing 1`] = `
+<PermissionDenied
+  missingPermissions={
+    Array [
+      "view_subscriptions",
+    ]
+  }
+/>
+`;
+
 exports[`subscriptions page should render 1`] = `
 <Grid
   bsClass="container-fluid"
@@ -19,6 +29,7 @@ exports[`subscriptions page should render 1`] = `
         Subscriptions
       </h1>
       <SubscriptionsToolbar
+        canManageSubscriptionAllocations={false}
         disableAddButton={false}
         disableDeleteButton={true}
         disableDeleteReason="This is disabled because no subscriptions are selected."
@@ -36,6 +47,7 @@ exports[`subscriptions page should render 1`] = `
         updateSearchQuery={[Function]}
       />
       <Connect(ManageManifestModal)
+        canImportManifest={false}
         delete={[Function]}
         disabledReason={null}
         onClose={[Function]}
@@ -49,6 +61,7 @@ exports[`subscriptions page should render 1`] = `
         id="subscriptions-table"
       >
         <SubscriptionsTable
+          canManageSubscriptionAllocations={false}
           emptyState={
             Object {
               "action": Object {

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

@@ -312,6 +312,7 @@ Object {
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
+  "missingPermissions": undefined,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -489,6 +490,12 @@ Object {
 
 exports[`Subscriptions reducer should handle SUBSCRIPTIONS_SUCCESS 1`] = `
 Object {
+  "activePermissions": Object {
+    "can_delete_manifest": undefined,
+    "can_edit_organizations": undefined,
+    "can_import_manifest": undefined,
+    "can_manage_subscription_allocations": undefined,
+  },
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,

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

@@ -253,6 +253,24 @@ export const successState = Immutable({
   tableColumns: [],
   selectedTableColumns: [],
 });
+export const permissionDeniedState = Immutable({
+  loading: false,
+  manifestModalOpened: false,
+  results: [],
+  searchIsActive: false,
+  search: undefined,
+  pagination: {
+    page: 1,
+    perPage: 2,
+  },
+  missingPermissions: ['view_subscriptions'],
+  itemCount: 0,
+  quantitiesLoading: false,
+  availableQuantities: null,
+  tasks: [],
+  tableColumns: [],
+  selectedTableColumns: [],
+});
 export const settingsSuccessState = Immutable({
   tables: {
     loading: false,

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

@@ -50,9 +50,7 @@ class SubscriptionsTable extends Component {
       const editedValue = this.state.updatedQuantity[rowData.id];
       return this.hasQuantityChanged(rowData, editedValue);
     },
-    onActivate: () => {
-      this.enableEditing(true);
-    },
+    onActivate: () => this.enableEditing(true),
     onConfirm: () => {
       if (recordsValid(this.state.rows)) {
         this.showUpdateConfirm(true);
@@ -119,7 +117,7 @@ class SubscriptionsTable extends Component {
 
   getTableProps = () => {
     const {
-      subscriptions, emptyState, tableColumns, loadSubscriptions,
+      subscriptions, emptyState, tableColumns, loadSubscriptions, canManageSubscriptionAllocations,
     } = this.props;
     const { groupedSubscriptions, rows, editing } = this.state;
 
@@ -131,6 +129,7 @@ class SubscriptionsTable extends Component {
       rows,
       subscriptions,
       tableColumns,
+      canManageSubscriptionAllocations,
       toggleSubscriptionGroup: this.toggleSubscriptionGroup,
       inlineEditController: this.getInlineEditController(),
       selectionController: this.getSelectionController(),
@@ -289,6 +288,7 @@ SubscriptionsTable.propTypes = {
   loadSubscriptions: PropTypes.func.isRequired,
   updateQuantity: PropTypes.func.isRequired,
   emptyState: PropTypes.shape({}).isRequired,
+  canManageSubscriptionAllocations: PropTypes.bool,
   subscriptions: PropTypes.shape({
     loading: PropTypes.bool,
     availableQuantities: PropTypes.shape({}),
@@ -311,6 +311,7 @@ SubscriptionsTable.defaultProps = {
   task: { humanized: {} },
   bulkSearch: undefined,
   organization: undefined,
+  canManageSubscriptionAllocations: false,
 };
 
 export default SubscriptionsTable;

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

@@ -30,18 +30,39 @@ const buildTableRow = (subscription, availableQuantities, updatedQuantity) => {
       quantity: updatedQuantity[subscription.id],
     };
   }
+
   return baseSubscription;
 };
 
+const buildTableCollapseRow = (subscriptionGroup) => {
+  const first = subscriptionGroup.subscriptions[0];
+  const heading = {
+    id: 0,
+    collapsible: true,
+    contract_number: 'NA',
+    start_date: 'NA',
+    end_date: 'NA',
+    consumed: 'NA',
+    product_id: first.product_id,
+    name: first.name,
+    virt_only: first.virt_only,
+    hypervisor: first.hypervisor,
+  };
+  return heading;
+};
+
 const buildTableRowsFromGroup = (subscriptionGroup, availableQuantities, updatedQuantity) => {
   const { open, subscriptions } = subscriptionGroup;
 
-  // build row for each subscription
-  if (open) {
-    return subscriptions.map(subscription =>
-      buildTableRow(subscription, availableQuantities, updatedQuantity));
+  if (subscriptions.length > 1) {
+    const rows = [];
+    rows.push(buildTableCollapseRow(subscriptionGroup));
+    if (open) {
+      subscriptions.forEach(sub =>
+        rows.push(buildTableRow(sub, availableQuantities, updatedQuantity)));
+    }
+    return rows;
   }
-
   // build row only for the first subscription in the group
   const [firstSubscription] = subscriptions;
   return [buildTableRow(firstSubscription, availableQuantities, updatedQuantity)];

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

@@ -13,10 +13,18 @@ import {
   collapseableAndSelectionCellFormatter,
 } from '../../../../move_to_foreman/components/common/table';
 
+function getEntitlementsFormatter(inlineEditController, canManageSubscriptionAllocations) {
+  if (canManageSubscriptionAllocations) {
+    return entitlementsInlineEditFormatter(inlineEditController);
+  }
+  return cellFormatter;
+}
+
 export const createSubscriptionsTableSchema = (
   inlineEditController,
   selectionController,
   groupingController,
+  hasPermission,
 ) => [
   {
     property: 'select',
@@ -138,7 +146,7 @@ export const createSubscriptionsTableSchema = (
       formatters: [headerFormatter],
     },
     cell: {
-      formatters: [entitlementsInlineEditFormatter(inlineEditController)],
+      formatters: [getEntitlementsFormatter(inlineEditController, hasPermission)],
     },
   },
 ];

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

@@ -2,7 +2,7 @@ import Immutable from 'seamless-immutable';
 
 const groupedSubscriptions = Immutable({
   RH00001: {
-    open: false,
+    open: true,
     subscriptions: [
       {
         id: 1,
@@ -58,7 +58,20 @@ const groupedSubscriptions = Immutable({
   },
 });
 
-export const subOne = Immutable({
+export const genericRow = Immutable({
+  collapsible: true,
+  consumed: 'NA',
+  contract_number: 'NA',
+  end_date: 'NA',
+  hypervisor: undefined,
+  id: 0,
+  name: 'Alpha',
+  product_id: 'RH00001',
+  start_date: 'NA',
+  virt_only: undefined,
+});
+
+export const subOneRowOne = Immutable({
   consumed: 0,
   id: 1,
   maxQuantity: 60,
@@ -69,6 +82,17 @@ export const subOne = Immutable({
   upstreamAvailableLoaded: true,
 });
 
+export const subOneRowTwo = Immutable({
+  consumed: 5,
+  id: 2,
+  maxQuantity: 65,
+  name: 'Alpha',
+  product_id: 'RH00001',
+  quantity: 15,
+  upstreamAvailable: 50,
+  upstreamAvailableLoaded: true,
+});
+
 export const subTwo = Immutable({
   consumed: 0,
   id: 3,
@@ -103,3 +127,4 @@ export const subFour = Immutable({
 });
 
 export default groupedSubscriptions;
+