katello 3.15.0.rc1.3 → 3.15.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -2,6 +2,7 @@
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
+  <div data-extend-template="common/views/katello-agent-notice.html"></div>
   <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
     <span translate>
       If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html

@@ -1,7 +1,8 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
-<h3 translate>Applicable Packages</h3>
 
+<h3 translate>Applicable Packages</h3>
+<div data-extend-template="common/views/katello-agent-notice.html"></div>
 <div data-extend-template="layouts/partials/table.html">
 
   <span data-block="no-rows-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html

@@ -1,5 +1,9 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
+<h3 translate>Installed Packages</h3>
+
+<div data-extend-template="common/views/katello-agent-notice.html"></div>
+
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
     <span translate>
@@ -8,8 +12,6 @@
   </p>
 </section>
 
-<h3 translate>Installed Packages</h3>
-
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
     The host has not reported any installed packages, registering with subscription-manager should cause these to be reported.

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js

@@ -142,7 +142,16 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         };
 
         $scope.autoHealOptions = function () {
-            return [{value: true, name: translate("Yes")}, {value: true, name: translate("No")}];
+            return [
+                {
+                    id: true,
+                    name: translate("Yes")
+                },
+                {
+                    id: false,
+                    name: translate("No")
+                }
+            ];
         };
 
         $scope.serviceLevels = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -81,9 +81,12 @@
           </ul>
         </dd>
 
-        <dt translate>Auto-Attach</dt>
-        <dd ng-if= "simpleContentAccessEnabled" translate> Not Applicable </dd>
-        <dd ng-if= "!simpleContentAccessEnabled" bst-edit-select="host.subscription_facet_attributes.autoheal"
+        <dt translate>Auto-Attach Details</dt>
+        <dd ng-if="simpleContentAccessEnabled" translate>Not Applicable</dd>
+        <dd ng-if="!simpleContentAccessEnabled"
+            bst-edit-select="host.subscription_facet_attributes.autoheal"
+            selector="host.subscription_facet_attributes.autoheal"
+            options="autoHealOptions()"
             readonly="denied('edit_hosts', host)"
             formatter="booleanToYesNo"
             on-save="saveSubscriptionFacet(host)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html

@@ -29,11 +29,13 @@
             Not Applicable
           </span>
           <div ng-if="!simpleContentAccessEnabled">
-          <div bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
+            <div bst-edit-select="host.subscription_facet_attributes.autoheal"
+               options="autoHealOptions()"
+               selector="host.subscription_facet_attributes.autoheal"
                formatter="booleanToYesNo"
                readonly="denied('edit_hosts', host)"
                on-save="saveSubscriptionFacet(host)">
-          </div>
+            </div>
             <a ng-hide="denied('edit_hosts', host)"
                ng-click="autoAttachSubscriptions()"
                class="btn btn-default"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html

@@ -7,7 +7,15 @@
   <p translate>To optionally report tracer information:</p>
   <pre><code>yum -y install katello-host-tools-tracer</code></pre>
 
-  <p translate>For remote actions and reporting package & errata information:</p>
+  <p translate>For remote actions via katello-agent:</p>
   <pre><code>yum -y install katello-agent</code></pre>
+  <section>
+    <p bst-alert="warning" >
+    <span translate>
+      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+    </span>
+    </p>
+  </section>
+
   <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
 </li>

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -3,7 +3,8 @@ require File.expand_path("../engine", File.dirname(__FILE__))
 namespace :katello do
   desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
   task :pulp3_content_switchover => :environment do
-    content_types = Katello::Pulp3::Migration.content_types_for_migration
+    migration_service = Katello::Pulp3::Migration.new(SmartProxy.pulp_master)
+    content_types = migration_service.content_types_for_migration
 
     content_types.each do |content_type|
       if content_type.model_class.where(migrated_pulp3_href: nil).any?

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.0.rc1.3".freeze
+  VERSION = "3.15.0.rc2".freeze
 end

data/webpack/__mocks__/foremanReact/redux/API.js

@@ -0,0 +1,6 @@
+export const get = action => ({
+  ...action,
+  type: 'API_GET',
+});
+
+export default get;

data/webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js

@@ -0,0 +1,6 @@
+export const selectDoesIntervalExist = (state, key) => {
+  const intervals = state.intervals || {};
+  return !!intervals[key];
+};
+
+export default selectDoesIntervalExist;

data/webpack/__mocks__/foremanReact/redux/middlewares/IntervalMiddleware/index.js

@@ -0,0 +1,11 @@
+export const withInterval = (action, interval = 1000) => ({
+  ...action,
+  interval,
+});
+
+export const stopInterval = key => ({
+  type: 'STOP_INTERVAL',
+  key,
+});
+
+export default stopInterval;

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

@@ -4,9 +4,6 @@ import {
   MANIFEST_HISTORY_REQUEST,
   MANIFEST_HISTORY_SUCCESS,
   MANIFEST_HISTORY_FAILURE,
-  UPLOAD_MANIFEST_SUCCESS,
-  DELETE_MANIFEST_SUCCESS,
-  REFRESH_MANIFEST_SUCCESS,
 } from './ManifestConstants';
 
 const initialState = Immutable({ loading: true, results: [] });
@@ -31,15 +28,6 @@ export default (state = initialState, action) => {
         loading: false,
       });
 
-    case UPLOAD_MANIFEST_SUCCESS:
-      return state.set('taskDetails', action.response);
-
-    case DELETE_MANIFEST_SUCCESS:
-      return state.set('taskDetails', action.response);
-
-    case REFRESH_MANIFEST_SUCCESS:
-      return state.set('taskDetails', action.response);
-
     default:
       return state;
   }

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

@@ -19,7 +19,6 @@ import './Manifest.scss';
 const mapStateToProps = state => ({
   organization: state.katello.organization,
   manifestHistory: state.katello.manifestHistory,
-  taskDetails: state.katello.manifestHistory.taskDetails,
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
   deleteManifestModalIsOpen: selectIsModalOpen(state, DELETE_MANIFEST_MODAL_ID),

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -4,6 +4,7 @@ import { isEmpty } from 'lodash';
 import api, { orgId } from '../../services/api';
 
 import {
+  SUBSCRIPTIONS,
   SUBSCRIPTIONS_REQUEST,
   SUBSCRIPTIONS_SUCCESS,
   SUBSCRIPTIONS_FAILURE,
@@ -23,15 +24,21 @@ import {
   SUBSCRIPTIONS_UPDATE_SEARCH_QUERY,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
-  SUBSCRIPTIONS_OPEN_TASK_MODAL,
-  SUBSCRIPTIONS_CLOSE_TASK_MODAL,
   SUBSCRIPTIONS_DISABLE_DELETE_BUTTON,
   SUBSCRIPTIONS_ENABLE_DELETE_BUTTON,
+  BLOCKING_FOREMAN_TASK_TYPES,
+  SUBSCRIPTIONS_RESET_TASKS,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions, selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
-import { pollTaskUntilDone } from '../Tasks/TaskActions';
-import { POLL_TASK_INTERVAL } from '../Tasks/TaskConstants';
+import {
+  startPollingTask,
+  stopPollingTask,
+  startPollingTasks,
+  stopPollingTasks,
+  toastTaskFinished,
+} from '../Tasks/TaskActions';
+import { selectIsPollingTasks, selectIsPollingTask } from '../Tasks/TaskSelectors';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{
@@ -79,8 +86,41 @@ export const loadSubscriptions = (extendedParams = {}) => async (dispatch) => {
   }
 };
 
+export const cancelPollTasks = () => (dispatch, getState) => {
+  if (selectIsPollingTasks(getState(), SUBSCRIPTIONS)) {
+    dispatch(stopPollingTasks(SUBSCRIPTIONS));
+  }
+};
+
+export const pollTasks = () => dispatch => dispatch(startPollingTasks(SUBSCRIPTIONS, {
+  organization_id: orgId(),
+  result: 'pending',
+  label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
+}));
+
+export const resetTasks = () => (dispatch) => {
+  dispatch({
+    type: SUBSCRIPTIONS_RESET_TASKS,
+  });
+};
+
+export const handleTask = task => async (dispatch, getState) => {
+  if (selectIsPollingTask(getState(), SUBSCRIPTIONS)) {
+    if (!task.pending) {
+      dispatch(stopPollingTask(SUBSCRIPTIONS));
+      dispatch(toastTaskFinished(task));
+      dispatch(resetTasks());
+      dispatch(pollTasks());
+      dispatch(loadSubscriptions());
+    }
+  } else {
+    dispatch(cancelPollTasks());
+    dispatch(startPollingTask(SUBSCRIPTIONS, task));
+  }
+};
+
 export const updateQuantity = (quantities = {}) => async (dispatch) => {
-  dispatch({ type: UPDATE_QUANTITY_REQUEST, quantities });
+  dispatch({ type: UPDATE_QUANTITY_REQUEST });
 
   const params = {
     pools: quantities,
@@ -127,8 +167,10 @@ export const deleteSubscriptions = poolIds => async (dispatch) => {
 
   try {
     const { data } = await api.delete(`/organizations/${(orgId())}/upstream_subscriptions`, {}, params);
-    dispatch(pollTaskUntilDone(data.id, {}, POLL_TASK_INTERVAL, Number(orgId())));
-    return dispatch({ type: DELETE_SUBSCRIPTIONS_SUCCESS });
+    return dispatch({
+      type: DELETE_SUBSCRIPTIONS_SUCCESS,
+      response: data,
+    });
   } catch (error) {
     return dispatch(apiError(DELETE_SUBSCRIPTIONS_FAILURE, error));
   }
@@ -142,9 +184,6 @@ export const updateSearchQuery = query => ({
 export const openDeleteModal = () => ({ type: SUBSCRIPTIONS_OPEN_DELETE_MODAL });
 export const closeDeleteModal = () => ({ type: SUBSCRIPTIONS_CLOSE_DELETE_MODAL });
 
-export const openTaskModal = () => ({ type: SUBSCRIPTIONS_OPEN_TASK_MODAL });
-export const closeTaskModal = () => ({ type: SUBSCRIPTIONS_CLOSE_TASK_MODAL });
-
 export const disableDeleteButton = () => ({ type: SUBSCRIPTIONS_DISABLE_DELETE_BUTTON });
 export const enableDeleteButton = () => ({ type: SUBSCRIPTIONS_ENABLE_DELETE_BUTTON });
 

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -1,5 +1,15 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 
+export const SUBSCRIPTIONS = 'SUBSCRIPTIONS';
+
+export const SUBSCRIPTIONS_RESET_TASKS = 'SUBSCRIPTIONS_RESET_TASKS';
+
+export const SUBSCRIPTIONS_TASK_SEARCH_SUCCESS = 'SUBSCRIPTIONS_TASK_SEARCH_SUCCESS';
+export const SUBSCRIPTIONS_TASK_SEARCH_FAILURE = 'SUBSCRIPTIONS_TASK_SEARCH_FAILURE';
+
+export const SUBSCRIPTIONS_POLL_TASK_SUCCESS = 'SUBSCRIPTIONS_POLL_TASK_SUCCESS';
+export const SUBSCRIPTIONS_POLL_TASK_FAILURE = 'SUBSCRIPTIONS_POLL_TASK_FAILURE';
+
 export const SUBSCRIPTIONS_REQUEST = 'SUBSCRIPTIONS_REQUEST';
 export const SUBSCRIPTIONS_SUCCESS = 'SUBSCRIPTIONS_SUCCESS';
 export const SUBSCRIPTIONS_FAILURE = 'SUBSCRIPTIONS_FAILURE';
@@ -24,9 +34,6 @@ export const SUBSCRIPTIONS_UPDATE_SEARCH_QUERY = 'SUBSCRIPTIONS_UPDATE_SEARCH_QU
 export const SUBSCRIPTIONS_OPEN_DELETE_MODAL = 'SUBSCRIPTIONS_OPEN_DELETE_MODAL';
 export const SUBSCRIPTIONS_CLOSE_DELETE_MODAL = 'SUBSCRIPTIONS_CLOSE_DELETE_MODAL';
 
-export const SUBSCRIPTIONS_OPEN_TASK_MODAL = 'SUBSCRIPTIONS_OPEN_TASK_MODAL';
-export const SUBSCRIPTIONS_CLOSE_TASK_MODAL = 'SUBSCRIPTIONS_CLOSE_TASK_MODAL';
-
 export const SUBSCRIPTIONS_DISABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_DISABLE_DELETE_BUTTON';
 export const SUBSCRIPTIONS_ENABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_ENABLE_DELETE_BUTTON';
 
@@ -40,8 +47,6 @@ export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlements',
 ];
 
-export const MANIFEST_TASKS_BULK_SEARCH_ID = 'activeManifestTasksSearch';
-export const BULK_TASK_SEARCH_INTERVAL = 10000;
 export const SUBSCRIPTION_TABLE_NAME = 'Katello::Subscriptions';
 export const SUBSCRIPTION_TABLE_COLUMNS = [
   {

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -3,8 +3,6 @@ import { get } from 'lodash';
 import { GET_SETTING_SUCCESS } from 'foremanReact/components/Settings/SettingsConstants';
 import { initialApiState } from '../../services/api';
 
-import { TASK_BULK_SEARCH_SUCCESS, RESET_TASKS, GET_TASK_SUCCESS } from '../Tasks/TaskConstants';
-
 import {
   SUBSCRIPTIONS_REQUEST,
   SUBSCRIPTIONS_SUCCESS,
@@ -14,30 +12,35 @@ import {
   SUBSCRIPTIONS_QUANTITIES_FAILURE,
   SUBSCRIPTIONS_COLUMNS_REQUEST,
   UPDATE_SUBSCRIPTION_COLUMNS,
-  UPDATE_QUANTITY_REQUEST,
   UPDATE_QUANTITY_SUCCESS,
-  UPDATE_QUANTITY_FAILURE,
   DELETE_SUBSCRIPTIONS_SUCCESS,
-  DELETE_SUBSCRIPTIONS_FAILURE,
   SUBSCRIPTIONS_UPDATE_SEARCH_QUERY,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
-  SUBSCRIPTIONS_OPEN_TASK_MODAL,
-  SUBSCRIPTIONS_CLOSE_TASK_MODAL,
   SUBSCRIPTIONS_DISABLE_DELETE_BUTTON,
   SUBSCRIPTIONS_ENABLE_DELETE_BUTTON,
+  SUBSCRIPTIONS_RESET_TASKS,
+  SUBSCRIPTIONS_TASK_SEARCH_SUCCESS,
+  SUBSCRIPTIONS_TASK_SEARCH_FAILURE,
+  SUBSCRIPTIONS_POLL_TASK_SUCCESS,
+  SUBSCRIPTIONS_POLL_TASK_FAILURE,
 } from './SubscriptionConstants';
 
+import {
+  DELETE_MANIFEST_SUCCESS,
+  UPLOAD_MANIFEST_SUCCESS,
+  REFRESH_MANIFEST_SUCCESS,
+} from './Manifest/ManifestConstants';
+
 const initialState = Immutable({
   ...initialApiState,
   disconnected: false,
   searchQuery: '',
   deleteModalOpened: false,
-  taskModalOpened: false,
   deleteButtonDisabled: true,
   quantitiesLoading: false,
   availableQuantities: null,
-  tasks: [],
+  task: null,
   tableColumns: [],
   selectedTableColumns: [],
 });
@@ -45,7 +48,6 @@ const initialState = Immutable({
 export default (state = initialState, action) => {
   switch (action.type) {
     case SUBSCRIPTIONS_REQUEST:
-    case UPDATE_QUANTITY_REQUEST:
       return state.set('loading', true);
     case SUBSCRIPTIONS_COLUMNS_REQUEST:
       return state
@@ -85,14 +87,6 @@ export default (state = initialState, action) => {
       });
     }
 
-    case DELETE_SUBSCRIPTIONS_SUCCESS:
-      return state
-        .set('deleteButtonDisabled', true)
-        .set('loading', false);
-
-    case UPDATE_QUANTITY_SUCCESS:
-      return state.set('loading', false);
-
     case SUBSCRIPTIONS_FAILURE:
       return state
         .set('loading', false)
@@ -103,12 +97,6 @@ export default (state = initialState, action) => {
           get(action, ['payload', 'messages', 0, 'missing_permissions']),
         );
 
-    case UPDATE_QUANTITY_FAILURE:
-    case DELETE_SUBSCRIPTIONS_FAILURE:
-      return state.merge({
-        loading: false,
-      });
-
     case SUBSCRIPTIONS_QUANTITIES_REQUEST:
       return state.merge({
         quantitiesLoading: true,
@@ -129,25 +117,36 @@ export default (state = initialState, action) => {
       });
     }
 
-    case TASK_BULK_SEARCH_SUCCESS: {
-      const tasks = action.response.results;
-      const prevTasksSize = state.tasks.length;
-      const shouldInitTasks = prevTasksSize === 0 && tasks.length > 0;
-      const isTaskFinished = prevTasksSize > 0 && !state.tasks[0].pending;
-
-      if (shouldInitTasks || isTaskFinished) {
-        return state.set('tasks', tasks);
+    case SUBSCRIPTIONS_TASK_SEARCH_SUCCESS: {
+      if (!state.task) {
+        const tasks = action.response.results;
+        if (tasks.length > 0) {
+          return state
+            .set('task', tasks[0]); // this will be the oldest pending task
+        }
       }
+
       return state;
     }
 
-    case GET_TASK_SUCCESS: {
-      return state.set('tasks', [action.response]);
-    }
+    case DELETE_MANIFEST_SUCCESS:
+    case UPLOAD_MANIFEST_SUCCESS:
+    case REFRESH_MANIFEST_SUCCESS:
+    case UPDATE_QUANTITY_SUCCESS:
+    case SUBSCRIPTIONS_POLL_TASK_SUCCESS:
+      return state
+        .set('task', action.response);
 
-    case RESET_TASKS: {
-      return state.set('tasks', []);
-    }
+    case DELETE_SUBSCRIPTIONS_SUCCESS:
+      return state
+        .set('task', action.response)
+        .set('deleteButtonDisabled', true);
+
+    case SUBSCRIPTIONS_RESET_TASKS:
+    case SUBSCRIPTIONS_TASK_SEARCH_FAILURE:
+    case SUBSCRIPTIONS_POLL_TASK_FAILURE:
+      return state
+        .set('task', null);
 
     case GET_SETTING_SUCCESS: {
       if (action.response.name === 'content_disconnected') {
@@ -165,11 +164,6 @@ export default (state = initialState, action) => {
     case SUBSCRIPTIONS_CLOSE_DELETE_MODAL:
       return state.set('deleteModalOpened', false);
 
-    case SUBSCRIPTIONS_OPEN_TASK_MODAL:
-      return state.set('taskModalOpened', true);
-    case SUBSCRIPTIONS_CLOSE_TASK_MODAL:
-      return state.set('taskModalOpened', false);
-
     case SUBSCRIPTIONS_DISABLE_DELETE_BUTTON:
       return state.set('deleteButtonDisabled', true);
     case SUBSCRIPTIONS_ENABLE_DELETE_BUTTON: