katello 4.7.0 → 4.7.2

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignHostsForm.js

@@ -1,7 +1,7 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, Select, SelectOption } from '@patternfly/react-core';
+import { ExpandableSection, SelectOption } from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EnvironmentPaths from '../../../../components/EnvironmentPaths/EnvironmentPaths';
@@ -9,6 +9,7 @@ import getContentViews from '../../../../ContentViewsActions';
 import { selectContentViewError, selectContentViews, selectContentViewStatus } from '../../../../ContentViewSelectors';
 import AffectedHosts from '../affectedHosts';
 import DeleteContext from '../DeleteContext';
+import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
 
 const CVReassignHostsForm = () => {
   const dispatch = useDispatch();
@@ -74,6 +75,11 @@ const CVReassignHostsForm = () => {
     return results.filter(cv => cv.id === id)[0]?.name;
   };
 
+  const onClear = () => {
+    setSelectedCVForHosts(null);
+    setSelectedCVNameForHosts(null);
+  };
+
   const onSelect = (event, selection) => {
     setSelectedCVForHosts(selection);
     setSelectedCVNameForHosts(fetchSelectedCVName(selection));
@@ -90,9 +96,8 @@ const CVReassignHostsForm = () => {
         multiSelect={false}
       />
       {selectedEnvForHost.length > 0 &&
-      <div style={{ marginTop: '1em' }}>
-        <h3>{__('Select content view')}</h3>
-        <Select
+        <ContentViewSelect
+          onClear={onClear}
           selections={selectedCVForHosts}
           onSelect={onSelect}
           isOpen={cvSelectOpen}
@@ -105,8 +110,7 @@ const CVReassignHostsForm = () => {
           placeholderText={(cvSelectOptions.length === 0) ? __('No content views available') : __('Select a content view')}
         >
           {cvSelectOptions}
-        </Select>
-      </div>
+        </ContentViewSelect>
       }
       <ExpandableSection
         toggleText={showHosts ? 'Hide hosts' : 'Show hosts'}

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js

@@ -160,7 +160,7 @@ test('Can open Remove wizard and remove version from environment with hosts', as
 
 
   const {
-    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText,
+    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText, getByPlaceholderText,
   } = renderWithRedux(
     <ContentViewVersions cvId={2} details={cvDetailData} />,
     renderOptions,
@@ -190,9 +190,9 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   fireEvent.click(getByLabelText('test1'));
   await patientlyWaitFor(() => {
     expect(getByText('Select content view')).toBeInTheDocument();
-    expect(getByText('Select a content view')).toBeInTheDocument();
+    expect(getByPlaceholderText('Select a content view')).toBeInTheDocument();
   });
-  fireEvent.click(getByText('Select a content view'));
+  fireEvent.click(getByPlaceholderText('Select a content view'));
   await patientlyWaitFor(() => {
     expect(getByText('cv2')).toBeInTheDocument();
   });
@@ -250,7 +250,7 @@ test('Can open Remove wizard and remove version from environment with activation
 
 
   const {
-    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText,
+    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText, getByPlaceholderText,
   } = renderWithRedux(
     <ContentViewVersions cvId={2} details={cvDetailData} />,
     renderOptions,
@@ -280,9 +280,9 @@ test('Can open Remove wizard and remove version from environment with activation
   fireEvent.click(getByLabelText('test1'));
   await patientlyWaitFor(() => {
     expect(getByText('Select content view')).toBeInTheDocument();
-    expect(getByText('Select a content view')).toBeInTheDocument();
+    expect(getByPlaceholderText('Select a content view')).toBeInTheDocument();
   });
-  fireEvent.click(getByText('Select a content view'));
+  fireEvent.click(getByPlaceholderText('Select a content view'));
   await patientlyWaitFor(() => {
     expect(getByText('cv2')).toBeInTheDocument();
   });

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

@@ -0,0 +1,40 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Select, SelectVariant } from '@patternfly/react-core';
+import PropTypes from 'prop-types';
+
+const ContentViewSelect = ({
+  headerText,
+  children,
+  onClear,
+  ...pfSelectProps
+}) => (
+  <div style={{ marginTop: '1em' }}>
+    <h3>{headerText}</h3>
+    <Select
+      variant={SelectVariant.typeahead}
+      onClear={onClear}
+      maxHeight="20rem"
+      menuAppendTo="parent"
+      ouiaId="select-content-view"
+      id="selectCV"
+      name="selectCV"
+      aria-label="selectCV"
+      {...pfSelectProps}
+    >
+      {children}
+    </Select>
+  </div>
+);
+
+ContentViewSelect.propTypes = {
+  headerText: PropTypes.string,
+  onClear: PropTypes.func.isRequired,
+  children: PropTypes.node.isRequired,
+};
+
+ContentViewSelect.defaultProps = {
+  headerText: __('Select content view'),
+};
+
+export default ContentViewSelect;

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

@@ -27,7 +27,6 @@ export const changeContentSource = (environmentId, contentViewId, contentSourceI
       content_source_id: contentSourceId,
       host_ids: hostIds,
     },
-    successToast: () => __('Content source successfully updated.'),
     errorToast: () => __('Something went wrong while updating the content source. See the logs for more information'),
   });
 

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import {
   ActionGroup,
+  Alert,
   Button,
   Form,
   Grid,
@@ -24,6 +25,7 @@ const ContentSourceForm = ({
   contentSourceId,
   contentHosts,
   isLoading,
+  hostsUpdated,
 }) => {
   const formIsValid = () => (!!environmentId &&
     !!contentViewId &&
@@ -44,6 +46,16 @@ const ContentSourceForm = ({
       isHorizontal
     >
       <Grid hasGutter className="margin-top-16">
+        {(contentHosts.length === 0 && !isLoading) && (
+
+        <GridItem span={7}>
+          <Alert
+            variant="danger"
+            className="margin-top-20"
+            title={__('No hosts found')}
+          />
+        </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} />
@@ -54,10 +66,10 @@ const ContentSourceForm = ({
               variant="primary"
               id="generate_btn"
               onClick={e => handleSubmit(e)}
-              isDisabled={isLoading || !formIsValid()}
+              isDisabled={isLoading || !formIsValid() || hostsUpdated}
               isLoading={isLoading}
             >
-              {__('Change content source')}
+              {__('Update')}
             </Button>
           </ActionGroup>
         </GridItem>
@@ -78,6 +90,7 @@ ContentSourceForm.propTypes = {
   contentSourceId: PropTypes.string,
   contentHosts: PropTypes.arrayOf(PropTypes.shape({})),
   isLoading: PropTypes.bool,
+  hostsUpdated: PropTypes.bool,
 };
 
 ContentSourceForm.defaultProps = {
@@ -89,6 +102,7 @@ ContentSourceForm.defaultProps = {
   contentSourceId: '',
   contentHosts: [],
   isLoading: false,
+  hostsUpdated: false,
 };
 
 export default ContentSourceForm;

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

@@ -1,5 +1,7 @@
 import React, { useState } from 'react';
+import { FormattedMessage } from 'react-intl';
 import {
+  Alert,
   Grid,
   GridItem,
   CodeBlock,
@@ -39,25 +41,19 @@ const ContentSourceTemplate = ({ template, jobInvocationPath }) => {
   return (
     <Grid>
       <GridItem span={7}>
-        <h1>
-          {__("What's next?")}
-        </h1>
-        <p>
-          {jobInvocationPath && (
-            <>
-              <a href={jobInvocationPath}>
-                {__('Run job invocation')}
-              </a>
-          &nbsp;
-              {__('to update configuration on all hosts, or')}
-            </>
-          )}
-        &nbsp;
-          {__('update configuration on the hosts manually:')}
-        </p>
+        <Alert variant="warning" title={__('Host configurations are not updated yet')} className="margin-top-20" isInline>
+          <FormattedMessage
+            id="ccs_alert"
+            values={{
+              link: <a href={jobInvocationPath}>{__('run job invocation')}</a>,
+            }}
+            defaultMessage={jobInvocationPath ? __('To update the selected host configuration, {link}, or update hosts manually in the next section.') : __('To update the selected host configuration, update hosts manually in the next section.')}
+          />
+        </Alert>
+
       </GridItem>
       <GridItem span={7}>
-        <CodeBlock actions={actions} className="cs_template_code">
+        <CodeBlock actions={actions} className="cs_template_code margin-top-20">
           <CodeBlockCode>
             {__('Change content source')}
             <ExpandableSection isExpanded={isExpanded} isDetached>

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

@@ -1,10 +1,13 @@
 import React, { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import { Alert, Grid, GridItem } from '@patternfly/react-core';
+import { Alert, Grid, GridItem, PageSection, Title } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
 import { STATUS } from 'foremanReact/constants';
+import BreadcrumbBar from 'foremanReact/components/BreadcrumbBar';
+import Head from 'foremanReact/components/Head';
 
 import { selectApiDataStatus,
   selectApiContentViewStatus,
@@ -53,6 +56,8 @@ const ChangeContentSourcePage = () => {
   const [environmentId, setEnvironmentId] = useState('');
   const [contentViewId, setContentViewId] = useState('');
 
+  const noHostSpecified = getHostIds(urlParams.host_id).length === 0 && urlParams.searchParam === '';
+
   const handleSubmit = (e) => {
     e.preventDefault();
 
@@ -61,6 +66,7 @@ const ChangeContentSourcePage = () => {
       contentViewId,
       contentSourceId,
       contentHosts.map(h => h.id),
+      jobInvocationPath,
     ));
   };
 
@@ -74,6 +80,19 @@ const ChangeContentSourcePage = () => {
     }
   };
 
+  const breadcrumbItems = () => {
+    const linkHosts = { caption: __('Hosts'), url: foremanUrl('/hosts') };
+    const linkContent = { caption: __('Change host content source') };
+
+    if (urlParams.host_id) {
+      const hostName = contentHosts.concat(hostsWithoutContent)
+        .find(h => `${h.id}` === urlParams.host_id)?.name;
+
+      return ([linkHosts, { caption: hostName, url: foremanUrl(`/new/hosts/${hostName}`) }, linkContent]);
+    }
+    return ([linkHosts, linkContent]);
+  };
+
   const handleEnvironment = (envId) => {
     setEnvironmentId(envId);
     setContentViewId('');
@@ -86,45 +105,66 @@ const ChangeContentSourcePage = () => {
     dispatch(getFormData(getHostIds(urlParams.host_id), urlParams.searchParam));
   }, [dispatch, urlParams.host_id, urlParams.searchParam]);
 
-  if (getHostIds(urlParams.host_id).length === 0 && urlParams.searchParam === '') {
-    return (
-      <Grid className="margin-40">
-        <GridItem span={7}>
-          <Alert
-            variant="danger"
-            title={__('No hosts with content source found!')}
-          />
-        </GridItem>
-      </Grid>);
-  }
-
   return (
-    <Grid className="margin-40">
-      <GridItem span={7}>
-        <h1>{__('Change host content source')}</h1>
-      </GridItem>
-      <Hosts
-        contentHosts={contentHosts}
-        hostsWithoutContent={hostsWithoutContent}
-      />
-
-      <ContentSourceForm
-        handleSubmit={handleSubmit}
-        environments={environments}
-        handleEnvironment={handleEnvironment}
-        environmentId={environmentId}
-        contentViews={contentViews}
-        handleContentView={setContentViewId}
-        contentViewId={contentViewId}
-        contentSources={contentSources}
-        contentSourceId={contentSourceId}
-        handleContentSource={handleContentSource}
-        contentHosts={contentHosts}
-        isLoading={isLoading}
-      />
-      { apiChangeStatus === STATUS.RESOLVED &&
-      <ContentSourceTemplate template={template} jobInvocationPath={jobInvocationPath} /> }
-    </Grid>
+    <>
+      <Head>
+        <title>{__('Change host content source')}</title>
+      </Head>
+      <PageSection
+        isFilled
+        variant="light"
+      >
+        <div className="margin-left-20">
+          <BreadcrumbBar
+            breadcrumbItems={breadcrumbItems()}
+          />
+        </div>
+        <Grid className="margin-left-20">
+          <GridItem span={7}>
+            <Title
+              headingLevel="h5"
+              size="2xl"
+            >
+              {__('Change host content source')}
+            </Title>
+          </GridItem>
+          {noHostSpecified &&
+            <GridItem span={7}>
+              <Alert
+                variant="danger"
+                className="margin-top-20"
+                title={__('No hosts were specified')}
+              />
+            </GridItem>
+        }
+          { !noHostSpecified &&
+          <>
+            <Hosts
+              contentHosts={contentHosts}
+              hostsWithoutContent={hostsWithoutContent}
+            />
+
+            <ContentSourceForm
+              handleSubmit={handleSubmit}
+              environments={environments}
+              handleEnvironment={handleEnvironment}
+              environmentId={environmentId}
+              contentViews={contentViews}
+              handleContentView={setContentViewId}
+              contentViewId={contentViewId}
+              contentSources={contentSources}
+              contentSourceId={contentSourceId}
+              handleContentSource={handleContentSource}
+              contentHosts={contentHosts}
+              isLoading={isLoading}
+              hostsUpdated={apiChangeStatus === STATUS.RESOLVED}
+            />
+          </> }
+          { apiChangeStatus === STATUS.RESOLVED &&
+          <ContentSourceTemplate template={template} jobInvocationPath={jobInvocationPath} /> }
+        </Grid>
+      </PageSection>
+    </>
   );
 };
 

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

@@ -6,6 +6,10 @@
   margin-bottom: 40px;
 }
 
-.margin-40 {
-  margin: 40px;
+.margin-left-20 {
+  margin-left: 20px;
+}
+
+.margin-top-20 {
+  margin-top: 20px;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1485,7 +1485,6 @@ files:
 - app/services/katello/candlepin/message_handler.rb
 - app/services/katello/candlepin/pool_service.rb
 - app/services/katello/candlepin/system_purpose.rb
-- app/services/katello/candlepin/upstream_consumer.rb
 - app/services/katello/candlepin_event_listener.rb
 - app/services/katello/component_view_presenter.rb
 - app/services/katello/content_unit_indexer.rb
@@ -2235,6 +2234,7 @@ files:
 - db/migrate/20220920173656_add_http_proxy_to_smart_proxy.rb
 - db/migrate/20220920180858_remove_http_proxy_from_katello_alternate_content_sources.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/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -5160,6 +5160,7 @@ files:
 - webpack/scenes/ContentViews/__tests__/mockDetails.fixtures.json
 - webpack/scenes/ContentViews/components/CVBreadCrumb.js
 - webpack/scenes/ContentViews/components/ContentViewIcon.js
+- webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelect.js
 - webpack/scenes/ContentViews/components/ContentViewsCounter.js
 - webpack/scenes/ContentViews/components/EnvironmentLabels.js
 - webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathActions.js

data/app/services/katello/candlepin/upstream_consumer.rb

@@ -1,28 +0,0 @@
-module Katello
-  module Candlepin
-    class UpstreamConsumer
-      def initialize(organization)
-        @organization = organization
-      end
-
-      def simple_content_access_eligible?
-        eligible = true
-        ::Organization.as_org(@organization) do
-          content_modes = resource_class.content_access
-
-          if content_modes.key?(:contentAccessModeList)
-            eligible = content_modes[:contentAccessModeList].include?('org_environment')
-          end
-        end
-
-        eligible
-      end
-
-      private
-
-      def resource_class
-        Katello::Resources::Candlepin::UpstreamConsumer
-      end
-    end
-  end
-end