katello 4.3.0.rc4 → 4.4.0.rc2

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

@@ -14,7 +14,7 @@ import DeleteManifestModalText from './DeleteManifestModalText';
 import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
 import { CONTENT_CREDENTIAL_CERT_TYPE } from '../../ContentCredentials/ContentCredentialConstants';
 import SimpleContentAccess from './SimpleContentAccess';
-import CdnConfigurationForm from './CdnConfigurationForm';
+import CdnConfigurationForm from './CdnConfigurationTab';
 
 import './ManageManifestModal.scss';
 
@@ -52,6 +52,10 @@ class ManageManifestModal extends Component {
     }
   };
 
+  reloadOrganization = () => {
+    this.props.loadOrganization();
+  }
+
   uploadManifest = (fileList) => {
     if (fileList.length > 0) {
       this.props.upload(fileList[0]);
@@ -155,7 +159,7 @@ class ManageManifestModal extends Component {
                           simpleContentAccessEligible={simpleContentAccessEligible}
                         />
                       </Row>
-                        }
+                      }
                       <Row>
                         <Col sm={5}>
                           <strong>{__('Subscription Allocation')}</strong>
@@ -172,7 +176,7 @@ class ManageManifestModal extends Component {
                           >
                             <div>{__('Import New Manifest')}</div>
                           </ControlLabel>
-                            }
+                          }
                         </Col>
                         <Col sm={7} className="manifest-actions">
                           <Spinner loading={actionInProgress} />
@@ -184,7 +188,7 @@ class ManageManifestModal extends Component {
                             disabled={actionInProgress}
                             onChange={e => this.uploadManifest(e.target.files)}
                           />
-                            }
+                          }
                           <div id="manifest-actions-row">
                             {canImportManifest &&
                             <TooltipButton
@@ -196,7 +200,7 @@ class ManageManifestModal extends Component {
                               disabled={!isManifestImported ||
                                     actionInProgress || disableManifestActions}
                             />
-                              }
+                            }
                             {canDeleteManifest &&
                             <React.Fragment>
                               <TooltipButton
@@ -209,7 +213,7 @@ class ManageManifestModal extends Component {
                                 tooltipPlacement="top"
                               />
                             </React.Fragment>
-                              }
+                            }
                           </div>
                           <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
                             <DeleteManifestModalText />
@@ -247,6 +251,7 @@ class ManageManifestModal extends Component {
                 <CdnConfigurationForm
                   cdnConfiguration={organization.cdn_configuration}
                   contentCredentials={contentCredentials}
+                  onUpdate={this.reloadOrganization}
                 />
               </Grid>
             </Tab>

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

@@ -10,25 +10,25 @@ const initialState = Immutable({ loading: true, results: [] });
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case MANIFEST_HISTORY_REQUEST:
-      return state.set('loading', true);
+  case MANIFEST_HISTORY_REQUEST:
+    return state.set('loading', true);
 
-    case MANIFEST_HISTORY_SUCCESS: {
-      const results = action.response;
+  case MANIFEST_HISTORY_SUCCESS: {
+    const results = action.response;
 
-      return state.merge({
-        results,
-        loading: false,
-      });
-    }
+    return state.merge({
+      results,
+      loading: false,
+    });
+  }
 
-    case MANIFEST_HISTORY_FAILURE:
-      return state.merge({
-        error: action.payload.message,
-        loading: false,
-      });
+  case MANIFEST_HISTORY_FAILURE:
+    return state.merge({
+      error: action.payload.message,
+      loading: false,
+    });
 
-    default:
-      return state;
+  default:
+    return state;
   }
 };

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -69,160 +69,160 @@ const initialState = Immutable({
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS:
-      return state.set('simpleContentAccessEligible', action.response.simple_content_access_eligible);
-    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:
-      return state
-        .set('tableColumns', action.payload.tableColumns);
-    case UPDATE_SUBSCRIPTION_COLUMNS:
-      return state
-        .set('selectedTableColumns', action.payload.enabledColumns);
-    case SUBSCRIPTIONS_SUCCESS: {
-      const {
-        page,
-        per_page, // eslint-disable-line camelcase
-        subtotal,
-        results,
-        can_import_manifest, // eslint-disable-line camelcase
-        can_delete_manifest, // eslint-disable-line camelcase
-        can_manage_subscription_allocations, // eslint-disable-line camelcase
-        can_edit_organizations, // eslint-disable-line camelcase
-      } = action.response;
-
-      return state.merge({
-        results,
-        activePermissions: {
-          can_import_manifest,
-          can_delete_manifest,
-          can_manage_subscription_allocations,
-          can_edit_organizations,
-        },
-        loading: false,
-        searchIsActive: !!action.search,
-        search: action.search,
-        pagination: {
-          page: Number(page),
-          // eslint-disable-next-line camelcase
-          perPage: Number(per_page || state.pagination.perPage),
-        },
-        itemCount: Number(subtotal),
-      });
-    }
+  case SIMPLE_CONTENT_ACCESS_ELIGIBLE_SUCCESS:
+    return state.set('simpleContentAccessEligible', action.response.simple_content_access_eligible);
+  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:
+    return state
+      .set('tableColumns', action.payload.tableColumns);
+  case UPDATE_SUBSCRIPTION_COLUMNS:
+    return state
+      .set('selectedTableColumns', action.payload.enabledColumns);
+  case SUBSCRIPTIONS_SUCCESS: {
+    const {
+      page,
+      per_page, // eslint-disable-line camelcase
+      subtotal,
+      results,
+      can_import_manifest, // eslint-disable-line camelcase
+      can_delete_manifest, // eslint-disable-line camelcase
+      can_manage_subscription_allocations, // eslint-disable-line camelcase
+      can_edit_organizations, // eslint-disable-line camelcase
+    } = action.response;
+
+    return state.merge({
+      results,
+      activePermissions: {
+        can_import_manifest,
+        can_delete_manifest,
+        can_manage_subscription_allocations,
+        can_edit_organizations,
+      },
+      loading: false,
+      searchIsActive: !!action.search,
+      search: action.search,
+      pagination: {
+        page: Number(page),
+        // eslint-disable-next-line camelcase
+        perPage: Number(per_page || state.pagination.perPage),
+      },
+      itemCount: Number(subtotal),
+    });
+  }
 
-    case SUBSCRIPTIONS_FAILURE:
-      return state
-        .set('loading', false)
-        .set('results', [])
-        .set('itemCount', 0)
-        .set(
-          'missingPermissions',
-          get(action, ['payload', 'messages', 0, 'missing_permissions']),
-        );
-
-    case SUBSCRIPTIONS_QUANTITIES_REQUEST:
-      return state.merge({
-        quantitiesLoading: true,
-        availableQuantities: null,
-      });
-
-    case SUBSCRIPTIONS_QUANTITIES_SUCCESS: {
-      return state.merge({
-        quantitiesLoading: false,
-        availableQuantities: action.payload,
-      });
-    }
+  case SUBSCRIPTIONS_FAILURE:
+    return state
+      .set('loading', false)
+      .set('results', [])
+      .set('itemCount', 0)
+      .set(
+        'missingPermissions',
+        get(action, ['payload', 'messages', 0, 'missing_permissions']),
+      );
+
+  case SUBSCRIPTIONS_QUANTITIES_REQUEST:
+    return state.merge({
+      quantitiesLoading: true,
+      availableQuantities: null,
+    });
+
+  case SUBSCRIPTIONS_QUANTITIES_SUCCESS: {
+    return state.merge({
+      quantitiesLoading: false,
+      availableQuantities: action.payload,
+    });
+  }
 
-    case SUBSCRIPTIONS_QUANTITIES_FAILURE: {
-      return state.merge({
-        quantitiesLoading: false,
-        availableQuantities: {},
-      });
-    }
+  case SUBSCRIPTIONS_QUANTITIES_FAILURE: {
+    return state.merge({
+      quantitiesLoading: false,
+      availableQuantities: {},
+    });
+  }
 
-    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
-        }
+  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 DELETE_MANIFEST_SUCCESS:
-      return state.merge({
-        task: action.response,
-        hasUpstreamConnection: false,
-        manifestActionStarted: false,
-      });
-
-    case SUBSCRIPTIONS_POLL_TASK_SUCCESS:
-      return state
-        .set('task', action.response);
-
-    case UPDATE_QUANTITY_SUCCESS:
-    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('manifestActionStarted', 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:
-    case UPDATE_QUANTITY_REQUEST:
-    case DELETE_SUBSCRIPTIONS_REQUEST:
-      return state
-        .set('manifestActionStarted', 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:
-    case DELETE_SUBSCRIPTIONS_FAILURE:
-    case UPDATE_QUANTITY_FAILURE:
-      return state
-        .set('manifestActionStarted', false);
-
-    case DELETE_SUBSCRIPTIONS_SUCCESS:
-      return state
-        .set('task', action.response)
-        .set('manifestActionStarted', false)
-        .set('deleteButtonDisabled', true);
-
-    case SUBSCRIPTIONS_RESET_TASKS:
-    case SUBSCRIPTIONS_TASK_SEARCH_FAILURE:
-    case SUBSCRIPTIONS_POLL_TASK_FAILURE:
-      return state
-        .set('task', null);
-
-    case SUBSCRIPTIONS_UPDATE_SEARCH_QUERY:
-      return state.set('searchQuery', action.payload);
-
-    case SUBSCRIPTIONS_OPEN_DELETE_MODAL:
-      return state.set('deleteModalOpened', true);
-    case SUBSCRIPTIONS_CLOSE_DELETE_MODAL:
-      return state.set('deleteModalOpened', false);
-
-    case SUBSCRIPTIONS_DISABLE_DELETE_BUTTON:
-      return state.set('deleteButtonDisabled', true);
-    case SUBSCRIPTIONS_ENABLE_DELETE_BUTTON:
-      return state.set('deleteButtonDisabled', false);
-
-    default:
-      return state;
+    return state;
+  }
+
+  case DELETE_MANIFEST_SUCCESS:
+    return state.merge({
+      task: action.response,
+      hasUpstreamConnection: false,
+      manifestActionStarted: false,
+    });
+
+  case SUBSCRIPTIONS_POLL_TASK_SUCCESS:
+    return state
+      .set('task', action.response);
+
+  case UPDATE_QUANTITY_SUCCESS:
+  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('manifestActionStarted', 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:
+  case UPDATE_QUANTITY_REQUEST:
+  case DELETE_SUBSCRIPTIONS_REQUEST:
+    return state
+      .set('manifestActionStarted', 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:
+  case DELETE_SUBSCRIPTIONS_FAILURE:
+  case UPDATE_QUANTITY_FAILURE:
+    return state
+      .set('manifestActionStarted', false);
+
+  case DELETE_SUBSCRIPTIONS_SUCCESS:
+    return state
+      .set('task', action.response)
+      .set('manifestActionStarted', false)
+      .set('deleteButtonDisabled', true);
+
+  case SUBSCRIPTIONS_RESET_TASKS:
+  case SUBSCRIPTIONS_TASK_SEARCH_FAILURE:
+  case SUBSCRIPTIONS_POLL_TASK_FAILURE:
+    return state
+      .set('task', null);
+
+  case SUBSCRIPTIONS_UPDATE_SEARCH_QUERY:
+    return state.set('searchQuery', action.payload);
+
+  case SUBSCRIPTIONS_OPEN_DELETE_MODAL:
+    return state.set('deleteModalOpened', true);
+  case SUBSCRIPTIONS_CLOSE_DELETE_MODAL:
+    return state.set('deleteModalOpened', false);
+
+  case SUBSCRIPTIONS_DISABLE_DELETE_BUTTON:
+    return state.set('deleteButtonDisabled', true);
+  case SUBSCRIPTIONS_ENABLE_DELETE_BUTTON:
+    return state.set('deleteButtonDisabled', false);
+
+  default:
+    return state;
   }
 };

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

@@ -13,46 +13,46 @@ const initialState = initialApiState;
 
 export default (state = initialState, action) => {
   switch (action.type) {
-    case UPSTREAM_SUBSCRIPTIONS_REQUEST:
-      return state.set('loading', true);
-
-    case UPSTREAM_SUBSCRIPTIONS_SUCCESS: {
-      const {
-        page, per_page, total, results, // eslint-disable-line camelcase
-
-      } = action.response;
-
-      return state.merge({
-        results,
-        loading: false,
-        searchIsActive: !!action.search,
-        search: action.search,
-        pagination: {
-          page: Number(page),
-          // eslint-disable-next-line camelcase
-          perPage: Number(per_page || state.pagination.perPage),
-        },
-        itemCount: Number(total),
-      });
-    }
-
-    case UPSTREAM_SUBSCRIPTIONS_FAILURE:
-      return state.merge({
-        error: action.payload.message,
-        loading: false,
-      });
-
-    case SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST:
-      return state.set('loading', true);
-
-    case SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS:
-      return state.set('task', action.response).set('loading', false);
-
-    case SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE: {
-      return state.set('error', action.payload.message).set('loading', false);
-    }
-
-    default:
-      return state;
+  case UPSTREAM_SUBSCRIPTIONS_REQUEST:
+    return state.set('loading', true);
+
+  case UPSTREAM_SUBSCRIPTIONS_SUCCESS: {
+    const {
+      page, per_page, total, results, // eslint-disable-line camelcase
+
+    } = action.response;
+
+    return state.merge({
+      results,
+      loading: false,
+      searchIsActive: !!action.search,
+      search: action.search,
+      pagination: {
+        page: Number(page),
+        // eslint-disable-next-line camelcase
+        perPage: Number(per_page || state.pagination.perPage),
+      },
+      itemCount: Number(total),
+    });
+  }
+
+  case UPSTREAM_SUBSCRIPTIONS_FAILURE:
+    return state.merge({
+      error: action.payload.message,
+      loading: false,
+    });
+
+  case SAVE_UPSTREAM_SUBSCRIPTIONS_REQUEST:
+    return state.set('loading', true);
+
+  case SAVE_UPSTREAM_SUBSCRIPTIONS_SUCCESS:
+    return state.set('task', action.response).set('loading', false);
+
+  case SAVE_UPSTREAM_SUBSCRIPTIONS_FAILURE: {
+    return state.set('error', action.payload.message).set('loading', false);
+  }
+
+  default:
+    return state;
   }
 };

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

@@ -6,7 +6,6 @@ import { successState } from './upstreamSubscriptions.fixtures';
 import { loadUpstreamSubscriptions, saveUpstreamSubscriptions } from '../UpstreamSubscriptionsActions';
 
 jest.mock('foremanReact/components/BreadcrumbBar');
-jest.mock('foremanReact/components/Pagination/PaginationWrapper');
 
 describe('upstream subscriptions page', () => {
   let shallowWrapper;

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

@@ -9,7 +9,6 @@ import { checkSimpleContentAccessEligible } from '../Manifest/ManifestActions';
 import { createColumns, updateColumns } from '../../../scenes/Settings/Tables/TableActions';
 
 jest.mock('foremanReact/components/PermissionDenied');
-jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 jest.mock('foremanReact/components/ForemanModal', () => (<div>ForemanModal Mock</div>));
 
 const loadTables = () => new Promise((resolve) => {

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

@@ -43,7 +43,8 @@ Array [
   },
   Object {
     "payload": Object {
-      "message": Object {
+      "key": "addToast",
+      "toast": Object {
         "link": Object {
           "children": "Go to task page",
           "href": "/foreman_tasks/tasks/eb1b6271-8a69-4d98-84fc-bea06ddcc166/",
@@ -53,7 +54,7 @@ Array [
         "type": "pending",
       },
     },
-    "type": "TOASTS_ADD",
+    "type": "toasts/addToast",
   },
   Object {
     "type": "SUBSCRIPTIONS_RESET_TASKS",

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js

@@ -8,6 +8,10 @@ import { successState, loadingState, emptyState, groupedSubscriptions } from '..
 import { loadSubscriptions, updateQuantity } from '../../../SubscriptionActions';
 
 jest.useFakeTimers();
+jest.mock('foremanReact/components/Pagination', () => ({
+  __esModule: true,
+  default: () => <div>MockPagination</div>,
+}));
 
 const tableColumns = [
   'id',

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap

@@ -141,6 +141,9 @@ exports[`subscriptions table should disable checkboxes for custom subscriptions
       </tr>
     </tbody>
   </table>
+  <div>
+    MockPagination
+  </div>
 </div>
 `;
 
@@ -306,6 +309,9 @@ exports[`subscriptions table should render a table 1`] = `
       </tr>
     </tbody>
   </table>
+  <div>
+    MockPagination
+  </div>
 </div>
 `;
 
@@ -405,5 +411,8 @@ exports[`subscriptions table should render subscription name without hyperlink f
       </tr>
     </tbody>
   </table>
+  <div>
+    MockPagination
+  </div>
 </div>
 `;

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js

@@ -13,15 +13,15 @@ const DeleteDialog = ({
       // eslint-disable-next-line react/no-danger
       <p dangerouslySetInnerHTML={{
         __html: sprintf(
-              __(`Are you sure you want to delete %(entitlementCount)s
+          __(`Are you sure you want to delete %(entitlementCount)s
                   subscription(s)? This action will remove the subscription(s) and
                   refresh your manifest. All systems using these subscription(s) will
                   lose them and also may lose access to updates and Errata.`),
-              {
-                entitlementCount: `<b>${selectedRows.length}</b>`,
-              },
-          ),
-        }}
+          {
+            entitlementCount: `<b>${selectedRows.length}</b>`,
+          },
+        ),
+      }}
       />
     }
     primaryActionButtonContent={__('Delete')}