katello 3.16.0.rc3.1 → 3.16.0.rc4

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

@@ -47,7 +47,7 @@ const UpdateDialog = ({
 UpdateDialog.propTypes = {
   show: PropTypes.bool.isRequired,
   updateQuantity: PropTypes.func.isRequired,
-  updatedQuantity: PropTypes.shape(PropTypes.Object).isRequired,
+  updatedQuantity: PropTypes.shape({}).isRequired,
   showUpdateConfirm: PropTypes.func.isRequired,
   enableEditing: PropTypes.func.isRequired,
 };

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

@@ -17,10 +17,10 @@ const Dialogs = ({
 );
 
 Dialogs.propTypes = {
-  updateDialog: PropTypes.shape(UpdateDialog.propTypes).isRequired,
-  unsavedChangesDialog: PropTypes.shape(UnsavedChangesDialog.propTypes).isRequired,
-  inputsErrorsDialog: PropTypes.shape(InputsErrorsDialog.propTypes).isRequired,
-  deleteDialog: PropTypes.shape(DeleteDialog.propTypes).isRequired,
+  updateDialog: PropTypes.shape({}).isRequired,
+  unsavedChangesDialog: PropTypes.shape({}).isRequired,
+  inputsErrorsDialog: PropTypes.shape({}).isRequired,
+  deleteDialog: PropTypes.shape({}).isRequired,
 };
 
 export default Dialogs;

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

@@ -15,9 +15,9 @@ const Table = ({
   inlineEditController,
   rows,
   editing,
+  selectionEnabled,
   groupedSubscriptions,
   toggleSubscriptionGroup,
-  canManageSubscriptionAllocations,
 }) => {
   const allSubscriptionResults = subscriptions.results;
 
@@ -28,18 +28,23 @@ const Table = ({
 
   const groupingController = {
     isCollapseable: ({ rowData }) =>
-      // the group contains more then one subscription
+      // the group contains more than one subscription
       rowData.collapsible,
     isCollapsed: ({ rowData }) => !groupedSubscriptions[rowData.product_id].open,
     toggle: ({ rowData }) => toggleSubscriptionGroup(rowData.product_id),
   };
 
-  const alwaysDisplayColumns = ['select'];
+  const alwaysDisplayColumns = [];
+
+  if (selectionEnabled) {
+    alwaysDisplayColumns.push('select');
+  }
+
   const columnsDefinition = createSubscriptionsTableSchema(
     inlineEditController,
     selectionController,
     groupingController,
-    canManageSubscriptionAllocations,
+    selectionEnabled,
   ).filter(column => tableColumns.includes(column.property) ||
     alwaysDisplayColumns.includes(column.property));
 
@@ -88,13 +93,14 @@ const Table = ({
 };
 
 Table.propTypes = {
-  canManageSubscriptionAllocations: PropTypes.bool,
   emptyState: PropTypes.shape({}).isRequired,
   tableColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
   subscriptions: PropTypes.shape({
     searchIsActive: PropTypes.bool,
     itemCount: PropTypes.number,
     pagination: 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,
   loadSubscriptions: PropTypes.func.isRequired,
@@ -107,11 +113,7 @@ Table.propTypes = {
   groupedSubscriptions: PropTypes.shape({}).isRequired,
   editing: PropTypes.bool.isRequired,
   rows: PropTypes.arrayOf(PropTypes.object).isRequired,
-
-};
-
-Table.defaultProps = {
-  canManageSubscriptionAllocations: false,
+  selectionEnabled: PropTypes.bool.isRequired,
 };
 
 export default Table;

data/webpack/scenes/Subscriptions/index.js

@@ -16,10 +16,11 @@ import {
   selectActivePermissions,
   selectTableSettings,
   selectIsTaskPending,
+  selectHasUpstreamConnection,
 } from './SubscriptionsSelectors';
 import { selectIsPollingTask } from '../Tasks/TaskSelectors';
-import { selectSimpleContentAccessEnabled } from '../Organizations/OrganizationSelectors';
-
+import { selectOrganizationState, selectSimpleContentAccessEnabled } from '../Organizations/OrganizationSelectors';
+import { pingUpstreamSubscriptions } from './UpstreamSubscriptions/UpstreamSubscriptionsActions';
 import reducer from './SubscriptionReducer';
 import { SUBSCRIPTION_TABLE_NAME, SUBSCRIPTIONS } from './SubscriptionConstants';
 import SubscriptionsPage from './SubscriptionsPage';
@@ -34,18 +35,20 @@ const mapStateToProps = (state) => {
     subscriptionTableSettings,
     activePermissions: selectActivePermissions(state),
     simpleContentAccess: selectSimpleContentAccessEnabled(state),
+    hasUpstreamConnection: selectHasUpstreamConnection(state),
     task: selectSubscriptionsTask(state),
     isTaskPending: selectIsTaskPending(state),
     isPollingTask: selectIsPollingTask(state, SUBSCRIPTIONS),
     searchQuery: selectSearchQuery(state),
     deleteModalOpened: selectDeleteModalOpened(state),
     deleteButtonDisabled: selectDeleteButtonDisabled(state),
-    organization: state.katello.organization,
+    organization: selectOrganizationState(state),
   };
 };
 
 // map action dispatchers to props
 const actions = {
+  pingUpstreamSubscriptions,
   ...subscriptionActions,
   ...taskActions,
   ...settingActions,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc3.1
+  version: 3.16.0.rc4
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -218,40 +218,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
@@ -278,47 +278,47 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0b2
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -326,9 +326,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0b2
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -1418,6 +1418,7 @@ files:
 - app/services/katello/ui_notifications/subscriptions/manifest_refresh_error.rb
 - app/services/katello/ui_notifications/subscriptions/manifest_refresh_success.rb
 - app/services/katello/ui_notifications/task_notification.rb
+- app/services/katello/upstream_connection_checker.rb
 - app/views/common/400.html
 - app/views/dashboard/_content_views_widget.html.erb
 - app/views/dashboard/_errata_widget.html.erb
@@ -1621,6 +1622,9 @@ files:
 - app/views/katello/api/v2/repository_sets/show.json.rabl
 - app/views/katello/api/v2/root/resource_list.json.rabl
 - app/views/katello/api/v2/smart_proxies/pulp_info.json.rabl
+- app/views/katello/api/v2/srpms/backend.json.rabl
+- app/views/katello/api/v2/srpms/base.json.rabl
+- app/views/katello/api/v2/srpms/compare.json.rabl
 - app/views/katello/api/v2/srpms/index.json.rabl
 - app/views/katello/api/v2/srpms/show.json.rabl
 - app/views/katello/api/v2/subscription_facet/base.json.rabl
@@ -4792,7 +4796,7 @@ files:
 - webpack/scenes/Subscriptions/SubscriptionsPage.scss
 - webpack/scenes/Subscriptions/SubscriptionsSelectors.js
 - webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsActions.js
-- webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsContstants.js
+- webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsConstants.js
 - webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js
 - webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsReducer.js
 - webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsTableSchema.js