katello 4.4.1 → 4.5.0

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js

@@ -75,7 +75,6 @@ test('Can open Remove wizard and remove version from simple environment', async
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
-    .times(2)
     .query(true)
     .reply(200, cvVersionsData);
 
@@ -115,7 +114,7 @@ test('Can open Remove wizard and remove version from simple environment', async
   fireEvent.click(getByLabelText('Select row 1'));
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
-    expect(getByText('Review Details')).toBeInTheDocument();
+    expect(getByText('Review details')).toBeInTheDocument();
   });
   expect(getAllByText('qa1')[0].closest('a'))
     .toHaveAttribute('href', '/lifecycle_environments/4');
@@ -123,8 +122,7 @@ test('Can open Remove wizard and remove version from simple environment', async
   assertNockRequest(scope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(envPathRemovalScope);
-  assertNockRequest(versionRemovalScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(versionRemovalScope, done);
 });
 
 test('Can open Remove wizard and remove version from environment with hosts', async (done) => {
@@ -136,7 +134,6 @@ test('Can open Remove wizard and remove version from environment with hosts', as
 
   const scope = nockInstance
     .get(cvVersions)
-    .times(2)
     .query(true)
     .reply(200, cvVersionsData);
 
@@ -203,7 +200,7 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   fireEvent.click(getByText('cv2'));
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
-    expect(getByText('Review Details')).toBeInTheDocument();
+    expect(getByText('Review details')).toBeInTheDocument();
     expect(getByText('1 host will be moved to content view cv2 in')).toBeInTheDocument();
   });
   fireEvent.click(getAllByText('Remove')[0]);
@@ -215,8 +212,7 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   assertNockRequest(hostScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(envPathRemovalScope);
-  assertNockRequest(versionRemovalScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(versionRemovalScope, done);
 });
 
 test('Can open Remove wizard and remove version from environment with activation keys', async (done) => {
@@ -228,7 +224,6 @@ test('Can open Remove wizard and remove version from environment with activation
 
   const scope = nockInstance
     .get(cvVersions)
-    .times(2)
     .query(true)
     .reply(200, cvVersionsData);
 
@@ -295,7 +290,7 @@ test('Can open Remove wizard and remove version from environment with activation
   fireEvent.click(getByText('cv2'));
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
-    expect(getByText('Review Details')).toBeInTheDocument();
+    expect(getByText('Review details')).toBeInTheDocument();
     expect(getByText('1 activation key will be moved to content view cv2 in')).toBeInTheDocument();
   });
   fireEvent.click(getAllByText('Remove')[0]);
@@ -308,6 +303,5 @@ test('Can open Remove wizard and remove version from environment with activation
   assertNockRequest(activationKeysScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(envPathRemovalScope);
-  assertNockRequest(versionRemovalScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(versionRemovalScope, done);
 });

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js

@@ -54,6 +54,7 @@ const AffectedActivationKeys = ({
         fetchItems,
         status,
       }}
+      ouiaId="content-view-delete-modal-affected-activation-keys"
       autocompleteEndpoint="/activation_keys/auto_complete_search"
       variant={TableVariant.compact}
     >

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js

@@ -49,6 +49,7 @@ const AffectedHosts = ({
         fetchItems,
         status,
       }}
+      ouiaId="content-view-delete-modal-affected-hosts-table"
       autocompleteEndpoint="/hosts/auto_complete_search"
       foremanApiAutoComplete
       variant={TableVariant.compact}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -149,6 +149,7 @@ export default ({ cvId, versionId }) => [
       { title: __('Version'), getProperty: item => item?.version },
       { title: __('Release'), getProperty: item => item?.release },
       { title: __('Arch'), getProperty: item => item?.arch },
+      { title: __('Epoch'), getProperty: item => item?.epoch },
     ],
   },
   {

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js

@@ -1,9 +1,8 @@
-import React, { useEffect, useState } from 'react';
-import useDeepCompareEffect from 'use-deep-compare-effect';
+import React, { useEffect } from 'react';
 import { useParams, Route, useHistory, useLocation, Redirect, Switch } from 'react-router-dom';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
-import { isEmpty, first } from 'lodash';
+import { first } from 'lodash';
 import { Grid, Tabs, Tab, TabTitleText, Label } from '@patternfly/react-core';
 import { number, shape } from 'prop-types';
 import './ContentViewVersionDetails.scss';
@@ -20,8 +19,6 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const { pathname } = useLocation();
   const { push } = useHistory();
   const dispatch = useDispatch();
-  const [versionDetails, setVersionDetails] = useState({});
-  const [mounted, setMounted] = useState(true);
   // Example urls expected:/versions/:id or /versions/:id/repositories.
   const tab = pathname.split('/')[3];
   const response = useSelector(state =>
@@ -32,20 +29,11 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const tableConfigs = getCVVersionTableConfigs({ cvId, versionId });
 
   useEffect(() => {
-    if (mounted || (isEmpty(response) && status === STATUS.PENDING)) {
-      dispatch(getContentViewVersionDetails(versionId, cvId));
-    }
-    return () => { setMounted(false); };
-  }, [dispatch, mounted, setMounted, versionId, cvId, response, status]);
-
-  useDeepCompareEffect(() => {
-    if (loaded) {
-      setVersionDetails(response);
-    }
-  }, [response, loaded, tableConfigs]);
+    dispatch(getContentViewVersionDetails(versionId, cvId));
+  }, [dispatch, versionId, cvId]);
 
   const editDiscription = (val, attribute) => {
-    const { description } = versionDetails;
+    const { description } = response;
     if (val !== description) {
       dispatch(editContentViewVersionDetails(
         versionId,
@@ -64,16 +52,16 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   };
 
   // Checking versionDetails is done to prevent two renders of the table.
-  if (!loaded && isEmpty(versionDetails)) return <Loading />;
+  if (!loaded) return <Loading />;
   const filteredTableConfigs = tableConfigs.filter(({ getCountKey }) => !!getCountKey(response));
-  const { repositories } = versionDetails;
+  const { repositories } = response;
   const showTabs = filteredTableConfigs.length > 0 && repositories;
   const getCurrentActiveKey = tab ?? first(filteredTableConfigs)?.route;
 
   return (
     <Grid>
       <ContentViewVersionDetailsHeader
-        versionDetails={versionDetails}
+        versionDetails={response}
         onEdit={editDiscription}
         loading={status === STATUS.PENDING}
         details={details}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js

@@ -16,21 +16,25 @@ import {
   KebabToggle,
   DropdownPosition,
 } from '@patternfly/react-core';
+import { useHistory } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { hasPermission } from '../../../helpers';
 import ContentViewVersionPromote from '../../Promote/ContentViewVersionPromote';
 import getEnvironmentPaths from '../../../components/EnvironmentPaths/EnvironmentPathActions';
 import RemoveCVVersionWizard from '../Delete/RemoveCVVersionWizard';
 import ActionableDetail from '../../../../../components/ActionableDetail';
+import BulkDeleteModal from '../BulkDelete/BulkDeleteModal';
 
 const ContentViewVersionDetailsHeader = ({
-  versionDetails: {
-    version, description, environments, content_view_id: cvId, id,
-  },
+  versionDetails,
   onEdit,
   details: { permissions },
   loading,
 }) => {
+  const history = useHistory();
+  const {
+    version, description, environments, content_view_id: cvId, id,
+  } = versionDetails;
   const dispatch = useDispatch();
   useEffect(
     () => {
@@ -42,7 +46,7 @@ const ContentViewVersionDetailsHeader = ({
   const [promoting, setPromoting] = useState(false);
   const [removingFromEnv, setRemovingFromEnv] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
-  const [deleteVersion, setDeleteVersion] = useState(false);
+  const [bulkDeleteOpen, setBulkDeleteOpen] = useState(false);
   const dropDownItems = [
     <DropdownItem
       key="remove"
@@ -54,14 +58,12 @@ const ContentViewVersionDetailsHeader = ({
     </DropdownItem>,
     <DropdownItem
       key="delete"
-      onClick={() => {
-        setCurrentStep(1);
-        setDeleteVersion(true);
-        setRemovingFromEnv(true);
-      }}
+      onClick={() =>
+        setBulkDeleteOpen(true)
+      }
     >
       {__('Delete')}
-    </DropdownItem>,
+    </DropdownItem >,
   ];
 
   return (
@@ -73,10 +75,11 @@ const ContentViewVersionDetailsHeader = ({
       </GridItem>
       <GridItem sm={6} style={{ display: 'flex' }}>
         <Button
+          ouiaId="cv-details-promote-button"
           style={{ marginLeft: 'auto' }}
           onClick={() => setPromoting(true)}
           variant="primary"
-          aria-label="publish_content_view"
+          aria-label="promote_content_view"
         >
           {__('Promote')}
         </Button>
@@ -120,6 +123,15 @@ const ContentViewVersionDetailsHeader = ({
           aria-label="promote_content_view_modal"
         />
       }
+      {bulkDeleteOpen &&
+        <BulkDeleteModal
+          versions={[versionDetails]}
+          onClose={(redirect) => {
+            setBulkDeleteOpen(false);
+            if (redirect) history.push(`/content_views/${cvId}#/versions`);
+          }}
+        />
+      }
       {removingFromEnv &&
         <RemoveCVVersionWizard
           cvId={cvId}
@@ -130,8 +142,6 @@ const ContentViewVersionDetailsHeader = ({
           setIsOpen={setRemovingFromEnv}
           currentStep={currentStep}
           setCurrentStep={setCurrentStep}
-          deleteWizard={deleteVersion}
-          detailsPage
           aria-label="remove_content_view_version_modal"
         />
       }

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js

@@ -2,6 +2,7 @@
 import React, { useState } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
+import { kebabCase } from 'lodash';
 import {
   shallowEqual,
   useSelector,
@@ -34,6 +35,7 @@ const ContentViewVersionDetailsTable = ({
     fetchItems,
     columnHeaders,
     disableSearch,
+    route,
   }, repositories,
 }) => {
   const ALL_REPOSITORIES = __('All Repositories');
@@ -77,6 +79,7 @@ const ContentViewVersionDetailsTable = ({
           autocompleteEndpoint,
           disableSearch,
         }}
+        ouiaId={`content-view-version-details-${kebabCase(route)}-table`}
         additionalListeners={[selected]}
         fetchItems={fetchItemsWithRepositoryId}
         emptySearchTitle={__('Your search returned no matching ') + name}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json

@@ -146,12 +146,12 @@
     "yum_repository_count": 0,
     "repositories": [],
     "errata_counts": {
-        "security": 2,
+        "security": 0,
         "bugfix": 0,
-        "enhancement": 5,
-        "total": 9
+        "enhancement": 0,
+        "total": 0
     },
     "permissions": {
         "deletable": true
     }
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -58,7 +58,6 @@ test('Can show versions details - Components Tab', async (done) => {
   const { version } = ContentViewVersionDetailsData;
   const scope = nockInstance
     .get(cvVersions)
-    .times(2)
     .query(true)
     .reply(200, getTabSpecificData('component_view_count'));
 
@@ -204,7 +203,6 @@ testConfig.forEach(({
 
     const scope = nockInstance
       .get(cvVersions)
-      .times(2)
       .query(true)
       .reply(200, getTabSpecificData(countKey));
 
@@ -257,7 +255,6 @@ test('Can change repository selector', async (done) => {
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
-    .times(2)
     .reply(200, {
       ...getTabSpecificData(countKey),
       repositories: ContentViewVersionDetailsCounts.repositories,

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, act } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 
 import nock, { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
@@ -55,11 +55,11 @@ test('Can show versions detail header', async (done) => {
   );
 
   // Nothing will show at first, page is loading
-  expect(queryByText(`Version ${version}`)).toBeNull();
+  expect(queryByText(`Version ${version}`)).not.toBeInTheDocument();
   // Assert that the CV version is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
-    expect(getByText(`Version ${version}`)).toBeTruthy();
+    expect(getByText(`Version ${version}`)).toBeInTheDocument();
   });
-
   assertNockRequest(scope, done);
+  act(done);// Need to tell the test to stahp!
 });

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { act, renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
@@ -122,7 +122,7 @@ test('Can show package and erratas and link to list page', async () => {
 
   await patientlyWaitFor(() => {
     expect(getAllByText(8)[0].closest('a'))
-      .toHaveAttribute('href', '/content_views/5#/versions/11/rpmPackages/');
+      .toHaveAttribute('href', '/content_views/5#/versions/11/packages/');
     expect(getAllByText(15)[0].closest('a'))
       .toHaveAttribute('href', '/content_views/5#/versions/11/errata/');
     expect(getByText(5)).toBeInTheDocument();
@@ -146,7 +146,6 @@ test('Can show additional content and link to list page', async () => {
     renderOptions,
   );
 
-
   await patientlyWaitFor(() => {
     expect(getByText('3 Files').closest('a'))
       .toHaveAttribute('href', '/content_views/5#/versions/11/files/');
@@ -183,6 +182,7 @@ test('Can call API and show versions with tasks on page load', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const { results: withTaskResults } = cvVersionsTasksData;
   [firstVersion] = withTaskResults;
+
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
@@ -190,6 +190,7 @@ test('Can call API and show versions with tasks on page load', async (done) => {
 
   const taskInProgressScope = nockInstance
     .get(taskPollingUrl)
+    .times(4)
     .reply(200, contentViewTaskInProgressResponseData);
 
   const {
@@ -207,9 +208,11 @@ test('Can call API and show versions with tasks on page load', async (done) => {
     expect(getByLabelText('task_presenter')).toBeInTheDocument();
     expect(getByLabelText('task_presenter')).toHaveAttribute('aria-valuenow', '50');
   });
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(taskInProgressScope, done);
+  act(done);// Force the test to stop listening for tasks
 });
 
 test('Can reload versions upon task completion', async (done) => {
@@ -223,6 +226,7 @@ test('Can reload versions upon task completion', async (done) => {
 
   const taskSuccessScope = nockInstance
     .get(taskPollingUrl)
+    .times(6)
     .reply(200, contentViewTaskResponseData);
 
   const reloadScope = nockInstance
@@ -230,9 +234,8 @@ test('Can reload versions upon task completion', async (done) => {
     .query(true)
     .reply(200, cvVersionsData);
 
-
   const {
-    getByText, queryByLabelText, getByLabelText, queryByText,
+    queryByLabelText, queryByText,
   } = renderWithRedux(
     withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
     renderOptions,
@@ -240,33 +243,27 @@ test('Can reload versions upon task completion', async (done) => {
 
   // Nothing will show at first, page is loading
   expect(queryByText(`Version ${firstVersion.version}`)).toBeNull();
-  // Assert that the CV version and active task is now showing on the screen.
-  await patientlyWaitFor(() => {
-    expect(queryByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
-    expect(getByLabelText('task_presenter')).toBeInTheDocument();
-  });
-  const { results } = cvVersionsData;
-  [firstVersion] = results;
 
   // Assert that the CV version is shown and active task is not rendered anymore on the screen.
   await patientlyWaitFor(() => {
-    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
     expect(queryByLabelText('task_presenter')).not.toBeInTheDocument();
   });
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(taskSuccessScope);
   // Assert CV Versions API is called upon task completion
   assertNockRequest(reloadScope, done);
+  act(done);
 });
 
 test('Can open Promote Modal', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
-    .times(2)
     .query(true)
     .reply(200, cvVersionsData);
+
   const cvPromoteParams = {
     id: 10, versionEnvironments: [], description: '', environment_ids: [5], force: true,
   };
@@ -307,4 +304,5 @@ test('Can open Promote Modal', async (done) => {
   assertNockRequest(promoteScope);
   // Page is refreshed
   assertNockRequest(scope, done);
+  act(done);
 });

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json

@@ -7,6 +7,7 @@
   "latest_version": "5.0",
   "auto_publish": false,
   "solve_dependencies": false,
+  "generated_for": "none",
   "repository_ids": [
     58,
     62,