katello 4.8.0.rc1 → 4.8.0

data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import {
   ActionGroup,
   Alert,
@@ -6,20 +7,87 @@ import {
   Form,
   Grid,
   GridItem,
+  Select,
+  SelectOption,
+  SelectVariant,
+  TextContent,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
+import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
+import { STATUS } from 'foremanReact/constants';
+import api, { orgId } from '../../../../services/api';
+import { ENVIRONMENT_PATHS_KEY } from '../../../../scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathConstants';
+import EnvironmentPaths from '../../../../scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths';
+import ContentViewSelect from '../../../../scenes/ContentViews/components/ContentViewSelect/ContentViewSelect';
+import ContentViewSelectOption from '../../../../scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption';
+import { selectContentViewsStatus } from '../selectors';
 
-import FormField from './FormField';
+const ENV_PATH_OPTIONS = { key: ENVIRONMENT_PATHS_KEY };
+
+const ContentSourceSelect = ({
+  contentSources,
+  selections,
+  onToggle,
+  onSelect,
+  isOpen,
+  isDisabled,
+  onClear,
+}) => (
+  <div className="content_source_section">
+    <TextContent>{__('Content source')}</TextContent>
+    <Select
+      variant={SelectVariant.single}
+      aria-label="content-source-select"
+      ouiaId="content-source-select"
+      onToggle={onToggle}
+      onSelect={onSelect}
+      selections={selections}
+      isOpen={isOpen}
+      isDisabled={isDisabled}
+      onClear={onClear}
+      className="set-select-width"
+      placeholderText={__('Select a source')}
+    >
+      {contentSources.map(cs => (
+        <SelectOption
+          key={cs.id}
+          value={`${cs.id}`}
+        >
+          {cs.name}
+        </SelectOption>
+      ))}
+    </Select>
+  </div>
+);
+
+ContentSourceSelect.propTypes = {
+  contentSources: PropTypes.arrayOf(PropTypes.shape({})),
+  selections: PropTypes.string,
+  onToggle: PropTypes.func,
+  onSelect: PropTypes.func,
+  onClear: PropTypes.func,
+  isOpen: PropTypes.bool,
+  isDisabled: PropTypes.bool,
+};
+
+ContentSourceSelect.defaultProps = {
+  contentSources: [],
+  selections: null,
+  onToggle: undefined,
+  onSelect: undefined,
+  onClear: undefined,
+  isOpen: false,
+  isDisabled: false,
+};
 
 const ContentSourceForm = ({
   handleSubmit,
   environments,
   handleEnvironment,
-  environmentId,
   contentViews,
   handleContentView,
-  contentViewId,
+  contentViewName,
   contentSources,
   handleContentSource,
   contentSourceId,
@@ -27,17 +95,36 @@ const ContentSourceForm = ({
   isLoading,
   hostsUpdated,
 }) => {
-  const formIsValid = () => (!!environmentId &&
-    !!contentViewId &&
+  useAPI( // No TableWrapper here, so we can useAPI from Foreman
+    'get',
+    api.getApiUrl(`/organizations/${orgId()}/environments/paths?permission_type=promotable`),
+    ENV_PATH_OPTIONS,
+  );
+  const contentViewsStatus = useSelector(selectContentViewsStatus);
+  const [csSelectOpen, setCSSelectOpen] = useState(false);
+  const [cvSelectOpen, setCVSelectOpen] = useState(false);
+
+  const handleCSSelect = (_event, selection) => {
+    handleContentSource(selection);
+    setCSSelectOpen(false);
+  };
+
+  const handleCVSelect = (_event, selection) => {
+    handleContentView(selection);
+    setCVSelectOpen(false);
+  };
+
+  const formIsValid = () => (!!environments &&
+    !!contentViewName &&
     !!contentSourceId &&
     contentHosts.length !== 0);
 
   const contentSourcesIsDisabled = (isLoading || contentSources.length === 0 ||
     contentHosts.length === 0);
-  const environmentIsDisabled = (isLoading || environments.length === 0 ||
+  const environmentIsDisabled = (isLoading || environments === [] ||
     contentSourceId === '');
   const viewIsDisabled = (isLoading || contentViews.length === 0 ||
-    contentSourceId === '' || environmentId === '');
+    contentSourceId === '' || environments === []);
 
   return (
     <Form
@@ -56,24 +143,64 @@ const ContentSourceForm = ({
           />
         </GridItem>
         )}
-        <FormField label={__('Content source')} id="change_cs_content_source" value={contentSourceId} items={contentSources} onChange={handleContentSource} isDisabled={contentSourcesIsDisabled} />
-        <FormField label={__('Environment')} id="change_cs_environment" value={environmentId} items={environments} onChange={handleEnvironment} isDisabled={environmentIsDisabled} />
-        <FormField label={__('Content view')} id="change_cs_content_view" value={contentViewId} items={contentViews} onChange={handleContentView} isDisabled={viewIsDisabled} />
-
-        <GridItem>
-          <ActionGroup>
-            <Button
-              variant="primary"
-              id="generate_btn"
-              onClick={e => handleSubmit(e)}
-              isDisabled={isLoading || !formIsValid() || hostsUpdated}
-              isLoading={isLoading}
+        {contentViewsStatus === STATUS.RESOLVED &&
+            !!environments.length && contentViews.length === 0 &&
+            <Alert
+              variant="warning"
+              className="margin-top-20"
+              title={__('No content views available for the selected environment')}
+              style={{ marginBottom: '1rem' }}
             >
-              {__('Update')}
-            </Button>
-          </ActionGroup>
-        </GridItem>
+              <a href="/content_views">{__('View the Content Views page')}</a>
+              {__(' to manage and promote content views, or select a different environment.')}
+            </Alert>
+        }
       </Grid>
+      <ContentSourceSelect
+        contentSources={contentSources}
+        selections={contentSourceId}
+        onToggle={isExpanded => setCSSelectOpen(isExpanded)}
+        onSelect={handleCSSelect}
+        onClear={() => handleContentSource(null)}
+        isOpen={csSelectOpen}
+        isDisabled={contentSourcesIsDisabled || hostsUpdated}
+      />
+      <EnvironmentPaths
+        style={{ display: 'block' }}
+        userCheckedItems={environments}
+        setUserCheckedItems={handleEnvironment}
+        publishing={false}
+        multiSelect={false}
+        headerText={__('Environment')}
+        isDisabled={environmentIsDisabled || hostsUpdated}
+      />
+      {environments.length > 0 && contentViewsStatus !== STATUS.PENDING &&
+        <ContentViewSelect
+          selections={contentViewName}
+          onClear={() => handleContentView(null)}
+          onSelect={handleCVSelect}
+          isOpen={cvSelectOpen}
+          isDisabled={viewIsDisabled || hostsUpdated}
+          onToggle={isExpanded => setCVSelectOpen(isExpanded)}
+          headerText={__('Content view')}
+          ouiaId="SelectContentView"
+          className="set-select-width"
+          placeholderText={(contentViews.length === 0) ? __('No content views available') : __('Select a content view')}
+        >
+          {contentViews?.map(cv => <ContentViewSelectOption key={`${cv.id}`} cv={cv} env={environments[0]} />)}
+        </ContentViewSelect>
+        }
+      <ActionGroup style={{ display: 'block' }}>
+        <Button
+          variant="primary"
+          id="generate_btn"
+          onClick={e => handleSubmit(e)}
+          isDisabled={isLoading || !formIsValid() || hostsUpdated}
+          isLoading={isLoading}
+        >
+          {__('Update')}
+        </Button>
+      </ActionGroup>
     </Form>);
 };
 
@@ -81,10 +208,9 @@ ContentSourceForm.propTypes = {
   handleSubmit: PropTypes.func.isRequired,
   environments: PropTypes.arrayOf(PropTypes.shape({})),
   handleEnvironment: PropTypes.func.isRequired,
-  environmentId: PropTypes.string,
   contentViews: PropTypes.arrayOf(PropTypes.shape({})),
   handleContentView: PropTypes.func.isRequired,
-  contentViewId: PropTypes.string,
+  contentViewName: PropTypes.string,
   contentSources: PropTypes.arrayOf(PropTypes.shape({})),
   handleContentSource: PropTypes.func.isRequired,
   contentSourceId: PropTypes.string,
@@ -95,9 +221,8 @@ ContentSourceForm.propTypes = {
 
 ContentSourceForm.defaultProps = {
   environments: [],
-  environmentId: '',
   contentViews: [],
-  contentViewId: '',
+  contentViewName: '',
   contentSources: [],
   contentSourceId: '',
   contentHosts: [],

data/webpack/scenes/Hosts/ChangeContentSource/index.js

@@ -14,7 +14,6 @@ import { selectApiDataStatus,
   selectApiChangeContentStatus,
   selectContentHosts,
   selectContentHostsWithoutContent,
-  selectEnvironments,
   selectContentSources,
   selectJobInvocationPath,
   selectContentViews,
@@ -45,7 +44,6 @@ const ChangeContentSourcePage = () => {
 
   const contentHosts = useSelector(selectContentHosts);
   const hostsWithoutContent = useSelector(selectContentHostsWithoutContent);
-  const environments = useSelector(selectEnvironments);
   const contentSources = useSelector(selectContentSources);
   const jobInvocationPath = useSelector(selectJobInvocationPath);
 
@@ -53,10 +51,12 @@ const ChangeContentSourcePage = () => {
   const contentViews = useSelector(selectContentViews);
 
   const [contentSourceId, setCapsuleId] = useState('');
-  const [environmentId, setEnvironmentId] = useState('');
-  const [contentViewId, setContentViewId] = useState('');
+  const [selectedEnvironment, setSelectedEnvironment] = useState([]);
+  const [contentViewName, setContentViewName] = useState('');
 
+  const contentViewId = contentViews?.find(cv => cv.name === contentViewName)?.id;
   const noHostSpecified = getHostIds(urlParams.host_id).length === 0 && urlParams.searchParam === '';
+  const environmentId = selectedEnvironment[0]?.id;
 
   const handleSubmit = (e) => {
     e.preventDefault();
@@ -72,8 +72,8 @@ const ChangeContentSourcePage = () => {
 
   const handleContentSource = (id) => {
     setCapsuleId(id);
-    setEnvironmentId('');
-    setContentViewId('');
+    setSelectedEnvironment([]);
+    setContentViewName('');
 
     if (id) {
       dispatch(getProxy(id));
@@ -93,12 +93,12 @@ const ChangeContentSourcePage = () => {
     return ([linkHosts, linkContent]);
   };
 
-  const handleEnvironment = (envId) => {
-    setEnvironmentId(envId);
-    setContentViewId('');
+  const handleEnvironment = (selection) => {
+    setSelectedEnvironment(selection);
+    setContentViewName('');
 
-    if (envId) {
-      dispatch(getContentViews(envId));
+    if (selection[0].id) {
+      dispatch(getContentViews(selection[0].id));
     }
   };
   useEffect(() => {
@@ -146,12 +146,11 @@ const ChangeContentSourcePage = () => {
 
             <ContentSourceForm
               handleSubmit={handleSubmit}
-              environments={environments}
               handleEnvironment={handleEnvironment}
-              environmentId={environmentId}
+              environments={selectedEnvironment}
               contentViews={contentViews}
-              handleContentView={setContentViewId}
-              contentViewId={contentViewId}
+              handleContentView={setContentViewName}
+              contentViewName={contentViewName}
               contentSources={contentSources}
               contentSourceId={contentSourceId}
               handleContentSource={handleContentSource}

data/webpack/scenes/Hosts/ChangeContentSource/selectors.js

@@ -3,6 +3,7 @@ import {
   selectAPIResponse,
   selectAPIError,
 } from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
 
 import { CHANGE_CONTENT_SOURCE_DATA, CHANGE_CONTENT_SOURCE_PROXY, CHANGE_CONTENT_SOURCE, CHANGE_CONTENT_SOURCE_VIEWS } from './constants';
 
@@ -37,6 +38,9 @@ export const selectJobInvocationPath = state =>
 export const selectContentViews = state =>
   selectAPIResponse(state, CHANGE_CONTENT_SOURCE_VIEWS).results || [];
 
+export const selectContentViewsStatus = state =>
+  selectAPIStatus(state, CHANGE_CONTENT_SOURCE_VIEWS) || STATUS.PENDING;
+
 export const selectTemplate = state =>
   selectAPIResponse(state, CHANGE_CONTENT_SOURCE) || '';
 

data/webpack/scenes/Hosts/ChangeContentSource/styles.scss

@@ -13,3 +13,7 @@
 .margin-top-20 {
   margin-top: 20px;
 }
+
+.set-select-width {
+  width: 60%
+}

data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js

@@ -4,7 +4,7 @@ import qs from 'query-string';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { orgId } from '../../services/api';
 import TableSchema from '../ModuleStreams/ModuleStreamsTableSchema';
-import ContentPage from '../../components/Content/ContentPage';
+import GenericContentPage from '../../components/Content/GenericContentPage';
 
 class ModuleStreamsPage extends Component {
   constructor(props) {
@@ -39,7 +39,7 @@ class ModuleStreamsPage extends Component {
   render() {
     const { moduleStreams } = this.props;
     return (
-      <ContentPage
+      <GenericContentPage
         header={__('Module Streams')}
         content={moduleStreams}
         tableSchema={TableSchema}

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import ModuleStreamsPage from '../ModuleStreamsPage';
-import ContentPage from '../../../components/Content/ContentPage';
+import GenericContentPage from '../../../components/Content/GenericContentPage';
 
 describe('Module streams page', () => {
   it('should render and contain appropiate components', async () => {
@@ -17,7 +17,7 @@ describe('Module streams page', () => {
     />);
 
     expect(toJson(wrapper)).toMatchSnapshot();
-    expect(wrapper.find(ContentPage)).toHaveLength(1);
+    expect(wrapper.find(GenericContentPage)).toHaveLength(1);
   });
 });
 

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

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Module streams page should render and contain appropiate components 1`] = `
-<ContentPage
+<GenericContentPage
   autocompleteEndpoint="/katello/api/v2/module_streams"
   autocompleteQueryParams={
     Object {

data/webpack/scenes/Settings/SettingsConstants.js

@@ -1,3 +1,2 @@
-export const AUTOSEARCH_DELAY = 'autosearch_delay';
-export const AUTOSEARCH_WHILE_TYPING = 'autosearch_while_typing';
-export const CONTENT_DISCONNECTED = 'content_disconnected';
+const CONTENT_DISCONNECTED = 'content_disconnected';
+export default CONTENT_DISCONNECTED;

data/webpack/scenes/Settings/SettingsReducer.js

@@ -1,25 +1,11 @@
-import Immutable from 'seamless-immutable';
 import { GET_SETTING_SUCCESS } from 'foremanReact/components/Settings/SettingsConstants';
-import {
-  AUTOSEARCH_DELAY,
-  AUTOSEARCH_WHILE_TYPING,
-  CONTENT_DISCONNECTED,
-} from './SettingsConstants';
+import { CONTENT_DISCONNECTED } from './SettingsConstants';
 
-export const initialSettingsState = Immutable({
-  autoSearchEnabled: true,
-  autoSearchDelay: 500,
-});
-
-export default (state = initialSettingsState, action) => {
+export default (state, action) => {
   switch (action.type) {
   case GET_SETTING_SUCCESS: {
     const { name, value } = action.response;
     switch (name) {
-    case AUTOSEARCH_DELAY:
-      return state.set('autoSearchDelay', value);
-    case AUTOSEARCH_WHILE_TYPING:
-      return state.set('autoSearchEnabled', value);
     case CONTENT_DISCONNECTED:
       return state.set('disconnected', value);
     default:

data/webpack/scenes/Settings/SettingsSelectors.js

@@ -1,4 +1,4 @@
-export const selectSettings = state => state.katello.settings.settings;
+export const selectSettings = state => state.katello.settings?.settings;
 
 export const selectTableSettings = (state, tableName) =>
-  state.katello.settings.tables[tableName] || undefined;
+  state.katello.settings?.tables[tableName] || undefined;

data/webpack/test-utils/react-testing-lib-wrapper.js

@@ -12,7 +12,6 @@ import { render, waitFor, waitForElementToBeRemoved } from '@testing-library/rea
 import { createStore, applyMiddleware, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
 import { MemoryRouter, BrowserRouter } from 'react-router-dom';
-import { initialSettingsState } from '../scenes/Settings/SettingsReducer';
 import allKatelloReducers from '../redux/reducers/index.js';
 
 // r-t-lib's print limit for debug() is quite small, setting it to a much higher char max here.
@@ -43,11 +42,6 @@ function renderWithRedux(
     API: {
       [apiNamespace]: initialApiState,
     },
-    katello: {
-      settings: {
-        settings: initialSettingsState,
-      },
-    },
     extendable: {},
     ...initialState,
   });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.8.0.rc1
+  version: 4.8.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2160,6 +2160,7 @@ files:
 - db/migrate/20221123212341_remove_pulp_docker_registry_port_setting.rb
 - db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb
 - db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb
+- db/migrate/20230203141353_set_new_acs_verify_ssl_default.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4412,6 +4413,7 @@ files:
 - lib/katello/tasks/upgrades/4.3/fix_url_auth.rake
 - lib/katello/tasks/upgrades/4.4/publish_import_cvvs.rake
 - lib/katello/tasks/upgrades/4.8/fix_incorrect_providers.rake
+- lib/katello/tasks/upgrades/4.8/regenerate_imported_repository_metadata.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb
@@ -4522,7 +4524,6 @@ files:
 - webpack/components/Bookmark/BookmarkConstants.js
 - webpack/components/Bookmark/BookmarkSelectors.js
 - webpack/components/Bookmark/index.js
-- webpack/components/Content/ContentPage.js
 - webpack/components/Content/ContentTable.js
 - webpack/components/Content/Details/ContentDetailInfo.js
 - webpack/components/Content/Details/ContentDetailRepositories.js
@@ -4534,9 +4535,9 @@ files:
 - webpack/components/Content/Details/__tests__/__snapshots__/ContentDetailInfo.test.js.snap
 - webpack/components/Content/Details/__tests__/__snapshots__/ContentDetailRepositories.test.js.snap
 - webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap
-- webpack/components/Content/__tests__/ContentPage.test.js
+- webpack/components/Content/GenericContentPage.js
 - webpack/components/Content/__tests__/ContentTable.test.js
-- webpack/components/Content/__tests__/__snapshots__/ContentPage.test.js.snap
+- webpack/components/Content/__tests__/GenericContentPage.test.js
 - webpack/components/Content/__tests__/__snapshots__/ContentTable.test.js.snap
 - webpack/components/EditableSwitch.js
 - webpack/components/EditableTextInput/EditableTextInput.js
@@ -4561,10 +4562,7 @@ files:
 - webpack/components/Packages/index.js
 - webpack/components/RoutedTabs/__tests__/RoutedTabs.test.js
 - webpack/components/RoutedTabs/index.js
-- webpack/components/Search/Search.js
-- webpack/components/Search/__tests__/search.test.js
-- webpack/components/Search/helpers.js
-- webpack/components/Search/index.js
+- webpack/components/Search/SearchText.js
 - webpack/components/Select/Select.js
 - webpack/components/SelectAllCheckbox/SelectAllCheckbox.scss
 - webpack/components/SelectAllCheckbox/index.js
@@ -4591,18 +4589,6 @@ files:
 - webpack/components/TooltipButton/TooltipButton.test.js
 - webpack/components/TooltipButton/__snapshots__/TooltipButton.test.js.snap
 - webpack/components/TooltipButton/index.js
-- webpack/components/TypeAhead/TypeAhead.js
-- webpack/components/TypeAhead/TypeAhead.scss
-- webpack/components/TypeAhead/helpers/commonPropTypes.js
-- webpack/components/TypeAhead/helpers/helpers.js
-- webpack/components/TypeAhead/index.js
-- webpack/components/TypeAhead/pf3Search/TypeAheadInput.js
-- webpack/components/TypeAhead/pf3Search/TypeAheadItems.js
-- webpack/components/TypeAhead/pf3Search/TypeAheadSearch.js
-- webpack/components/TypeAhead/pf4Search/TypeAheadInput.js
-- webpack/components/TypeAhead/pf4Search/TypeAheadInput.scss
-- webpack/components/TypeAhead/pf4Search/TypeAheadItems.js
-- webpack/components/TypeAhead/pf4Search/TypeAheadSearch.js
 - webpack/components/WithOrganization/__snapshots__/withOrganization.test.js.snap
 - webpack/components/WithOrganization/withOrganization.js
 - webpack/components/WithOrganization/withOrganization.test.js
@@ -4722,6 +4708,10 @@ files:
 - webpack/components/extensions/RegistrationCommands/fields/IgnoreSubmanErrors.js
 - webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js
 - webpack/components/extensions/RegistrationCommands/index.js
+- webpack/components/extensions/SearchBar/SearchBarConstants.js
+- webpack/components/extensions/SearchBar/SearchBarHooks.js
+- webpack/components/extensions/SearchBar/SearchBarReducer.js
+- webpack/components/extensions/SearchBar/SearchBarSelectors.js
 - webpack/components/extensions/about/SystemStatuses.js
 - webpack/components/extensions/about/SystemStatusesActions.js
 - webpack/components/extensions/about/SystemStatusesConsts.js
@@ -4848,7 +4838,6 @@ files:
 - webpack/scenes/Content/ContentActions.js
 - webpack/scenes/Content/ContentConfig.js
 - webpack/scenes/Content/ContentConstants.js
-- webpack/scenes/Content/ContentPage.js
 - webpack/scenes/Content/ContentSelectors.js
 - webpack/scenes/Content/Details/ContentDetails.js
 - webpack/scenes/Content/Details/ContentInfo.js
@@ -4859,6 +4848,7 @@ files:
 - webpack/scenes/Content/Details/__tests__/pythonPackageDetails.fixtures.json
 - webpack/scenes/Content/Details/__tests__/pythonPackageRepositoryDetails.fixtures.json
 - webpack/scenes/Content/Details/index.js
+- webpack/scenes/Content/GenericContentPage.js
 - webpack/scenes/Content/Table/ContentTable.js
 - webpack/scenes/Content/Table/index.js
 - webpack/scenes/Content/__tests__/ansibleCollections.fixtures.json
@@ -5095,6 +5085,7 @@ files:
 - webpack/scenes/ContentViews/components/CVBreadCrumb.js
 - webpack/scenes/ContentViews/components/ContentViewIcon.js
 - webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelect.js
+- webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption.js
 - webpack/scenes/ContentViews/components/ContentViewsCounter.js
 - webpack/scenes/ContentViews/components/EnvironmentLabels.js
 - webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathActions.js
@@ -5372,11 +5363,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman

data/webpack/components/Content/__tests__/ContentPage.test.js

@@ -1,32 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import SearchBar from 'foremanReact/components/SearchBar';
-import ContentPage from '../ContentPage';
-import ContentTable from '../ContentTable';
-
-describe('Content page', () => {
-  it('should render and contain appropriate components', async () => {
-    const contentHeader = 'Content Header';
-    const content = {};
-    const onSearch = () => {};
-    const updateSearchQuery = () => {};
-    const searchQuery = '';
-    const onPaginationChange = () => {};
-    const TableSchema = [];
-
-    const wrapper = shallow(<ContentPage
-      header={contentHeader}
-      content={content}
-      tableSchema={TableSchema}
-      onSearch={onSearch}
-      updateSearchQuery={updateSearchQuery}
-      initialInputValue={searchQuery}
-      onPaginationChange={onPaginationChange}
-    />);
-
-    expect(toJson(wrapper)).toMatchSnapshot();
-    expect(wrapper.find(ContentTable)).toHaveLength(1);
-    expect(wrapper.find(SearchBar)).toHaveLength(1);
-  });
-});