katello 4.4.0.2 → 4.5.0.rc2

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{UpstreamServerTypeForm.js → NetworkSyncForm.js}

@@ -18,7 +18,7 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
-import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
+import { NETWORK_SYNC, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
@@ -28,11 +28,11 @@ import {
 import { updateCdnConfiguration } from '../../../Organizations/OrganizationActions';
 import './CdnConfigurationForm.scss';
 
-const UpstreamServerTypeForm = ({
+const NetworkSyncForm = ({
   showUpdate, contentCredentials, cdnConfiguration, onUpdate,
 }) => {
   const dispatch = useDispatch();
-  const urlValue = cdnConfiguration.type === UPSTREAM_SERVER ? cdnConfiguration.url : '';
+  const urlValue = cdnConfiguration.type === NETWORK_SYNC ? cdnConfiguration.url : '';
   const [url, setUrl] = useState(urlValue);
   const [username, setUsername] = useState(cdnConfiguration.username);
   const [password, setPassword] = useState(null);
@@ -92,7 +92,7 @@ const UpstreamServerTypeForm = ({
       upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
       upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
       DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL,
-      type: UPSTREAM_SERVER,
+      type: NETWORK_SYNC,
     }, onUpdate, onError));
   };
 
@@ -136,6 +136,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-url-input"
             aria-label="cdn-url"
             type="text"
             value={url || ''}
@@ -148,6 +149,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-username-input"
             aria-label="cdn-username"
             type="text"
             value={username || ''}
@@ -160,6 +162,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <EditableTextInput
+            ouiaId="network-sync-password-input"
             attribute="cdn-password"
             value={password}
             isPassword
@@ -173,6 +176,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <TextInput
+            ouiaId="network-sync-organization-input"
             aria-label="cdn-organization-label"
             type="text"
             value={organizationLabel || ''}
@@ -184,6 +188,7 @@ const UpstreamServerTypeForm = ({
           label={__('Lifecycle Environment Label')}
         >
           <TextInput
+            ouiaId="network-sync-lifecycle-environment-input"
             aria-label="cdn-lifecycle-environment-label"
             type="text"
             value={lifecycleEnvironmentLabel || ''}
@@ -195,6 +200,7 @@ const UpstreamServerTypeForm = ({
           label={__('Content view label')}
         >
           <TextInput
+            ouiaId="network-sync-content-view-input"
             aria-label="cdn-content-view-label"
             type="text"
             value={contentViewLabel || ''}
@@ -207,6 +213,7 @@ const UpstreamServerTypeForm = ({
           isRequired
         >
           <FormSelect
+            ouiaId="network-sync-ca-content-credential-input"
             aria-label="cdn-ssl-ca-content-credential"
             value={sslCaCredentialId || ''}
             isDisabled={updatingCdnConfiguration}
@@ -220,6 +227,7 @@ const UpstreamServerTypeForm = ({
 
         <ActionGroup>
           <Button
+            ouiaId="network-sync-configuration-update-button"
             aria-label="update-upstream-configuration"
             variant="secondary"
             onClick={performUpdate}
@@ -234,7 +242,7 @@ const UpstreamServerTypeForm = ({
   );
 };
 
-UpstreamServerTypeForm.propTypes = {
+NetworkSyncForm.propTypes = {
   showUpdate: PropTypes.bool.isRequired,
   contentCredentials: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.number,
@@ -253,10 +261,10 @@ UpstreamServerTypeForm.propTypes = {
   onUpdate: PropTypes.func,
 };
 
-UpstreamServerTypeForm.defaultProps = {
+NetworkSyncForm.defaultProps = {
   contentCredentials: [],
   cdnConfiguration: {},
   onUpdate: noop,
 };
 
-export default UpstreamServerTypeForm;
+export default NetworkSyncForm;

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{AirGappedTypeForm.test.js → ExportSyncForm.test.js}

@@ -1,10 +1,10 @@
 import React from 'react';
 import { cleanup } from '@testing-library/react';
 import { renderWithRedux, fireEvent } from 'react-testing-lib-wrapper';
-import AirGappedTypeForm from '../AirGappedTypeForm';
+import ExportSyncForm from '../ExportSyncForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { AIRGAPPED } from '../CdnConfigurationConstants';
+import { EXPORT_SYNC } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -25,13 +25,13 @@ const initialState = {
 
 
 test('Can update to Airgapped type', async (done) => {
-  const { getByLabelText } = renderWithRedux(<AirGappedTypeForm
+  const { getByLabelText } = renderWithRedux(<ExportSyncForm
     showUpdate
   />, { initialState });
 
   const updateCdnConfigurationRequest = nockInstance
     .put(updateCdnConfigurationPath, {
-      type: AIRGAPPED,
+      type: EXPORT_SYNC,
     })
     .reply(200, updateCdnConfigurationSuccessResponse);
 

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{UpstreamServerTypeForm.test.js → NetworkSyncForm.test.js}

@@ -2,10 +2,10 @@ import React from 'react';
 import { cleanup } from '@testing-library/react';
 import { renderWithRedux, fireEvent, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import userEvent from '@testing-library/user-event';
-import UpstreamServerTypeForm from '../UpstreamServerTypeForm';
+import NetworkSyncForm from '../NetworkSyncForm';
 import { nockInstance, assertNockRequest } from '../../../../../test-utils/nockWrapper';
 import { updateCdnConfigurationSuccessResponse } from '../../../../Organizations/__tests__/organizations.fixtures';
-import { UPSTREAM_SERVER } from '../CdnConfigurationConstants';
+import { NETWORK_SYNC } from '../CdnConfigurationConstants';
 
 import api from '../../../../../services/api';
 
@@ -20,7 +20,7 @@ const cdnConfiguration = {
   password_exists: false,
   upstream_organization_label: 'CurrentOrg',
   ssl_ca_credential_id: 2,
-  type: UPSTREAM_SERVER,
+  type: NETWORK_SYNC,
   upstream_lifecycle_environment_label: 'Library',
   upstream_content_view_label: 'CV',
 };
@@ -47,7 +47,7 @@ const contentCredentials = [
 ];
 
 test('Can update the upstream server configuration', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
@@ -60,7 +60,7 @@ test('Can update the upstream server configuration', async (done) => {
       password: 'changeme',
       upstream_organization_label: 'Default_Organization',
       ssl_ca_credential_id: '1',
-      type: UPSTREAM_SERVER,
+      type: NETWORK_SYNC,
       upstream_lifecycle_environment_label: 'Library',
       upstream_content_view_label: 'CV',
     })
@@ -92,7 +92,7 @@ test('Can update the upstream server configuration', async (done) => {
 });
 
 test('the form shall reflect the given cdnConfiguration', () => {
-  const { getAllByTestId, getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getAllByTestId, getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={cdnConfiguration}
     contentCredentials={contentCredentials}
@@ -109,7 +109,7 @@ test('the form shall reflect the given cdnConfiguration', () => {
 });
 
 test('resetting the password enables/disables appropriately', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
   />, { initialState });
@@ -130,7 +130,7 @@ test('resetting the password enables/disables appropriately', async (done) => {
 });
 
 test('update button disabled on incomplete information', async (done) => {
-  const { getByLabelText } = renderWithRedux(<UpstreamServerTypeForm
+  const { getByLabelText } = renderWithRedux(<NetworkSyncForm
     showUpdate
     cdnConfiguration={{ ...cdnConfiguration, password_exists: true }}
     contentCredentials={contentCredentials}

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

@@ -7,11 +7,11 @@ import {
 } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import CdnTypeForm from './CdnTypeForm';
-import AirGappedTypeForm from './AirGappedTypeForm';
-import UpstreamServerTypeForm from './UpstreamServerTypeForm';
+import ExportSyncForm from './ExportSyncForm';
+import NetworkSyncForm from './NetworkSyncForm';
 
 import './CdnConfigurationForm.scss';
-import { CDN_URL, CDN, AIRGAPPED, UPSTREAM_SERVER, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
+import { CDN_URL, CDN, EXPORT_SYNC, NETWORK_SYNC, CDN_CONFIGURATION_TYPES } from './CdnConfigurationConstants';
 
 const CdnConfigurationForm = (props) => {
   const {
@@ -35,17 +35,17 @@ const CdnConfigurationForm = (props) => {
       <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[UPSTREAM_SERVER]}
+          text={CDN_CONFIGURATION_TYPES[NETWORK_SYNC]}
           key={1}
           buttonId="usptream_server"
-          isSelected={type === UPSTREAM_SERVER}
-          onChange={() => updateType(UPSTREAM_SERVER)}
+          isSelected={type === NETWORK_SYNC}
+          onChange={() => updateType(NETWORK_SYNC)}
         />
-        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[AIRGAPPED]} key={2} buttonId="airgapped" isSelected={type === AIRGAPPED} onChange={() => updateType(AIRGAPPED)} />
+        <ToggleGroupItem text={CDN_CONFIGURATION_TYPES[EXPORT_SYNC]} key={2} buttonId="airgapped" isSelected={type === EXPORT_SYNC} onChange={() => updateType(EXPORT_SYNC)} />
       </ToggleGroup>
 
-      { type === UPSTREAM_SERVER &&
-        <UpstreamServerTypeForm
+      { type === NETWORK_SYNC &&
+        <NetworkSyncForm
           cdnConfiguration={cdnConfiguration}
           contentCredentials={contentCredentials}
           onUpdate={onUpdate}
@@ -60,8 +60,8 @@ const CdnConfigurationForm = (props) => {
           url={cdnUrl}
         />
       }
-      { type === AIRGAPPED &&
-        <AirGappedTypeForm
+      { type === EXPORT_SYNC &&
+        <ExportSyncForm
           showUpdate={type !== cdnConfiguration.type}
           onUpdate={onUpdate}
         />

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -38,6 +38,7 @@ export const SUBSCRIPTIONS_DISABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_DISABLE_DELETE
 export const SUBSCRIPTIONS_ENABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_ENABLE_DELETE_BUTTON';
 
 export const SUBSCRIPTION_WATCH_URL = 'https://access.redhat.com/articles/subscription-watch';
+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 } from './SubscriptionConstants';
+import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTION_WATCH_URL, SCA_URL } from './SubscriptionConstants';
 import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
@@ -218,21 +218,22 @@ class SubscriptionsPage extends Component {
       },
     };
 
-    const SCAAlert = simpleContentAccess ? (
-      <Alert type="info">
+    const SCAAlert = (
+      <Alert type={simpleContentAccess ? 'info' : 'warning'}>
         <FormattedMessage
           id="sca-alert"
           values={{
             subscriptionWatch: <a href={SUBSCRIPTION_WATCH_URL} target="_blank" rel="noreferrer">{__('Subscription Watch')}</a>,
             br: <br />,
+            scaLink: <a href={SCA_URL} target="_blank" rel="noreferrer">{__('Simple Content Access')}</a>,
           }}
-          defaultMessage={__(`This organization has Simple Content Access enabled.
+          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}.`)}
+          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.')}
         />
       </Alert>
-    ) : null;
+    );
     return (
       <Grid bsClass="container-fluid">
         <Row>
@@ -271,7 +272,7 @@ class SubscriptionsPage extends Component {
             />
 
             <div id="subscriptions-table" className="modal-container">
-              {SCAAlert}
+              {isManifestImported && SCAAlert}
               <SubscriptionsTable
                 canManageSubscriptionAllocations={canManageSubscriptionAllocations}
                 loadSubscriptions={this.props.loadSubscriptions}

data/webpack/scenes/Tasks/TaskActions.js

@@ -41,3 +41,9 @@ export const startPollingTask = (key, task, handleSuccess) =>
   withInterval(getTask(pollTaskKey(key), task, handleSuccess));
 
 export const stopPollingTask = key => stopInterval(pollTaskKey(key));
+
+export const clearPollTaskData = key => ({
+  type: `${pollTaskKey(key)}_UPDATE`,
+  key: pollTaskKey(key),
+  payload: {},
+});

data/webpack/scenes/Tasks/TaskSelectors.js

@@ -3,5 +3,16 @@ import { bulkSearchKey, pollTaskKey } from './helpers';
 
 export const selectIsPollingTask = (state, key) => selectDoesIntervalExist(state, pollTaskKey(key));
 
+export const selectIsPollingTaskComplete = (state, key) => {
+  const taskKey = pollTaskKey(key);
+  const { response } = state?.API[taskKey] || {};
+  if (response) {
+    const { progress, pending, result } = response;
+    return progress === 1 && pending === false &&
+      (result === 'success' || result === 'error');
+  }
+  return false;
+};
+
 export const selectIsPollingTasks = (state, key) =>
   selectDoesIntervalExist(state, bulkSearchKey(key));

data/webpack/scenes/Tasks/helpers.js

@@ -1,14 +1,18 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
+import store from 'foremanReact/redux';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import { addToast } from 'foremanReact/components/ToastsList/slice.js';
+import { getResponseErrorMsgs } from '../../utils/helpers';
 
 export const bulkSearchKey = key => `${key}_TASK_SEARCH`;
 export const pollTaskKey = key => `${key}_POLL_TASK`;
 
-const link = id => ({
-  children: __('Go to task page'),
-  href: urlBuilder('foreman_tasks/tasks', '', id),
+const link = ({ id, message, baseUrl }) => ({
+  children: message,
+  href: urlBuilder(baseUrl, '', id),
 });
+
 const getErrors = task => (
   <ul>
     {task.humanized.errors.map(e => (
@@ -17,6 +21,18 @@ const getErrors = task => (
   </ul>
 );
 
+const foremanTasksLink = id => link({
+  id,
+  message: __('Go to task page'),
+  baseUrl: 'foreman_tasks/tasks',
+});
+
+const rexJobLink = id => link({
+  id,
+  message: __('Go to job details'),
+  baseUrl: 'job_invocations',
+});
+
 export const renderTaskStartedToast = (task) => {
   if (!task) return;
 
@@ -25,11 +41,48 @@ export const renderTaskStartedToast = (task) => {
   window.tfm.toastNotifications.notify({
     message,
     type: 'info',
-    link: link(task.id),
+    link: foremanTasksLink(task.id),
 
   });
 };
 
+export const renderRexJobStartedToast = ({ id, description, key }) => {
+  if (!id) return;
+  const message = (__(`Job '${description}' has started.`));
+
+  store.dispatch(addToast({
+    message,
+    type: 'info',
+    link: rexJobLink(id),
+    sticky: true,
+    key,
+  }));
+};
+
+export const renderRexJobFailedToast = ({ id, description }) => {
+  if (!id) return;
+
+  const message = (__(`Remote execution job '${description}' failed.`));
+
+  window.tfm.toastNotifications.notify({
+    message,
+    type: 'danger',
+    link: rexJobLink(id),
+  });
+};
+
+export const renderRexJobSucceededToast = ({ id, description }) => {
+  if (!id) return;
+
+  const message = (__(`Job '${description}' completed`));
+
+  window.tfm.toastNotifications.notify({
+    message,
+    type: 'success',
+    link: rexJobLink(id),
+  });
+};
+
 export const taskFinishedToast = (task) => {
   const message = __(`Task ${task.humanized.action} completed with a result of ${task.result}.
   ${task.errors ? getErrors(task) : ''}`);
@@ -37,7 +90,7 @@ export const taskFinishedToast = (task) => {
   return {
     message,
     type: task.result,
-    link: link(task.id),
+    link: foremanTasksLink(task.id),
   };
 };
 
@@ -46,3 +99,5 @@ export const renderTaskFinishedToast = (task) => {
 
   window.tfm.toastNotifications.notify(taskFinishedToast(task));
 };
+
+export const errorToast = error => getResponseErrorMsgs(error.response);

data/webpack/utils/helpers.js

@@ -106,6 +106,8 @@ export const apiError = (actionType, result, additionalData = {}) => (dispatch)
   return resultWithSuccessFlag(result);
 };
 
+export const uniq = items => [...new Set(items)];
+
 export const capitalize = s => s && s[0].toUpperCase() + s.slice(1);
 
 export const truncate = (str = '', truncateLimit = 50) => (str.length > truncateLimit ? `${str.substring(0, truncateLimit - 3)}...` : str);