katello 4.7.2 → 4.8.0.rc1

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewComponents from '../ContentViewComponents';
@@ -15,27 +15,21 @@ const cvComponents = api.getApiUrl('/content_views/4/content_view_components/sho
 const addComponentURL = api.getApiUrl('/content_views/4/content_view_components/add');
 const publishedComponentDetailsURL = api.getApiUrl('/content_views/13');
 const removeComponentURL = api.getApiUrl('/content_views/4/content_view_components/remove');
-const cvComponentsSearchURL = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&search=name+%3D+%227%22&status=All');
 const autocompleteUrl = '/content_views/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 let firstComponent;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = cvComponentData;
   [firstComponent] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API and show components on page load', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
@@ -55,7 +49,7 @@ test('Can call API and show components on page load', async (done) => {
 });
 
 test('Can call API and show unpublished components', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvUnpublishedComponentData);
@@ -79,7 +73,7 @@ test('Can call API and show unpublished components', async (done) => {
 });
 
 test('Can link to view environment', async () => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
@@ -102,17 +96,36 @@ test('Can search for component content views in composite view', async (done) =>
   const lastComponent = cvComponentData.results[1];
   const { name: firstComponentName } = firstComponent.content_view;
   const { name: lastComponentName } = lastComponent.content_view;
-  const searchQueryMatcher = actualParams => actualParams?.search?.includes(lastComponentName);
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: `name = ${lastComponentName}`,
+  };
+  const searchResults = [
+    {
+      completed: `name = ${lastComponentName}`,
+      part: 'and',
+      label: `name = ${lastComponentName} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastComponentName}`,
+      part: 'or',
+      label: `name = ${lastComponentName} or`,
+      category: 'Operators',
+    },
+  ];
 
   const cvComponentsScope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
-  const cvComponentsSearchScope = nockInstance
-    .get(cvComponentsSearchURL)
-    .reply(200, { results: [lastComponent] });
 
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(<ContentViewComponents cvId={4} details={cvDetails} />, renderOptions);
 
@@ -123,23 +136,23 @@ test('Can search for component content views in composite view', async (done) =>
   });
 
   // Search and only searched result shows
-  const searchInput = getByLabelText(/text input for search/i);
+  const searchInput = getByLabelText('Search input');
   expect(searchInput).toBeInTheDocument();
-  fireEvent.change(searchInput, { target: { value: `name = "${lastComponentName}"` } });
+  searchInput.focus();
+  fireEvent.change(searchInput, { target: { value: `name = ${lastComponentName}` } });
 
   await patientlyWaitFor(() => {
-    expect(getByText(lastComponentName)).toBeInTheDocument();
-    expect(queryByText(firstComponentName)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastComponentName} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${firstComponentName} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvComponentsScope);
-  assertNockRequest(withSearchScope);
-  assertNockRequest(cvComponentsSearchScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
 test('Can handle no components being present', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const noResults = {
     total: 0,
@@ -172,7 +185,7 @@ test('Can handle no components being present', async (done) => {
 });
 
 test('Can add published component views to content view with modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -225,7 +238,7 @@ test('Can add published component views to content view with modal', async (done
 });
 
 test('Can add unpublished component views to content view', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -261,7 +274,7 @@ test('Can add unpublished component views to content view', async (done) => {
 });
 
 test('Can remove component views from content view', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -297,7 +310,7 @@ test('Can remove component views from content view', async (done) => {
 });
 
 test('Can bulk add component views to content view with modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -82,6 +82,7 @@ export default () => {
   const dropDownItems = [
     <DropdownItem
       key="copy"
+      ouiaId="cv-copy"
       onClick={() => {
         setCopying(true);
       }}
@@ -90,6 +91,7 @@ export default () => {
     </DropdownItem>,
     <DropdownItem
       key="delete"
+      ouiaId="cv-delete"
       onClick={() => {
         setDeleting(true);
       }}

data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js

@@ -178,6 +178,9 @@ const AffectedRepositoryTable = ({
   const emptySearchBody = __('Try changing your search settings.');
   const activeFilters = [productSelected];
   const defaultFilters = [allProducts];
+  const resetFilters = () => {
+    setProductSelected(allProducts);
+  };
   const dropdownItems = [
     <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={removeBulk}>
       {__('Remove')}
@@ -197,6 +200,7 @@ const AffectedRepositoryTable = ({
         updateSearchQuery,
         activeFilters,
         defaultFilters,
+        resetFilters,
         error,
         status,
       }}
@@ -204,7 +208,8 @@ const AffectedRepositoryTable = ({
       onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
       cells={columnHeaders}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/repositories/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/repositories"
+      bookmarkController="katello_content_view_filters"
       fetchItems={useCallback(params => getCVReposWithOptions(params), [getCVReposWithOptions])}
       additionalListeners={[productSelected]}
       actionButtons={

data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js

@@ -152,7 +152,8 @@ const CVContainerImageFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_docker_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={hasPermission(permissions, 'edit_content_views') &&
               <>

data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js

@@ -170,7 +170,8 @@ const CVDebFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_deb_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={
               <>

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -205,7 +205,7 @@ const CVErrataDateFilterContent = ({
                     value={startDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setStartDate}
+                    onChange={(e, val) => setStartDate(val)}
                     dateParse={dateParse}
                     placeholder={startEntry ? 'MM/DD/YYYY' : __('Start date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}
@@ -227,7 +227,7 @@ const CVErrataDateFilterContent = ({
                     value={endDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setEndDate}
+                    onChange={(e, val) => setEndDate(val)}
                     dateParse={dateParse}
                     placeholder={endEntry ? 'MM/DD/YYYY' : __('End date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -206,12 +206,12 @@ const CVErrataIDFilterContent = ({
     } else setSelectedTypes([...selectedTypes, selection]);
   };
 
-  const setValidStartDate = (value) => {
+  const setValidStartDate = (e, value) => {
     setStartDate(value);
     if (validAPIDate(value)) setApiStartDate(value);
   };
 
-  const setValidEndDate = (value) => {
+  const setValidEndDate = (e, value) => {
     setEndDate(value);
     if (validAPIDate(value)) setApiEndDate(value);
   };
@@ -276,7 +276,9 @@ const CVErrataIDFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/errata/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/errata"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_erratum_filter_rules"
             additionalListeners={[statusSelected, selectedTypes.length,
               dateType, apiStartDate, apiEndDate]}
             fetchItems={useCallback(params =>

data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js

@@ -229,7 +229,9 @@ const CVModuleStreamFilterContent = ({
             defaultFilters={[allAddedNotAdded[0]]}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/module_streams/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/module_streams"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_module_stream_filter_rules"
             fetchItems={fetchItems}
             actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}

data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js

@@ -219,7 +219,9 @@ const CVPackageGroupFilterContent = ({
             defaultFilters={[allAddedNotAdded[0]]}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/package_groups/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/package_groups"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_package_group_filter_rules"
             fetchItems={fetchItems}
             actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}

data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js

@@ -183,7 +183,8 @@ const CVRpmFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_package_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={
               <>

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js

@@ -67,6 +67,7 @@ const ContentViewFilterDetailsHeader = ({
   const dropDownItems = [
     <DropdownItem
       key="delete"
+      ouiaId="cv-filter-delete"
       onClick={() => {
         dispatch(deleteContentViewFilter(filterId, () => {
           push(`/content_views/${cvId}#/filters/`);
@@ -129,6 +130,7 @@ const ContentViewFilterDetailsHeader = ({
           </FlexItem>
           <FlexItem>
             <Dropdown
+              ouiaId="cv-filter-actions-kebab"
               position={DropdownPosition.right}
               style={{ marginLeft: 'auto' }}
               toggle={<KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />}

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js

@@ -142,7 +142,8 @@ const ContentViewFilters = ({ cvId, details }) => {
       onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
       cells={columnHeaders}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/content_view_filters/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/content_view_filters"
+      bookmarkController="katello_content_view_filters"
       fetchItems={useCallback(params => getContentViewFilters(cvId, params), [cvId])}
       actionButtons={hasPermission(permissions, 'edit_content_views') &&
         <>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVDebMatchContentModal.js

@@ -54,7 +54,7 @@ const CVDebMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
           status,
         }}
         ouiaId="content-view-deb-match-content-table"
-        autocompleteEndpoint="/debs/auto_complete_search"
+        autocompleteEndpoint="/katello/api/v2/debs"
         variant={TableVariant.compact}
       >
         <Thead>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js

@@ -55,7 +55,7 @@ const CVRpmMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
           status,
         }}
         ouiaId="content-view-rpm-match-content-table"
-        autocompleteEndpoint="/packages/auto_complete_search"
+        autocompleteEndpoint="/katello/api/v2/packages"
         variant={TableVariant.compact}
       >
         <Thead>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js

@@ -1,39 +1,28 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 
-
 import api from '../../../../../../services/api';
 import CVRpmMatchContentModal from '../CVRpmMatchContentModal';
-import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 
 import CVMatchedContent from './CVRpmMatchContent.fixtures.json';
-import CVMatchContentSearch from './CVRpmMatchContentSearch.fixtures.json';
 
 const firstMatchContent = CVMatchedContent.results[0];
 const { nvra: secondMatchContentName } = CVMatchedContent.results[1];
 const cvMatchContentPath = api.getApiUrl('/packages');
 const autocompleteUrl = '/packages/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 const onClose = jest.fn();
 
 const MatchContentModal =
   <CVRpmMatchContentModal filterId={194} filterRuleId={13} onClose={onClose} />;
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-});
-
-
 test('Can show matching content modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvMatchContentscope = nockInstance
     .get(cvMatchContentPath)
     .query(true)
@@ -50,22 +39,36 @@ test('Can show matching content modal', async (done) => {
 });
 
 test('Can search with filter', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const matchQuery = {
+    organization_id: 1,
+    search: `nvra = ${firstMatchContent.nvra}`,
+  };
+  const searchResults = [
+    {
+      completed: `nvra = ${firstMatchContent.nvra}`,
+      part: 'and',
+      label: `nvra = ${firstMatchContent.nvra} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `nvra = ${firstMatchContent.nvra}`,
+      part: 'or',
+      label: `nvra = ${firstMatchContent.nvra} or`,
+      category: 'Operators',
+    },
+  ];
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const secondGetMatchContentscope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    matchQuery,
+    searchResults,
+  );
   const getMatchContentscope = nockInstance
     .get(cvMatchContentPath)
     .query(true)
     .reply(200, CVMatchedContent);
 
-  const autocompleteSearchScope = nockInstance
-    .get(api.getApiUrl(autocompleteUrl))
-    .query(true)
-    .reply(200, []);
-
-  const secondGetMatchContentscope = nockInstance
-    .get(cvMatchContentPath)
-    .query(true)
-    .reply(200, CVMatchContentSearch);
-
   const { queryByText, getByLabelText } = renderWithRedux(MatchContentModal);
 
   await patientlyWaitFor(() => {
@@ -73,17 +76,16 @@ test('Can search with filter', async (done) => {
     expect(queryByText(secondMatchContentName)).toBeInTheDocument();
   });
 
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: `nvra = ${firstMatchContent.nvra}` } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `nvra = ${firstMatchContent.nvra}` } });
 
   await patientlyWaitFor(() => {
-    expect(queryByText('Matching content')).toBeInTheDocument();
+    expect(queryByText(`nvra = ${firstMatchContent.nvra} and`)).toBeInTheDocument();
     expect(queryByText(firstMatchContent.nvra)).toBeInTheDocument();
-    expect(queryByText(secondMatchContentName)).not.toBeInTheDocument();
+    expect(queryByText(`nvra = ${secondMatchContentName} and`)).not.toBeInTheDocument();
   });
 
-
   assertNockRequest(autocompleteScope);
   assertNockRequest(getMatchContentscope);
-  assertNockRequest(autocompleteSearchScope);
   assertNockRequest(secondGetMatchContentscope, done);
 });