katello 4.3.0 → 4.4.0.rc1

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

@@ -1,6 +1,6 @@
 import { API_OPERATIONS, APIActions, get, put, post } from 'foremanReact/redux/API';
-import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { lowerCase } from 'lodash';
 import {
   RPM_PACKAGES_CONTENT,
   RPM_PACKAGE_GROUPS_CONTENT,
@@ -45,11 +45,11 @@ import {
   ERRATA_CONTENT,
   MODULE_STREAMS_CONTENT,
   DEB_PACKAGES_CONTENT,
-  ANSIBLE_COLLECTIONS_CONTENT,
   DOCKER_TAGS_CONTENT,
+  generatedContentKey,
 } from '../ContentViewsConstants';
 import api, { foremanApi, orgId } from '../../../services/api';
-import { getResponseErrorMsgs, apiError } from '../../../utils/helpers';
+import { getResponseErrorMsgs } from '../../../utils/helpers';
 import { renderTaskStartedToast } from '../../Tasks/helpers';
 import { cvErrorToast } from '../ContentViewsActions';
 
@@ -60,15 +60,13 @@ const getContentViewDetails = (cvId, extraParams = {}) => get({
   url: api.getApiUrl(`/content_views/${cvId}`),
 });
 
-const cvUpdateSuccess = (response, dispatch) => {
-  const { data: { id } } = response;
-  // Update CV info in redux with the updated CV info from API
-  dispatch(getContentViewDetails(id));
-  return dispatch(addToast({
-    type: 'success',
-    message: __(' Content view updated'),
-  }));
-};
+export const getContent = (pluralLabel, params) => get({
+  type: API_OPERATIONS.GET,
+  key: generatedContentKey(pluralLabel),
+  url: api.getApiUrl(`/${pluralLabel}`),
+  params,
+  errorToast: error => __(`Something went wrong while fetching ${lowerCase(pluralLabel)}! ${getResponseErrorMsgs(error.response)}`),
+});
 
 export const getRPMPackages = params => get({
   type: API_OPERATIONS.GET,
@@ -86,19 +84,21 @@ export const getFiles = params => get({
   errorToast: error => __(`Something went wrong while fetching files! ${getResponseErrorMsgs(error.response)}`),
 });
 
-export const updateContentView = (cvId, params) => dispatch => dispatch(put({
+export const updateContentView = (cvId, params, handleSuccess) => put({
   type: API_OPERATIONS.PUT,
   key: cvDetailsKey(cvId),
   url: api.getApiUrl(`/content_views/${cvId}`),
-  params,
-  handleSuccess: response => cvUpdateSuccess(response, dispatch),
-  handleError: error => dispatch(apiError(null, error)),
+  handleSuccess,
+  params: { include_permissions: true, ...params },
+  successToast: () => __(' Content view updated'),
+  errorToast: error => getResponseErrorMsgs(error.response),
+  updateData: (_prevState, respState) => respState,
   actionTypes: {
     REQUEST: UPDATE_CONTENT_VIEW,
     SUCCESS: UPDATE_CONTENT_VIEW_SUCCESS,
     FAILURE: UPDATE_CONTENT_VIEW_FAILURE,
   },
-}));
+});
 
 export const addComponent = params => put({
   type: API_OPERATIONS.PUT,
@@ -135,14 +135,6 @@ export const getDockerTags = params => get({
   errorToast: error => __(`Something went wrong while getting docker tags! ${getResponseErrorMsgs(error.response)}`),
 });
 
-export const getAnsibleCollections = params => get({
-  type: API_OPERATIONS.GET,
-  key: ANSIBLE_COLLECTIONS_CONTENT,
-  url: api.getApiUrl('/ansible_collections'),
-  params,
-  errorToast: error => __(`Something went wrong while getting ansible collections! ${getResponseErrorMsgs(error.response)}`),
-});
-
 export const getErrata = params => get({
   type: API_OPERATIONS.GET,
   key: ERRATA_CONTENT,
@@ -176,7 +168,7 @@ export const getRepositories = params => get({
 });
 
 export const getContentViewRepositories = (cvId, params, status) => {
-  const apiParams = { ...params };
+  const apiParams = { organization_id: orgId(), ...params };
   let apiUrl = `/content_views/${cvId}/repositories`;
 
   if (status === ALL_STATUSES) {
@@ -205,12 +197,13 @@ export const getFilterRepositories = (cvId, filterId, params) => {
   });
 };
 
-export const editCVFilter = (filterId, params, handleSuccess) => put({
+export const editCVFilter = (filterId, params, handleSuccess, handleError) => put({
   type: API_OPERATIONS.PUT,
   key: EDIT_CONTENT_VIEW_FILTER,
   url: api.getApiUrl(`/content_view_filters/${filterId}`),
   params,
   handleSuccess,
+  handleError,
   successToast: () => __('Filter edited'),
   errorToast: error => __(`Something went wrong while editing the filter! ${getResponseErrorMsgs(error.response)}`),
 });
@@ -416,6 +409,7 @@ export const editContentViewVersionDetails = (versionId, cvId, params, handleSuc
     url: api.getApiUrl(`/content_view_versions/${versionId}`),
     params,
     handleSuccess,
+    successToast: () => __('Version details updated.'),
     errorToast: error => __(`Something went wrong while editing version details. ${getResponseErrorMsgs(error.response)}`),
   });
 

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

@@ -33,8 +33,8 @@ import {
   ERRATA_CONTENT,
   MODULE_STREAMS_CONTENT,
   DEB_PACKAGES_CONTENT,
-  ANSIBLE_COLLECTIONS_CONTENT,
   DOCKER_TAGS_CONTENT,
+  generatedContentKey,
 } from '../ContentViewsConstants';
 import { pollTaskKey } from '../../Tasks/helpers';
 
@@ -131,11 +131,11 @@ export const selectCVFilterRules = (state, filterId) =>
 export const selectCVFilterRulesStatus = (state, filterId) =>
   selectAPIStatus(state, cvFilterRulesKey(filterId)) || STATUS.PENDING;
 
-export const selectAnsibleCollections = state =>
-  selectAPIResponse(state, ANSIBLE_COLLECTIONS_CONTENT);
+export const selectContent = (pluralLabel, state) =>
+  selectAPIResponse(state, generatedContentKey(pluralLabel));
 
-export const selectAnsibleCollectionsStatus = state =>
-  selectAPIStatus(state, ANSIBLE_COLLECTIONS_CONTENT) || STATUS.PENDING;
+export const selectContentStatus = (pluralLabel, state) =>
+  selectAPIStatus(state, generatedContentKey(pluralLabel)) || STATUS.PENDING;
 
 export const selectDockerTags = state =>
   selectAPIResponse(state, DOCKER_TAGS_CONTENT);

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

@@ -15,7 +15,6 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 import { updateContentView } from './ContentViewDetailActions';
 import { selectIsCVUpdating } from './ContentViewDetailSelectors';
-import Loading from '../../../components/Loading';
 import ContentViewIcon from '../components/ContentViewIcon';
 import ActionableDetail from '../../../components/ActionableDetail';
 import './contentViewInfo.scss';
@@ -37,8 +36,6 @@ const ContentViewInfo = ({ cvId, details }) => {
     permissions,
   } = details;
 
-  if (updating) return <Loading size="sm" showText={false} />;
-
   const onEdit = (val, attribute) => {
     if (val === details[attribute]) return;
     dispatch(updateContentView(cvId, { [attribute]: val }));
@@ -48,8 +45,10 @@ const ContentViewInfo = ({ cvId, details }) => {
     <TextContent className="margin-0-24">
       <TextList component={TextListVariants.dl}>
         <ActionableDetail
+          key={name}
           label={__('Name')}
           attribute="name"
+          loading={updating && currentAttribute === 'name'}
           onEdit={onEdit}
           disabled={!hasPermission(permissions, 'edit_content_views')}
           value={name}
@@ -76,9 +75,11 @@ const ContentViewInfo = ({ cvId, details }) => {
           </Flex>
         </TextListItem>
         <ActionableDetail
+          key={description}
           textArea
           label={__('Description')}
           attribute="description"
+          loading={updating && currentAttribute === 'description'}
           onEdit={onEdit}
           disabled={!hasPermission(permissions, 'edit_content_views')}
           value={description}
@@ -86,8 +87,10 @@ const ContentViewInfo = ({ cvId, details }) => {
         />
         {composite ?
           (<ActionableDetail
+            key={autoPublish}
             label={__('Autopublish')}
             attribute="auto_publish"
+            loading={updating && currentAttribute === 'auto_publish'}
             value={autoPublish}
             onEdit={onEdit}
             disabled={!hasPermission(permissions, 'edit_content_views')}
@@ -98,6 +101,8 @@ const ContentViewInfo = ({ cvId, details }) => {
           (<ActionableDetail
             label={__('Solve dependencies')}
             attribute="solve_dependencies"
+            key={solveDependencies}
+            loading={updating && currentAttribute === 'solve_dependencies'}
             value={solveDependencies}
             onEdit={onEdit}
             disabled={!hasPermission(permissions, 'edit_content_views')}

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

@@ -1,27 +1,27 @@
 import React, { useEffect } from 'react';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
-import PropTypes from 'prop-types';
 import { STATUS } from 'foremanReact/constants';
-import EmptyStateMessage from '../../../components/Table/EmptyStateMessage';
+import PropTypes from 'prop-types';
+import {
+  shallowEqual,
+  useDispatch,
+  useSelector,
+} from 'react-redux';
 import Loading from '../../../components/Loading';
+import EmptyStateMessage from '../../../components/Table/EmptyStateMessage';
 import getContentViewDetails from './ContentViewDetailActions';
 import {
-  selectCVDetails,
-  selectCVDetailStatus,
   selectCVDetailError,
+  selectCVDetailStatus,
 } from './ContentViewDetailSelectors';
 
-const DetailsContainer = ({ children, cvId, isOpen }) => {
+const DetailsContainer = ({ children, cvId }) => {
   const dispatch = useDispatch();
-  const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
   const status = useSelector(state => selectCVDetailStatus(state, cvId), shallowEqual);
   const error = useSelector(state => selectCVDetailError(state, cvId), shallowEqual);
 
   useEffect(() => {
-    if (isOpen && Object.keys(details).length === 0) {
-      dispatch(getContentViewDetails(cvId));
-    }
-  });
+    dispatch(getContentViewDetails(cvId));
+  }, [cvId, dispatch]);
 
   if (status === STATUS.PENDING) return (<Loading />);
   if (status === STATUS.ERROR) return (<EmptyStateMessage error={error} />);
@@ -31,11 +31,6 @@ const DetailsContainer = ({ children, cvId, isOpen }) => {
 DetailsContainer.propTypes = {
   children: PropTypes.element.isRequired,
   cvId: PropTypes.number.isRequired,
-  isOpen: PropTypes.bool,
-};
-
-DetailsContainer.defaultProps = {
-  isOpen: true,
 };
 
 export default DetailsContainer;

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

@@ -50,8 +50,8 @@ const ContentViewFilterDetails = ({ cvId, details }) => {
       {loaded && (Object.keys(filterDetails).length > 0) ?
         <ContentViewFilterDetailsHeader
           {...{
- cvId, filterId, filterDetails, setShowAffectedRepos, details,
-}}
+            cvId, filterId, filterDetails, setShowAffectedRepos, details,
+          }}
         /> :
         <Loading />
       }

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

@@ -8,15 +8,16 @@ import { getCVFilterDetails, editCVFilter } from '../ContentViewDetailActions';
 import AffectedRepositorySelection from './AffectedRepositories/AffectedRepositorySelection';
 import RepoIcon from '../Repositories/RepoIcon';
 import { repoType } from '../../../../utils/helpers';
-import EditableTextInput from '../../../../components/EditableTextInput';
 import { hasPermission } from '../../helpers';
 import { typeName } from './ContentType';
+import ActionableDetail from '../../../../components/ActionableDetail';
 
 const ContentViewFilterDetailsHeader = ({
   cvId, filterId, filterDetails, setShowAffectedRepos, details,
 }) => {
   const dispatch = useDispatch();
   const [currentAttribute, setCurrentAttribute] = useState('');
+  const [loading, setLoading] = useState(false);
   const {
     type, name, inclusion, description, rules,
   } = filterDetails;
@@ -26,12 +27,17 @@ const ContentViewFilterDetailsHeader = ({
 
   const displayedType = () => typeName(type, errataByDate);
 
-  const onEdit = (val, attribute) => {
+  const onEdit = async (val, attribute) => {
     if (val === filterDetails[attribute]) return;
-    dispatch(editCVFilter(
+    setLoading(true);
+    await dispatch(editCVFilter(
       filterId,
       { [attribute]: val },
-      () => dispatch(getCVFilterDetails(cvId, filterId)),
+      () => {
+        setLoading(false);
+        dispatch(getCVFilterDetails(cvId, filterId));
+      },
+      () => setLoading(false),
     ));
   };
 
@@ -39,10 +45,10 @@ const ContentViewFilterDetailsHeader = ({
     <Grid className="margin-0-24">
       <GridItem span={9}>
         <TextContent>
-          <EditableTextInput
+          <ActionableDetail
             key={name} // This fixes a render issue with the initial value
-            label={__('Name')}
             attribute="name"
+            loading={loading && currentAttribute === 'name'}
             placeholder={__('Enter a name')}
             onEdit={onEdit}
             disabled={!hasPermission(permissions, 'edit_content_views')}
@@ -53,11 +59,11 @@ const ContentViewFilterDetailsHeader = ({
           />
         </TextContent>
         <TextContent style={{ padding: '24px 0 12px' }}>
-          <EditableTextInput
+          <ActionableDetail
             key={description} // This fixes a render issue with the initial value
             textArea
-            label={__('Description')}
             attribute="description"
+            loading={loading && currentAttribute === 'description'}
             placeholder={__('No description')}
             onEdit={onEdit}
             disabled={!hasPermission(permissions, 'edit_content_views')}

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

@@ -22,8 +22,8 @@ const MatchContentModal =
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {

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

@@ -43,9 +43,8 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {

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

@@ -35,9 +35,8 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {
@@ -46,11 +45,6 @@ afterEach(() => {
   nock.cleanAll();
 });
 
-jest.mock('../../../../../utils/useDebounce', () => ({
-  __esModule: true,
-  default: value => value,
-}));
-
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -127,7 +121,6 @@ test('Can search for package rules in package filter details', async (done) => {
 
   // Search and only searched result shows
   fireEvent.change(getByLabelText(/text input for search/i), { target: { value: lastPackageRuleName } });
-  getByLabelText(/search button/i).click();
   await patientlyWaitFor(() => {
     expect(getByText(lastPackageRuleName)).toBeInTheDocument();
     expect(queryByText(firstPackageRuleName)).not.toBeInTheDocument();

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js

@@ -33,9 +33,8 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {
@@ -105,7 +104,7 @@ test('Can search for package groups in package group filter', async (done) => {
     .reply(200, { results: [lastPackageGroup] });
 
   const autocompleteScope =
-    mockAutocomplete(nockInstance, autocompleteUrl, undefined, undefined, 2);
+    mockAutocomplete(nockInstance, autocompleteUrl);
   const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
@@ -121,7 +120,6 @@ test('Can search for package groups in package group filter', async (done) => {
 
   // Search and only searched result shows
   fireEvent.change(getByLabelText(/text input for search/i), { target: { value: lastPackageGroupName } });
-  getByLabelText(/search button/i).click();
   await patientlyWaitFor(() => {
     expect(getByText(lastPackageGroupName)).toBeInTheDocument();
     expect(queryByText(firstPackageGroupName)).not.toBeInTheDocument();

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js

@@ -31,11 +31,9 @@ let autoSearchScope;
 beforeEach(() => {
   const { results } = cvFilterFixtures;
   [firstFilter] = results;
-  // lastFilter = results.pop();
   [lastFilter] = results.slice(-1);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {
@@ -44,11 +42,6 @@ afterEach(() => {
   nock.cleanAll();
 });
 
-jest.mock('../../../../../utils/useDebounce', () => ({
-  __esModule: true,
-  default: value => value,
-}));
-
 test('Can call API and show filters on page load', async (done) => {
   const { name, description } = firstFilter;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
@@ -96,7 +89,6 @@ test('Can search for filter', async (done) => {
   await patientlyWaitFor(() => expect(getByText(description)).toBeInTheDocument());
   // Search for a filter by name
   fireEvent.change(getByLabelText(/text input for search/i), { target: { value: name } });
-  getByLabelText(/search button/i).click();
   // Only the first filter should be showing, not the last one
   await patientlyWaitFor(() => {
     expect(getByText(description)).toBeInTheDocument();

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js

@@ -40,9 +40,8 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js

@@ -40,9 +40,8 @@ const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filter
 let searchDelayScope;
 let autoSearchScope;
 beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {

data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js

@@ -18,8 +18,8 @@ let autoSearchScope;
 beforeEach(() => {
   const { results } = historyData;
   [firstHistory] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 });
 
 afterEach(() => {

data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js

@@ -41,7 +41,7 @@ const ContentCounts = ({ productId, repoId, counts }) => {
   Object.keys(counts).forEach((type) => {
     const count = counts[type];
     let info = repoLabels[type];
-    const config = ContentConfig().find(typeConfig =>
+    const config = ContentConfig.find(typeConfig =>
       typeConfig.names.singularLabel === type);
 
     if (config) {

data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js

@@ -143,14 +143,35 @@ const ContentViewRepositories = ({ cvId, details }) => {
 
   const onAdd = (repos) => {
     const { repository_ids: repositoryIds = [] } = details;
-    dispatch(updateContentView(cvId, { repository_ids: repositoryIds.concat(repos) }));
+    dispatch(updateContentView(
+      cvId,
+      { repository_ids: repositoryIds.concat(repos) },
+      () =>
+        dispatch(getContentViewRepositories(
+          cvId,
+          typeSelected !== 'All repositories' ? {
+            content_type: repoTypes[typeSelected],
+          } : {},
+          statusSelected,
+        )),
+    ));
   };
 
   const onRemove = (repos) => {
     const reposToDelete = [].concat(repos);
     const { repository_ids: repositoryIds = [] } = details;
     const deletedRepos = repositoryIds.filter(x => !reposToDelete.includes(x));
-    dispatch(updateContentView(cvId, { repository_ids: deletedRepos }));
+    dispatch(updateContentView(
+      cvId, { repository_ids: deletedRepos },
+      () =>
+        dispatch(getContentViewRepositories(
+          cvId,
+          typeSelected !== 'All repositories' ? {
+            content_type: repoTypes[typeSelected],
+          } : {},
+          statusSelected,
+        )),
+    ));
   };
 
   const addBulk = () => {

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.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 nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
@@ -23,8 +23,8 @@ let autoSearchScope;
 beforeEach(() => {
   const { results } = repoData;
   [firstRepo] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   nockInstance
     .persist() // match any query to this endpoint, gets cleaned up by `nock.cleanAll()`
     .get(api.getApiUrl('/repositories/repository_types'))
@@ -66,7 +66,7 @@ test('Can enable and disable add repositories button', async (done) => {
 
 test('Can add repositories', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const cvAddparams = { repository_ids: [58, 62, 64, 106] };
+  const cvAddparams = { include_permissions: true, repository_ids: [58, 62, 64, 106] };
 
   const repoAddscope = nockInstance
     .put(cvDetailsPath, cvAddparams)
@@ -92,16 +92,19 @@ test('Can add repositories', async (done) => {
   expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
   getByLabelText('Select all rows').click();
   getByLabelText('add_repositories').click();
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
+
   assertNockRequest(repoAddscope);
 
   assertNockRequest(cvDetailScope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
+  act(done);
 });
 
 test('Can remove repositories', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const cvRemoveParams = { repository_ids: [58, 62, 64] };
+  const cvRemoveParams = { include_permissions: true, repository_ids: [58, 62, 64] };
   const scope = nockInstance
     .get(cvAllRepos)
     .query(true)
@@ -131,9 +134,12 @@ test('Can remove repositories', async (done) => {
     expect(getByLabelText('bulk_remove')).toBeInTheDocument();
   });
   getByLabelText('bulk_remove').click();
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
+
   assertNockRequest(repoRemoveScope);
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvDetailScope);
   assertNockRequest(scope, done);
+  act(done);
 });