katello 4.6.2.1 → 4.7.0.rc1

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/NetworkSyncForm.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
@@ -16,12 +16,13 @@ import {
 } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
-import { noop } from 'foremanReact/common/helpers';
+import { noop, propsToCamelCase } from 'foremanReact/common/helpers';
 
 import { NETWORK_SYNC, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
+  selectOrgLoading,
   selectUpdatingCdnConfiguration,
 } from '../../../Organizations/OrganizationSelectors';
 
@@ -29,39 +30,30 @@ import { updateCdnConfiguration } from '../../../Organizations/OrganizationActio
 import './CdnConfigurationForm.scss';
 
 const NetworkSyncForm = ({
-  showUpdate, contentCredentials, cdnConfiguration, onUpdate,
+  typeChangeInProgress, contentCredentials, cdnConfiguration, onUpdate,
 }) => {
   const dispatch = useDispatch();
-  const urlValue = cdnConfiguration.type === NETWORK_SYNC ? cdnConfiguration.url : '';
+  const cdnConfigurationObject = propsToCamelCase(cdnConfiguration);
+  const urlValue = cdnConfigurationObject.type === NETWORK_SYNC ? cdnConfigurationObject.url : '';
   const [url, setUrl] = useState(urlValue);
-  const [username, setUsername] = useState(cdnConfiguration.username);
+  const [username, setUsername] = useState(cdnConfigurationObject.username);
   const [password, setPassword] = useState(null);
-  const [organizationLabel, setOrganizationLabel] =
-    useState(cdnConfiguration.upstream_organization_label || DEFAULT_ORGANIZATION_LABEL);
-  const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
-  const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
+  const [upstreamOrganizationLabel, setUpstreamOrganizationLabel] =
+    useState(cdnConfigurationObject.upstreamOrganizationLabel || DEFAULT_ORGANIZATION_LABEL);
+  const [sslCaCredentialId, setSslCaCredentialId] =
+    useState(cdnConfigurationObject.sslCaCredentialId);
+  const updatingCdnConfiguration =
+    useSelector(state => selectUpdatingCdnConfiguration(state));
+  const orgIsLoading = useSelector(state => selectOrgLoading(state));
 
-  const [contentViewLabel, setContentViewLabel] =
-    useState(cdnConfiguration.upstream_content_view_label ||
+  const [upstreamContentViewLabel, setUpstreamContentViewLabel] =
+    useState(cdnConfigurationObject.upstreamContentViewLabel ||
       DEFAULT_CONTENT_VIEW_LABEL);
 
-  const [lifecycleEnvironmentLabel, setLifecycleEnvironmentLabel] =
-    useState(cdnConfiguration.upstream_lifecycle_environment_label ||
+  const [upstreamLifecycleEnvironmentLabel, setUpstreamLifecycleEnvironmentLabel] =
+    useState(cdnConfigurationObject.upstreamLifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL);
 
-  const [updateEnabled, setUpdateEnabled] = useState(false);
-
-  const firstUpdate = useRef(true);
-  useEffect(() => {
-    if (firstUpdate.current) {
-      firstUpdate.current = false;
-      return;
-    }
-    setUpdateEnabled(true);
-  }, [url, username, password, organizationLabel,
-    contentViewLabel, lifecycleEnvironmentLabel,
-    sslCaCredentialId, cdnConfiguration]);
-
   const editPassword = (value) => {
     if (value === null) {
       setPassword('');
@@ -69,31 +61,54 @@ const NetworkSyncForm = ({
       setPassword(value);
     }
   };
-  const hasPassword = (cdnConfiguration.password_exists && !password)
+
+  const hasPassword = (cdnConfigurationObject.passwordExists && !password)
       || password?.length > 0;
 
-  const requiredFields = [username, organizationLabel, sslCaCredentialId];
+  const requiredFields = [username, upstreamOrganizationLabel, sslCaCredentialId, url];
 
   if (!hasPassword) {
     requiredFields.push(password);
   }
 
   const validated = !requiredFields.some(field => !field);
-  const onError = () => setUpdateEnabled(true);
+  const disableUpdate = () => {
+    if (updatingCdnConfiguration || orgIsLoading || !validated) {
+      return true;
+    }
+    const needsUpdate = Object.entries({
+      url,
+      username,
+      upstreamOrganizationLabel,
+      upstreamContentViewLabel,
+      upstreamLifecycleEnvironmentLabel,
+    }).some(([key, value]) => value?.toString() !== cdnConfigurationObject[key]?.toString());
+
+    if (needsUpdate || password?.length > 0) {
+      return false;
+    }
+
+    const sslCaCredentialIdOrNull = sslCaCredentialId === '' ? null : sslCaCredentialId;
+    return sslCaCredentialIdOrNull?.toString() ===
+            cdnConfigurationObject.sslCaCredentialId?.toString();
+  };
+
+  const sslCaCredentialValue =
+    cdnConfigurationObject.type === NETWORK_SYNC || typeChangeInProgress ?
+      sslCaCredentialId : null;
 
   const performUpdate = () => {
-    setUpdateEnabled(false);
     dispatch(updateCdnConfiguration({
       url,
       username,
       password,
-      upstream_organization_label: organizationLabel || DEFAULT_ORGANIZATION_LABEL,
+      upstream_organization_label: upstreamOrganizationLabel || DEFAULT_ORGANIZATION_LABEL,
       ssl_ca_credential_id: sslCaCredentialId,
-      upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
-      upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
+      upstream_content_view_label: upstreamContentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
+      upstream_lifecycle_environment_label: upstreamLifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL,
       type: NETWORK_SYNC,
-    }, onUpdate, onError));
+    }, onUpdate));
   };
 
   return (
@@ -120,7 +135,7 @@ const NetworkSyncForm = ({
               }}
             />
             <br />
-            {showUpdate &&
+            {typeChangeInProgress &&
             <FormattedMessage
               id="cdn-configuration-type-upstream-server"
               defaultMessage={__('Provide the required information and click {update} below to save changes.')}
@@ -179,9 +194,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-organization-input"
             aria-label="cdn-organization-label"
             type="text"
-            value={organizationLabel || ''}
+            value={upstreamOrganizationLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setOrganizationLabel}
+            onChange={setUpstreamOrganizationLabel}
           />
         </FormGroup>
         <FormGroup
@@ -191,9 +206,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-lifecycle-environment-input"
             aria-label="cdn-lifecycle-environment-label"
             type="text"
-            value={lifecycleEnvironmentLabel || ''}
+            value={upstreamLifecycleEnvironmentLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setLifecycleEnvironmentLabel}
+            onChange={setUpstreamLifecycleEnvironmentLabel}
           />
         </FormGroup>
         <FormGroup
@@ -203,9 +218,9 @@ const NetworkSyncForm = ({
             ouiaId="network-sync-content-view-input"
             aria-label="cdn-content-view-label"
             type="text"
-            value={contentViewLabel || ''}
+            value={upstreamContentViewLabel || ''}
             isDisabled={updatingCdnConfiguration}
-            onChange={setContentViewLabel}
+            onChange={setUpstreamContentViewLabel}
           />
         </FormGroup>
         <FormGroup
@@ -215,7 +230,7 @@ const NetworkSyncForm = ({
           <FormSelect
             ouiaId="network-sync-ca-content-credential-input"
             aria-label="cdn-ssl-ca-content-credential"
-            value={sslCaCredentialId || ''}
+            value={sslCaCredentialValue || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={value => setSslCaCredentialId(value)}
           >
@@ -231,7 +246,7 @@ const NetworkSyncForm = ({
             aria-label="update-upstream-configuration"
             variant="secondary"
             onClick={performUpdate}
-            isDisabled={updatingCdnConfiguration || !validated || !updateEnabled}
+            isDisabled={disableUpdate()}
             isLoading={updatingCdnConfiguration}
           >
             {__('Update')}
@@ -243,7 +258,7 @@ const NetworkSyncForm = ({
 };
 
 NetworkSyncForm.propTypes = {
-  showUpdate: PropTypes.bool.isRequired,
+  typeChangeInProgress: PropTypes.bool.isRequired,
   contentCredentials: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.number,
     name: PropTypes.string,

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/CdnTypeForm.test.js

@@ -4,7 +4,7 @@ import { renderWithRedux, fireEvent } from 'react-testing-lib-wrapper';
 import CdnTypeForm from '../CdnTypeForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { CDN, CDN_URL } from '../CdnConfigurationConstants';
+import { CDN } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -24,44 +24,19 @@ const initialState = {
 
 test('Can update to cdn type', async (done) => {
   const { getByLabelText } = renderWithRedux(<CdnTypeForm
-    showUpdate
-    url={CDN_URL}
+    typeChangeInProgress
   />, { initialState });
 
   const updateCdnConfigurationRequest = nockInstance
     .put(updateCdnConfigurationPath, {
-      url: CDN_URL,
       type: CDN,
     })
     .reply(200, updateCdnConfigurationSuccessResponse);
 
   expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'false');
+  expect(getByLabelText('redhat-cdn-url')).toHaveAttribute('disabled');
 
   const updateButton = getByLabelText(updateButtonName);
   fireEvent.click(updateButton);
   assertNockRequest(updateCdnConfigurationRequest, done);
 });
-
-test('Can update the cdn url', async (done) => {
-  const { getByLabelText } = renderWithRedux(<CdnTypeForm
-    showUpdate={false}
-    url={CDN_URL}
-  />, { initialState });
-
-  const updateCdnConfigurationRequest = nockInstance
-    .put(updateCdnConfigurationPath, {
-      url: 'http://cdn.example.com',
-      type: CDN,
-    })
-    .reply(200, updateCdnConfigurationSuccessResponse);
-
-  expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'true');
-
-  const url = getByLabelText('cdn-url');
-  fireEvent.change(url, { target: { value: 'http://cdn.example.com' } });
-
-  const updateButton = getByLabelText(updateButtonName);
-  expect(updateButton).toHaveAttribute('aria-disabled', 'false');
-  fireEvent.click(updateButton);
-  assertNockRequest(updateCdnConfigurationRequest, done);
-});

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/CustomCdnTypeForm.test.js

@@ -0,0 +1,97 @@
+import React from 'react';
+import { cleanup } from '@testing-library/react';
+import { renderWithRedux, fireEvent } from 'react-testing-lib-wrapper';
+import userEvent from '@testing-library/user-event';
+import CustomCdnTypeForm from '../CustomCdnTypeForm';
+import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
+import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
+import { CUSTOM_CDN } from '../CdnConfigurationConstants';
+
+import api from '../../../../../services/api';
+
+afterEach(cleanup);
+const updateCdnConfigurationPath = api.getApiUrl('/organizations/1/cdn_configuration');
+
+const updateButtonName = 'update-custom-cdn-configuration';
+const organization = {
+  id: 1,
+};
+
+const initialState = {
+  katello: {
+    organization,
+  },
+};
+
+const cdnConfiguration = {
+  url: 'http://currentcdn.example.com',
+  ssl_ca_credential_id: 2,
+  type: CUSTOM_CDN,
+};
+
+const contentCredentials = [
+  {
+    name: 'Credential1',
+    id: 1,
+  },
+  {
+    name: 'Credential2',
+    id: 2,
+  },
+];
+
+test('Can update the custom cdn server configuration', async (done) => {
+  const { getByLabelText } = renderWithRedux(<CustomCdnTypeForm
+    typeChangeInProgress
+    cdnConfiguration={cdnConfiguration}
+    contentCredentials={contentCredentials}
+  />, { initialState });
+
+  const updateCdnConfigurationRequest = nockInstance
+    .put(updateCdnConfigurationPath, {
+      url: 'http://cdn.example.com',
+      ssl_ca_credential_id: '1',
+      type: CUSTOM_CDN,
+    })
+    .reply(200, updateCdnConfigurationSuccessResponse);
+
+  const url = getByLabelText('cdn-url');
+  fireEvent.change(url, { target: { value: 'http://cdn.example.com' } });
+
+  userEvent.selectOptions(
+    getByLabelText('cdn-ssl-ca-content-credential'),
+    '1',
+  );
+
+  const updateButton = getByLabelText(updateButtonName);
+  fireEvent.click(updateButton);
+
+  assertNockRequest(updateCdnConfigurationRequest, done);
+});
+
+test('the form shall reflect the given cdnConfiguration', () => {
+  const { getAllByTestId } = renderWithRedux(<CustomCdnTypeForm
+    typeChangeInProgress
+    cdnConfiguration={cdnConfiguration}
+    contentCredentials={contentCredentials}
+  />, { initialState });
+
+  const options = getAllByTestId('ssl-ca-content-credential-option');
+
+  expect(options).toHaveLength(contentCredentials.length);
+  expect(options[0].selected).toBeFalsy();
+  expect(options[1].selected).toBeTruthy();
+});
+
+test('update button disabled on incomplete information', async (done) => {
+  const { getByLabelText } = renderWithRedux(<CustomCdnTypeForm
+    typeChangeInProgress
+    cdnConfiguration={{ ...cdnConfiguration, url: '' }}
+    contentCredentials={contentCredentials}
+  />, { initialState });
+
+  expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'true');
+  fireEvent.change(getByLabelText('cdn-url'), { target: { value: 'http://example.com' } });
+  expect(getByLabelText(updateButtonName)).toHaveAttribute('aria-disabled', 'false');
+  done();
+});

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/ExportSyncForm.test.js

@@ -26,7 +26,7 @@ const initialState = {
 
 test('Can update to Airgapped type', async (done) => {
   const { getByLabelText } = renderWithRedux(<ExportSyncForm
-    showUpdate
+    typeChangeInProgress
   />, { initialState });
 
   const updateCdnConfigurationRequest = nockInstance

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/NetworkSyncForm.test.js

@@ -48,7 +48,7 @@ const contentCredentials = [
 
 test('Can update the upstream server configuration', async (done) => {
   const { getByLabelText } = renderWithRedux(<NetworkSyncForm
-    showUpdate
+    typeChangeInProgress
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
   />, { initialState });
@@ -93,7 +93,7 @@ test('Can update the upstream server configuration', async (done) => {
 
 test('the form shall reflect the given cdnConfiguration', () => {
   const { getAllByTestId, getByLabelText } = renderWithRedux(<NetworkSyncForm
-    showUpdate
+    typeChangeInProgress
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
   />, { initialState });
@@ -110,7 +110,7 @@ test('the form shall reflect the given cdnConfiguration', () => {
 
 test('resetting the password enables/disables appropriately', async (done) => {
   const { getByLabelText } = renderWithRedux(<NetworkSyncForm
-    showUpdate
+    typeChangeInProgress
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
   />, { initialState });
 
@@ -131,7 +131,7 @@ test('resetting the password enables/disables appropriately', async (done) => {
 
 test('update button disabled on incomplete information', async (done) => {
   const { getByLabelText } = renderWithRedux(<NetworkSyncForm
-    showUpdate
+    typeChangeInProgress
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
     contentCredentials={contentCredentials}
   />, { initialState });

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/index.js

@@ -9,9 +9,9 @@ import { noop } from 'foremanReact/common/helpers';
 import CdnTypeForm from './CdnTypeForm';
 import ExportSyncForm from './ExportSyncForm';
 import NetworkSyncForm from './NetworkSyncForm';
-
+import CustomCdnTypeForm from './CustomCdnTypeForm';
 import './CdnConfigurationForm.scss';
-import { CDN_URL, CDN, EXPORT_SYNC, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
+import { CDN, EXPORT_SYNC, CUSTOM_CDN, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
 
 const CdnConfigurationForm = (props) => {
   const {
@@ -28,20 +28,25 @@ const CdnConfigurationForm = (props) => {
     }
   };
 
-  const cdnUrl = type !== cdnConfiguration.type ? CDN_URL : cdnConfiguration.url;
-
   return (
     <div id="cdn-configuration">
       <ToggleGroup aria-label="Default with multiple selectable">
         <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[CDN]} key={0} buttonId="cdn" isSelected={type === CDN} onChange={() => updateType(CDN)} />
         <ToggleGroupItem
-          text={CDN_CONFIGURATION_TYPES[NETWORK_SYNC]}
+          text={CDN_CONFIGURATION_TYPES[CUSTOM_CDN]}
           key={1}
+          buttonId="customCdn"
+          isSelected={type === CUSTOM_CDN}
+          onChange={() => updateType(CUSTOM_CDN)}
+        />
+        <ToggleGroupItem
+          text={CDN_CONFIGURATION_TYPES[NETWORK_SYNC]}
+          key={2}
           buttonId="usptream_server"
           isSelected={type === NETWORK_SYNC}
           onChange={() => updateType(NETWORK_SYNC)}
         />
-        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={2} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
+        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={3} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
       </ToggleGroup>
 
       { type === NETWORK_SYNC &&
@@ -49,20 +54,28 @@ const CdnConfigurationForm = (props) => {
           cdnConfiguration={cdnConfiguration}
           contentCredentials={contentCredentials}
           onUpdate={onUpdate}
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
         />
       }
 
       { type === CDN &&
         <CdnTypeForm
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
-          url={cdnUrl}
         />
       }
+      { type === CUSTOM_CDN &&
+        <CustomCdnTypeForm
+          cdnConfiguration={cdnConfiguration}
+          contentCredentials={contentCredentials}
+          typeChangeInProgress={type !== cdnConfiguration.type}
+          onUpdate={onUpdate}
+        />
+      }
+
       { type === EXPORT_SYNC &&
         <ExportSyncForm
-          showUpdate={type !== cdnConfiguration.type}
+          typeChangeInProgress={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
         />
       }

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

@@ -138,7 +138,7 @@ class ManageManifestModal extends Component {
                       <hr />
                       <Row>
                         <Col sm={5}>
-                          <strong>{__('Subscription Allocation')}</strong>
+                          <strong>{__('Manifest')}</strong>
                         </Col>
                         <Col sm={7}>
                           {getManifestName()}

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -37,7 +37,8 @@ export const SUBSCRIPTIONS_CLOSE_DELETE_MODAL = 'SUBSCRIPTIONS_CLOSE_DELETE_MODA
 export const SUBSCRIPTIONS_DISABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_DISABLE_DELETE_BUTTON';
 export const SUBSCRIPTIONS_ENABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_ENABLE_DELETE_BUTTON';
 
-export const SUBSCRIPTION_WATCH_URL = 'https://access.redhat.com/articles/subscription-watch';
+export const SUBSCRIPTIONS_SERVICE_DOC_URL = 'https://access.redhat.com/documentation/en-us/subscription_central/2021/html-single/getting_started_with_the_subscriptions_service/index';
+export const SUBSCRIPTIONS_SERVICE_URL = 'https://console.redhat.com/subscriptions';
 export const SCA_URL = 'https://access.redhat.com/articles/simple-content-access';
 
 export const MANIFEST_DELETE_TASK_LABEL = 'Actions::Katello::Organization::ManifestDelete';

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -16,7 +16,7 @@ import { filterRHSubscriptions } from './SubscriptionHelpers';
 import api, { orgId } from '../../services/api';
 
 import { createSubscriptionParams } from './SubscriptionActions.js';
-import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTION_WATCH_URL, SCA_URL } from './SubscriptionConstants';
+import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS_SERVICE_DOC_URL, SCA_URL } from './SubscriptionConstants';
 import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
@@ -102,9 +102,9 @@ class SubscriptionsPage extends Component {
     let disabledReason = null;
 
     if (!hasUpstreamConnection) {
-      disabledReason = __('This is disabled because no connection could be made to the upstream Subscription Allocation.');
+      disabledReason = __('This is disabled because no connection could be made to the upstream Manifest.');
     } else if (task) {
-      disabledReason = __('This is disabled because a manifest related task is in progress.');
+      disabledReason = __('This is disabled because a manifest-related task is in progress.');
     } else if (deleteButton && !disabledReason) {
       disabledReason = __('This is disabled because no subscriptions are selected.');
     } else if (!isManifestImported) {
@@ -223,14 +223,14 @@ class SubscriptionsPage extends Component {
         <FormattedMessage
           id="sca-alert"
           values={{
-            subscriptionWatch: <a href={SUBSCRIPTION_WATCH_URL} target="_blank" rel="noreferrer">{__('Subscription Watch')}</a>,
+            subscriptionsService: <a href={SUBSCRIPTIONS_SERVICE_DOC_URL} target="_blank" rel="noreferrer">{__('Subscriptions service')}</a>,
             br: <br />,
             scaLink: <a href={SCA_URL} target="_blank" rel="noreferrer">{__('Simple Content Access')}</a>,
           }}
           defaultMessage={simpleContentAccess ? __(`This organization has Simple Content Access enabled.
           Hosts are not required to have subscriptions attached to access repositories.
           {br}
-          Learn more about your overall subscription usage at {subscriptionWatch}.`) : __('This organization is not using {scaLink}. Legacy subscription management is deprecated and will be removed in a future version.')}
+          Learn more about your overall subscription usage with the {subscriptionsService}.`) : __('This organization is not using {scaLink}. Legacy subscription management is deprecated and will be removed in a future version.')}
         />
       </Alert>
     );

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

@@ -181,9 +181,9 @@ class UpstreamSubscriptionsPage extends Component {
     };
 
     const emptyStateData = () => ({
-      header: __('There are no Subscription Allocations to display'),
-      description: __('Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to ' +
-        'an on-premise subscription management application such as Red Hat Satellite.'),
+      header: __('There are no Manifests to display'),
+      description: __('Manifests allow you to find, access, synchronize, and download content ' +
+        'from upstream Red Hat repositories for use in Red Hat Satellite.'),
       action: {
         title: __('Import a Manifest to Begin'),
         url: '/subscriptions',

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

@@ -131,8 +131,8 @@ exports[`upstream subscriptions page should render 1`] = `
                 "title": "Import a Manifest to Begin",
                 "url": "/subscriptions",
               },
-              "description": "Subscription Allocations allow you to export subscriptions from the Red Hat Customer Portal to an on-premise subscription management application such as Red Hat Satellite.",
-              "header": "There are no Subscription Allocations to display",
+              "description": "Manifests allow you to find, access, synchronize, and download content from upstream Red Hat repositories for use in Red Hat Satellite.",
+              "header": "There are no Manifests to display",
             }
           }
           itemCount={2}

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

@@ -40,9 +40,9 @@ exports[`subscriptions page should render 1`] = `
         canManageSubscriptionAllocations={false}
         disableAddButton={true}
         disableDeleteButton={true}
-        disableDeleteReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
+        disableDeleteReason="This is disabled because no connection could be made to the upstream Manifest."
         disableManifestActions={true}
-        disableManifestReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
+        disableManifestReason="This is disabled because no connection could be made to the upstream Manifest."
         getAutoCompleteParams={[Function]}
         isManifestImported={false}
         onDeleteButtonClick={[Function]}
@@ -58,7 +58,7 @@ exports[`subscriptions page should render 1`] = `
         canImportManifest={false}
         delete={[Function]}
         disableManifestActions={true}
-        disabledReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
+        disabledReason="This is disabled because no connection could be made to the upstream Manifest."
         refresh={[Function]}
         taskInProgress={false}
         upload={[Function]}

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

@@ -4,7 +4,7 @@ import { Row, Col, Form, FormGroup, Button } from 'patternfly-react';
 import { LinkContainer } from 'react-router-bootstrap';
 import { noop } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { SUBSCRIPTION_WATCH_URL } from '../../SubscriptionConstants';
+import { SUBSCRIPTIONS_SERVICE_URL } from '../../SubscriptionConstants';
 
 import Search from '../../../../components/Search/index';
 import TooltipButton from '../../../../components/TooltipButton';
@@ -61,12 +61,12 @@ const SubscriptionsToolbar = ({
 
             {isManifestImported &&
               <a
-                href={SUBSCRIPTION_WATCH_URL}
+                href={SUBSCRIPTIONS_SERVICE_URL}
                 className="btn btn-default"
                 target="_blank"
                 rel="noreferrer"
               >
-                {__('Subscription Watch')}
+                {__('View Subscription Usage')}
               </a>
             }
 

data/webpack/scenes/Tasks/helpers.js

@@ -33,17 +33,24 @@ const rexJobLink = id => link({
   baseUrl: 'job_invocations',
 });
 
-export const renderTaskStartedToast = (task) => {
+export const renderTaskStartedToast = (task, override = '') => {
   if (!task) return;
 
   const message = (__(`Task ${task.humanized.action} has started.`));
 
-  window.tfm.toastNotifications.notify({
-    message,
-    type: 'info',
-    link: foremanTasksLink(task.id),
-
-  });
+  if (override) {
+    window.tfm.toastNotifications.notify({
+      message: override,
+      type: 'info',
+      link: foremanTasksLink(task.id),
+    });
+  } else {
+    window.tfm.toastNotifications.notify({
+      message,
+      type: 'info',
+      link: foremanTasksLink(task.id),
+    });
+  }
 };
 
 export const renderRexJobStartedToast = ({ id, description, key }) => {