katello 3.18.0.rc2 → 3.18.2

data/webpack/components/TypeAhead/TypeAhead.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import Downshift from 'downshift';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import TypeAheadSearch from './pf3Search/TypeAheadSearch';
 // eslint-disable-next-line import/no-named-default
@@ -101,7 +102,7 @@ TypeAhead.propTypes = {
 };
 
 TypeAhead.defaultProps = {
-  actionText: 'Search',
+  actionText: __('Search'),
   initialInputValue: '',
   patternfly4: false,
 };

data/webpack/components/TypeAhead/pf3Search/TypeAheadSearch.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { InputGroup, Button, Icon } from 'patternfly-react';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import TypeAheadInput from './TypeAheadInput';
 import TypeAheadItems from './TypeAheadItems';
@@ -46,7 +47,7 @@ TypeAheadSearch.propTypes = {
 };
 
 TypeAheadSearch.defaultProps = {
-  actionText: 'Search',
+  actionText: __('Search'),
 };
 
 export default TypeAheadSearch;

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

@@ -51,8 +51,11 @@ class ManageManifestModal extends Component {
   showDeleteManifestModal = () =>
     this.props.setModalOpen({ id: DELETE_MANIFEST_MODAL_ID });
 
-  hideDeleteManifestModal = () =>
-    this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+  hideDeleteManifestModal = () => {
+    if (this.props.deleteManifestModalExists) {
+      this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+    }
+  };
 
   updateRepositoryUrl = (event) => {
     this.setState({ redhat_repository_url: event.target.value });
@@ -326,6 +329,7 @@ ManageManifestModal.propTypes = {
   canImportManifest: PropTypes.bool,
   canDeleteManifest: PropTypes.bool,
   isManifestImported: PropTypes.bool,
+  deleteManifestModalExists: PropTypes.bool,
   canEditOrganizations: PropTypes.bool,
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
@@ -351,6 +355,7 @@ ManageManifestModal.defaultProps = {
   canImportManifest: false,
   canDeleteManifest: false,
   isManifestImported: false,
+  deleteManifestModalExists: false,
   canEditOrganizations: false,
   simpleContentAccess: false,
   simpleContentAccessEligible: undefined,

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

@@ -20,6 +20,7 @@ const mapStateToProps = state => ({
   simpleContentAccess: selectSimpleContentAccessEnabled(state),
   isManifestImported: selectIsManifestImported(state),
   modalOpenState: state.foremanModals.ManageManifestModal,
+  deleteManifestModalExists: !!state.foremanModals.deleteManifestModal,
   manifestActionStarted: selectManifestActionStarted(state),
   simpleContentAccessEligible: selectSimpleContentAccessEligible(state),
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.0.rc2
+  version: 3.18.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +97,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -360,46 +366,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.2
+        version: 3.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: pulp_2to3_migration_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.6.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: pulp_certguard_client
   requirement: !ruby/object:Gem::Requirement
@@ -720,6 +720,9 @@ files:
 - app/controllers/katello/api/v2/capsule_content_controller.rb
 - app/controllers/katello/api/v2/capsules_controller.rb
 - app/controllers/katello/api/v2/content_credentials_controller.rb
+- app/controllers/katello/api/v2/content_export_incrementals_controller.rb
+- app/controllers/katello/api/v2/content_exports_controller.rb
+- app/controllers/katello/api/v2/content_imports_controller.rb
 - app/controllers/katello/api/v2/content_uploads_controller.rb
 - app/controllers/katello/api/v2/content_view_components_controller.rb
 - app/controllers/katello/api/v2/content_view_filter_rules_controller.rb
@@ -884,6 +887,7 @@ files:
 - app/lib/actions/katello/content_view_version/destroy.rb
 - app/lib/actions/katello/content_view_version/export.rb
 - app/lib/actions/katello/content_view_version/import.rb
+- app/lib/actions/katello/content_view_version/import_library.rb
 - app/lib/actions/katello/content_view_version/incremental_update.rb
 - app/lib/actions/katello/content_view_version/republish_repositories.rb
 - app/lib/actions/katello/environment/destroy.rb
@@ -1067,6 +1071,8 @@ files:
 - app/lib/actions/pulp3/content_guard/refresh.rb
 - app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb
 - app/lib/actions/pulp3/content_migration.rb
+- app/lib/actions/pulp3/content_migration_presenter.rb
+- app/lib/actions/pulp3/content_migration_reset.rb
 - app/lib/actions/pulp3/content_view/delete_repository_references.rb
 - app/lib/actions/pulp3/content_view_version/create_exporter.rb
 - app/lib/actions/pulp3/content_view_version/create_importer.rb
@@ -1077,6 +1083,7 @@ files:
 - app/lib/actions/pulp3/import_migration.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/export.rb
+- app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb
 - app/lib/actions/pulp3/orchestration/content_view_version/import.rb
 - app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
@@ -1128,6 +1135,7 @@ files:
 - app/lib/actions/pulp3/repository/update_remote.rb
 - app/lib/actions/pulp3/repository/update_repository.rb
 - app/lib/actions/pulp3/repository/upload_file.rb
+- app/lib/actions/pulp3/repository/upload_tag.rb
 - app/lib/katello/README
 - app/lib/katello/api/constraints/activation_key_constraint.rb
 - app/lib/katello/api/mapper_extensions.rb
@@ -1266,6 +1274,7 @@ files:
 - app/models/katello/content_facet_applicable_rpm.rb
 - app/models/katello/content_facet_erratum.rb
 - app/models/katello/content_facet_repository.rb
+- app/models/katello/content_migration_progress.rb
 - app/models/katello/content_override.rb
 - app/models/katello/content_view.rb
 - app/models/katello/content_view_component.rb
@@ -2131,6 +2140,8 @@ files:
 - db/migrate/20201012172713_remove_gpg_key_perms.rb
 - db/migrate/20201012192035_add_metadata_to_katello_content_view_version_export_history.rb
 - db/migrate/20201021150008_add_import_only_to_katello_content_view.rb
+- db/migrate/20201119211133_pulp3_migration_progress.rb
+- db/migrate/20210201165835_add_migration_missing_content.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4476,7 +4487,6 @@ files:
 - lib/katello/tasks/clean_backend_objects.rake
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
-- lib/katello/tasks/common.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/import_applicability.rake
 - lib/katello/tasks/import_subscriptions.rake
@@ -4485,6 +4495,8 @@ files:
 - lib/katello/tasks/pulp3_content_switchover.rake
 - lib/katello/tasks/pulp3_migration.rake
 - lib/katello/tasks/pulp3_migration_abort.rake
+- lib/katello/tasks/pulp3_migration_approve_corrupted.rake
+- lib/katello/tasks/pulp3_migration_reset.rake
 - lib/katello/tasks/pulp3_migration_stats.rake
 - lib/katello/tasks/pulp3_post_migration_check.rake
 - lib/katello/tasks/receptor/extract_orgs.rake
@@ -5061,9 +5073,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: 

data/lib/katello/tasks/common.rake

@@ -1,7 +0,0 @@
-namespace :katello do
-  task :disable_dynflow do
-    #Ensures that we run as a dynflow 'client'
-    ::Rails.application.dynflow.initialize!
-    ForemanTasks.dynflow.config.remote = true
-  end
-end