katello 4.9.1 → 4.10.0.rc2

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

@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { FormattedMessage } from 'react-intl';
 import { useSelector } from 'react-redux';
 import {
   ActionGroup,
@@ -11,6 +12,7 @@ import {
   SelectOption,
   SelectVariant,
   TextContent,
+  Text,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
@@ -96,6 +98,7 @@ const ContentSourceForm = ({
   contentHosts,
   isLoading,
   hostsUpdated,
+  showTemplate,
 }) => {
   const pathsUrl = `/organizations/${orgId()}/environments/paths?permission_type=promotable${contentSourceId ? `&content_source_id=${contentSourceId}` : ''}`;
   useAPI( // No TableWrapper here, so we can useAPI from Foreman
@@ -108,6 +111,7 @@ const ContentSourceForm = ({
   const envList = environmentPathResponse?.results?.map(path => path.environments).flat();
   const [csSelectOpen, setCSSelectOpen] = useState(false);
   const [cvSelectOpen, setCVSelectOpen] = useState(false);
+  const hostCount = contentHosts.length;
 
   const handleCSSelect = (_event, selection) => {
     handleContentSource(selection);
@@ -122,10 +126,10 @@ const ContentSourceForm = ({
   const formIsValid = () => (!!environments &&
     !!contentViewName &&
     !!contentSourceId &&
-    contentHosts.length !== 0);
+    hostCount !== 0);
 
   const contentSourcesIsDisabled = (isLoading || contentSources.length === 0 ||
-    contentHosts.length === 0);
+    hostCount === 0);
   const environmentIsDisabled = (isLoading || environments === [] ||
     contentSourceId === '');
   const viewIsDisabled = (isLoading || contentViews.length === 0 ||
@@ -152,7 +156,7 @@ const ContentSourceForm = ({
       isHorizontal
     >
       <Grid hasGutter className="margin-top-16">
-        {(contentHosts.length === 0 && !isLoading) && (
+        {(hostCount === 0 && !isLoading) && (
 
         <GridItem span={7}>
           <Alert
@@ -203,7 +207,7 @@ const ContentSourceForm = ({
         setUserCheckedItems={handleEnvironment}
         publishing={false}
         multiSelect={false}
-        headerText={__('Environment')}
+        headerText={__('Lifecycle environment')}
         isDisabled={environmentIsDisabled || hostsUpdated}
       />
       <ContentViewSelect
@@ -225,17 +229,51 @@ const ContentSourceForm = ({
           env={environments[0]}
         />))}
       </ContentViewSelect>
+      <TextContent>
+        <Text
+          ouiaId="ccs-options-description"
+        >
+          <FormattedMessage
+            defaultMessage={__('After configuring Foreman, configuration must also be updated on {hosts}. Choose one of the following options to update {hosts}:')}
+            values={{
+              hosts: (
+                <FormattedMessage
+                  defaultMessage="{count, plural, one {{singular}} other {# {plural}}}"
+                  values={{
+                    count: hostCount,
+                    singular: __('the host'),
+                    plural: __('hosts'),
+                  }}
+                  id="ccs-options-i18n"
+                />
+              ),
+            }}
+            id="ccs-options-description-i18n"
+          />
+        </Text>
+      </TextContent>
       <ActionGroup style={{ display: 'block' }}>
         <Button
           variant="primary"
           id="generate_btn"
           ouiaId="update-source-button"
-          onClick={e => handleSubmit(e)}
+          onClick={e => handleSubmit(e, { shouldRedirect: true })}
+          isDisabled={isLoading || !formIsValid() || hostsUpdated}
+          isLoading={isLoading}
+        >
+          {__('Run job invocation')}
+        </Button>
+        <Button
+          variant="secondary"
+          id="generate_btn"
+          ouiaId="update-source-button"
+          onClick={showTemplate}
           isDisabled={isLoading || !formIsValid() || hostsUpdated}
           isLoading={isLoading}
         >
-          {__('Update')}
+          {__('Update hosts manually')}
         </Button>
+
       </ActionGroup>
     </Form>);
 };
@@ -253,6 +291,7 @@ ContentSourceForm.propTypes = {
   contentHosts: PropTypes.arrayOf(PropTypes.shape({})),
   isLoading: PropTypes.bool,
   hostsUpdated: PropTypes.bool,
+  showTemplate: PropTypes.func.isRequired,
 };
 
 ContentSourceForm.defaultProps = {

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

@@ -16,7 +16,7 @@ import PropTypes from 'prop-types';
 
 import { copyToClipboard } from '../helpers';
 
-const ContentSourceTemplate = ({ template, jobInvocationPath }) => {
+const ContentSourceTemplate = ({ template, hostCount }) => {
   const [isExpanded, setIsExpanded] = useState(false);
   const [isCopied, setCopied] = useState(false);
 
@@ -41,19 +41,54 @@ const ContentSourceTemplate = ({ template, jobInvocationPath }) => {
   return (
     <Grid>
       <GridItem span={7}>
+        <Alert
+          ouiaId="host-server-content-source-complete"
+          variant="info"
+          title={__('Configuration updated on Foreman')}
+          className="margin-top-20"
+          isInline
+        />
         <Alert
           ouiaId="host-configuration-alert"
           variant="warning"
-          title={__('Host configurations are not updated yet')}
+          title={
+            <FormattedMessage
+              defaultMessage={__('Configuration still must be updated on {hosts}')}
+              values={{
+                hosts: (
+                  <FormattedMessage
+                    defaultMessage="{count, plural, one {{singular}} other {# {plural}}}"
+                    values={{
+                      count: hostCount,
+                      singular: __('the host'),
+                      plural: __('hosts'),
+                    }}
+                    id="ccs-status-i18n"
+                  />
+                ),
+              }}
+              id="ccs-status-description-i18n"
+            />
+          }
           className="margin-top-20"
           isInline
         >
           <FormattedMessage
-            id="ccs_alert"
+            defaultMessage={__('To finish the process of changing the content source, run the following script manually on {hosts}.')}
             values={{
-              link: <a href={jobInvocationPath}>{__('run job invocation')}</a>,
+              hosts: (
+                <FormattedMessage
+                  defaultMessage="{count, plural, one {{singular}} other {{plural}}}"
+                  values={{
+                    count: hostCount,
+                    singular: __('the host'),
+                    plural: __('the hosts'),
+                  }}
+                  id="ccs-status2-i18n"
+                />
+              ),
             }}
-            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.')}
+            id="ccs-status2-description-i18n"
           />
         </Alert>
 
@@ -81,12 +116,12 @@ const ContentSourceTemplate = ({ template, jobInvocationPath }) => {
 
 ContentSourceTemplate.propTypes = {
   template: PropTypes.string,
-  jobInvocationPath: PropTypes.string,
+  hostCount: PropTypes.number,
 };
 
 ContentSourceTemplate.defaultProps = {
   template: '',
-  jobInvocationPath: '',
+  hostCount: 1,
 };
 
 export default ContentSourceTemplate;

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

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import { Alert, Grid, GridItem, PageSection, Title } from '@patternfly/react-core';
+import { Alert, Grid, GridItem, PageSection, Title, Text, TextContent } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
@@ -53,12 +53,23 @@ const ChangeContentSourcePage = () => {
   const [contentSourceId, setCapsuleId] = useState('');
   const [selectedEnvironment, setSelectedEnvironment] = useState([]);
   const [contentViewName, setContentViewName] = useState('');
+  const [shouldShowTemplate, setShouldShowTemplate] = useState(false);
+  const [redirect, setRedirect] = useState(false);
 
   const contentViewId = contentViews?.find(cv => cv.name === contentViewName)?.id;
-  const noHostSpecified = getHostIds(urlParams.host_id).length === 0 && urlParams.searchParam === '';
+  const hostIds = useMemo(() => getHostIds(urlParams.host_id), [urlParams.host_id]);
+  const noHostSpecified = (hostIds.length === 0 && urlParams.searchParam === '');
   const environmentId = selectedEnvironment[0]?.id;
 
-  const handleSubmit = (e) => {
+  const redirectToJobInvocationForm = () => setRedirect(true);
+
+  const handleSuccess = ({ shouldRedirect }) => {
+    if (shouldRedirect) {
+      redirectToJobInvocationForm();
+    }
+  };
+
+  const handleSubmit = (e, { shouldRedirect = false }) => {
     e.preventDefault();
 
     dispatch(changeContentSource(
@@ -66,7 +77,7 @@ const ChangeContentSourcePage = () => {
       contentViewId,
       contentSourceId,
       contentHosts.map(h => h.id),
-      jobInvocationPath,
+      () => handleSuccess({ shouldRedirect }),
     ));
   };
 
@@ -80,6 +91,11 @@ const ChangeContentSourcePage = () => {
     }
   };
 
+  const showTemplate = (e) => {
+    handleSubmit(e, { shouldRedirect: false });
+    setShouldShowTemplate(true);
+  };
+
   const breadcrumbItems = () => {
     const linkHosts = { caption: __('Hosts'), url: foremanUrl('/hosts') };
     const linkContent = { caption: __('Change host content source') };
@@ -102,8 +118,12 @@ const ChangeContentSourcePage = () => {
     }
   };
   useEffect(() => {
-    dispatch(getFormData(getHostIds(urlParams.host_id), urlParams.searchParam));
-  }, [dispatch, urlParams.host_id, urlParams.searchParam]);
+    dispatch(getFormData(hostIds, urlParams.searchParam));
+  }, [dispatch, hostIds, urlParams.searchParam]);
+
+  if (redirect && jobInvocationPath) {
+    window.location.assign(jobInvocationPath); // redirect to job invocation wizard
+  }
 
   return (
     <>
@@ -125,9 +145,15 @@ const ChangeContentSourcePage = () => {
               ouiaId="change-cs-title"
               headingLevel="h5"
               size="2xl"
+              className="margin-top-20"
             >
               {__('Change host content source')}
             </Title>
+            <TextContent>
+              <Text ouiaId="change-content-source-description" id="ccs-description">
+                {__('Changing a host\'s content source will change the Smart Proxy from which the host gets its content.')}
+              </Text>
+            </TextContent>
           </GridItem>
           {noHostSpecified &&
             <GridItem span={7}>
@@ -158,11 +184,12 @@ const ChangeContentSourcePage = () => {
               handleContentSource={handleContentSource}
               contentHosts={contentHosts}
               isLoading={isLoading}
-              hostsUpdated={apiChangeStatus === STATUS.RESOLVED}
+              hostsUpdated={apiChangeStatus === STATUS.RESOLVED || shouldShowTemplate}
+              showTemplate={showTemplate}
             />
           </> }
-          { apiChangeStatus === STATUS.RESOLVED &&
-          <ContentSourceTemplate template={template} jobInvocationPath={jobInvocationPath} /> }
+          { (apiChangeStatus === STATUS.RESOLVED && shouldShowTemplate) &&
+          <ContentSourceTemplate template={template} hostCount={contentHosts.length} /> }
         </Grid>
       </PageSection>
     </>

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

@@ -17,3 +17,8 @@
 .set-select-width {
   width: 60%
 }
+
+#ccs-description {
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+}

data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap

@@ -2,19 +2,11 @@
 
 exports[`RedHatRepositories page should render <PermissionDenied /> when permissions are missing 1`] = `
 <PermissionDenied
-  backHref="/"
   missingPermissions={
     Array [
       "view_organizations",
     ]
   }
-  texts={
-    Object {
-      "notAuthorizedMsg": "You are not authorized to perform this action.",
-      "permissionDeniedMsg": "Permission denied",
-      "pleaseRequestMsg": "Please request one of the required permissions listed below from a Foreman administrator:",
-    }
-  }
 />
 `;
 

data/webpack/scenes/RedHatRepositories/index.scss

@@ -126,7 +126,7 @@
 
 .sticky-pagination {
   position: sticky;
-  top: 60px;
+  top: 0;
   z-index: 2;
   background-color: white;
   padding-top: 10px;

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -101,8 +101,8 @@ class ManageManifestModal extends Component {
       header: __('There is no Manifest History to display.'),
       description: __('Import a Manifest using the manifest tab above.'),
       documentation: {
-        label: __('Learn more about adding Subscription Manifests'),
-        url: 'http://redhat.com',
+        label: __('Learn more about adding Subscription Manifests '),
+        url: 'https://access.redhat.com/solutions/3410771',
       },
     });
 

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -2,19 +2,11 @@
 
 exports[`subscriptions page should render <PermissionDenied /> when permissions are missing 1`] = `
 <PermissionDenied
-  backHref="/"
   missingPermissions={
     Array [
       "view_subscriptions",
     ]
   }
-  texts={
-    Object {
-      "notAuthorizedMsg": "You are not authorized to perform this action.",
-      "permissionDeniedMsg": "Permission denied",
-      "pleaseRequestMsg": "Please request one of the required permissions listed below from a Foreman administrator:",
-    }
-  }
 />
 `;