katello 3.16.2 → 3.17.0.rc1

data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap

@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`manage manifest modal should render 1`] = `
-<ForemanModal
+<ConnectedForemanModal
   id="manageManifestModal"
   title="Manage Manifest"
 >
-  <Uncontrolled(Tabs)
+  <ForwardRef
     id="manifest-history-tabs"
   >
     <Tab
@@ -141,8 +141,8 @@ exports[`manage manifest modal should render 1`] = `
         />
       </LoadingState>
     </Tab>
-  </Uncontrolled(Tabs)>
-  <mockConstructor>
+  </ForwardRef>
+  <ForemanModalFooter>
     <Button
       active={false}
       block={false}
@@ -153,6 +153,6 @@ exports[`manage manifest modal should render 1`] = `
     >
       Close
     </Button>
-  </mockConstructor>
-</ForemanModal>
+  </ForemanModalFooter>
+</ConnectedForemanModal>
 `;

data/webpack/scenes/Subscriptions/Manifest/__tests__/manifest.fixtures.js

@@ -207,3 +207,39 @@ export const deleteManifestFailureActions = [
   failureAction('DELETE_MANIFEST_FAILURE'),
   toastErrorAction(),
 ];
+
+export const enableSimpleContentAccessSuccessActions = [
+  {
+    type: 'ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST',
+  },
+  {
+    response: taskSuccessResponse,
+    type: 'ENABLE_SIMPLE_CONTENT_ACCESS_SUCCESS',
+  },
+];
+
+export const enableSimpleContentAccessFailureActions = [
+  {
+    type: 'ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST',
+  },
+  failureAction('ENABLE_SIMPLE_CONTENT_ACCESS_FAILURE'),
+  toastErrorAction(),
+];
+
+export const disableSimpleContentAccessSuccessActions = [
+  {
+    type: 'DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST',
+  },
+  {
+    response: taskSuccessResponse,
+    type: 'DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS',
+  },
+];
+
+export const disableSimpleContentAccessFailureActions = [
+  {
+    type: 'DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST',
+  },
+  failureAction('DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE'),
+  toastErrorAction(),
+];

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

@@ -9,7 +9,7 @@ import * as manifestActions from './ManifestActions';
 import * as organizationActions from '../../Organizations/OrganizationActions';
 import * as tasksActions from '../../Tasks/TaskActions';
 import history from './ManifestHistoryReducer';
-import { selectSimpleContentAccessEnabled } from '../../Organizations/OrganizationSelectors';
+import { selectSimpleContentAccessEnabled, selectIsManifestImported } from '../../Organizations/OrganizationSelectors';
 
 import ManifestModal from './ManageManifestModal';
 
@@ -20,8 +20,10 @@ const mapStateToProps = state => ({
   organization: state.katello.organization,
   manifestHistory: state.katello.manifestHistory,
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
+  isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
   deleteManifestModalIsOpen: selectIsModalOpen(state, DELETE_MANIFEST_MODAL_ID),
+  manifestActionInProgress: state.katello.subscriptions.manifestActionInProgress,
 });
 
 // map action dispatchers to props

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -31,7 +31,7 @@ import {
   MANIFEST_DELETE_TASK_LABEL,
 } from './SubscriptionConstants';
 import { selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
-import { apiError } from '../../move_to_foreman/common/helpers.js';
+import { apiError } from '../../utils/helpers.js';
 import {
   startPollingTask,
   stopPollingTask,

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -37,6 +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://cloud.redhat.com/subscriptions/rhel-sw/all';
+
 export const MANIFEST_DELETE_TASK_LABEL = 'Actions::Katello::Organization::ManifestDelete';
 
 export const BLOCKING_FOREMAN_TASK_TYPES = [
@@ -47,6 +49,8 @@ export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlement',
   'Actions::Katello::UpstreamSubscriptions::RemoveEntitlements',
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlements',
+  'Actions::Katello::Organization::SimpleContentAccess::Enable',
+  'Actions::Katello::Organization::SimpleContentAccess::Disable',
 ];
 
 export const SUBSCRIPTION_TABLE_NAME = 'Katello::Subscriptions';

data/webpack/scenes/Subscriptions/SubscriptionHelpers.js

@@ -3,9 +3,6 @@ export const filterRHSubscriptions = subscriptions =>
   subscriptions.filter(sub =>
     sub.available >= 0 && sub.upstream_pool_id);
 
-export const manifestExists = organization =>
-  organization.owner_details && organization.owner_details.upstreamConsumer;
-
 export const selectSubscriptionsQuantitiesFromResponse = ({ results }) => {
   const quantityMap = {};
 

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -1,6 +1,5 @@
 import Immutable from 'seamless-immutable';
 import { get } from 'lodash';
-import { GET_SETTING_SUCCESS } from 'foremanReact/components/Settings/SettingsConstants';
 import { initialApiState } from '../../services/api';
 
 import {
@@ -30,6 +29,18 @@ import {
   DELETE_MANIFEST_SUCCESS,
   UPLOAD_MANIFEST_SUCCESS,
   REFRESH_MANIFEST_SUCCESS,
+  REFRESH_MANIFEST_FAILURE,
+  ENABLE_SIMPLE_CONTENT_ACCESS_FAILURE,
+  DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE,
+  REFRESH_MANIFEST_REQUEST,
+  DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST,
+  ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST,
+  ENABLE_SIMPLE_CONTENT_ACCESS_SUCCESS,
+  DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS,
+  UPLOAD_MANIFEST_FAILURE,
+  UPLOAD_MANIFEST_REQUEST,
+  DELETE_MANIFEST_FAILURE,
+  DELETE_MANIFEST_REQUEST,
 } from './Manifest/ManifestConstants';
 
 import {
@@ -48,6 +59,7 @@ const initialState = Immutable({
   tableColumns: [],
   selectedTableColumns: [],
   hasUpstreamConnection: false,
+  manifestActionInProgress: false,
 });
 
 export default (state = initialState, action) => {
@@ -142,15 +154,38 @@ export default (state = initialState, action) => {
       return state.merge({
         task: action.response,
         hasUpstreamConnection: false,
+        manifestActionInProgress: false,
       });
 
-    case UPLOAD_MANIFEST_SUCCESS:
-    case REFRESH_MANIFEST_SUCCESS:
     case UPDATE_QUANTITY_SUCCESS:
     case SUBSCRIPTIONS_POLL_TASK_SUCCESS:
       return state
         .set('task', action.response);
 
+    case UPLOAD_MANIFEST_SUCCESS:
+    case REFRESH_MANIFEST_SUCCESS:
+    case ENABLE_SIMPLE_CONTENT_ACCESS_SUCCESS:
+    case DISABLE_SIMPLE_CONTENT_ACCESS_SUCCESS:
+      return state
+        .set('task', action.response)
+        .set('manifestActionInProgress', false);
+
+    case ENABLE_SIMPLE_CONTENT_ACCESS_REQUEST:
+    case DISABLE_SIMPLE_CONTENT_ACCESS_REQUEST:
+    case REFRESH_MANIFEST_REQUEST:
+    case UPLOAD_MANIFEST_REQUEST:
+    case DELETE_MANIFEST_REQUEST:
+      return state
+        .set('manifestActionInProgress', true);
+
+    case ENABLE_SIMPLE_CONTENT_ACCESS_FAILURE:
+    case DISABLE_SIMPLE_CONTENT_ACCESS_FAILURE:
+    case REFRESH_MANIFEST_FAILURE:
+    case UPLOAD_MANIFEST_FAILURE:
+    case DELETE_MANIFEST_FAILURE:
+      return state
+        .set('manifestActionInProgress', false);
+
     case DELETE_SUBSCRIPTIONS_SUCCESS:
       return state
         .set('task', action.response)
@@ -162,14 +197,6 @@ export default (state = initialState, action) => {
       return state
         .set('task', null);
 
-    case GET_SETTING_SUCCESS: {
-      if (action.response.name === 'content_disconnected') {
-        return state.set('disconnected', action.response.value);
-      }
-
-      return state;
-    }
-
     case SUBSCRIPTIONS_UPDATE_SEARCH_QUERY:
       return state.set('searchQuery', action.payload);
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -11,13 +11,12 @@ import ManageManifestModal from './Manifest/';
 import { MANAGE_MANIFEST_MODAL_ID } from './Manifest/ManifestConstants';
 import { SubscriptionsTable } from './components/SubscriptionsTable';
 import SubscriptionsToolbar from './components/SubscriptionsToolbar';
-import { filterRHSubscriptions, manifestExists } from './SubscriptionHelpers';
+import { filterRHSubscriptions } from './SubscriptionHelpers';
 import api, { orgId } from '../../services/api';
+import { CONTENT_DISCONNECTED } from '../Settings/SettingsConstants';
 
 import { createSubscriptionParams } from './SubscriptionActions.js';
-import {
-  SUBSCRIPTION_TABLE_NAME,
-} from './SubscriptionConstants';
+import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTION_WATCH_URL } from './SubscriptionConstants';
 import './SubscriptionsPage.scss';
 
 class SubscriptionsPage extends Component {
@@ -47,12 +46,14 @@ class SubscriptionsPage extends Component {
       hasUpstreamConnection,
       loadAvailableQuantities,
       organization,
+      isManifestImported,
       pingUpstreamSubscriptions,
+      settings,
       subscriptions,
       task,
     } = this.props;
 
-    const { disconnected } = subscriptions;
+    const { disconnected } = settings;
 
     if (task) {
       if (isPollingTask) {
@@ -69,8 +70,8 @@ class SubscriptionsPage extends Component {
         this.loadData();
       }
 
-      if (disconnected === false && disconnected !== prevProps.subscriptions.disconnected) {
-        if (manifestExists(organization)) {
+      if (disconnected === false && disconnected !== prevProps.settings.disconnected) {
+        if (isManifestImported) {
           pingUpstreamSubscriptions();
           this.state.availableQuantitiesLoaded = false;
         }
@@ -97,10 +98,10 @@ class SubscriptionsPage extends Component {
     const {
       hasUpstreamConnection,
       task,
-      subscriptions,
-      organization,
+      settings,
+      isManifestImported,
     } = this.props;
-    const { disconnected } = subscriptions;
+    const { disconnected } = settings;
     let disabledReason = null;
 
     if (disconnected) {
@@ -109,7 +110,7 @@ class SubscriptionsPage extends Component {
       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 (!manifestExists(organization)) {
+    } else if (!isManifestImported) {
       disabledReason = __('This is disabled because no manifest has been uploaded.');
     } else if (!hasUpstreamConnection) {
       disabledReason = __('This is disabled because no connection could be made to the upstream Subscription Allocation.');
@@ -133,7 +134,7 @@ class SubscriptionsPage extends Component {
     } = this.props;
 
     pollTasks();
-    loadSetting('content_disconnected');
+    loadSetting(CONTENT_DISCONNECTED);
     loadSubscriptions();
     await loadTables();
     loadTableColumns(subscriptionTableSettings);
@@ -144,8 +145,8 @@ class SubscriptionsPage extends Component {
     const {
       deleteModalOpened, openDeleteModal, closeDeleteModal,
       deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
-      searchQuery, updateSearchQuery, simpleContentAccess, hasUpstreamConnection,
-      task, activePermissions, subscriptions, subscriptionTableSettings,
+      searchQuery, updateSearchQuery, simpleContentAccess, settings, hasUpstreamConnection,
+      task, activePermissions, subscriptions, subscriptionTableSettings, isManifestImported,
     } = this.props;
     // Basic permissions - should we even show this page?
     if (subscriptions.missingPermissions && subscriptions.missingPermissions.length > 0) {
@@ -159,7 +160,7 @@ class SubscriptionsPage extends Component {
       canImportManifest,
       canEditOrganizations,
     } = permissions;
-    const { disconnected } = subscriptions;
+    const { disconnected } = settings;
     const disableManifestActions = !!task || disconnected || !hasUpstreamConnection;
 
     const openManageManifestModal = () => this.props.setModalOpen({ id: MANAGE_MANIFEST_MODAL_ID });
@@ -233,6 +234,7 @@ class SubscriptionsPage extends Component {
 
             <SubscriptionsToolbar
               canManageSubscriptionAllocations={canManageSubscriptionAllocations}
+              isManifestImported={isManifestImported}
               disableManifestActions={disableManifestActions}
               disableManifestReason={this.getDisabledReason()}
               disableDeleteButton={deleteButtonDisabled}
@@ -259,14 +261,17 @@ class SubscriptionsPage extends Component {
               upload={this.props.uploadManifest}
               delete={this.props.deleteManifest}
               refresh={this.props.refreshManifest}
+              key={task?.id}
             />
 
             <div id="subscriptions-table" className="modal-container">
               {simpleContentAccess && (
                 <Alert type="info">
-                  This organization has Simple Content Access enabled. <br />
+                  This organization has Simple Content Access enabled.
                   Hosts can consume from all repositories in their Content View regardless of
-                  subscription status.
+                  subscription status.  <br />
+                  Learn more about your overall subscription usage at
+                  {' '}<a href={SUBSCRIPTION_WATCH_URL} target="_blank" rel="noreferrer">Subscription Watch</a>.
                 </Alert>
               )}
               <SubscriptionsTable
@@ -309,8 +314,11 @@ SubscriptionsPage.propTypes = {
   updateQuantity: PropTypes.func.isRequired,
   loadTableColumns: PropTypes.func.isRequired,
   simpleContentAccess: PropTypes.bool,
-  subscriptions: PropTypes.shape({
+  isManifestImported: PropTypes.bool,
+  settings: PropTypes.shape({
     disconnected: PropTypes.bool,
+  }),
+  subscriptions: PropTypes.shape({
     // Disabling rule as existing code failed due to an eslint-plugin-react update
     /* eslint-disable react/forbid-prop-types */
     tableColumns: PropTypes.array,
@@ -376,11 +384,15 @@ SubscriptionsPage.defaultProps = {
   deleteButtonDisabled: true,
   subscriptionTableSettings: {},
   simpleContentAccess: false,
+  isManifestImported: false,
   hasUpstreamConnection: false,
   activePermissions: {
     can_import_manifest: false,
     can_manage_subscription_allocations: false,
   },
+  settings: {
+    disconnected: true,
+  },
 };
 
 export default SubscriptionsPage;

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -24,8 +24,5 @@ export const selectIsTaskPending = (state) => {
   return false;
 };
 
-export const selectTableSettings = (state, tableName) =>
-  state.katello.settings.tables[tableName] || undefined;
-
 export const selectHasUpstreamConnection = state =>
   selectSubscriptionsState(state).hasUpstreamConnection;

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

@@ -1,7 +1,7 @@
 import { propsToSnakeCase } from 'foremanReact/common/helpers';
 
 import api, { orgId } from '../../../services/api';
-import { apiError } from '../../../move_to_foreman/common/helpers.js';
+import { apiError } from '../../../utils/helpers.js';
 
 import {
   UPSTREAM_SUBSCRIPTIONS_REQUEST,

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

@@ -8,8 +8,8 @@ import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
 import { Button } from 'patternfly-react';
 import { stringIsPositiveNumber } from 'foremanReact/common/helpers';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import { LoadingState } from '../../../move_to_pf/LoadingState';
-import { Table } from '../../../move_to_foreman/components/common/table';
+import { LoadingState } from '../../../components/LoadingState';
+import { Table } from '../../../components/pf3Table';
 import { columns } from './UpstreamSubscriptionsTableSchema';
 
 class UpstreamSubscriptionsPage extends Component {

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

@@ -4,7 +4,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import {
   headerFormatter,
   cellFormatter,
-} from '../../../move_to_foreman/components/common/table';
+} from '../../../components/pf3Table';
 
 export const columns = controller => [
   {

data/webpack/scenes/Subscriptions/__tests__/SubscriptionHelpers.test.js

@@ -4,7 +4,6 @@ import {
 } from './subscriptions.fixtures';
 import {
   filterRHSubscriptions,
-  manifestExists,
   selectSubscriptionsQuantitiesFromResponse,
 } from '../SubscriptionHelpers';
 
@@ -65,16 +64,6 @@ describe('Subscription helper', () => {
     expect(filteredSubscriptions).toMatchSnapshot();
   });
 
-  it('should check if manifest exists in an organization', () => {
-    const upstreamConsumer = 'some-upstream-consumer';
-
-    expect(manifestExists({
-      owner_details: { upstreamConsumer },
-    })).toBe(upstreamConsumer);
-
-    expect(manifestExists({})).toBeFalsy();
-  });
-
   it('should select subscriptions-quantities from api response', () => {
     const quantities =
       selectSubscriptionsQuantitiesFromResponse(quantitiesRequestSuccessResponse);

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

@@ -63,7 +63,7 @@ Array [
     "payload": Object {
       "key": "SUBSCRIPTIONS_TASK_SEARCH",
       "params": Object {
-        "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements",
+        "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements or Actions::Katello::Organization::SimpleContentAccess::Enable or Actions::Katello::Organization::SimpleContentAccess::Disable",
       },
       "url": "/foreman_tasks/api/tasks",
     },
@@ -98,7 +98,7 @@ Object {
   "payload": Object {
     "key": "SUBSCRIPTIONS_TASK_SEARCH",
     "params": Object {
-      "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements",
+      "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements or Actions::Katello::Organization::SimpleContentAccess::Enable or Actions::Katello::Organization::SimpleContentAccess::Disable",
     },
     "url": "/foreman_tasks/api/tasks",
   },

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

@@ -40,11 +40,11 @@ exports[`subscriptions page should render 1`] = `
         canManageSubscriptionAllocations={false}
         disableAddButton={true}
         disableDeleteButton={true}
-        disableDeleteReason="This is disabled because no subscriptions are selected."
+        disableDeleteReason="This is disabled because disconnected mode is enabled."
         disableManifestActions={true}
-        disableManifestReason="This is disabled because no connection could be made to the upstream Subscription Allocation."
+        disableManifestReason="This is disabled because disconnected mode is enabled."
         getAutoCompleteParams={[Function]}
-        initialInputValue=""
+        isManifestImported={false}
         onDeleteButtonClick={[Function]}
         onExportCsvButtonClick={[Function]}
         onManageManifestButtonClick={[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 disconnected mode is enabled."
         refresh={[Function]}
         taskInProgress={false}
         upload={[Function]}