katello 4.0.3 → 4.1.0.rc1

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -56,6 +56,101 @@ test('Can call API for CVs and show on screen on page load', async (done) => {
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
+test('Can show last task and link to it', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
+
+  const { getByText, queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
+
+  expect(queryByText(firstCV.name)).toBeNull();
+
+  await patientlyWaitFor(() => {
+    expect(queryByText(firstCV.name)).toBeTruthy();
+    // Reads task details and displays link to the task
+    expect(getByText('3 days ago').closest('a'))
+      .toHaveAttribute('href', '/foreman_tasks/tasks/54088dac-b990-491c-a891-1d7d1a3f5161/');
+    // If no task is found display empty text N/A
+    expect(queryByText('N/A')).toBeTruthy();
+  });
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Can show latest version and link to it', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
+
+  const {
+    getByText,
+    queryByText,
+    queryAllByText,
+  } = renderWithRedux(<ContentViewsPage />, renderOptions);
+
+  expect(queryByText(firstCV.name)).toBeNull();
+
+  await patientlyWaitFor(() => {
+    expect(queryByText(firstCV.name)).toBeTruthy();
+    // Displays link to the latest version
+    expect(getByText('Version 1.0').closest('a'))
+      .toHaveAttribute('href', '/content_views/2/versions/11/');
+    // If no task is found display empty text Not yet published if latest version is null
+    expect(queryAllByText('Not yet published')[0]).toBeTruthy();
+    // Able to display Environment labels with link to the environment
+    expect(getByText('Library').closest('a'))
+      .toHaveAttribute('href', '/lifecycle_environments/1');
+    expect(getByText('dev').closest('a'))
+      .toHaveAttribute('href', '/lifecycle_environments/2');
+  });
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Can expand cv and show activation keys and hosts', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
+
+  const {
+    queryByLabelText,
+    getAllByLabelText,
+    queryByText,
+  } = renderWithRedux(<ContentViewsPage />, renderOptions);
+
+  expect(queryByText(firstCV.name)).toBeNull();
+
+  await patientlyWaitFor(() => {
+    expect(queryByText(firstCV.name)).toBeTruthy();
+  });
+
+  expect(getAllByLabelText('Details')[0]).toHaveAttribute('aria-expanded', 'false');
+  // Expand content for first CV
+  getAllByLabelText('Details')[0].click();
+
+  await patientlyWaitFor(() => {
+    expect(getAllByLabelText('Details')[0]).toHaveAttribute('aria-expanded', 'true');
+    // Displays activation key link with count
+    expect(queryByLabelText('activation_keys_link_2')).toHaveAttribute('href', '/activation_keys?search=content_view_id+%3D+2');
+    expect(queryByLabelText('activation_keys_link_2').textContent).toEqual('1');
+
+    // Displays hosts link with count
+    expect(queryByLabelText('host_link_2')).toHaveAttribute('href', '/hosts?search=content_view_id+%3D+2');
+    expect(queryByLabelText('host_link_2').textContent).toEqual('1');
+  });
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
 test('Can handle no Content Views being present', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
 

data/webpack/scenes/ContentViews/components/ContentViewIcon.js

@@ -1,26 +1,32 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CubesIcon, CubeIcon } from '@patternfly/react-icons';
+import { EnterpriseIcon, RegistryIcon } from '@patternfly/react-icons';
 import './contentViewIcon.scss';
 
-const ContentViewIcon = ({ composite }) => {
+const ContentViewIcon = ({ composite, count, description }) => {
   const props = {
-    title: composite ? 'composite' : 'single',
+    title: composite ? 'composite' : 'component',
     className: 'svg-icon-centered',
   };
   return (
-    <div className="svg-centered-container">
-      {composite ? <CubesIcon {...props} /> : <CubeIcon {...props} />}
+    <div aria-label="content_view_icon" className="svg-centered-container">
+      {count}
+      {composite ? <RegistryIcon {...props} /> : <EnterpriseIcon {...props} />}
+      {description}
     </div>
   );
 };
 
 ContentViewIcon.propTypes = {
   composite: PropTypes.bool,
+  count: PropTypes.node,
+  description: PropTypes.node,
 };
 
 ContentViewIcon.defaultProps = {
   composite: false,
+  count: null,
+  description: null,
 };
 
 export default ContentViewIcon;

data/webpack/scenes/ContentViews/components/EnvironmentLabels.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Label } from '@patternfly/react-core';
+
+const EnvironmentLabels = environments => environments.map(env =>
+  <React.Fragment key={env.id}><Label color="purple" href={`/lifecycle_environments/${env.id}`}>{`${env.name}`}</Label></React.Fragment>);
+
+EnvironmentLabels.propTypes = {
+  environments: PropTypes.instanceOf(Array),
+};
+
+EnvironmentLabels.defaultProps = {
+  environments: [],
+};
+
+export default EnvironmentLabels;

data/webpack/scenes/ContentViews/components/IconWithCount.js

@@ -10,7 +10,7 @@ const IconWithCount = ({ count, title, Icon }) => (
 );
 
 IconWithCount.propTypes = {
-  count: PropTypes.number.isRequired,
+  count: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
   title: PropTypes.string.isRequired,
   Icon: PropTypes.elementType.isRequired,
 };

data/webpack/scenes/ContentViews/components/InactiveText.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { TextContent, Text, TextVariants } from '@patternfly/react-core';
+
+const InactiveText = props => (
+  <TextContent>
+    <Text component={TextVariants.small} {...props}>{props.text}</Text>
+  </TextContent>
+);
+
+InactiveText.propTypes = {
+  text: PropTypes.string.isRequired,
+};
+
+export default InactiveText;

data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js

@@ -2,10 +2,28 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-const DetailsExpansion = ({ cvId }) => <div id={`cv-details-expansion-${cvId}`}>{__('Details')}</div>;
+const DetailsExpansion = ({ cvId, activationKeys, hosts }) => {
+  const activationKeyCount = activationKeys.length;
+  const hostCount = hosts.length;
+
+  return (
+    <div id={`cv-details-expansion-${cvId}`}>
+      {__('Activation keys: ')}<a aria-label={`activation_keys_link_${cvId}`} href={`/activation_keys?search=content_view_id+%3D+${cvId}`}>{activationKeyCount}</a>
+      <br />
+      {__('Hosts: ')}<a aria-label={`host_link_${cvId}`} href={`/hosts?search=content_view_id+%3D+${cvId}`}>{hostCount}</a>
+    </div>
+  );
+};
 
 DetailsExpansion.propTypes = {
   cvId: PropTypes.number.isRequired,
+  activationKeys: PropTypes.arrayOf(PropTypes.shape({})),
+  hosts: PropTypes.arrayOf(PropTypes.shape({})),
+};
+
+DetailsExpansion.defaultProps = {
+  activationKeys: [],
+  hosts: [],
 };
 
 export default DetailsExpansion;

data/webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js

@@ -3,6 +3,6 @@ import { translate as __ } from 'foremanReact/common/I18n';
 export default {
   support_level: __('Service Level (SLA)'),
   usage: __('Usage Type'),
-  role: __('Role'),
+  roles: __('Roles'),
   addons: __('Add ons'),
 };

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailInfo.test.js.snap

@@ -201,7 +201,7 @@ exports[`subscriptions detail associations page renders correctly 1`] = `
       <tr>
         <td>
           <b>
-            Role
+            Roles
           </b>
         </td>
         <td>

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -205,7 +205,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
-                          "role": "Test Role",
+                          "roles": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",
@@ -346,7 +346,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
-                          "role": "Test Role",
+                          "roles": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",
@@ -481,7 +481,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
-                          "role": "Test Role",
+                          "roles": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",

data/webpack/scenes/Subscriptions/Details/__tests__/subscriptionDetails.fixtures.js

@@ -25,7 +25,7 @@ export const subDetails = Immutable({
   arch: 'ia64,ppc,ppc64,ppc64le,s390,s390x,x86,x86_64',
   description: 'OpenShift Enterprise',
   support_type: 'L1-L3',
-  role: 'Test Role',
+  roles: 'Test Role',
   usage: ' Development',
   addons: 'Addon1, Addon2',
   id: 48,

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

@@ -1,3 +1,6 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+
 const getMaxQuantity = (subscription, upstreamAvailable) => {
   if (upstreamAvailable === -1) {
     return upstreamAvailable;
@@ -102,3 +105,17 @@ export const buildPools = updatedQuantity =>
     id,
     quantity,
   }));
+
+export const getEntitlementsDisplayValue = ({
+  rawValue, available, collapsible, upstreamPoolId,
+}) => {
+  if (collapsible) {
+    return __('NA');
+  }
+  if ((available && available < 0) || !upstreamPoolId) {
+    return (
+      available < 0 ? __('Unlimited') : available
+    );
+  }
+  return rawValue;
+};

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

@@ -2,6 +2,7 @@
 import React from 'react';
 import { Icon } from 'patternfly-react';
 import { translate as __ } from 'foremanReact/common/I18n';
+import entitlementsValueFormatter from '../../../../components/pf3Table/formatters/entitlementsValueFormatter.js';
 import { entitlementsInlineEditFormatter } from '../../../../components/pf3Table/formatters/EntitlementsInlineEditFormatter';
 import { subscriptionTypeFormatter } from './SubscriptionTypeFormatter';
 import { subscriptionNameFormatter } from './SubscriptionNameFormatter';
@@ -16,7 +17,7 @@ function getEntitlementsFormatter(inlineEditController, canManageSubscriptionAll
   if (canManageSubscriptionAllocations) {
     return entitlementsInlineEditFormatter(inlineEditController);
   }
-  return cellFormatter;
+  return entitlementsValueFormatter;
 }
 
 export const createSubscriptionsTableSchema = (

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

@@ -80,7 +80,7 @@ describe('subscriptions table', () => {
         selectionEnabled
       />
                         </MemoryRouter>);
-    expect(page.find('#select1').is('[disabled]')).toBe(true);
+    expect(toJson(page)).toMatchSnapshot();
   });
 
   it('should render an empty state', async () => {

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

@@ -1,5 +1,149 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`subscriptions table should disable checkboxes for custom subscriptions 1`] = `
+<div>
+  <table
+    class="table table-striped table-bordered table-hover pf-table-inline-edit table-fixed"
+  >
+    <thead>
+      <tr
+        class=""
+      >
+        <th
+          aria-label="Select all rows"
+          class="table-view-pf-select"
+        >
+          <label
+            class="control-label sr-only"
+            for="selectAll"
+          >
+            Select all rows
+          </label>
+          <input
+            id="selectAll"
+            type="checkbox"
+          />
+        </th>
+        <th
+          class=""
+        >
+          Name
+        </th>
+        <th
+          class=""
+        >
+          SKU
+        </th>
+        <th
+          class=""
+        >
+          Contract
+        </th>
+        <th
+          class=""
+        >
+          Start Date
+        </th>
+        <th
+          class=""
+        >
+          End Date
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class="table-view-pf-select"
+        >
+          <label
+            class="control-label sr-only"
+            for="select0"
+          >
+            Select row
+          </label>
+          <input
+            id="select0"
+            type="checkbox"
+          />
+        </td>
+        <td>
+          <a
+            href="/subscriptions/3/"
+          >
+            zoo
+          </a>
+        </td>
+        <td
+          class=""
+        >
+          853987721546
+        </td>
+        <td
+          class=""
+        />
+        <td
+          class=""
+        >
+          2017-09-21 16:18:44 -0400
+        </td>
+        <td
+          class=""
+        >
+          2047-09-14 15:18:44 -0500
+        </td>
+      </tr>
+      <tr
+        class=""
+      >
+        <td
+          class="table-view-pf-select"
+        >
+          <label
+            class="control-label sr-only"
+            for="select1"
+          >
+            Select row
+          </label>
+          <input
+            disabled=""
+            id="select1"
+            type="checkbox"
+          />
+        </td>
+        <td>
+          <a
+            href="/subscriptions/4/"
+          >
+            hsdfhsdh
+          </a>
+        </td>
+        <td
+          class=""
+        >
+          947637693017
+        </td>
+        <td
+          class=""
+        />
+        <td
+          class=""
+        >
+          2017-09-25 17:54:36 -0400
+        </td>
+        <td
+          class=""
+        >
+          2047-09-18 16:54:36 -0500
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+`;
+
 exports[`subscriptions table should render a loading state 1`] = `
 <SubscriptionsTable
   emptyState={Object {}}

data/webpack/scenes/Tasks/helpers.js

@@ -11,8 +11,8 @@ const link = id => ({
 });
 const getErrors = task => (
   <ul>
-    {task.humanized.errors.map(error => (
-      <li key={error}> {error} </li>
+    {task.humanized.errors.map(e => (
+      <li key={e}> {e} </li>
     ))}
   </ul>
 );

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

@@ -11,7 +11,7 @@ import { STATUS } from 'foremanReact/constants';
 import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
 import { createStore, applyMiddleware, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
+import { MemoryRouter, BrowserRouter } from 'react-router-dom';
 import { initialSettingsState } from '../scenes/Settings/SettingsReducer';
 import allKatelloReducers from '../redux/reducers/index.js';
 
@@ -27,6 +27,7 @@ function renderWithRedux(
     apiNamespace, // namespace if using API middleware
     initialApiState = { response: {}, status: STATUS.PENDING }, // Default state for API middleware
     initialState = {}, // Override full state
+    routerParams = {},
   } = {},
 ) {
   // Adding the reducer in the expected namespaced format
@@ -54,13 +55,20 @@ function renderWithRedux(
   const store = createStore(combinedReducers, initialFullState, middlewares);
   const connectedComponent = (
     <Provider store={store}>
-      <MemoryRouter>{component}</MemoryRouter>
+      <MemoryRouter {...routerParams} >{component}</MemoryRouter>
     </Provider>
   );
 
   return { ...render(connectedComponent), store };
 }
 
+// When you actually need to change browser history
+const renderWithRouter = (ui, { route = '/' } = {}) => {
+  window.history.pushState({}, 'Test page', route);
+
+  return render(ui, { wrapper: BrowserRouter });
+};
+
 // 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
 const rtlTimeout = 5000;
@@ -71,4 +79,4 @@ export const patientlyWaitForRemoval = waitForFunc =>
 // re-export everything, so the library can be used from this wrapper.
 export * from '@testing-library/react';
 
-export { renderWithRedux };
+export { renderWithRedux, renderWithRouter };

data/webpack/utils/__tests__/useParamsWithHash.test.js

@@ -0,0 +1,22 @@
+import paramsFromHash from '../paramsFromHash';
+
+test('can parse both hash and query params', () => {
+  const { hash, params: { foo } } = paramsFromHash('#filters?foo=bar');
+  expect(hash).toBe('filters');
+  expect(foo).toBe('bar');
+});
+
+test('can parse just hash', () => {
+  const { hash } = paramsFromHash('#filters');
+  expect(hash).toBe('filters');
+});
+
+test('can parse just query params', () => {
+  const { params: { foo } } = paramsFromHash('?foo=bar');
+  expect(foo).toBe('bar');
+});
+
+test("won't error with blank string", () => {
+  const { hash } = paramsFromHash('');
+  expect(hash).toBe('');
+});

data/webpack/utils/helpers.js

@@ -100,6 +100,8 @@ export const capitalize = s => s && s[0].toUpperCase() + s.slice(1);
 
 export const truncate = (str, truncateLimit = 50) => (str.length > truncateLimit ? `${str.substring(0, truncateLimit - 3)}...` : str);
 
+export const repoType = type => (['rpm', 'modulemd', 'erratum', 'package_group'].includes(type) ? 'yum' : type);
+
 export default {
   getResponseErrorMsgs,
   apiError,

data/webpack/utils/paramsFromHash.js

@@ -0,0 +1,16 @@
+import qs from 'query-string';
+
+/*
+ For when you have a hash with your params in the URL
+ pass in the the 'hash' object from react-router's useLocation();
+ e.g. "mysite.com/foo#bar?baz=bop"
+ will return { hash: 'bar', params: { baz: "bop" }}
+*/
+const paramsFromHash = (hash) => {
+  const [baseHash, queryParams = {}] = hash.split('?');
+  const params = qs.parse(queryParams);
+  const trimmedHash = baseHash.replace('#', '').replace('/', '');
+  return { hash: trimmedHash, params };
+};
+
+export default paramsFromHash;

data/webpack/utils/useUrlParams.js

@@ -0,0 +1,14 @@
+import qs from 'query-string';
+import { useLocation } from 'react-router-dom';
+
+// Allows hash and params e.g. "/foo#bar?query=baz"
+// returns { hash: "bar", params: { query: "baz" } }
+const useUrlParamsWithHash = () => {
+  const { hash: fullParams } = useLocation();
+  const [hash, queryParams = {}] = fullParams.split('?');
+  const params = qs.parse(queryParams);
+  const trimmedhash = hash.replace('#', '');
+  return { hash: trimmedhash, params };
+};
+
+export default useUrlParamsWithHash;