katello 4.4.0.rc1 → 4.4.0.rc2

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

@@ -159,7 +159,7 @@ class ManageManifestModal extends Component {
                           simpleContentAccessEligible={simpleContentAccessEligible}
                         />
                       </Row>
-                        }
+                      }
                       <Row>
                         <Col sm={5}>
                           <strong>{__('Subscription Allocation')}</strong>
@@ -176,7 +176,7 @@ class ManageManifestModal extends Component {
                           >
                             <div>{__('Import New Manifest')}</div>
                           </ControlLabel>
-                            }
+                          }
                         </Col>
                         <Col sm={7} className="manifest-actions">
                           <Spinner loading={actionInProgress} />
@@ -188,7 +188,7 @@ class ManageManifestModal extends Component {
                             disabled={actionInProgress}
                             onChange={e => this.uploadManifest(e.target.files)}
                           />
-                            }
+                          }
                           <div id="manifest-actions-row">
                             {canImportManifest &&
                             <TooltipButton
@@ -200,7 +200,7 @@ class ManageManifestModal extends Component {
                               disabled={!isManifestImported ||
                                     actionInProgress || disableManifestActions}
                             />
-                              }
+                            }
                             {canDeleteManifest &&
                             <React.Fragment>
                               <TooltipButton
@@ -213,7 +213,7 @@ class ManageManifestModal extends Component {
                                 tooltipPlacement="top"
                               />
                             </React.Fragment>
-                              }
+                            }
                           </div>
                           <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
                             <DeleteManifestModalText />

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/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')}

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js

@@ -65,10 +65,10 @@ const Table = ({
       bodyMessage={bodyMessage}
       rows={rows}
       components={{
-      header: {
-        row: PFtable.TableInlineEditHeaderRow,
-      },
-    }}
+        header: {
+          row: PFtable.TableInlineEditHeaderRow,
+        },
+      }}
       itemCount={subscriptions.itemCount}
       pagination={subscriptions.pagination}
       onPaginationChange={onPaginationChange}
@@ -76,11 +76,11 @@ const Table = ({
     >
       <PFtable.Header
         onRow={() => ({
-        role: 'row',
-        isEditing: () => editing,
-        onCancel: () => inlineEditController.onCancel(),
-        onConfirm: () => inlineEditController.onConfirm(),
-      })}
+          role: 'row',
+          isEditing: () => editing,
+          onCancel: () => inlineEditController.onCancel(),
+          onConfirm: () => inlineEditController.onConfirm(),
+        })}
       />
       <ForemanTableBody
         columns={columnsDefinition}
@@ -88,8 +88,8 @@ const Table = ({
         rowKey="id"
         message={bodyMessage}
         onRow={rowData => ({
-        className: classNames({ 'open-grouped-row': !groupingController.isCollapsed({ rowData }) }),
-      })}
+          className: classNames({ 'open-grouped-row': !groupingController.isCollapsed({ rowData }) }),
+        })}
       />
     </ForemanTable>
   );
@@ -115,7 +115,7 @@ Table.propTypes = {
   }).isRequired,
   groupedSubscriptions: PropTypes.shape({}).isRequired,
   editing: PropTypes.bool.isRequired,
-  rows: PropTypes.arrayOf(PropTypes.object).isRequired,
+  rows: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
   selectionEnabled: PropTypes.bool.isRequired,
 };
 

data/webpack/services/index.js

@@ -3,42 +3,42 @@ export function getTypeIcon(type) {
   const typeIcon = { name: '', type: '' };
 
   switch (type) {
-    case 'yum':
-      typeIcon.name = 'bundle';
-      typeIcon.type = 'pf';
-      break;
-    case 'source_rpm':
-      typeIcon.name = 'code';
-      typeIcon.type = 'fa';
-      break;
-    case 'file':
-      typeIcon.name = 'file';
-      typeIcon.type = 'fa';
-      break;
-    case 'debug':
-      typeIcon.name = 'bug';
-      typeIcon.type = 'fa';
-      break;
-    case 'iso':
-      typeIcon.name = 'file-image-o';
-      typeIcon.type = 'fa';
-      break;
-    case 'beta':
-      typeIcon.name = 'bold';
-      typeIcon.type = 'fa';
-      break;
-    case 'kickstart':
-      typeIcon.name = 'futbol-o';
-      typeIcon.type = 'fa';
-      break;
-    case 'containerimage':
-      typeIcon.name = 'cube';
-      typeIcon.type = 'fa';
-      break;
-    default:
-      typeIcon.name = 'question';
-      typeIcon.type = 'fa';
-      break;
+  case 'yum':
+    typeIcon.name = 'bundle';
+    typeIcon.type = 'pf';
+    break;
+  case 'source_rpm':
+    typeIcon.name = 'code';
+    typeIcon.type = 'fa';
+    break;
+  case 'file':
+    typeIcon.name = 'file';
+    typeIcon.type = 'fa';
+    break;
+  case 'debug':
+    typeIcon.name = 'bug';
+    typeIcon.type = 'fa';
+    break;
+  case 'iso':
+    typeIcon.name = 'file-image-o';
+    typeIcon.type = 'fa';
+    break;
+  case 'beta':
+    typeIcon.name = 'bold';
+    typeIcon.type = 'fa';
+    break;
+  case 'kickstart':
+    typeIcon.name = 'futbol-o';
+    typeIcon.type = 'fa';
+    break;
+  case 'containerimage':
+    typeIcon.name = 'cube';
+    typeIcon.type = 'fa';
+    break;
+  default:
+    typeIcon.name = 'question';
+    typeIcon.type = 'fa';
+    break;
   }
   return typeIcon;
 }

data/webpack/utils/helpers.js

@@ -23,11 +23,11 @@ export const getBookmarkErrorMsgs = ({ data: { error } } = {}) => {
 const getCustomMessage = (actionType, message) => {
   let customMessage;
   switch (actionType) {
-    case SUBSCRIPTIONS_QUANTITIES_FAILURE:
-      customMessage = getSubscriptionsErrorMessage(message);
-      break;
-    default:
-      customMessage = null;
+  case SUBSCRIPTIONS_QUANTITIES_FAILURE:
+    customMessage = getSubscriptionsErrorMessage(message);
+    break;
+  default:
+    customMessage = null;
   }
   return customMessage;
 };