katello 4.5.1 → 4.6.0.rc1

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

@@ -1,7 +1,7 @@
 import React from 'react';
 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 { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewVersions from '../ContentViewVersions';
@@ -12,8 +12,10 @@ import contentViewTaskInProgressResponseData from './contentViewTaskInProgressRe
 import contentViewTaskResponseData from './contentViewTaskResponse.fixtures.json';
 import cvDetailData from '../../../../ContentViews/__tests__/mockDetails.fixtures.json';
 import environmentPathsData from '../../../Publish/__tests__/environmentPaths.fixtures.json';
+import cvIndexData from '../../../__tests__/contentViewList.fixtures.json';
 
 const cvPromotePath = api.getApiUrl('/content_view_versions/10/promote');
+const cvIndexPath = api.getApiUrl('/content_views');
 const promoteResponseData = contentViewTaskInProgressResponseData;
 
 
@@ -50,7 +52,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  nock.cleanAll();
   assertNockRequest(envScope);
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
@@ -75,10 +76,11 @@ test('Can call API and show versions on page load', async (done) => {
     expect(getByText(`Version ${firstVersion.version}`)).toBeTruthy();
   });
   assertNockRequest(autocompleteScope);
-  assertNockRequest(scope, done);
+  assertNockRequest(scope);
+  act(done);
 });
 
-test('Can link to view environment and see publish time', async () => {
+test('Can link to view environment and see publish time', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
@@ -105,9 +107,10 @@ test('Can link to view environment and see publish time', async () => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  act(done);
 });
 
-test('Can show package and erratas and link to list page', async () => {
+test('Can show package and erratas and link to list page', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
@@ -132,9 +135,10 @@ test('Can show package and erratas and link to list page', async () => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  act(done);
 });
 
-test('Can show additional content and link to list page', async () => {
+test('Can show additional content and link to list page', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
@@ -157,9 +161,10 @@ test('Can show additional content and link to list page', async () => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  act(done);
 });
 
-test('Can load for empty versions', async () => {
+test('Can load for empty versions', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
@@ -176,6 +181,7 @@ test('Can load for empty versions', async () => {
     expect(queryByText("You currently don't have any versions for this content view.")).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
+  act(done);
 });
 
 test('Can call API and show versions with tasks on page load', async (done) => {
@@ -211,10 +217,66 @@ test('Can call API and show versions with tasks on page load', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(taskInProgressScope, done);
+  assertNockRequest(taskInProgressScope);
   act(done);// Force the test to stop listening for tasks
 });
 
+test('Can open Promote Modal', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const cvScope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
+  const scope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, cvVersionsData);
+
+  const cvPromoteParams = {
+    id: 10, versionEnvironments: [], description: '', environment_ids: [5], force: true,
+  };
+
+  const promoteScope = nockInstance
+    .post(cvPromotePath, cvPromoteParams)
+    .reply(202, promoteResponseData);
+
+  const {
+    getByText, queryByText, getByLabelText, getAllByLabelText,
+  } = renderWithRedux(
+    withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
+    renderOptions,
+  );
+
+  expect(queryByText(`Version ${firstVersion.version}`)).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
+  });
+  // Expand Row Action
+  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Actions')[1]);
+  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getByText('Promote'));
+  await patientlyWaitFor(() => {
+    expect(getByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeInTheDocument();
+    expect(getByLabelText('prod')).toBeInTheDocument();
+  });
+  // Select env prod
+  fireEvent.click(getByLabelText('prod'));
+  fireEvent.click(getByLabelText('promote_content_view'));
+  // Modal closes itself
+  await patientlyWaitFor(() => {
+    expect(queryByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeNull();
+    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(promoteScope);
+  // Page is refreshed
+  assertNockRequest(scope);
+  assertNockRequest(cvScope);
+  act(done);
+});
+
 test('Can reload versions upon task completion', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const { results: withTaskResults } = cvVersionsTasksData;
@@ -223,6 +285,10 @@ test('Can reload versions upon task completion', async (done) => {
     .get(cvVersions)
     .query(true)
     .reply(200, cvVersionsTasksData);
+  const cvScope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
 
   const taskSuccessScope = nockInstance
     .get(taskPollingUrl)
@@ -253,56 +319,63 @@ test('Can reload versions upon task completion', async (done) => {
   assertNockRequest(scope);
   assertNockRequest(taskSuccessScope);
   // Assert CV Versions API is called upon task completion
-  assertNockRequest(reloadScope, done);
+  assertNockRequest(reloadScope);
+  assertNockRequest(cvScope);
   act(done);
 });
 
-test('Can open Promote Modal', async (done) => {
+test('Shows call-to-action when there are no versions', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
-    .reply(200, cvVersionsData);
-
-  const cvPromoteParams = {
-    id: 10, versionEnvironments: [], description: '', environment_ids: [5], force: true,
-  };
+    .reply(200, emptyCVVersionData);
 
-  const promoteScope = nockInstance
-    .post(cvPromotePath, cvPromoteParams)
-    .reply(202, promoteResponseData);
+  const scopeWizard = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
 
-  const {
-    getByText, queryByText, getByLabelText, getAllByLabelText,
-  } = renderWithRedux(
+  const { getByText, queryByText } = renderWithRedux(
     withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
     renderOptions,
   );
 
-  expect(queryByText(`Version ${firstVersion.version}`)).toBeNull();
-  await patientlyWaitFor(() => {
-    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
-  });
-  // Expand Row Action
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'false');
-  fireEvent.click(getAllByLabelText('Actions')[1]);
-  expect(getAllByLabelText('Actions')[1]).toHaveAttribute('aria-expanded', 'true');
-  fireEvent.click(getByText('Promote'));
+  // Nothing will show at first, page is loading
+  expect(queryByText('Publish new version')).toBeNull();
+  // Assert that the CV version is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
-    expect(getByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeInTheDocument();
-    expect(getByLabelText('prod')).toBeInTheDocument();
+    expect(getByText('Publish new version')).toBeInTheDocument();
   });
-  // Select env prod
-  fireEvent.click(getByLabelText('prod'));
-  fireEvent.click(getByLabelText('promote_content_view'));
-  // Modal closes itself
+  fireEvent.click(getByText('Publish new version'));
+  await patientlyWaitFor(() => expect(getByText('Publish new version - 1.0')).toBeInTheDocument);
+
+  assertNockRequest(scopeWizard);
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  act(done);
+});
+
+test('Hides selectAllCheckbox when there are no versions', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, emptyCVVersionData);
+
+  const { queryByLabelText, queryByText, getByText } = renderWithRedux(
+    withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
+    renderOptions,
+  );
+  // Nothing will show at first, page is loading
+  expect(queryByText('Publish new version')).toBeNull();
+  // Assert that the CV version is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => {
-    expect(queryByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeNull();
+    expect(getByText('Publish new version')).toBeInTheDocument();
+    expect(queryByLabelText('Select all')).not.toBeInTheDocument();
   });
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(promoteScope);
-  // Page is refreshed
-  assertNockRequest(scope, done);
   act(done);
 });

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -126,9 +126,10 @@ const ContentViewTable = () => {
   );
 
   const emptyContentTitle = __("You currently don't have any Content views.");
-  const emptyContentBody = __('A content view can be added by using the "Create content view" button above.');
+  const emptyContentBody = __('A content view can be added by using the "Create content view" button below.');
   const emptySearchTitle = __('No matching content views found');
   const emptySearchBody = __('Try changing your search settings.');
+  const showPrimaryAction = true;
   const {
     id,
     latest_version_id: latestVersionId,
@@ -137,7 +138,6 @@ const ContentViewTable = () => {
     environments,
     versions,
   } = actionableCvDetails;
-
   return (
     <TableWrapper
       {...{
@@ -150,6 +150,7 @@ const ContentViewTable = () => {
         searchQuery,
         updateSearchQuery,
         fetchItems,
+        showPrimaryAction,
       }}
       ouiaId="content-views-table"
       additionalListeners={[activeSortColumn, activeSortDirection]}
@@ -157,16 +158,25 @@ const ContentViewTable = () => {
       variant={TableVariant.compact}
       status={status}
       autocompleteEndpoint="/content_views/auto_complete_search"
+      primaryActionButton={canCreate ? (
+        <Button
+          ouiaId="create-content-view"
+          onClick={openForm}
+          variant="primary"
+          aria-label="create_content_view"
+        > {__('Create content view')}
+        </Button >) : undefined}
       actionButtons={
         <>
-          {canCreate &&
+          {results?.length !== 0 &&
             <Button ouiaId="create-content-view" onClick={openForm} variant="primary" aria-label="create_content_view">
               {__('Create content view')}
             </Button>
           }
           <CreateContentViewModal show={isModalOpen} setIsOpen={setIsModalOpen} aria-label="create_content_view_modal" />
           <CopyContentViewModal cvId={actionableCvId} cvName={actionableCvName} show={copy} setIsOpen={setCopy} aria-label="copy_content_view_modal" />
-          {isPublishModalOpen &&
+          {
+            isPublishModalOpen &&
             <PublishContentViewWizard
               details={actionableCvDetails}
               show={isPublishModalOpen}
@@ -179,7 +189,8 @@ const ContentViewTable = () => {
               aria-label="publish_content_view_modal"
             />
           }
-          {isPromoteModalOpen &&
+          {
+            isPromoteModalOpen &&
             <ContentViewVersionPromote
               cvId={id && Number(id)}
               versionIdToPromote={latestVersionId}
@@ -188,7 +199,8 @@ const ContentViewTable = () => {
               setIsOpen={setIsPromoteModalOpen}
             />
           }
-          {isDeleteModalOpen &&
+          {
+            isDeleteModalOpen &&
             <ContentViewDeleteWizard
               cvId={id && Number(id)}
               cvEnvironments={environments}
@@ -196,7 +208,8 @@ const ContentViewTable = () => {
               show={isDeleteModalOpen}
               setIsOpen={setIsDeleteModalOpen}
               aria-label="delete_content_view_modal"
-            />}
+            />
+          }
         </>
       }
     >
@@ -214,80 +227,82 @@ const ContentViewTable = () => {
           <Th key="action-menu" />
         </Tr>
       </Thead>
-      {results?.map((cvInfo, rowIndex) => {
-        const {
-          composite,
-          name,
-          id: cvId,
-          last_published: lastPublished,
-          latest_version: latestVersion,
-          latest_version_id: cvLatestVersionId,
-          latest_version_environments: cvLatestVersionEnvironments,
-          last_task: lastTask,
-          activation_keys: activationKeys,
-          hosts,
-          related_cv_count: relatedCVCount,
-          related_composite_cvs: relatedCompositeCVs,
-          description,
-          createdAt,
-        } = cvInfo;
-        const { last_sync_words: lastSyncWords, started_at: startedAt } = lastTask ?? {};
-        const isExpanded = tableRowIsExpanded(cvId);
-        return (
-          <Tbody isExpanded={isExpanded} key={`${cvId}_${createdAt}`}>
-            <Tr key={cvId}>
-              <Td
-                expand={{
-                  rowIndex,
-                  isExpanded,
-                  onToggle: (_event, _rInx, isOpen) =>
-                    expandedTableRows.onToggle(isOpen, cvId),
-                }}
-              />
-              <Td><ContentViewIcon position="right" composite={composite} /></Td>
-              <Td><Link to={`${urlBuilder('content_views', '')}${cvId}`}>{name}</Link></Td>
-              <Td>{lastPublished ? <LongDateTime date={lastPublished} showRelativeTimeTooltip /> : <InactiveText text={__('Not yet published')} />}</Td>
-              <Td><LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /></Td>
-              <Td>{latestVersion ?
-                <ContentViewVersionCell {...{
-                  id: cvId,
-                  latestVersion,
-                  latestVersionId: cvLatestVersionId,
-                  latestVersionEnvironments: cvLatestVersionEnvironments,
-                }}
-                /> :
-                <InactiveText style={{ marginTop: '0.5em', marginBottom: '0.5em' }} text={__('Not yet published')} />}
-              </Td>
-              <Td
-                key={`rowActions-${id}`}
-                actions={{
-                  items: actionsWithPermissions(cvInfo),
-                }}
-              />
-            </Tr>
-            <Tr key="child_row" isExpanded={isExpanded}>
-              <Td colSpan={2}>
-                <ExpandableRowContent>
-                  <DetailsExpansion
-                    cvId={cvId}
-                    cvName={name}
-                    cvComposite={composite}
-                    {...{
-                      activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
-                    }}
-                  />
-                </ExpandableRowContent>
-              </Td>
-              <Td colSpan={4}>
-                <ExpandableRowContent>
-                  {description || <InactiveText text={__('No description')} />}
-                </ExpandableRowContent>
-              </Td>
-            </Tr>
-          </Tbody>
-        );
-      })}
-    </TableWrapper>
+      {
+        results?.map((cvInfo, rowIndex) => {
+          const {
+            composite,
+            name,
+            id: cvId,
+            last_published: lastPublished,
+            latest_version: latestVersion,
+            latest_version_id: cvLatestVersionId,
+            latest_version_environments: cvLatestVersionEnvironments,
+            last_task: lastTask,
+            activation_keys: activationKeys,
+            hosts,
+            related_cv_count: relatedCVCount,
+            related_composite_cvs: relatedCompositeCVs,
+            description,
+            createdAt,
+          } = cvInfo;
+          const { last_sync_words: lastSyncWords, started_at: startedAt } = lastTask ?? {};
+          const isExpanded = tableRowIsExpanded(cvId);
+          return (
+            <Tbody isExpanded={isExpanded} key={`${cvId}_${createdAt}`}>
+              <Tr key={cvId}>
+                <Td
+                  expand={{
+                    rowIndex,
+                    isExpanded,
+                    onToggle: (_event, _rInx, isOpen) =>
+                      expandedTableRows.onToggle(isOpen, cvId),
+                  }}
+                />
+                <Td><ContentViewIcon position="right" composite={composite} /></Td>
+                <Td><Link to={`${urlBuilder('content_views', '')}${cvId}`}>{name}</Link></Td>
+                <Td>{lastPublished ? <LongDateTime date={lastPublished} showRelativeTimeTooltip /> : <InactiveText text={__('Not yet published')} />}</Td>
+                <Td><LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /></Td>
+                <Td>{latestVersion ?
+                  <ContentViewVersionCell {...{
+                    id: cvId,
+                    latestVersion,
+                    latestVersionId: cvLatestVersionId,
+                    latestVersionEnvironments: cvLatestVersionEnvironments,
+                  }}
+                  /> :
+                  <InactiveText style={{ marginTop: '0.5em', marginBottom: '0.5em' }} text={__('Not yet published')} />}
+                </Td>
+                <Td
+                  key={`rowActions-${id}`}
+                  actions={{
+                    items: actionsWithPermissions(cvInfo),
+                  }}
+                />
+              </Tr>
+              <Tr key="child_row" isExpanded={isExpanded}>
+                <Td colSpan={2}>
+                  <ExpandableRowContent>
+                    <DetailsExpansion
+                      cvId={cvId}
+                      cvName={name}
+                      cvComposite={composite}
+                      {...{
+                        activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
+                      }}
+                    />
+                  </ExpandableRowContent>
+                </Td>
+                <Td colSpan={4}>
+                  <ExpandableRowContent>
+                    {description || <InactiveText text={__('No description')} />}
+                  </ExpandableRowContent>
+                </Td>
+              </Tr>
+            </Tbody>
+          );
+        })
+      }
+    </TableWrapper >
   );
 };
 

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

@@ -5,7 +5,7 @@ import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-
 import CONTENT_VIEWS_KEY from '../ContentViewsConstants';
 import ContentViewsPage from '../../ContentViews';
 import api from '../../../services/api';
-import nock, {
+import {
   nockInstance, assertNockRequest, mockAutocomplete, mockSetting,
 } from '../../../test-utils/nockWrapper';
 import createBasicCVs from './basicContentViews.fixtures';
@@ -31,7 +31,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  nock.cleanAll();
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
 });

data/webpack/scenes/ContentViews/__tests__/mockDetails.fixtures.json

@@ -1,10 +1,15 @@
 {
   "label": "mock_details",
   "permissions": {
-  "view_content_views": true,
+    "view_content_views": true,
     "edit_content_views": true,
     "destroy_content_views": true,
     "publish_content_views": true,
     "promote_or_remove_content_views": true
-}
+  },
+  "name": "mock_details",
+  "composite": false,
+  "next_version": "1.0",
+  "id": "5",
+  "version_count": 0
 }

data/webpack/scenes/SmartProxy/SmartProxyContentActions.js

@@ -12,7 +12,7 @@ export const getSmartProxies = () => get({
   type: API_OPERATIONS.GET,
   key: SMART_PROXY_KEY,
   url: foremanApi.getApiUrl('/smart_proxies'),
-  params: { organization_id: orgId() },
+  params: { organization_id: orgId(), per_page: 'all' },
 });
 
 export default getSmartProxyContent;

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -13,7 +13,6 @@ import { columns } from './ManifestHistoryTableSchema';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
 import { CONTENT_CREDENTIAL_CERT_TYPE } from '../../ContentCredentials/ContentCredentialConstants';
-import SimpleContentAccess from './SimpleContentAccess';
 import CdnConfigurationForm from './CdnConfigurationTab';
 
 import './ManageManifestModal.scss';
@@ -87,10 +86,6 @@ class ManageManifestModal extends Component {
       canDeleteManifest,
       isManifestImported,
       canEditOrganizations,
-      simpleContentAccess,
-      simpleContentAccessEligible,
-      enableSimpleContentAccess,
-      disableSimpleContentAccess,
       taskInProgress,
       manifestActionStarted,
       contentCredentials,
@@ -100,14 +95,6 @@ class ManageManifestModal extends Component {
     const showCdnConfigurationTab = canEditOrganizations;
     const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
     const showManifestTab = (canEditOrganizations || showSubscriptionManifest);
-    const disableSCASwitch = (
-      // allow users to turn SCA off even if they are not eligible to turn it back on
-      (!simpleContentAccessEligible && !simpleContentAccess) ||
-      disableManifestActions ||
-      !isManifestImported ||
-      actionInProgress ||
-      organization.loading
-    );
 
     const emptyStateData = () => ({
       header: __('There is no Manifest History to display.'),
@@ -149,17 +136,6 @@ class ManageManifestModal extends Component {
                     <Grid>
                       <h3>{__('Subscription Manifest')}</h3>
                       <hr />
-                      { isManifestImported &&
-                      <Row>
-                        <SimpleContentAccess
-                          enableSimpleContentAccess={enableSimpleContentAccess}
-                          disableSimpleContentAccess={disableSimpleContentAccess}
-                          isSimpleContentAccessEnabled={simpleContentAccess}
-                          canToggleSimpleContentAccess={!disableSCASwitch}
-                          simpleContentAccessEligible={simpleContentAccessEligible}
-                        />
-                      </Row>
-                      }
                       <Row>
                         <Col sm={5}>
                           <strong>{__('Subscription Allocation')}</strong>
@@ -271,8 +247,6 @@ ManageManifestModal.propTypes = {
   upload: PropTypes.func.isRequired,
   refresh: PropTypes.func.isRequired,
   delete: PropTypes.func.isRequired,
-  enableSimpleContentAccess: PropTypes.func.isRequired,
-  disableSimpleContentAccess: PropTypes.func.isRequired,
   loadManifestHistory: PropTypes.func.isRequired,
   getContentCredentials: PropTypes.func.isRequired,
   organization: PropTypes.shape({
@@ -302,8 +276,6 @@ ManageManifestModal.propTypes = {
   disabledReason: PropTypes.string,
   loadOrganization: PropTypes.func.isRequired,
   taskInProgress: PropTypes.bool.isRequired,
-  simpleContentAccess: PropTypes.bool,
-  simpleContentAccessEligible: PropTypes.bool,
   manifestHistory: PropTypes.shape({
     loading: PropTypes.bool,
     // Disabling rule as existing code failed due to an eslint-plugin-react update
@@ -327,8 +299,6 @@ ManageManifestModal.defaultProps = {
   isManifestImported: false,
   deleteManifestModalExists: false,
   canEditOrganizations: false,
-  simpleContentAccess: false,
-  simpleContentAccessEligible: undefined,
   manifestActionStarted: false,
   contentCredentials: [],
 };

data/webpack/test-utils/nockWrapper.js

@@ -18,6 +18,13 @@ export const nockInstance = nock('http://localhost');
 // The number of tries dictates the number of attempts assert will make before failing.
 // `tries * interval` is the maximum time that every nock scope will wait before failing if not met.
 export const assertNockRequest = (nockScope, jestDone, tries = 600) => {
+  // First function run of setInterval is not until after interval milliseconds.
+  // So duplicating some code here just in case the scope is already complete.
+  if (nockScope.isDone()) {
+    nockScope.done(); // Assert nock request
+    if (jestDone) jestDone(); // Tell jest test is done
+    return;
+  }
   // 500ms interval * 600 tries = 5 min timeout
   const interval = 500;
   let i = 0;