katello 3.13.4 → 3.14.0.rc1

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

@@ -1,4 +1,4 @@
-import groupedSubscriptions, { subOne, subTwo, subThree, subFour } from './SubscriptionsTable.fixtures';
+import groupedSubscriptions, { genericRow, subOneRowOne, subOneRowTwo, subTwo, subThree, subFour } from './SubscriptionsTable.fixtures';
 import { buildTableRows } from '../SubscriptionsTableHelpers';
 
 describe('Build Table Rows', () => {
@@ -11,7 +11,7 @@ describe('Build Table Rows', () => {
       5: 50,
     };
 
-    const rows = [subOne, subTwo, subThree, subFour];
+    const rows = [genericRow, subOneRowOne, subOneRowTwo, subTwo, subThree, subFour];
 
     expect(buildTableRows(groupedSubscriptions, availableQuantities, {}))
       .toEqual(rows);
@@ -31,8 +31,9 @@ describe('Build Table Rows', () => {
       4: 150,
     };
 
-    const rows = [
-      { ...subOne, entitlementsChanged: true, quantity: 20 },
+    const rows = [genericRow,
+      { ...subOneRowOne, entitlementsChanged: true, quantity: 20 },
+      subOneRowTwo,
       subTwo,
       { ...subThree, entitlementsChanged: true, quantity: 150 },
       subFour,

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap

@@ -2,6 +2,7 @@
 
 exports[`subscriptions table should render a loading state 1`] = `
 <SubscriptionsTable
+  canManageSubscriptionAllocations={false}
   emptyState={Object {}}
   loadSubscriptions={[Function]}
   onDeleteSubscriptions={[Function]}

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

@@ -17,20 +17,20 @@ const UpdateDialog = ({
   enableEditing,
 }) => {
   const quantityLength = Object.keys(updatedQuantity).length;
-  const confirmEdit = () => {
+  const confirmEdit = async () => {
     showUpdateConfirm(false);
     if (quantityLength > 0) {
-      updateQuantity(buildPools(updatedQuantity))
-        .then(() =>
-          bulkSearch({
-            action: `organization '${organization.owner_details.displayName}'`,
-            result: 'pending',
-            label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
-          }))
-        .then(() => renderTaskStartedToast(task));
+      await updateQuantity(buildPools(updatedQuantity));
+      await bulkSearch({
+        action: `organization '${organization.owner_details.displayName}'`,
+        result: 'pending',
+        label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
+      });
+      renderTaskStartedToast(task);
     }
     enableEditing(false);
   };
+
   return (
     <MessageDialog
       show={show}

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

@@ -17,6 +17,7 @@ const Table = ({
   editing,
   groupedSubscriptions,
   toggleSubscriptionGroup,
+  canManageSubscriptionAllocations,
 }) => {
   const allSubscriptionResults = subscriptions.results;
 
@@ -27,10 +28,8 @@ const Table = ({
 
   const groupingController = {
     isCollapseable: ({ rowData }) =>
-      // it is the first subscription in the group
-      rowData.id === groupedSubscriptions[rowData.product_id].subscriptions[0].id &&
       // the group contains more then one subscription
-      groupedSubscriptions[rowData.product_id].subscriptions.length > 1,
+      rowData.collapsible,
     isCollapsed: ({ rowData }) => !groupedSubscriptions[rowData.product_id].open,
     toggle: ({ rowData }) => toggleSubscriptionGroup(rowData.product_id),
   };
@@ -40,6 +39,7 @@ const Table = ({
     inlineEditController,
     selectionController,
     groupingController,
+    canManageSubscriptionAllocations,
   ).filter(column => tableColumns.includes(column.property) ||
     alwaysDisplayColumns.includes(column.property));
 
@@ -88,6 +88,7 @@ const Table = ({
 };
 
 Table.propTypes = {
+  canManageSubscriptionAllocations: PropTypes.bool,
   emptyState: PropTypes.shape({}).isRequired,
   tableColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
   subscriptions: PropTypes.shape({
@@ -109,4 +110,8 @@ Table.propTypes = {
 
 };
 
+Table.defaultProps = {
+  canManageSubscriptionAllocations: false,
+};
+
 export default Table;

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

@@ -10,6 +10,7 @@ import TooltipButton from '../../../../move_to_pf/TooltipButton';
 import OptionTooltip from '../../../../move_to_pf/OptionTooltip';
 
 const SubscriptionsToolbar = ({
+  canManageSubscriptionAllocations,
   disableManifestActions,
   disableManifestReason,
   disableDeleteButton,
@@ -40,19 +41,21 @@ const SubscriptionsToolbar = ({
         </div>
         <div className="toolbar-pf-action-right">
           <FormGroup>
-            <LinkContainer
-              to="subscriptions/add"
-              disabled={disableManifestActions || disableAddButton}
-            >
-              <TooltipButton
-                tooltipId="add-subscriptions-button-tooltip"
-                tooltipText={disableManifestReason}
-                tooltipPlacement="top"
-                title={__('Add Subscriptions')}
-                disabled={disableManifestActions}
-                bsStyle="primary"
-              />
-            </LinkContainer>
+            {canManageSubscriptionAllocations &&
+              <LinkContainer
+                to="subscriptions/add"
+                disabled={disableManifestActions || disableAddButton}
+              >
+                <TooltipButton
+                  tooltipId="add-subscriptions-button-tooltip"
+                  tooltipText={disableManifestReason}
+                  tooltipPlacement="top"
+                  title={__('Add Subscriptions')}
+                  disabled={disableManifestActions}
+                  bsStyle="primary"
+                />
+              </LinkContainer>
+            }
 
             <Button onClick={onManageManifestButtonClick}>
               {__('Manage Manifest')}
@@ -63,17 +66,18 @@ const SubscriptionsToolbar = ({
             >
               {__('Export CSV')}
             </Button>
+            {canManageSubscriptionAllocations &&
 
-            <TooltipButton
-              bsStyle="danger"
-              onClick={onDeleteButtonClick}
-              tooltipId="delete-subscriptions-button-tooltip"
-              tooltipText={disableDeleteReason}
-              tooltipPlacement="top"
-              title={__('Delete')}
-              disabled={disableManifestActions || disableDeleteButton}
-            />
-
+              <TooltipButton
+                bsStyle="danger"
+                onClick={onDeleteButtonClick}
+                tooltipId="delete-subscriptions-button-tooltip"
+                tooltipText={disableDeleteReason}
+                tooltipPlacement="top"
+                title={__('Delete')}
+                disabled={disableManifestActions || disableDeleteButton}
+              />
+            }
           </FormGroup>
         </div>
       </Form>
@@ -84,6 +88,7 @@ const SubscriptionsToolbar = ({
 SubscriptionsToolbar.propTypes = {
   ...Search.propTypes,
   tableColumns: OptionTooltip.propTypes.options,
+  canManageSubscriptionAllocations: PropTypes.bool,
   disableManifestActions: PropTypes.bool,
   disableManifestReason: PropTypes.string,
   disableDeleteButton: PropTypes.bool,

data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap

@@ -47,24 +47,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar 1`] = `
         <FormGroup
           bsClass="form-group"
         >
-          <LinkContainer
-            activeClassName="active"
-            disabled={false}
-            exact={false}
-            replace={false}
-            strict={false}
-            to="subscriptions/add"
-          >
-            <TooltipButton
-              bsStyle="primary"
-              disabled={false}
-              renderedButton={null}
-              title="Add Subscriptions"
-              tooltipId="add-subscriptions-button-tooltip"
-              tooltipPlacement="top"
-              tooltipText=""
-            />
-          </LinkContainer>
           <Button
             active={false}
             block={false}
@@ -83,15 +65,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar 1`] = `
           >
             Export CSV
           </Button>
-          <TooltipButton
-            bsStyle="danger"
-            disabled={false}
-            renderedButton={null}
-            title="Delete"
-            tooltipId="delete-subscriptions-button-tooltip"
-            tooltipPlacement="top"
-            tooltipText=""
-          />
         </FormGroup>
       </div>
     </Form>
@@ -146,24 +119,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled add but
         <FormGroup
           bsClass="form-group"
         >
-          <LinkContainer
-            activeClassName="active"
-            disabled={true}
-            exact={false}
-            replace={false}
-            strict={false}
-            to="subscriptions/add"
-          >
-            <TooltipButton
-              bsStyle="primary"
-              disabled={false}
-              renderedButton={null}
-              title="Add Subscriptions"
-              tooltipId="add-subscriptions-button-tooltip"
-              tooltipPlacement="top"
-              tooltipText="some reason for manifest"
-            />
-          </LinkContainer>
           <Button
             active={false}
             block={false}
@@ -182,15 +137,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled add but
           >
             Export CSV
           </Button>
-          <TooltipButton
-            bsStyle="danger"
-            disabled={false}
-            renderedButton={null}
-            title="Delete"
-            tooltipId="delete-subscriptions-button-tooltip"
-            tooltipPlacement="top"
-            tooltipText=""
-          />
         </FormGroup>
       </div>
     </Form>
@@ -245,24 +191,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled delete
         <FormGroup
           bsClass="form-group"
         >
-          <LinkContainer
-            activeClassName="active"
-            disabled={false}
-            exact={false}
-            replace={false}
-            strict={false}
-            to="subscriptions/add"
-          >
-            <TooltipButton
-              bsStyle="primary"
-              disabled={false}
-              renderedButton={null}
-              title="Add Subscriptions"
-              tooltipId="add-subscriptions-button-tooltip"
-              tooltipPlacement="top"
-              tooltipText=""
-            />
-          </LinkContainer>
           <Button
             active={false}
             block={false}
@@ -281,15 +209,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled delete
           >
             Export CSV
           </Button>
-          <TooltipButton
-            bsStyle="danger"
-            disabled={true}
-            renderedButton={null}
-            title="Delete"
-            tooltipId="delete-subscriptions-button-tooltip"
-            tooltipPlacement="top"
-            tooltipText="some reason for delete"
-          />
         </FormGroup>
       </div>
     </Form>
@@ -344,24 +263,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled manifes
         <FormGroup
           bsClass="form-group"
         >
-          <LinkContainer
-            activeClassName="active"
-            disabled={true}
-            exact={false}
-            replace={false}
-            strict={false}
-            to="subscriptions/add"
-          >
-            <TooltipButton
-              bsStyle="primary"
-              disabled={true}
-              renderedButton={null}
-              title="Add Subscriptions"
-              tooltipId="add-subscriptions-button-tooltip"
-              tooltipPlacement="top"
-              tooltipText="some reason for manifest"
-            />
-          </LinkContainer>
           <Button
             active={false}
             block={false}
@@ -380,15 +281,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled manifes
           >
             Export CSV
           </Button>
-          <TooltipButton
-            bsStyle="danger"
-            disabled={true}
-            renderedButton={null}
-            title="Delete"
-            tooltipId="delete-subscriptions-button-tooltip"
-            tooltipPlacement="top"
-            tooltipText=""
-          />
         </FormGroup>
       </div>
     </Form>
@@ -461,24 +353,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with table columns 1`
         <FormGroup
           bsClass="form-group"
         >
-          <LinkContainer
-            activeClassName="active"
-            disabled={false}
-            exact={false}
-            replace={false}
-            strict={false}
-            to="subscriptions/add"
-          >
-            <TooltipButton
-              bsStyle="primary"
-              disabled={false}
-              renderedButton={null}
-              title="Add Subscriptions"
-              tooltipId="add-subscriptions-button-tooltip"
-              tooltipPlacement="top"
-              tooltipText=""
-            />
-          </LinkContainer>
           <Button
             active={false}
             block={false}
@@ -497,15 +371,6 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with table columns 1`
           >
             Export CSV
           </Button>
-          <TooltipButton
-            bsStyle="danger"
-            disabled={false}
-            renderedButton={null}
-            title="Delete"
-            tooltipId="delete-subscriptions-button-tooltip"
-            tooltipPlacement="top"
-            tooltipText=""
-          />
         </FormGroup>
       </div>
     </Form>

data/webpack/scenes/Subscriptions/index.js

@@ -15,6 +15,7 @@ import {
   selectTaskModalOpened,
   selectDeleteButtonDisabled,
   selectSubscriptionsTasks,
+  selectActivePermissions,
   selectTableSettings,
 } from './SubscriptionsSelectors';
 
@@ -30,6 +31,7 @@ const mapStateToProps = (state) => {
   return {
     subscriptions,
     subscriptionTableSettings,
+    activePermissions: selectActivePermissions(state),
     tasks: selectSubscriptionsTasks(state),
     searchQuery: selectSearchQuery(state),
     manifestModalOpened: selectManifestModalOpened(state),

data/webpack/scenes/Tasks/TaskActions.js

@@ -11,7 +11,7 @@ import {
   RESET_TASKS,
 } from './TaskConstants';
 
-export const bulkSearch = (extendedParams = {}) => (dispatch) => {
+export const bulkSearch = (extendedParams = {}) => async (dispatch) => {
   const params = {
     search: Object.entries(propsToSnakeCase(extendedParams))
       .map((item) => {
@@ -23,22 +23,20 @@ export const bulkSearch = (extendedParams = {}) => (dispatch) => {
       .join(' and '),
   };
 
-
-  const onBulkSearchSuccess = ({ data }) => dispatch({
-    type: TASK_BULK_SEARCH_SUCCESS,
-    response: data,
-  });
-
-  const onBulkSearchFailure = result => dispatch({
-    type: TASK_BULK_SEARCH_FAILURE,
-    result,
-  });
-
   dispatch({ type: TASK_BULK_SEARCH_REQUEST });
-  return api
-    .get('/tasks', {}, params)
-    .then(onBulkSearchSuccess)
-    .catch(onBulkSearchFailure);
+
+  try {
+    const { data } = await api.get('/tasks', {}, params);
+    return dispatch({
+      type: TASK_BULK_SEARCH_SUCCESS,
+      response: data,
+    });
+  } catch (error) {
+    return dispatch({
+      type: TASK_BULK_SEARCH_FAILURE,
+      result: error,
+    });
+  }
 };
 
 export const resetTasks = () => (dispatch) => {
@@ -47,30 +45,35 @@ export const resetTasks = () => (dispatch) => {
   });
 };
 
-export const loadTask = (taskId, extendedParams = {}) => (dispatch) => {
+export const loadTask = (taskId, extendedParams = {}) => async (dispatch) => {
   dispatch({ type: GET_TASK_REQUEST });
 
   const params = {
     ...propsToSnakeCase(extendedParams),
   };
 
-  return api
-    .get(`/tasks/${taskId}`, {}, params)
-    .then(({ data }) => dispatch({
+  try {
+    const { data } = await api.get(`/tasks/${taskId}`, {}, params);
+    return dispatch({
       type: GET_TASK_SUCCESS,
       response: data,
-    }))
-    .catch(result => dispatch({
+    });
+  } catch (error) {
+    return dispatch({
       type: GET_TASK_FAILURE,
-      result,
-    }));
+      result: error,
+    });
+  }
 };
 
-const isUnauthorized = action =>
-  (action.result && action.result.response && action.result.response.status === 401);
+const isUnauthorized = (action = {}) => (action.result
+    && action.result
+    && action.result.response
+    && action.result.response.status === 401);
+
 
 export const pollBulkSearch = (extendedParams = {}, interval, orgId) =>
-  (dispatch, getState) => {
+  async (dispatch, getState) => {
     const triggerPolling = (action) => {
       const { id } = getState().katello.organization;
       if (!isUnauthorized(action)) {
@@ -80,9 +83,10 @@ export const pollBulkSearch = (extendedParams = {}, interval, orgId) =>
       }
     };
     const { id, loading } = getState().katello.organization;
-
     if (id === orgId && !loading) {
-      return dispatch(bulkSearch(extendedParams)).then(triggerPolling);
+      const dispatchedAction = await dispatch(await bulkSearch(extendedParams));
+      triggerPolling(dispatchedAction);
+      return dispatchedAction;
     }
 
     return dispatch({ type: 'POLLING_IS_SKIPPED' });
@@ -95,12 +99,13 @@ export const pollTaskUntilDone = (taskId, extendedParams = {}, interval, orgId)
 
       if (isUnauthorized(action) || id !== orgId || loading) {
         reject(action.result);
-      } else if (action.response.pending) {
+      } else if (action.response && action.response.pending) {
+        // eslint-disable-next-line promise/prefer-await-to-then
         setTimeout(() => dispatch(loadTask(taskId, extendedParams)).then(pollUntilDone), interval);
       } else {
         resolve(action.response);
       }
     };
-
+    // eslint-disable-next-line promise/prefer-await-to-then
     return dispatch(loadTask(taskId, extendedParams)).then(pollUntilDone);
   });