webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js in katello-3.7.0.rc1 vs webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js in katello-3.7.0.rc2

@@ -2,11 +2,12 @@
 import ReactDOMServer from 'react-dom/server';
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { LinkContainer } from 'react-router-bootstrap';
 import { Grid, Row, Col } from 'react-bootstrap';
-import { bindMethods, Button, Spinner } from 'patternfly-react';
+import { bindMethods, Button } from 'patternfly-react';
+import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
 import helpers from '../../../move_to_foreman/common/helpers';
 import { Table } from '../../../move_to_foreman/components/common/table';
 import { columns } from './UpstreamSubscriptionsTableSchema';
 
@@ -31,11 +32,11 @@
   onChange(value, rowData) {
     const { selectedRows } = this.state;
     const newValue = parseInt(value, 10);
     const pool = {
       ...rowData,
-      id: rowData.pool_id,
+      id: rowData.id,
       updatedQuantity: newValue,
       selected: true,
     };
 
     const match = this.poolInSelectedRows(pool);
@@ -84,11 +85,11 @@
             </a>
           </span>
         );
 
         notify({ message: ReactDOMServer.renderToStaticMarkup(message), type: 'success' });
-        this.props.history.push('/xui/subscriptions');
+        this.props.history.push('/subscriptions');
       } else {
         let errorMessages = [];
 
         if (error.errors) {
           errorMessages = error.errors;
@@ -124,11 +125,11 @@
                 onClick={this.saveUpstreamSubscriptions}
               >
                 {__('Submit')}
               </Button>
 
-              <LinkContainer to="/xui/subscriptions">
+              <LinkContainer to="/subscriptions">
                 <Button>
                   {__('Cancel')}
                 </Button>
               </LinkContainer>
             </Col>
@@ -211,11 +212,11 @@
 
     return (
       <Grid bsClass="container-fluid">
         <h1>{__('Add Subscriptions')}</h1>
 
-        <Spinner loading={upstreamSubscriptions.loading} className="small-spacer">
+        <LoadingState loading={upstreamSubscriptions.loading} loadingText={__('Loading')}>
           <Row>
             <Col sm={12}>
               <Table
                 rows={rows}
                 columns={tableColumns}
@@ -225,10 +226,10 @@
                 onPaginationChange={onPaginationChange}
               />
             </Col>
           </Row>
           {getSubscriptionActions()}
-        </Spinner>
+        </LoadingState>
       </Grid>
     );
   }
 }