katello 4.7.3 → 4.8.0.rc1

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

@@ -6,7 +6,7 @@ import CONTENT_VIEWS_KEY from '../ContentViewsConstants';
 import ContentViewsPage from '../../ContentViews';
 import api from '../../../services/api';
 import {
-  nockInstance, assertNockRequest, mockAutocomplete, mockSetting,
+  nockInstance, assertNockRequest, mockAutocomplete,
 } from '../../../test-utils/nockWrapper';
 import createBasicCVs from './basicContentViews.fixtures';
 import cvIndexData from './contentViewList.fixtures.json';
@@ -14,28 +14,23 @@ import cvIndexData from './contentViewList.fixtures.json';
 const cvIndexPath = api.getApiUrl('/content_views');
 const autocompleteUrl = '/content_views/auto_complete_search';
 const renderOptions = { apiNamespace: CONTENT_VIEWS_KEY };
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 let firstCV;
-let searchDelayScope;
-let autoSearchScope;
-let scopeBookmark;
 beforeEach(() => {
   const { results } = cvIndexData;
   [firstCV] = results;
 });
 
 test('Can call API for CVs and show on screen on page load', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
 
   const { queryByText, queryAllByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
@@ -49,25 +44,16 @@ test('Can call API for CVs and show on screen on page load', async (done) => {
   });
 
 
-  assertNockRequest(scopeBookmark);
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope, done);
 });
 
 test('Can show last task and link to it', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
 
   const { getByText, queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
@@ -82,25 +68,16 @@ test('Can show last task and link to it', async (done) => {
     expect(queryByText('N/A')).toBeTruthy();
   });
 
-  assertNockRequest(scopeBookmark);
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   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 autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
 
   const {
     getByText,
@@ -123,25 +100,16 @@ test('Can show latest version and link to it', async (done) => {
     expect(getByText('dev').closest('a'))
       .toHaveAttribute('href', '/lifecycle_environments/2');
   });
-  assertNockRequest(scopeBookmark);
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   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 autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
 
   const {
     queryByLabelText,
@@ -171,9 +139,6 @@ test('Can expand cv and show activation keys and hosts', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
 
@@ -215,25 +180,16 @@ test('Can handle unpublished Content Views', async (done) => {
   const { results } = cvIndexData;
   const unpublishedCVs = results.map(cv => ({ ...cv, last_published: null }));
   const unpublishedCVData = { ...cvIndexData, results: unpublishedCVs };
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, unpublishedCVData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
 
   const { getAllByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
   await patientlyWaitFor(() => expect(getAllByText(/not yet published/i).length).toBeGreaterThan(0));
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(scope, done);
 });
 
@@ -242,13 +198,7 @@ test('Can handle pagination', async (done) => {
   const { results } = cvIndexLarge;
   const cvIndexFirstPage = { ...cvIndexLarge, ...{ results: results.slice(0, 20) } };
   const cvIndexSecondPage = { ...cvIndexLarge, page: 2, results: results.slice(20, 40) };
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   // Match first page API request
   const firstPageScope = nockInstance
@@ -283,39 +233,43 @@ test('Can handle pagination', async (done) => {
     expect(queryByText(results[41].name)).not.toBeInTheDocument();
   });
   assertNockRequest(autocompleteScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(firstPageScope);
   assertNockRequest(secondPageScope, done); // Only pass jest callback to the last API request
 });
 
 test('Can search for specific Content View', async (done) => {
   const cvname = 'composite one';
-  const { results } = cvIndexData;
-  const matchQuery = actualParams => actualParams?.search?.includes(cvname);
-  const searchResults = {
-    ...cvIndexData,
-    ...{ total: 1, subtotal: 1, results: results.slice(-1) },
+  const matchQuery = {
+    organization_id: 1,
+    search: `name = ${firstCV.name}`,
   };
-
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, matchQuery);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
+  const searchResults = [
+    {
+      completed: 'name = cv1',
+      part: 'and',
+      label: 'name = cv1 and',
+      category: 'Operators',
+    },
+    {
+      completed: 'name = cv1',
+      part: 'or',
+      label: 'name = cv1 or',
+      category: 'Operators',
+    },
+  ];
+
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    matchQuery,
+    searchResults,
+  );
 
   const initialScope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  const searchResultScope = nockInstance
-    .get(cvIndexPath)
-    .query(matchQuery)
-    .reply(200, searchResults);
 
   const {
     getByLabelText,
@@ -325,71 +279,52 @@ test('Can search for specific Content View', async (done) => {
 
   await patientlyWaitFor(() => expect(getByText(firstCV.name)).toBeInTheDocument());
 
-  const searchInput = getByLabelText(/text input for search/i);
+  const searchInput = getByLabelText('Search input');
   expect(searchInput).toBeInTheDocument();
-  fireEvent.change(searchInput, { target: { value: `name = \"${cvname}\"` } });
+  searchInput.focus();
+  fireEvent.change(searchInput, { target: { value: `name = ${firstCV.name}` } });
 
   await patientlyWaitFor(() => {
-    expect(getByText(cvname)).toBeInTheDocument();
-    expect(queryByText(firstCV.name)).not.toBeInTheDocument();
+    expect(getByText(`name = ${firstCV.name} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${cvname} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(initialScope);
-  assertNockRequest(withSearchScope);
-  assertNockRequest(searchResultScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
-test('No results message is shown for empty search', async (done) => {
+test('Nothing is shown for empty search', async (done) => {
   const cvname = 'notanactualname';
   const query = `name = \"${cvname}\"`;
-  const matchQuery = actualParams => actualParams?.search?.includes(cvname);
-  const emptyResults = {
-    total: 0,
-    subtotal: 0,
-    page: 1,
-    per_page: 20,
+  const matchQuery = {
+    organization_id: 1,
     search: query,
-    results: [],
-    can_view: true,
-    can_create: true,
   };
 
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, matchQuery);
   const initialScope = nockInstance
     .get(cvIndexPath)
     .query(true)
     .reply(200, cvIndexData);
-  const searchResultScope = nockInstance
-    .get(cvIndexPath)
-    .query(matchQuery)
-    .reply(200, emptyResults);
 
-  const { getByLabelText, getByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
+  const {
+    getByLabelText,
+    getByText,
+    queryByText,
+  } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
   await patientlyWaitFor(() => expect(getByText(firstCV.name)).toBeInTheDocument());
 
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: query } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: query } });
 
-  await patientlyWaitFor(() => expect(getByText(/No matching content views found/i)).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText(`${query} and`)).not.toBeInTheDocument());
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(initialScope);
-  assertNockRequest(withSearchScope);
-  assertNockRequest(searchResultScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
 test('Displays Create Content View and opens modal with Form', async () => {

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

@@ -9,7 +9,7 @@ const WizardHeader = ({
   <Grid style={{ gridGap: '24px' }}>
     {title &&
       <TextContent>
-        <Text component={TextVariants.h2}>{title}</Text>
+        <Text ouiaId="wizard-header-text" component={TextVariants.h2}>{title}</Text>
       </TextContent>}
     {description &&
       <TextContent>

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

@@ -70,7 +70,7 @@ const RelatedContentViewsModal = ({ cvName, cvId, relatedCVCount }) => {
               ouiaId="related-content-view-components-table"
               fetchItems={useCallback(params => getContentViewComponents(cvId, params, 'Added'), [cvId])}
               variant={TableVariant.compact}
-              autocompleteEndpoint="/content_views/auto_complete_search"
+              autocompleteEndpoint="/katello/api/v2/content_views"
               emptyContentTitle={__('You currently don\'t have any related content views.')}
               emptySearchTitle={__('No matching content views found')}
               emptyContentBody={__('Related content views will appear here when created.')}

data/webpack/scenes/ContentViews/expansions/__tests__/contentViewComponentsModal.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 
-import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../test-utils/nockWrapper';
 import api from '../../../../services/api';
 
 import RelatedContentViewComponentsModal from '../RelatedContentViewComponentsModal';
@@ -16,6 +16,12 @@ test('Can call API and show Related Content Views Components Modal', async (done
   const relatedCvCount = 2;
   const cvName = 'italiano';
   const contentViewComponentsPath = api.getApiUrl(`/content_views/${cvId}/content_view_components/show_all`);
+  const autocompleteUrl = '/content_views/auto_complete_search';
+  const autocompleteQuery = {
+    organization_id: 1,
+    search: '',
+  };
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const scope = nockInstance
     .get(contentViewComponentsPath)
@@ -32,6 +38,7 @@ test('Can call API and show Related Content Views Components Modal', async (done
   fireEvent.click(getByLabelText(`button_${cvId}`));
   await patientlyWaitFor(() => expect(getByText('Related content views')).toBeInTheDocument());
 
+  assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
 

data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js

@@ -32,14 +32,6 @@ class ModuleStreamsPage extends Component {
     this.props.getModuleStreams({ search });
   };
 
-  getAutoCompleteParams = search => ({
-    endpoint: '/module_streams/auto_complete_search',
-    params: {
-      organization_id: orgId(),
-      search,
-    },
-  });
-
   updateSearchQuery = (searchQuery) => {
     this.setState({ searchQuery });
   };
@@ -52,7 +44,9 @@ class ModuleStreamsPage extends Component {
         content={moduleStreams}
         tableSchema={TableSchema}
         onSearch={this.onSearch}
-        getAutoCompleteParams={this.getAutoCompleteParams}
+        autocompleteEndpoint="/katello/api/v2/module_streams"
+        autocompleteQueryParams={{ organization_id: orgId() }}
+        bookmarkController="katello_module_streams"
         updateSearchQuery={this.updateSearchQuery}
         initialInputValue={this.state.searchQuery}
         onPaginationChange={this.onPaginationChange}

data/webpack/scenes/ModuleStreams/__tests__/__snapshots__/ModuleStreamPage.test.js.snap

@@ -2,8 +2,14 @@
 
 exports[`Module streams page should render and contain appropiate components 1`] = `
 <ContentPage
+  autocompleteEndpoint="/katello/api/v2/module_streams"
+  autocompleteQueryParams={
+    Object {
+      "organization_id": 1,
+    }
+  }
+  bookmarkController="katello_module_streams"
   content={Object {}}
-  getAutoCompleteParams={[Function]}
   header="Module Streams"
   initialInputValue=""
   onPaginationChange={[Function]}

data/webpack/scenes/RedHatRepositories/components/Search.js

@@ -2,9 +2,9 @@
 import React, { Component } from 'react';
 import { DropdownButton, MenuItem } from 'patternfly-react';
 import PropTypes from 'prop-types';
+import SearchBar from 'foremanReact/components/SearchBar';
 import { translate as __ } from 'foremanReact/common/I18n';
 import '../index.scss';
-import Search from '../../../components/Search/index';
 import { orgId } from '../../../services/api';
 
 class RepositorySearch extends Component {
@@ -29,7 +29,6 @@ class RepositorySearch extends Component {
     ];
     this.state = { searchList: this.dropDownItems[0] };
     this.onSearch = this.onSearch.bind(this);
-    this.getAutoCompleteParams = this.getAutoCompleteParams.bind(this);
   }
 
   onSearch(search) {
@@ -41,23 +40,24 @@ class RepositorySearch extends Component {
     this.props.onSelectSearchList(searchList.key);
   }
 
-  getAutoCompleteParams(search) {
-    const params = {
-      organization_id: orgId(),
-      search,
-    };
+  getAutoCompleteEndpoint() {
     let endpoint = '';
     if (this.state.searchList.key === 'enabled') {
-      params.enabled = true;
-      endpoint = '/repositories/auto_complete_search';
+      endpoint = '/katello/api/v2/repositories/auto_complete_search';
     } else if (this.state.searchList.key === 'available') {
-      endpoint = '/repository_sets/auto_complete_search';
+      endpoint = '/katello/api/v2/repository_sets/auto_complete_search';
+    }
+
+    return endpoint;
+  }
+
+  autocompleteQueryParams() {
+    const params = { organization_id: orgId() };
+    if (this.state.searchList.key === 'enabled') {
+      params.enabled = true;
     }
 
-    return {
-      endpoint,
-      params,
-    };
+    return params;
   }
 
   render() {
@@ -77,9 +77,15 @@ class RepositorySearch extends Component {
               </MenuItem>
             ))}
         </DropdownButton>
-        <Search
+        <SearchBar
+          data={{
+            autocomplete: {
+              url: this.getAutoCompleteEndpoint(),
+              apiParams: this.autocompleteQueryParams(),
+            },
+            bookmarks: {},
+          }}
           onSearch={this.onSearch}
-          getAutoCompleteParams={this.getAutoCompleteParams}
         />
       </div>
     );

data/webpack/scenes/RedHatRepositories/index.scss

@@ -21,16 +21,35 @@
   }
   .search-bar-row {
     min-height: 26px;
-    margin-bottom: 10px;
+    margin-bottom: 20px;
 
     .form-group {
       box-sizing: border-box;
+      width: 50%;
+
+      div:first-child {
+        display: flex;
+        justify-content: space-between;
+        .foreman-search-bar {
+          flex-grow: 1;
+          margin-left: 0.7rem;
+          .pf-c-search-input {
+            width: 100%;
+          }
+        }
+      }
 
       &:first-child {
         padding-left: 0;
       }
     }
+
+    .dropdown.btn-group {
+      margin-right: 0.6rem;
+    }
+
     &.search-bar-selects-row {
+      width: 50%;
       .form-group {
         border: none;
 

data/webpack/scenes/SmartProxy/SmartProxyContentTable.js

@@ -138,7 +138,18 @@ const SmartProxyContentTable = ({ smartProxyId }) => {
 
 
   return (
-    <MainTable onCollapse={onCollapse(rows, setRows)} status={status} cells={columnHeaders} rows={rows} error={error} emptyContentTitle="No content synced" emptyContentBody="No content synced to smart proxy" emptySearchTitle="Empty" emptySearchBody="Empty" />
+    <MainTable
+      onCollapse={onCollapse(rows, setRows)}
+      ouiaId="smart-proxy-content-table"
+      status={status}
+      cells={columnHeaders}
+      rows={rows}
+      error={error}
+      emptyContentTitle="No content synced"
+      emptyContentBody="No content synced to smart proxy"
+      emptySearchTitle="Empty"
+      emptySearchBody="Empty"
+    />
   );
 };
 

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnTypeForm.js

@@ -34,7 +34,7 @@ const CdnTypeForm = ({ typeChangeInProgress, onUpdate }) => {
   return (
     <Form isHorizontal>
       <div id="update-hint-cdn" className="margin-top-16">
-        <Text>
+        <Text ouiaId="update-hint-cdn-text">
           <FormattedMessage
             id="cdn-configuration-type"
             defaultMessage={__('Red Hat content will be consumed from the {type}.')}

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CustomCdnTypeForm.js

@@ -62,7 +62,7 @@ const CustomCdnTypeForm = ({
   return (
     <Form isHorizontal>
       <div id="update-hint-cdn" className="margin-top-16">
-        <Text>
+        <Text ouiaId="cdn-configuration-type-text">
           <FormattedMessage
             id="cdn-configuration-type"
             defaultMessage={__('Red Hat content will be consumed from {type}.')}

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -162,14 +162,6 @@ class SubscriptionsPage extends Component {
       this.props.loadSubscriptions({ search });
     };
 
-    const getAutoCompleteParams = search => ({
-      endpoint: '/subscriptions/auto_complete_search',
-      params: {
-        organization_id: currentOrg,
-        search,
-      },
-    });
-
     const onDeleteSubscriptions = (selectedRows) => {
       this.props.deleteSubscriptions(selectedRows);
       this.handleSelectedRowsChange([]);
@@ -209,14 +201,23 @@ class SubscriptionsPage extends Component {
       loadTableColumns({ columns: getEnabledColumns(columns) });
     };
     const columns = subscriptions.selectedTableColumns;
-    const emptyStateData = {
-      header: __('There are no Subscriptions to display'),
-      description: __('Import a Manifest to manage your Entitlements.'),
-      action: {
-        onClick: () => openManageManifestModal(),
-        title: __('Import a Manifest'),
-      },
-    };
+    const emptyStateData = isManifestImported
+      ? {
+        header: __('There are no Subscriptions to display'),
+        description: __('Add Subscriptions using the Add Subscriptions button.'),
+        action: {
+          title: __('Add subscriptions'),
+          url: 'subscriptions/add',
+        },
+      }
+      : {
+        header: __('There are no Subscriptions to display'),
+        description: __('Import a Manifest to manage your Entitlements.'),
+        action: {
+          onClick: () => openManageManifestModal(),
+          title: __('Import a Manifest'),
+        },
+      };
 
     const SCAAlert = (
       <Alert type={simpleContentAccess ? 'info' : 'warning'}>
@@ -230,7 +231,7 @@ class SubscriptionsPage extends Component {
           defaultMessage={simpleContentAccess ? __(`This organization has Simple Content Access enabled.
           Hosts are not required to have subscriptions attached to access repositories.
           {br}
-          Learn more about your overall subscription usage with the {subscriptionsService}.`) : __('This organization is not using {scaLink}. Legacy subscription management is deprecated and will be removed in a future version.')}
+          Learn more about your overall subscription usage with the {subscriptionsService}.`) : __('This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in a future version.')}
         />
       </Alert>
     );
@@ -248,7 +249,7 @@ class SubscriptionsPage extends Component {
               disableDeleteButton={deleteButtonDisabled}
               disableDeleteReason={this.getDisabledReason(true)}
               disableAddButton={disableManifestActions}
-              getAutoCompleteParams={getAutoCompleteParams}
+              autocompleteQueryParams={{ organization_id: currentOrg }}
               updateSearchQuery={updateSearchQuery}
               onDeleteButtonClick={openDeleteModal}
               onSearch={onSearch}
@@ -272,7 +273,7 @@ class SubscriptionsPage extends Component {
             />
 
             <div id="subscriptions-table" className="modal-container">
-              {isManifestImported && SCAAlert}
+              {!this.props.organization?.loading && SCAAlert}
               <SubscriptionsTable
                 canManageSubscriptionAllocations={canManageSubscriptionAllocations}
                 loadSubscriptions={this.props.loadSubscriptions}
@@ -330,6 +331,7 @@ SubscriptionsPage.propTypes = {
   }),
   organization: PropTypes.shape({
     id: PropTypes.number,
+    loading: PropTypes.bool,
     owner_details: PropTypes.shape({
       upstreamConsumer: PropTypes.shape({
         name: PropTypes.string,