katello 4.4.2.2 → 4.5.0.rc1

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,16 @@
 import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
+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 +19,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,8 +39,20 @@ export const renderTaskStartedToast = (task) => {
   window.tfm.toastNotifications.notify({
     message,
     type: 'info',
-    link: link(task.id),
+    link: foremanTasksLink(task.id),
+
+  });
+};
+
+export const renderRexJobStartedToast = ({ id, description }) => {
+  if (!id) return;
 
+  const message = (__(`Job ${description} has started.`));
+
+  window.tfm.toastNotifications.notify({
+    message,
+    type: 'info',
+    link: rexJobLink(id),
   });
 };
 
@@ -37,7 +63,7 @@ export const taskFinishedToast = (task) => {
   return {
     message,
     type: task.result,
-    link: link(task.id),
+    link: foremanTasksLink(task.id),
   };
 };
 
@@ -46,3 +72,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);