katello 3.16.2 → 3.17.0.rc1

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

@@ -8,6 +8,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -34,6 +35,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -57,10 +59,10 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
-  "disconnected": "some-value",
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -82,6 +84,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -103,6 +106,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -129,6 +133,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -150,6 +155,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -175,6 +181,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -196,6 +203,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -217,6 +225,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": false,
+  "manifestActionInProgress": false,
   "missingPermissions": undefined,
   "pagination": Object {
     "page": 0,
@@ -239,6 +248,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -260,6 +270,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -281,6 +292,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -307,6 +319,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -328,6 +341,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -349,6 +363,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -370,6 +385,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -391,6 +407,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -418,6 +435,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 20,
   "loading": false,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 1,
     "perPage": 10,
@@ -441,6 +459,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -462,6 +481,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -488,6 +508,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -509,6 +530,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -535,6 +557,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -559,6 +582,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,
@@ -585,6 +609,7 @@ Object {
   "hasUpstreamConnection": false,
   "itemCount": 0,
   "loading": true,
+  "manifestActionInProgress": false,
   "pagination": Object {
     "page": 0,
     "perPage": 20,

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 
@@ -9,11 +8,12 @@ export const subscriptionTypeFormatter = (value, { rowData }) => {
   if (rowData.virt_only === false) {
     cellContent = __('Physical');
   } else if (rowData.hypervisor) {
+    const hypervisorLink = urlBuilder('content_hosts', '', rowData.hypervisor.id);
     cellContent = (
       <span>
         {__('Guests of')}
         {' '}
-        <Link to={urlBuilder('content_hosts', '', rowData.hypervisor.id)}>{rowData.hypervisor.name}</Link>
+        <a href={hypervisorLink}>{rowData.hypervisor.name}</a>
       </span>
     );
   } else if (rowData.unmapped_guest) {

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

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { cloneDeep, findIndex, isEqual } from 'lodash';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { LoadingState } from '../../../../move_to_pf/LoadingState';
+import { LoadingState } from '../../../../components/LoadingState';
 import { recordsValid } from '../../SubscriptionValidations';
 import { buildTableRows, groupSubscriptionsByProductId } from './SubscriptionsTableHelpers';
 import Table from './components/Table';
@@ -29,7 +29,10 @@ class SubscriptionsTable extends Component {
       nextProps.subscriptions !== undefined &&
       !isEqual(nextProps.subscriptions, prevState.subscriptions)
     ) {
-      const groupedSubscriptions = groupSubscriptionsByProductId(nextProps.subscriptions);
+      const groupedSubscriptions = groupSubscriptionsByProductId(
+        nextProps.subscriptions,
+        prevState.groupedSubscriptions,
+      );
       const rows = buildTableRows(
         groupedSubscriptions,
         nextProps.subscriptions.availableQuantities,
@@ -192,19 +195,20 @@ class SubscriptionsTable extends Component {
 
 
   toggleSubscriptionGroup = (groupId) => {
-    const { subscriptions } = this.props;
-    const { groupedSubscriptions, updatedQuantity } = this.state;
-    const { open } = groupedSubscriptions[groupId];
-
-    groupedSubscriptions[groupId].open = !open;
+    this.setState((prevState) => {
+      const { subscriptions } = this.props;
+      const { groupedSubscriptions, updatedQuantity } = prevState;
+      const { open } = groupedSubscriptions[groupId];
 
-    const rows = buildTableRows(
-      groupedSubscriptions,
-      subscriptions.availableQuantities,
-      updatedQuantity,
-    );
+      groupedSubscriptions[groupId].open = !open;
 
-    this.setState({ rows, groupedSubscriptions });
+      const rows = buildTableRows(
+        groupedSubscriptions,
+        subscriptions.availableQuantities,
+        updatedQuantity,
+      );
+      return { rows, groupedSubscriptions };
+    });
   };
 
   enableEditing = (editingState) => {
@@ -215,15 +219,17 @@ class SubscriptionsTable extends Component {
   };
 
   updateRows = (updatedQuantity) => {
-    const { groupedSubscriptions } = this.state;
-    const { subscriptions } = this.props;
+    this.setState((prevState) => {
+      const { groupedSubscriptions } = prevState;
+      const { subscriptions } = this.props;
 
-    const rows = buildTableRows(
-      groupedSubscriptions,
-      subscriptions.availableQuantities,
-      updatedQuantity,
-    );
-    this.setState({ rows, updatedQuantity });
+      const rows = buildTableRows(
+        groupedSubscriptions,
+        subscriptions.availableQuantities,
+        updatedQuantity,
+      );
+      return { rows, updatedQuantity };
+    });
   };
 
   showUpdateConfirm = (show) => {

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

@@ -76,13 +76,17 @@ export const buildTableRows = (groupedSubscriptions, availableQuantities, update
   return rows;
 };
 
-export const groupSubscriptionsByProductId = ({ results: subscriptions }) => {
+export const groupSubscriptionsByProductId = (
+  { results: subscriptions },
+  prevGroupedSubscriptions,
+) => {
   const grouped = {};
 
   subscriptions.forEach((subscription) => {
     if (grouped[subscription.product_id] === undefined) {
+      const prevOpenState = prevGroupedSubscriptions?.[subscription.product_id]?.open || false;
       grouped[subscription.product_id] = {
-        open: false,
+        open: prevOpenState,
         subscriptions: [],
       };
     }

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

@@ -2,7 +2,7 @@
 import React from 'react';
 import { Icon } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { entitlementsInlineEditFormatter } from '../../../../move_to_foreman/components/common/table/formatters/EntitlementsInlineEditFormatter';
+import { entitlementsInlineEditFormatter } from '../../../../components/pf3Table/formatters/EntitlementsInlineEditFormatter';
 import { subscriptionTypeFormatter } from './SubscriptionTypeFormatter';
 import { subscriptionNameFormatter } from './SubscriptionNameFormatter';
 import {
@@ -10,7 +10,7 @@ import {
   cellFormatter,
   selectionHeaderCellFormatter,
   collapseableAndSelectionCellFormatter,
-} from '../../../../move_to_foreman/components/common/table';
+} from '../../../../components/pf3Table';
 
 function getEntitlementsFormatter(inlineEditController, canManageSubscriptionAllocations) {
   if (canManageSubscriptionAllocations) {

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

@@ -5,11 +5,11 @@ exports[`subscriptionTypeFormatter renders link to a host 1`] = `
   <span>
     Guests of
      
-    <Link
-      to="/content_hosts/83/"
+    <a
+      href="/content_hosts/83/"
     >
       host.example.com
-    </Link>
+    </a>
   </span>
 </td>
 `;

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

@@ -4,7 +4,7 @@ import { Table as PFtable } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import classNames from 'classnames';
 import { createSubscriptionsTableSchema } from '../SubscriptionsTableSchema';
-import { Table as ForemanTable, TableBody as ForemanTableBody } from '../../../../../move_to_foreman/components/common/table';
+import { Table as ForemanTable, TableBody as ForemanTableBody } from '../../../../../components/pf3Table';
 
 const Table = ({
   emptyState,

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

@@ -1,13 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Row, Col, Form, FormGroup, Button } from 'patternfly-react';
+import { Row, Col, Form, FormGroup, Button, OverlayTrigger, Tooltip, Icon } from 'patternfly-react';
 import { LinkContainer } from 'react-router-bootstrap';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { SUBSCRIPTION_WATCH_URL } from '../../SubscriptionConstants';
 
 import Search from '../../../../components/Search/index';
-import TooltipButton from '../../../../move_to_pf/TooltipButton';
-import OptionTooltip from '../../../../move_to_pf/OptionTooltip';
+import TooltipButton from '../../../../components/TooltipButton';
+import OptionTooltip from '../../../../components/OptionTooltip';
 
 const SubscriptionsToolbar = ({
   canManageSubscriptionAllocations,
@@ -25,6 +26,7 @@ const SubscriptionsToolbar = ({
   tableColumns,
   toolTipOnChange,
   toolTipOnclose,
+  isManifestImported,
 }) => (
   <Row className="toolbar-pf table-view-pf-toolbar-external">
     <Col sm={12}>
@@ -57,6 +59,29 @@ const SubscriptionsToolbar = ({
               </LinkContainer>
             }
 
+            {isManifestImported &&
+              <a
+                href={SUBSCRIPTION_WATCH_URL}
+                className="btn btn-default"
+                target="_blank"
+                rel="noreferrer"
+              >
+                {__('Subscription Watch')}
+                <OverlayTrigger
+                  overlay={
+                    <Tooltip id="sub-watch-tooltip">
+                      {__('Learn more about your overall subscription usage (opens in a new tab)')}
+                    </Tooltip>
+                  }
+                  placement="bottom"
+                  trigger={['hover', 'focus']}
+                  rootClose={false}
+                >
+                  <Icon type="pf" name="info" />
+                </OverlayTrigger>
+              </a>
+            }
+
             <Button onClick={onManageManifestButtonClick}>
               {__('Manage Manifest')}
             </Button>

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

@@ -22,9 +22,8 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar 1`] = `
         bsClass="form-group"
         className="toolbar-pf-filter"
       >
-        <Search
+        <Connect(Search)
           getAutoCompleteParams={[MockFunction]}
-          initialInputValue=""
           onSearch={[MockFunction]}
           updateSearchQuery={[MockFunction]}
         />
@@ -96,9 +95,8 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled add but
         bsClass="form-group"
         className="toolbar-pf-filter"
       >
-        <Search
+        <Connect(Search)
           getAutoCompleteParams={[MockFunction]}
-          initialInputValue=""
           onSearch={[MockFunction]}
           updateSearchQuery={[MockFunction]}
         />
@@ -170,9 +168,8 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled delete
         bsClass="form-group"
         className="toolbar-pf-filter"
       >
-        <Search
+        <Connect(Search)
           getAutoCompleteParams={[MockFunction]}
-          initialInputValue=""
           onSearch={[MockFunction]}
           updateSearchQuery={[MockFunction]}
         />
@@ -244,9 +241,8 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled manifes
         bsClass="form-group"
         className="toolbar-pf-filter"
       >
-        <Search
+        <Connect(Search)
           getAutoCompleteParams={[MockFunction]}
-          initialInputValue=""
           onSearch={[MockFunction]}
           updateSearchQuery={[MockFunction]}
         />
@@ -318,9 +314,8 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with table columns 1`
         bsClass="form-group"
         className="toolbar-pf-filter"
       >
-        <Search
+        <Connect(Search)
           getAutoCompleteParams={[MockFunction]}
-          initialInputValue=""
           onSearch={[MockFunction]}
           updateSearchQuery={[MockFunction]}
         />

data/webpack/scenes/Subscriptions/index.js

@@ -14,12 +14,13 @@ import {
   selectDeleteButtonDisabled,
   selectSubscriptionsTask,
   selectActivePermissions,
-  selectTableSettings,
   selectIsTaskPending,
   selectHasUpstreamConnection,
 } from './SubscriptionsSelectors';
+import { selectSettings,
+  selectTableSettings } from '../../scenes/Settings/SettingsSelectors';
 import { selectIsPollingTask } from '../Tasks/TaskSelectors';
-import { selectOrganizationState, selectSimpleContentAccessEnabled } from '../Organizations/OrganizationSelectors';
+import { selectOrganizationState, selectSimpleContentAccessEnabled, selectIsManifestImported } from '../Organizations/OrganizationSelectors';
 import { pingUpstreamSubscriptions } from './UpstreamSubscriptions/UpstreamSubscriptionsActions';
 import reducer from './SubscriptionReducer';
 import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS } from './SubscriptionConstants';
@@ -29,12 +30,15 @@ import SubscriptionsPage from './SubscriptionsPage';
 const mapStateToProps = (state) => {
   const subscriptions = selectSubscriptionsState(state);
   const subscriptionTableSettings = selectTableSettings(state, SUBSCRIPTION_TABLE_NAME);
+  const settings = selectSettings(state);
 
   return {
     subscriptions,
     subscriptionTableSettings,
+    settings,
     activePermissions: selectActivePermissions(state),
     simpleContentAccess: selectSimpleContentAccessEnabled(state),
+    isManifestImported: selectIsManifestImported(state),
     hasUpstreamConnection: selectHasUpstreamConnection(state),
     task: selectSubscriptionsTask(state),
     isTaskPending: selectIsTaskPending(state),

data/webpack/test-utils/nockWrapper.js

@@ -1,4 +1,5 @@
 import nock from 'nock';
+import api from '../services/api';
 
 // Using the library 'nock' as it matches actual network requests rather than mock another
 // library. This is helpful when the request is not coming from Katello. For example, axios
@@ -9,9 +10,42 @@ import nock from 'nock';
 export const nockInstance = nock('http://localhost');
 
 // Calling .done() with nock asserts that the request was fufilled. We use a timeout to ensure
-// that the component has set up and made the request before the assertion is made.
-export const assertNockRequest = (scope, timeout = 10000) => {
-  setTimeout(() => {
-    scope.done();
-  }, timeout);
+// that the component has set up and made the request before the assertion is made. This function
+// polls until the nock scope is met. If the `done` callback from jest is passed in, it will
+// call it once the request is made, telling jest the test is done. This is to make sure all
+// nock expectations are met and cleared before moving on to the next test.
+export const assertNockRequest = (nockScope, jestDone, tries = 10) => {
+  const interval = 500;
+  let i = 0;
+  const poll = setInterval(() => {
+    i += 1;
+    if (i === tries) {
+      /* eslint-disable-next-line no-console */
+      console.error(`Nock stubbed call ${nockScope.pendingMocks()} was not met in time!`);
+    }
+    if (nockScope.isDone()) {
+      nockScope.done(); // Assert nock request
+      if (jestDone) jestDone(); // Tell jest test is done
+      clearInterval(poll); // Clear the interval so polling stops
+    }
+  }, interval);
 };
+
+export const mockAutocomplete = (
+  instance,
+  autoCompUrl,
+  query = true,
+  response = [],
+  times = 1,
+) => instance
+  .get(api.getApiUrl(autoCompUrl))
+  .times(times)
+  .query(query) // can pass in function, see nock docs
+  .reply(200, response);
+
+export const mockSetting = (instance, name, value) => instance
+  .get(`/api/v2/settings/${name}`)
+  .query(true) // can pass in function, see nock docs
+  .reply(200, { name, value });
+
+export default nock;

data/webpack/test-utils/react-testing-lib-wrapper.js

@@ -4,27 +4,49 @@
 import React from 'react';
 import thunk from 'redux-thunk';
 import Immutable from 'seamless-immutable';
-import { reducers as apiReducer } from 'foremanReact/redux/API';
+import { APIMiddleware, reducers as apiReducer } from 'foremanReact/redux/API';
+import { reducers as foremanModalReducer } from 'foremanReact/components/ForemanModal';
 import { STATUS } from 'foremanReact/constants';
-import { render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 import { createStore, applyMiddleware, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
-import { APIMiddleware } from 'foremanReact/redux/middlewares';
+import { initialSettingsState } from '../scenes/Settings/SettingsReducer';
+import allKatelloReducers from '../redux/reducers/index.js';
+
+// r-t-lib's print limit for debug() is quite small, setting it to a much higher char max here.
+// See https://github.com/testing-library/react-testing-library/issues/503 for more info.
+process.env.DEBUG_PRINT_LIMIT = 99999;
 
 // Renders testable component with redux and react-router according to Katello's usage
 // This should be used when you want a fully connected component with Redux state and actions.
-function renderWithApiRedux(
+function renderWithRedux(
   component,
   {
-    namespace, // redux namespace
-    initialState = { response: {}, status: STATUS.RESOLVED },
+    apiNamespace, // namespace if using API middleware
+    initialApiState = { response: {}, status: STATUS.PENDING }, // Default state for API middleware
+    initialState = {}, // Override full state
   } = {},
 ) {
   // Adding the reducer in the expected namespaced format
-  const combinedReducers = combineReducers({ ...apiReducer });
+  const combinedReducers = combineReducers({
+    katello: allKatelloReducers,
+    ...apiReducer,
+    ...foremanModalReducer,
+  });
+
   // Namespacing the initial state as well
-  const initialFullState = Immutable({ API: { [namespace]: initialState } });
+  const initialFullState = Immutable({
+    API: {
+      [apiNamespace]: initialApiState,
+    },
+    katello: {
+      settings: {
+        settings: initialSettingsState,
+      },
+    },
+    ...initialState,
+  });
   const middlewares = applyMiddleware(thunk, APIMiddleware);
   const store = createStore(combinedReducers, initialFullState, middlewares);
   const connectedComponent = (
@@ -36,7 +58,11 @@ function renderWithApiRedux(
   return { ...render(connectedComponent), store };
 }
 
+// When the tests run slower, they can hit the default waitFor timeout, which is 1000ms
+// There doesn't seem to be a way to set it globally for r-t-lib, so using this wrapper function
+export const patientlyWaitFor = waitForFunc => waitFor(waitForFunc, { timeout: 5000 });
+
 // re-export everything, so the library can be used from this wrapper.
 export * from '@testing-library/react';
 
-export { renderWithApiRedux };
+export { renderWithRedux };