katello 3.16.0.rc1.1 → 3.16.0.rc4

data/package.json

@@ -29,8 +29,8 @@
     "@storybook/storybook-deployer": "^2.0.0",
     "@testing-library/jest-dom": "^5.3.0",
     "@testing-library/react": "^10.0.2",
-    "@theforeman/builder": "^4.2.0",
-    "@theforeman/vendor-dev": "^4.2.0",
+    "@theforeman/builder": "4.3.0",
+    "@theforeman/vendor-dev": "4.3.0",
     "axios-mock-adapter": "^1.10.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
@@ -56,8 +56,8 @@
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0"
   },
-  "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
+    "@theforeman/vendor-core": "4.3.0",
     "@patternfly/react-icons": "^3.15.15",
     "@patternfly/react-tokens": "^2.8.13",
     "angular": "1.7.9",

data/webpack/components/Content/ContentTable.js

@@ -34,6 +34,8 @@ const ContentTable = ({ content, tableSchema, onPaginationChange }) => {
 ContentTable.propTypes = {
   content: PropTypes.shape({
     loading: PropTypes.bool,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     itemCount: PropTypes.number,

data/webpack/components/Content/Details/ContentDetails.js

@@ -59,9 +59,12 @@ ContentDetails.propTypes = {
   contentDetails: PropTypes.shape({
     loading: PropTypes.bool,
     name: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     profiles: PropTypes.array,
     repositories: PropTypes.array,
     artifacts: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
     stream: PropTypes.string,
   }).isRequired,
   schema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,

data/webpack/global_test_setup.js

@@ -4,3 +4,6 @@
 global.console.error = (error) => {
   throw new Error(error);
 };
+
+// Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
+jest.setTimeout(10000);

data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js

@@ -83,8 +83,11 @@ AnsibleCollectionDetails.propTypes = {
     name: PropTypes.string,
     namespace: PropTypes.string,
     version: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     repositories: PropTypes.array,
     tags: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
   }).isRequired,
 };
 

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js

@@ -81,9 +81,12 @@ ModuleStreamDetails.propTypes = {
   moduleStreamDetails: PropTypes.shape({
     loading: PropTypes.bool,
     name: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     profiles: PropTypes.array,
     repositories: PropTypes.array,
     artifacts: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
     stream: PropTypes.string,
   }).isRequired,
 };

data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js

@@ -111,6 +111,8 @@ RedHatRepositoriesPage.propTypes = {
     recommended: PropTypes.bool,
     loading: PropTypes.bool,
     search: PropTypes.shape({}),
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     missingPermissions: PropTypes.array,
   }).isRequired,
 };

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js

@@ -94,6 +94,8 @@ EnabledRepository.propTypes = {
   search: PropTypes.shape({
     query: PropTypes.string,
     searchList: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     filters: PropTypes.array,
   }),
   pagination: PropTypes.shape({

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js

@@ -141,6 +141,8 @@ RepositorySetRepository.propTypes = {
   enabledSearch: PropTypes.shape({
     query: PropTypes.string,
     searchList: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     filters: PropTypes.array,
   }),
   enabledPagination: PropTypes.shape({

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailAssociations.js

@@ -45,6 +45,8 @@ SubscriptionDetailAssociations.propTypes = {
   subscriptionDetails: PropTypes.shape({
     id: PropTypes.number,
     host_count: PropTypes.number,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     activation_keys: PropTypes.array,
   }).isRequired,
 };

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailProductContent.js

@@ -50,6 +50,8 @@ const SubscriptionDetailProductContent = ({ productContent }) => {
 
 SubscriptionDetailProductContent.propTypes = {
   productContent: PropTypes.shape({
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
 };

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailProducts.js

@@ -18,6 +18,8 @@ const SubscriptionDetailProducts = ({ subscriptionDetails }) => (
 
 SubscriptionDetailProducts.propTypes = {
   subscriptionDetails: PropTypes.shape({
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     provided_products: PropTypes.array,
   }).isRequired,
 };

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

@@ -352,6 +352,8 @@ ManageManifestModal.propTypes = {
   simpleContentAccess: PropTypes.bool,
   manifestHistory: PropTypes.shape({
     loading: PropTypes.bool,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
   setModalClosed: PropTypes.func.isRequired,

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -28,8 +28,9 @@ import {
   SUBSCRIPTIONS_ENABLE_DELETE_BUTTON,
   BLOCKING_FOREMAN_TASK_TYPES,
   SUBSCRIPTIONS_RESET_TASKS,
+  MANIFEST_DELETE_TASK_LABEL,
 } from './SubscriptionConstants';
-import { filterRHSubscriptions, selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
+import { selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
 import {
   startPollingTask,
@@ -38,7 +39,8 @@ import {
   stopPollingTasks,
   toastTaskFinished,
 } from '../Tasks/TaskActions';
-import { selectIsPollingTasks, selectIsPollingTask } from '../Tasks/TaskSelectors';
+import { selectIsPollingTasks } from '../Tasks/TaskSelectors';
+import { pingUpstreamSubscriptions } from './UpstreamSubscriptions/UpstreamSubscriptionsActions';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{
@@ -51,10 +53,8 @@ export const createSubscriptionParams = (extendedParams = {}) => ({
 export const loadAvailableQuantities = (extendedParams = {}) => async (dispatch) => {
   dispatch({ type: SUBSCRIPTIONS_QUANTITIES_REQUEST });
 
-  const params = createSubscriptionParams(extendedParams);
-
   try {
-    const { data } = await api.get(`/organizations/${orgId()}/upstream_subscriptions`, {}, params);
+    const { data } = await api.get(`/organizations/${orgId()}/upstream_subscriptions`, {}, propsToSnakeCase(extendedParams));
     return dispatch({
       type: SUBSCRIPTIONS_QUANTITIES_SUCCESS,
       payload: selectSubscriptionsQuantitiesFromResponse(data),
@@ -76,10 +76,6 @@ export const loadSubscriptions = (extendedParams = {}) => async (dispatch) => {
       response: data,
       search: extendedParams.search,
     });
-    const poolIds = filterRHSubscriptions(data.results).map(subs => subs.id);
-    if (poolIds.length > 0) {
-      dispatch(loadAvailableQuantities({ poolIds }));
-    }
     return result;
   } catch (error) {
     return dispatch(apiError(SUBSCRIPTIONS_FAILURE, error));
@@ -104,21 +100,23 @@ export const resetTasks = () => (dispatch) => {
   });
 };
 
-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 handleFinishedTask = task => (dispatch) => {
+  dispatch(stopPollingTask(SUBSCRIPTIONS));
+  dispatch(toastTaskFinished(task));
+  dispatch(resetTasks());
+  dispatch(pollTasks());
+  dispatch(loadSubscriptions());
+
+  if (task.label !== MANIFEST_DELETE_TASK_LABEL) {
+    dispatch(pingUpstreamSubscriptions());
   }
 };
 
+export const handleStartTask = task => (dispatch) => {
+  dispatch(cancelPollTasks());
+  dispatch(startPollingTask(SUBSCRIPTIONS, task));
+};
+
 export const updateQuantity = (quantities = {}) => async (dispatch) => {
   dispatch({ type: UPDATE_QUANTITY_REQUEST });
 

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -37,10 +37,12 @@ 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 MANIFEST_DELETE_TASK_LABEL = 'Actions::Katello::Organization::ManifestDelete';
+
 export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::Organization::ManifestImport',
   'Actions::Katello::Organization::ManifestRefresh',
-  'Actions::Katello::Organization::ManifestDelete',
+  MANIFEST_DELETE_TASK_LABEL,
   'Actions::Katello::UpstreamSubscriptions::BindEntitlements',
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlement',
   'Actions::Katello::UpstreamSubscriptions::RemoveEntitlements',

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -32,9 +32,13 @@ import {
   REFRESH_MANIFEST_SUCCESS,
 } from './Manifest/ManifestConstants';
 
+import {
+  PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS,
+  PING_UPSTREAM_SUBSCRIPTIONS_FAILURE,
+} from './UpstreamSubscriptions/UpstreamSubscriptionsConstants';
+
 const initialState = Immutable({
   ...initialApiState,
-  disconnected: false,
   searchQuery: '',
   deleteModalOpened: false,
   deleteButtonDisabled: true,
@@ -43,10 +47,15 @@ const initialState = Immutable({
   task: null,
   tableColumns: [],
   selectedTableColumns: [],
+  hasUpstreamConnection: false,
 });
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case PING_UPSTREAM_SUBSCRIPTIONS_SUCCESS:
+      return state.set('hasUpstreamConnection', true);
+    case PING_UPSTREAM_SUBSCRIPTIONS_FAILURE:
+      return state.set('hasUpstreamConnection', false);
     case SUBSCRIPTIONS_REQUEST:
       return state.set('loading', true);
     case SUBSCRIPTIONS_COLUMNS_REQUEST:
@@ -130,6 +139,11 @@ export default (state = initialState, action) => {
     }
 
     case DELETE_MANIFEST_SUCCESS:
+      return state.merge({
+        task: action.response,
+        hasUpstreamConnection: false,
+      });
+
     case UPLOAD_MANIFEST_SUCCESS:
     case REFRESH_MANIFEST_SUCCESS:
     case UPDATE_QUANTITY_SUCCESS:

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -11,7 +11,7 @@ import ManageManifestModal from './Manifest/';
 import { MANAGE_MANIFEST_MODAL_ID } from './Manifest/ManifestConstants';
 import { SubscriptionsTable } from './components/SubscriptionsTable';
 import SubscriptionsToolbar from './components/SubscriptionsToolbar';
-import { manifestExists } from './SubscriptionHelpers';
+import { filterRHSubscriptions, manifestExists } from './SubscriptionHelpers';
 import api, { orgId } from '../../services/api';
 
 import { createSubscriptionParams } from './SubscriptionActions.js';
@@ -25,6 +25,7 @@ class SubscriptionsPage extends Component {
     super(props);
     this.state = {
       selectedRows: [],
+      availableQuantitiesLoaded: false,
     };
   }
 
@@ -39,17 +40,52 @@ class SubscriptionsPage extends Component {
 
   componentDidUpdate(prevProps) {
     const {
-      organization, task, handleTask,
+      handleStartTask,
+      handleFinishedTask,
+      isTaskPending,
+      isPollingTask,
+      hasUpstreamConnection,
+      loadAvailableQuantities,
+      organization,
+      pingUpstreamSubscriptions,
+      subscriptions,
+      task,
     } = this.props;
 
+    const { disconnected } = subscriptions;
+
     if (task) {
-      handleTask(task);
+      if (isPollingTask) {
+        if (prevProps.isTaskPending && !isTaskPending) {
+          handleFinishedTask(task);
+        }
+      } else {
+        handleStartTask(task);
+      }
     }
 
     if (organization) {
       if (!prevProps.organization || prevProps.organization.id !== organization.id) {
         this.loadData();
       }
+
+      if (disconnected === false && disconnected !== prevProps.subscriptions.disconnected) {
+        if (manifestExists(organization)) {
+          pingUpstreamSubscriptions();
+          this.state.availableQuantitiesLoaded = false;
+        }
+      }
+    }
+
+    if (hasUpstreamConnection) {
+      const subscriptionsChanged = subscriptions.results !== prevProps.subscriptions.results;
+      if (subscriptionsChanged || !this.state.availableQuantitiesLoaded) {
+        const poolIds = filterRHSubscriptions(subscriptions.results).map(subs => subs.id);
+        if (poolIds.length > 0) {
+          loadAvailableQuantities({ poolIds });
+          this.state.availableQuantitiesLoaded = true;
+        }
+      }
     }
   }
 
@@ -58,7 +94,12 @@ class SubscriptionsPage extends Component {
   }
 
   getDisabledReason(deleteButton) {
-    const { task, subscriptions, organization } = this.props;
+    const {
+      hasUpstreamConnection,
+      task,
+      subscriptions,
+      organization,
+    } = this.props;
     const { disconnected } = subscriptions;
     let disabledReason = null;
 
@@ -70,6 +111,8 @@ class SubscriptionsPage extends Component {
       disabledReason = __('This is disabled because no subscriptions are selected.');
     } else if (!manifestExists(organization)) {
       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.');
     }
 
     return disabledReason;
@@ -101,8 +144,8 @@ class SubscriptionsPage extends Component {
     const {
       deleteModalOpened, openDeleteModal, closeDeleteModal,
       deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
-      searchQuery, updateSearchQuery, simpleContentAccess,
-      task, activePermissions, subscriptions, organization, subscriptionTableSettings,
+      searchQuery, updateSearchQuery, simpleContentAccess, hasUpstreamConnection,
+      task, activePermissions, subscriptions, subscriptionTableSettings,
     } = this.props;
     // Basic permissions - should we even show this page?
     if (subscriptions.missingPermissions && subscriptions.missingPermissions.length > 0) {
@@ -117,7 +160,7 @@ class SubscriptionsPage extends Component {
       canEditOrganizations,
     } = permissions;
     const { disconnected } = subscriptions;
-    const disableManifestActions = !!task || disconnected;
+    const disableManifestActions = !!task || disconnected || !hasUpstreamConnection;
 
     const openManageManifestModal = () => this.props.setModalOpen({ id: MANAGE_MANIFEST_MODAL_ID });
 
@@ -194,7 +237,7 @@ class SubscriptionsPage extends Component {
               disableManifestReason={this.getDisabledReason()}
               disableDeleteButton={deleteButtonDisabled}
               disableDeleteReason={this.getDisabledReason(true)}
-              disableAddButton={!manifestExists(organization)}
+              disableAddButton={disableManifestActions}
               getAutoCompleteParams={getAutoCompleteParams}
               updateSearchQuery={updateSearchQuery}
               onDeleteButtonClick={openDeleteModal}
@@ -240,6 +283,7 @@ class SubscriptionsPage extends Component {
                 task={task}
                 selectedRows={this.state.selectedRows}
                 onSelectedRowsChange={this.handleSelectedRowsChange}
+                selectionEnabled={!disableManifestActions}
               />
               <ModalProgressBar
                 show={!!task}
@@ -256,7 +300,9 @@ class SubscriptionsPage extends Component {
 }
 
 SubscriptionsPage.propTypes = {
+  pingUpstreamSubscriptions: PropTypes.func.isRequired,
   loadSubscriptions: PropTypes.func.isRequired,
+  loadAvailableQuantities: PropTypes.func.isRequired,
   uploadManifest: PropTypes.func.isRequired,
   deleteManifest: PropTypes.func.isRequired,
   resetTasks: PropTypes.func.isRequired,
@@ -265,9 +311,13 @@ SubscriptionsPage.propTypes = {
   simpleContentAccess: PropTypes.bool,
   subscriptions: PropTypes.shape({
     disconnected: PropTypes.bool,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     tableColumns: PropTypes.array,
     selectedTableColumns: PropTypes.array,
     missingPermissions: PropTypes.array,
+    results: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
   }).isRequired,
   activePermissions: PropTypes.shape({
     can_delete_manifest: PropTypes.bool,
@@ -291,9 +341,13 @@ SubscriptionsPage.propTypes = {
     }),
     pending: PropTypes.bool,
   }),
+  isTaskPending: PropTypes.bool,
+  isPollingTask: PropTypes.bool,
   pollTasks: PropTypes.func.isRequired,
   cancelPollTasks: PropTypes.func.isRequired,
-  handleTask: PropTypes.func.isRequired,
+  handleStartTask: PropTypes.func.isRequired,
+  handleFinishedTask: PropTypes.func.isRequired,
+  hasUpstreamConnection: PropTypes.bool,
   loadSetting: PropTypes.func.isRequired,
   loadTables: PropTypes.func.isRequired,
   createColumns: PropTypes.func.isRequired,
@@ -314,12 +368,15 @@ SubscriptionsPage.propTypes = {
 
 SubscriptionsPage.defaultProps = {
   task: undefined,
+  isTaskPending: undefined,
+  isPollingTask: undefined,
   organization: undefined,
   searchQuery: '',
   deleteModalOpened: false,
   deleteButtonDisabled: true,
   subscriptionTableSettings: {},
   simpleContentAccess: false,
+  hasUpstreamConnection: false,
   activePermissions: {
     can_import_manifest: false,
     can_manage_subscription_allocations: false,