katello 4.12.0.rc3 → 4.13.0.rc1

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

@@ -23,7 +23,7 @@ import { ENVIRONMENT_PATHS_KEY } from '../../../../scenes/ContentViews/component
 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 { selectContentViewsStatus, selectJobInvocationPath } from '../selectors';
 import { getCVPlaceholderText, shouldDisableCVSelect } from '../../../ContentViews/components/ContentViewSelect/helpers';
 import { selectEnvironmentPaths } from '../../../ContentViews/components/EnvironmentPaths/EnvironmentPathSelectors';
 
@@ -95,6 +95,9 @@ const ContentSourceForm = ({
   contentSources,
   handleContentSource,
   contentSourceId,
+  showCVOnlyAlert,
+  hostDetailsPath,
+  hostEditPath,
   contentHosts,
   isLoading,
   hostsUpdated,
@@ -108,13 +111,14 @@ const ContentSourceForm = ({
   );
   const contentViewsStatus = useSelector(selectContentViewsStatus);
   const environmentPathResponse = useSelector(selectEnvironmentPaths);
+  const jobInvocationPath = useSelector(selectJobInvocationPath);
   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);
+    handleContentSource(typeof selection === 'number' ? selection.toString() : selection);
     setCSSelectOpen(false);
   };
 
@@ -127,13 +131,12 @@ const ContentSourceForm = ({
     !!contentViewName &&
     !!contentSourceId &&
     hostCount !== 0);
-
   const contentSourcesIsDisabled = (isLoading || contentSources.length === 0 ||
     hostCount === 0);
-  const environmentIsDisabled = (isLoading || environments === [] ||
+  const environmentIsDisabled = (isLoading ||
     contentSourceId === '');
   const viewIsDisabled = (isLoading || contentViews.length === 0 ||
-    contentSourceId === '' || environments === []);
+    contentSourceId === '');
 
   const cvPlaceholderText = getCVPlaceholderText({
     contentSourceId,
@@ -229,6 +232,15 @@ const ContentSourceForm = ({
           env={environments[0]}
         />))}
       </ContentViewSelect>
+      {showCVOnlyAlert &&
+        <Alert
+          ouiaId="cv-only-alert"
+          variant="info"
+          className="margin-top-20"
+          title={__('Host content source will remain the same. Click Save below to update the host\'s content view environment.')}
+        />
+      }
+      {!showCVOnlyAlert &&
       <TextContent>
         <Text
           ouiaId="ccs-options-description"
@@ -252,27 +264,49 @@ const ContentSourceForm = ({
           />
         </Text>
       </TextContent>
+      }
       <ActionGroup style={{ display: 'block' }}>
-        <Button
-          variant="primary"
-          id="generate_btn"
-          ouiaId="update-source-button"
-          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 hosts manually')}
-        </Button>
+        {!showCVOnlyAlert &&
+        <>
+          <Button
+            variant="primary"
+            id="generate_btn"
+            ouiaId="run-job-invocation-button"
+            onClick={e => handleSubmit(e, { redirectTo: jobInvocationPath })}
+            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 hosts manually')}
+          </Button>
+        </>
+        }
+        {showCVOnlyAlert &&
+          <Button
+            variant="primary"
+            id="generate_btn"
+            ouiaId="change-cv-button"
+            onClick={e =>
+              handleSubmit(e, {
+                redirectTo: hostEditPath || hostDetailsPath,
+                showSuccessToast: true,
+              })
+            }
+            isDisabled={isLoading || !formIsValid() || hostsUpdated}
+            isLoading={isLoading}
+          >
+            {__('Save')}
+          </Button>
+        }
 
       </ActionGroup>
     </Form>);
@@ -288,6 +322,9 @@ ContentSourceForm.propTypes = {
   contentSources: PropTypes.arrayOf(PropTypes.shape({})),
   handleContentSource: PropTypes.func.isRequired,
   contentSourceId: PropTypes.string,
+  showCVOnlyAlert: PropTypes.bool,
+  hostDetailsPath: PropTypes.string.isRequired,
+  hostEditPath: PropTypes.string.isRequired,
   contentHosts: PropTypes.arrayOf(PropTypes.shape({})),
   isLoading: PropTypes.bool,
   hostsUpdated: PropTypes.bool,
@@ -300,6 +337,7 @@ ContentSourceForm.defaultProps = {
   contentViewName: '',
   contentSources: [],
   contentSourceId: '',
+  showCVOnlyAlert: false,
   contentHosts: [],
   isLoading: false,
   hostsUpdated: false,

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

@@ -17,7 +17,6 @@ import { selectApiDataStatus,
   selectContentHosts,
   selectContentHostsWithoutContent,
   selectContentSources,
-  selectJobInvocationPath,
   selectContentViews,
   selectTemplate } from './selectors';
 
@@ -46,31 +45,36 @@ const ChangeContentSourcePage = () => {
   const contentHosts = useSelector(selectContentHosts);
   const hostsWithoutContent = useSelector(selectContentHostsWithoutContent);
   const contentSources = useSelector(selectContentSources);
-  const jobInvocationPath = useSelector(selectJobInvocationPath);
 
   const template = useSelector(selectTemplate);
   const contentViews = useSelector(selectContentViews);
-
-  const [contentSourceId, setCapsuleId] = useState('');
+  const { initialContentSourceId } = urlParams;
+  const [contentSourceId, setCapsuleId] = useState(initialContentSourceId ?? '');
+  // if this matches, we'll trust you that initialContentSourceId is the host's content source
+  const showCVOnlyAlert = (contentHosts.length === 1 &&
+    hostsWithoutContent.length === 0 &&
+    !!initialContentSourceId &&
+    initialContentSourceId === contentSourceId
+  );
+  const hostDetailsPath = showCVOnlyAlert ? `new/hosts/${contentHosts[0].name}` : '';
+  const hostEditPath = urlParams.fromPage === 'hostEdit' ? foremanUrl(`/hosts/${contentHosts[0]?.name}/edit`) : '';
   const [selectedEnvironment, setSelectedEnvironment] = useState([]);
   const [contentViewName, setContentViewName] = useState('');
   const [shouldShowTemplate, setShouldShowTemplate] = useState(false);
-  const [redirect, setRedirect] = useState(false);
+  const [redirect, setRedirect] = useState('');
 
   const contentViewId = contentViews?.find(cv => cv.name === contentViewName)?.id;
   const hostIds = useMemo(() => getHostIds(urlParams.host_id), [urlParams.host_id]);
   const noHostSpecified = (hostIds.length === 0 && urlParams.searchParam === '');
   const environmentId = selectedEnvironment[0]?.id;
 
-  const redirectToJobInvocationForm = () => setRedirect(true);
-
-  const handleSuccess = ({ shouldRedirect }) => {
-    if (shouldRedirect) {
-      redirectToJobInvocationForm();
+  const handleSuccess = ({ redirectTo = '' }) => {
+    if (redirectTo) {
+      setRedirect(redirectTo);
     }
   };
 
-  const handleSubmit = (e, { shouldRedirect = false }) => {
+  const handleSubmit = (e, { redirectTo = '', showSuccessToast = false } = {}) => {
     e.preventDefault();
 
     dispatch(changeContentSource(
@@ -78,7 +82,8 @@ const ChangeContentSourcePage = () => {
       contentViewId,
       contentSourceId,
       contentHosts.map(h => h.id),
-      () => handleSuccess({ shouldRedirect }),
+      () => handleSuccess({ redirectTo }),
+      showSuccessToast ? () => __('Host content view environment(s) updated') : undefined,
     ));
   };
 
@@ -93,7 +98,7 @@ const ChangeContentSourcePage = () => {
   };
 
   const showTemplate = (e) => {
-    handleSubmit(e, { shouldRedirect: false });
+    handleSubmit(e);
     setShouldShowTemplate(true);
   };
 
@@ -122,8 +127,8 @@ const ChangeContentSourcePage = () => {
     dispatch(getFormData(hostIds, urlParams.searchParam));
   }, [dispatch, hostIds, urlParams.searchParam]);
 
-  if (redirect && jobInvocationPath) {
-    window.location.assign(jobInvocationPath); // redirect to job invocation wizard
+  if (redirect && redirect !== '') {
+    window.location.assign(redirect);
   }
 
   return (
@@ -165,7 +170,7 @@ const ChangeContentSourcePage = () => {
                 title={__('No hosts were specified')}
               />
             </GridItem>
-        }
+          }
           { !noHostSpecified &&
           <>
             <Hosts
@@ -182,6 +187,9 @@ const ChangeContentSourcePage = () => {
               contentViewName={contentViewName}
               contentSources={contentSources}
               contentSourceId={contentSourceId}
+              showCVOnlyAlert={showCVOnlyAlert}
+              hostDetailsPath={hostDetailsPath}
+              hostEditPath={hostEditPath}
               handleContentSource={handleContentSource}
               contentHosts={contentHosts}
               isLoading={isLoading}

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

@@ -7,6 +7,7 @@ exports[`RedHatRepositories page should render <PermissionDenied /> when permiss
       "view_organizations",
     ]
   }
+  primaryButton={null}
 />
 `;
 

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

@@ -1,7 +1,10 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Col, Row, Tabs, Tab, FormControl, ControlLabel } from 'react-bootstrap';
+import { FormattedMessage } from 'react-intl';
 import { Button, Spinner } from 'patternfly-react';
+import { Alert } from '@patternfly/react-core';
+import { propsToCamelCase } from 'foremanReact/common/helpers';
 import ForemanModal from 'foremanReact/components/ForemanModal';
 import Slot from 'foremanReact/components/common/Slot';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -92,22 +95,29 @@ class ManageManifestModal extends Component {
       contentCredentials,
     } = this.props;
 
+    const {
+      manifestExpiringSoon,
+      manifestExpired,
+      manifestExpirationDate,
+      manifestExpireDaysRemaining,
+    } = propsToCamelCase(organization);
+
     const actionInProgress = (taskInProgress || manifestActionStarted);
     const showCdnConfigurationTab = canEditOrganizations;
     const showSubscriptionManifest = (canImportManifest || canDeleteManifest);
     const showManifestTab = (canEditOrganizations || showSubscriptionManifest);
 
     const emptyStateData = () => ({
-      header: __('There is no Manifest History to display.'),
-      description: __('Import a Manifest using the manifest tab above.'),
+      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 '),
+        label: __('Learn more about adding subscription manifests '),
         url: 'https://access.redhat.com/solutions/3410771',
       },
     });
 
     const getManifestName = () => {
-      let name = __('No Manifest Uploaded');
+      let name = __('No manifest imported');
 
       if (
         organization.owner_details &&
@@ -139,6 +149,46 @@ class ManageManifestModal extends Component {
                   <React.Fragment>
                     <Grid>
                       <h3>{__('Subscription Manifest')}</h3>
+                      {manifestExpiringSoon &&
+                        <Alert
+                          ouiaId="manifest-expiring-soon-alert"
+                          variant="warning"
+                          title={__('Manifest expiring soon')}
+                        >
+                          <FormattedMessage
+                            defaultMessage={__('Your manifest will expire in {daysMessage}. To extend the expiration date, refresh your manifest. Or, if your Foreman is disconnected, import a new manifest.')}
+                            values={{
+                              daysMessage: (
+                                <FormattedMessage
+                                  defaultMessage="{daysRemaining, plural, one {{singular}} other {# {plural}}}"
+                                  values={{
+                                    daysRemaining: manifestExpireDaysRemaining,
+                                    singular: __('day'),
+                                    plural: __('days'),
+                                  }}
+                                  id="manage-manifest-expire-days-i18n"
+                                />
+                              ),
+                            }}
+                            id="manage-manifest-expire-i18n"
+                          />
+                        </Alert>
+                      }
+                      {manifestExpired && isManifestImported &&
+                        <Alert
+                          ouiaId="manifest-expired-alert"
+                          variant="danger"
+                          title={__('Manifest expired')}
+                        >
+                          <FormattedMessage
+                            defaultMessage={__('Your manifest expired on {expirationDate}. To continue using Red Hat content, import a new manifest.')}
+                            values={{
+                              expirationDate: new Date(manifestExpirationDate).toDateString(),
+                            }}
+                            id="manage-manifest-expired-i18n"
+                          />
+                        </Alert>
+                      }
                       <hr />
                       <Row>
                         <Col sm={5}>
@@ -148,13 +198,22 @@ class ManageManifestModal extends Component {
                           {getManifestName()}
                         </Col>
                       </Row>
+                      {isManifestImported && manifestExpirationDate &&
+                        <Row>
+                          <Col sm={5} />
+                          <Col sm={7}>
+                            {manifestExpired ? __('Expired ') : __('Expires ')}
+                            {new Date(manifestExpirationDate).toDateString()}
+                          </Col>
+                        </Row>
+                      }
                       <Row>
                         <Col sm={5}>
                           {canImportManifest &&
                           <ControlLabel
                             style={{ paddingTop: '10px' }}
                           >
-                            <div>{__('Import New Manifest')}</div>
+                            <div>{__('Import new manifest')}</div>
                           </ControlLabel>
                           }
                         </Col>

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js

@@ -222,19 +222,22 @@ class UpstreamSubscriptionsPage extends Component {
 
     return (
       <Grid bsClass="container-fluid">
-        <BreadcrumbsBar data={{
-          isSwitchable: false,
-          breadcrumbItems: [
-            {
-              caption: __('Subscriptions'),
-              onClick: () => this.props.history.push('/subscriptions'),
-            },
-            {
-              caption: __('Add Subscriptions'),
-            },
-          ],
-        }}
-        />
+        {!upstreamSubscriptions.loading &&
+        <div style={{ marginBottom: '10px' }}>
+          <BreadcrumbsBar
+            isLoadingResources={upstreamSubscriptions.loading}
+            breadcrumbItems={[
+              {
+                caption: __('Subscriptions'),
+                url: '/subscriptions/',
+              },
+              {
+                caption: String(__('Add Subscriptions')),
+              },
+            ]}
+          />
+        </div>
+        }
 
         <LoadingState loading={upstreamSubscriptions.loading} loadingText={__('Loading')}>
           <Row>

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap

@@ -6,22 +6,28 @@ exports[`upstream subscriptions page should render 1`] = `
   componentClass="div"
   fluid={false}
 >
-  <BreadcrumbsBar
-    data={
+  <div
+    style={
       Object {
-        "breadcrumbItems": Array [
+        "marginBottom": "10px",
+      }
+    }
+  >
+    <BreadcrumbsBar
+      breadcrumbItems={
+        Array [
           Object {
             "caption": "Subscriptions",
-            "onClick": [Function],
+            "url": "/subscriptions/",
           },
           Object {
             "caption": "Add Subscriptions",
           },
-        ],
-        "isSwitchable": false,
+        ]
       }
-    }
-  />
+      isLoadingResources={false}
+    />
+  </div>
   <LoadingState
     loading={false}
     loadingText="Loading"

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

@@ -7,6 +7,7 @@ exports[`subscriptions page should render <PermissionDenied /> when permissions
       "view_subscriptions",
     ]
   }
+  primaryButton={null}
 />
 `;
 

data/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js

@@ -49,7 +49,7 @@ const SubscriptionsToolbar = ({
           <FormGroup>
             {canManageSubscriptionAllocations &&
               <LinkContainer
-                to="subscriptions/add"
+                to="/subscriptions/add"
                 disabled={disableManifestActions || disableAddButton}
               >
                 <TooltipButton