katello 4.8.0.rc1 → 4.8.0.rc2

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%
+}

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.rc2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-29 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
@@ -5095,6 +5097,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
@@ -5376,7 +5379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman