katello 4.4.2.2 → 4.5.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +5 -1
- data/app/controllers/katello/api/v2/alternate_content_sources_controller.rb +98 -0
- data/app/controllers/katello/api/v2/content_export_incrementals_controller.rb +39 -3
- data/app/controllers/katello/api/v2/content_exports_controller.rb +19 -0
- data/app/controllers/katello/api/v2/content_imports_controller.rb +13 -16
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +0 -12
- data/app/controllers/katello/api/v2/content_views_controller.rb +13 -0
- data/app/controllers/katello/api/v2/environments_controller.rb +1 -1
- data/app/controllers/katello/api/v2/host_module_streams_controller.rb +8 -2
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +25 -3
- data/app/controllers/katello/api/v2/organizations_controller.rb +4 -2
- data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb +1 -1
- data/app/controllers/katello/api/v2/repositories_controller.rb +9 -3
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +40 -7
- data/app/controllers/katello/api/v2/subscriptions_controller.rb +2 -2
- data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb +1 -1
- data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb +4 -0
- data/app/helpers/katello/hosts_and_hostgroups_helper.rb +21 -3
- data/app/lib/actions/katello/alternate_content_source/create.rb +24 -0
- data/app/lib/actions/katello/alternate_content_source/destroy.rb +27 -0
- data/app/lib/actions/katello/alternate_content_source/update.rb +41 -0
- data/app/lib/actions/katello/cdn_configuration/update.rb +2 -2
- data/app/lib/actions/katello/content_view/destroy.rb +2 -1
- data/app/lib/actions/katello/content_view/incremental_updates.rb +7 -3
- data/app/lib/actions/katello/content_view/publish.rb +7 -9
- data/app/lib/actions/katello/content_view_version/auto_create_products.rb +4 -4
- data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb +6 -4
- data/app/lib/actions/katello/content_view_version/auto_create_repositories.rb +6 -4
- data/app/lib/actions/katello/content_view_version/import.rb +25 -22
- data/app/lib/actions/katello/content_view_version/import_library.rb +0 -1
- data/app/lib/actions/katello/content_view_version/import_repository.rb +21 -0
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +85 -93
- data/app/lib/actions/katello/content_view_version/reset_content_view_repositories_from_metadata.rb +2 -2
- data/app/lib/actions/katello/product/content_create.rb +10 -8
- data/app/lib/actions/katello/repository/destroy.rb +36 -12
- data/app/lib/actions/katello/repository_set/disable_repository.rb +8 -3
- data/app/lib/actions/pulp3/alternate_content_source/create.rb +20 -0
- data/app/lib/actions/pulp3/alternate_content_source/create_remote.rb +20 -0
- data/app/lib/actions/pulp3/alternate_content_source/delete.rb +16 -0
- data/app/lib/actions/pulp3/alternate_content_source/delete_remote.rb +16 -0
- data/app/lib/actions/pulp3/alternate_content_source/update.rb +16 -0
- data/app/lib/actions/pulp3/alternate_content_source/update_remote.rb +17 -0
- data/app/lib/actions/pulp3/content_view_version/{import.rb → create_import.rb} +5 -5
- data/app/lib/actions/pulp3/content_view_version/create_importer.rb +4 -3
- data/app/lib/actions/pulp3/content_view_version/destroy_importer.rb +12 -1
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/create.rb +18 -0
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/delete.rb +23 -0
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/update.rb +18 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb +1 -1
- data/app/lib/actions/pulp3/orchestration/content_view_version/export_repository.rb +51 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +5 -2
- data/app/lib/actions/pulp3/repository/refresh_distribution.rb +4 -1
- data/app/lib/actions/pulp3/repository/save_distribution_references.rb +2 -0
- data/app/lib/katello/api/v2/error_handling.rb +1 -0
- data/app/lib/katello/resources/cdn/katello_cdn.rb +3 -1
- data/app/lib/katello/util/errata.rb +2 -3
- data/app/lib/katello/validators/alternate_content_source_path_validator.rb +29 -0
- data/app/lib/katello/validators/content_default_http_proxy_setting_validator.rb +12 -0
- data/app/lib/katello/validators/content_view_environment_validator.rb +10 -5
- data/app/models/katello/alternate_content_source.rb +66 -0
- data/app/models/katello/authorization/alternate_content_source.rb +33 -0
- data/app/models/katello/authorization/repository.rb +3 -3
- data/app/models/katello/candlepin/repository_mapper.rb +13 -6
- data/app/models/katello/cdn_configuration.rb +15 -15
- data/app/models/katello/concerns/content_facet_host_extensions.rb +25 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +7 -5
- data/app/models/katello/concerns/http_proxy_extensions.rb +14 -0
- data/app/models/katello/concerns/organization_extensions.rb +4 -2
- data/app/models/katello/concerns/setting_extensions.rb +14 -0
- data/app/models/katello/concerns/smart_proxy_extensions.rb +2 -1
- data/app/models/katello/content.rb +1 -0
- data/app/models/katello/content_credential.rb +6 -0
- data/app/models/katello/content_override.rb +7 -3
- data/app/models/katello/content_view.rb +33 -2
- data/app/models/katello/content_view_erratum_filter.rb +26 -12
- data/app/models/katello/content_view_filter.rb +4 -0
- data/app/models/katello/content_view_version.rb +12 -0
- data/app/models/katello/content_view_version_export_history.rb +3 -1
- data/app/models/katello/erratum.rb +9 -5
- data/app/models/katello/events/delete_latest_content_view_version.rb +40 -0
- data/app/models/katello/host/content_facet.rb +14 -0
- data/app/models/katello/host_available_module_stream.rb +12 -0
- data/app/models/katello/product_content.rb +1 -0
- data/app/models/katello/purpose_sla_status.rb +1 -1
- data/app/models/katello/purpose_status.rb +2 -2
- data/app/models/katello/repository.rb +7 -4
- data/app/models/katello/root_repository.rb +1 -1
- data/app/models/katello/smart_proxy_alternate_content_source.rb +8 -0
- data/app/models/katello/sync_plan.rb +1 -1
- data/app/presenters/katello/product_content_presenter.rb +15 -0
- data/app/services/katello/applicable_host_queue.rb +1 -1
- data/app/services/katello/content_unit_indexer.rb +2 -1
- data/app/services/katello/product_content_finder.rb +12 -2
- data/app/services/katello/pulp3/alternate_content_source.rb +117 -0
- data/app/services/katello/pulp3/api/file.rb +8 -0
- data/app/services/katello/pulp3/api/yum.rb +8 -0
- data/app/services/katello/pulp3/content_view_version/export.rb +27 -5
- data/app/services/katello/pulp3/content_view_version/import.rb +97 -71
- data/app/services/katello/pulp3/content_view_version/import_export_common.rb +4 -4
- data/app/services/katello/pulp3/content_view_version/import_gpg_keys.rb +13 -11
- data/app/services/katello/pulp3/content_view_version/import_validator.rb +67 -72
- data/app/services/katello/pulp3/content_view_version/importable_products.rb +40 -24
- data/app/services/katello/pulp3/content_view_version/importable_repositories.rb +88 -39
- data/app/services/katello/pulp3/content_view_version/metadata_generator.rb +2 -2
- data/app/services/katello/pulp3/content_view_version/metadata_map.rb +117 -0
- data/app/services/katello/pulp3/pulp_content_unit.rb +6 -1
- data/app/services/katello/pulp3/repository/yum.rb +70 -12
- data/app/services/katello/pulp3/repository.rb +7 -91
- data/app/services/katello/pulp3/service_common.rb +66 -0
- data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb +4 -1
- data/app/services/katello/ui_notifications/content_view/delete_latest_version_failure.rb +22 -0
- data/app/views/foreman/job_templates/change_content_source.erb +1 -1
- data/app/views/foreman/job_templates/install_errata.erb +5 -5
- data/app/views/foreman/job_templates/install_errata_by_search_query.erb +7 -6
- data/app/views/foreman/job_templates/install_group.erb +4 -4
- data/app/views/foreman/job_templates/install_package.erb +4 -4
- data/app/views/foreman/job_templates/install_packages_by_search_query.erb +3 -3
- data/app/views/foreman/job_templates/remove_group.erb +4 -4
- data/app/views/foreman/job_templates/remove_package.erb +4 -4
- data/app/views/foreman/job_templates/remove_packages_by_search_query.erb +3 -3
- data/app/views/foreman/job_templates/resolve_traces.erb +2 -2
- data/app/views/foreman/job_templates/restart_services.erb +3 -3
- data/app/views/foreman/job_templates/update_group.erb +4 -4
- data/app/views/foreman/job_templates/update_package.erb +4 -4
- data/app/views/foreman/job_templates/update_packages_by_search_query.erb +3 -3
- data/app/views/katello/api/v2/alternate_content_sources/base.json.rabl +15 -0
- data/app/views/katello/api/v2/alternate_content_sources/index.json.rabl +7 -0
- data/app/views/katello/api/v2/alternate_content_sources/show.json.rabl +3 -0
- data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl +1 -1
- data/app/views/katello/api/v2/content_view_version_export_histories/show.json.rabl +2 -3
- data/app/views/katello/api/v2/content_view_versions/base.json.rabl +1 -1
- data/app/views/katello/api/v2/content_views/base.json.rabl +1 -0
- data/app/views/katello/api/v2/environments/show.json.rabl +2 -0
- data/app/views/katello/api/v2/errata/_counts.json.rabl +2 -2
- data/app/views/katello/api/v2/host_module_streams/base.json.rabl +2 -2
- data/app/views/katello/api/v2/hosts/host_collections.json.rabl +1 -1
- data/app/views/katello/api/v2/organizations/show.json.rabl +7 -1
- data/app/views/katello/api/v2/repositories/show.json.rabl +2 -1
- data/app/views/katello/sync_management/_repo.html.erb +8 -29
- data/config/routes/api/v2.rb +7 -0
- data/db/migrate/20150930183738_migrate_content_hosts.rb +0 -399
- data/db/migrate/20171025163149_remove_use_pulp_oauth_setting.rb +1 -1
- data/db/migrate/20171114150937_cleanup_installed_packages.rb +1 -1
- data/db/migrate/20180402160223_clean_up_force_post_sync_action_setting.rb +1 -1
- data/db/migrate/20211129200124_remove_dependency_solving_algorithm_setting.rb +1 -1
- data/db/migrate/20211220185935_clean_duplicate_content_units.rb +10 -12
- data/db/migrate/20220110223754_update_disconnected_settings.rb +5 -5
- data/db/migrate/20220117151612_add_alternate_content_sources.rb +48 -0
- data/db/migrate/20220124191056_add_type_to_cdn_configuration.rb +9 -4
- data/db/migrate/20220209203251_add_generated_for_to_content_views.rb +13 -0
- data/db/migrate/20220209205137_expand_sync_timeout_settings.rb +7 -7
- data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb +12 -0
- data/db/migrate/20220404190836_delete_old_setting_data.rb +9 -0
- data/db/migrate/20220405220616_update_cdn_configuration_type.rb +11 -0
- data/db/migrate/20220419193414_content_settings_to_dsl_category.rb +5 -0
- data/db/seeds.d/110-content-view-autopublish.rb +13 -0
- data/db/seeds.d/150-module_job_templates.rb +1 -1
- data/engines/bastion/README.md +1 -0
- data/engines/bastion/app/assets/javascripts/bastion/components/bst-modal.directive.js +1 -0
- data/engines/bastion/app/views/bastion/layouts/assets.html.erb +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +10 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-module-streams.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +8 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js +4 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +2 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js +10 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html +26 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html +27 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.routes.js +22 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html +13 -7
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +63 -17
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +7 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +10 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html +21 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +8 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +7 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html +6 -1
- data/lib/katello/engine.rb +1 -5
- data/lib/katello/permission_creator.rb +32 -4
- data/lib/katello/plugin.rb +378 -4
- data/lib/katello/tasks/reset.rake.bak +67 -0
- data/lib/katello/tasks/update_content_default_http_proxy.rake +2 -3
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +47 -41
- data/locale/bn/LC_MESSAGES/katello.mo +0 -0
- data/locale/bn/katello.po +820 -106
- data/locale/bn/katello.po.time_stamp +0 -0
- data/locale/cs/LC_MESSAGES/katello.mo +0 -0
- data/locale/cs/katello.po +818 -104
- data/locale/cs/katello.po.time_stamp +0 -0
- data/locale/de/LC_MESSAGES/katello.mo +0 -0
- data/locale/de/katello.po +893 -179
- data/locale/de/katello.po.time_stamp +0 -0
- data/locale/en/LC_MESSAGES/katello.mo +0 -0
- data/locale/en/katello.po +817 -103
- data/locale/en/katello.po.time_stamp +0 -0
- data/locale/es/LC_MESSAGES/katello.mo +0 -0
- data/locale/es/katello.po +882 -168
- data/locale/es/katello.po.time_stamp +0 -0
- data/locale/fr/LC_MESSAGES/katello.mo +0 -0
- data/locale/fr/katello.po +1219 -505
- data/locale/fr/katello.po.time_stamp +0 -0
- data/locale/gu/LC_MESSAGES/katello.mo +0 -0
- data/locale/gu/katello.po +826 -112
- data/locale/gu/katello.po.time_stamp +0 -0
- data/locale/hi/LC_MESSAGES/katello.mo +0 -0
- data/locale/hi/katello.po +826 -112
- data/locale/hi/katello.po.time_stamp +0 -0
- data/locale/it/LC_MESSAGES/katello.mo +0 -0
- data/locale/it/katello.po +863 -148
- data/locale/it/katello.po.time_stamp +0 -0
- data/locale/ja/LC_MESSAGES/katello.mo +0 -0
- data/locale/ja/katello.po +1216 -499
- data/locale/ja/katello.po.time_stamp +0 -0
- data/locale/katello.pot +3847 -2507
- data/locale/kn/LC_MESSAGES/katello.mo +0 -0
- data/locale/kn/katello.po +826 -112
- data/locale/kn/katello.po.time_stamp +0 -0
- data/locale/ko/LC_MESSAGES/katello.mo +0 -0
- data/locale/ko/katello.po +912 -198
- data/locale/ko/katello.po.time_stamp +0 -0
- data/locale/mr/LC_MESSAGES/katello.mo +0 -0
- data/locale/mr/katello.po +826 -112
- data/locale/mr/katello.po.time_stamp +0 -0
- data/locale/or/LC_MESSAGES/katello.mo +0 -0
- data/locale/or/katello.po +826 -112
- data/locale/or/katello.po.time_stamp +0 -0
- data/locale/pa/LC_MESSAGES/katello.mo +0 -0
- data/locale/pa/katello.po +826 -112
- data/locale/pa/katello.po.time_stamp +0 -0
- data/locale/pt/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt/katello.po +817 -103
- data/locale/pt/katello.po.time_stamp +0 -0
- data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt_BR/katello.po +879 -165
- data/locale/pt_BR/katello.po.time_stamp +0 -0
- data/locale/ru/LC_MESSAGES/katello.mo +0 -0
- data/locale/ru/katello.po +927 -213
- data/locale/ru/katello.po.time_stamp +0 -0
- data/locale/ta/LC_MESSAGES/katello.mo +0 -0
- data/locale/ta/katello.po +820 -106
- data/locale/ta/katello.po.time_stamp +0 -0
- data/locale/te/LC_MESSAGES/katello.mo +0 -0
- data/locale/te/katello.po +826 -112
- data/locale/te/katello.po.time_stamp +0 -0
- data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_CN/katello.po +1202 -486
- data/locale/zh_CN/katello.po.time_stamp +0 -0
- data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_TW/katello.po +856 -142
- data/locale/zh_TW/katello.po.time_stamp +0 -0
- data/webpack/components/EditableTextInput/EditableTextInput.js +20 -5
- data/webpack/components/Errata/index.js +38 -8
- data/webpack/components/Packages/index.js +1 -4
- data/webpack/components/Search/Search.js +18 -3
- data/webpack/components/SelectAllCheckbox/index.js +1 -0
- data/webpack/components/SelectableDropdown/SelectableDropdown.js +4 -2
- data/webpack/components/Table/EmptyStateMessage.js +21 -7
- data/webpack/components/Table/MainTable.js +29 -4
- data/webpack/components/Table/TableHooks.js +63 -19
- data/webpack/components/Table/TableWrapper.js +4 -2
- data/webpack/components/Table/components/SortableColumnHeaders.js +19 -0
- data/webpack/components/Table/components/TranslatedPlural.js +57 -0
- data/webpack/components/TypeAhead/TypeAhead.js +8 -0
- data/webpack/components/TypeAhead/pf4Search/TypeAheadInput.js +13 -11
- data/webpack/components/TypeAhead/pf4Search/TypeAheadSearch.js +5 -2
- data/webpack/components/extensions/HostDetails/ActionsBar/index.js +27 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js +256 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ContentViewDetailsCard.js +202 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/HostContentViewActions.js +19 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/HostContentViewConstants.js +2 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/changeHostCVModal.test.js +131 -0
- data/webpack/components/extensions/HostDetails/Cards/{__tests__ → ContentViewDetailsCard/__tests__}/contentViewDetailsCard.test.js +22 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/contentViews.fixtures.json +443 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/envPaths.fixtures.json +320 -0
- data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.js +57 -33
- data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.scss +3 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsActions.js +30 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsCard.js +187 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsConstants.js +7 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsModal.js +227 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsSelectors.js +18 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/availableHostCollections.fixtures.json +106 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/hostCollectionsCard.test.js +110 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/hostCollectionsModal.test.js +235 -0
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/removableHostCollections.fixtures.json +45 -0
- data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js +33 -8
- data/webpack/components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard.js +44 -0
- data/webpack/components/extensions/HostDetails/DetailsTabCards/RegistrationCard.js +107 -0
- data/webpack/components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions.js +38 -0
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js +62 -39
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/HostErrataActions.js +1 -7
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsActions.js +1 -3
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsConstants.js +28 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js +486 -116
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/moduleStreamsTab.test.js +147 -1
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/modules.fixtures.json +6 -3
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesActions.js +1 -7
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackageInstallModal.js +2 -1
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js +48 -19
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js +35 -47
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionConstants.js +1 -0
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsActions.js +33 -54
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsConstants.js +20 -0
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js +269 -132
- data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js +47 -11
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js +30 -42
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js +36 -1
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js +94 -46
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js +18 -2
- data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js +6 -0
- data/webpack/containers/Application/config.js +5 -0
- data/webpack/global_index.js +30 -7
- data/webpack/global_test_setup.js +13 -0
- data/webpack/redux/actions/RedHatRepositories/enabled.js +2 -1
- data/webpack/redux/actions/RedHatRepositories/helpers.js +9 -8
- data/webpack/scenes/AlternateContentSources/ACSActions.js +53 -0
- data/webpack/scenes/AlternateContentSources/ACSConstants.js +4 -0
- data/webpack/scenes/AlternateContentSources/ACSIndexPage.js +23 -0
- data/webpack/scenes/AlternateContentSources/ACSSelectors.js +15 -0
- data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js +152 -0
- data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsIndex.fixtures.json +91 -0
- data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js +67 -0
- data/webpack/scenes/AlternateContentSources/index.js +4 -0
- data/webpack/scenes/Content/Details/ContentRepositories.js +1 -0
- data/webpack/scenes/Content/Table/ContentTable.js +1 -0
- data/webpack/scenes/ContentViews/ContentViewsActions.js +6 -2
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +11 -3
- data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js +2 -1
- data/webpack/scenes/ContentViews/Create/ContentViewFormComponents.js +10 -1
- data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js +4 -3
- data/webpack/scenes/ContentViews/Create/__tests__/createContentView.test.js +1 -1
- data/webpack/scenes/ContentViews/Delete/ContentViewDeleteWizard.js +7 -5
- data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionFinish.js +29 -21
- data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js +15 -8
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js +3 -3
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js +4 -4
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +3 -1
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +4 -4
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +34 -8
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +33 -29
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +130 -79
- data/webpack/scenes/ContentViews/Details/ContentViewInfo.js +17 -3
- data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +2 -1
- data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js +2 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js +6 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js +41 -21
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js +38 -20
- data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js +2 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +8 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +9 -1
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +2 -1
- data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js +1 -0
- data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js +27 -12
- data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js +39 -17
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js +27 -10
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +46 -23
- data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js +3 -2
- data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js +5 -2
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +161 -108
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +7 -7
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/ActionSummary.js +58 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteContextWrapper.js +45 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteHelpers.js +30 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteModal.js +56 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ConfirmBulkDelete.js +126 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/FinishBulkDelete.js +61 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignActivationKeys.js +196 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignHosts.js +220 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReviewEnvironments.js +104 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteModal.test.js +122 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteVersions.fixtures.json +600 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/contentView.fixtures.json +1504 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/contentViewVersion.fixtures.json +936 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/environmentPaths.fixtures.json +261 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/hosts.fixtures.json +163 -0
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/bulkDeleteSteps.js +79 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +192 -167
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveCVVersionWizard.js +2 -5
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionDeleteFinish.js +38 -53
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js +6 -12
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js +1 -0
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js +8 -20
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js +23 -13
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js +3 -0
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json +4 -4
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js +0 -3
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js +4 -4
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +12 -14
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json +1 -0
- data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js +96 -117
- data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js +13 -19
- data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js +9 -20
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +165 -148
- data/webpack/scenes/ContentViews/Table/tableDataGenerator.js +2 -0
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +4 -4
- data/webpack/scenes/ContentViews/components/ContentViewIcon.js +14 -3
- data/webpack/scenes/ContentViews/components/ContentViewsCounter.js +1 -1
- data/webpack/scenes/ContentViews/components/EnvironmentLabels.js +4 -3
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js +9 -5
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.scss +6 -1
- data/webpack/scenes/ContentViews/components/TaskPresenter/TaskPresenter.js +40 -35
- data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js +2 -2
- data/webpack/scenes/ContentViews/expansions/RelatedCompositeContentViewsModal.js +1 -1
- data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js +4 -4
- data/webpack/scenes/ContentViews/expansions/__tests__/contentViewComponentsModal.test.js +1 -1
- data/webpack/scenes/ContentViews/helpers.js +3 -0
- data/webpack/scenes/Hosts/ChangeContentSource/helpers.js +5 -0
- data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +3 -3
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js +2 -1
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/EnabledRepository.test.js +2 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js +3 -3
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnTypeForm.js +2 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{AirGappedTypeForm.js → ExportSyncForm.js} +7 -6
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{UpstreamServerTypeForm.js → NetworkSyncForm.js} +15 -7
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{AirGappedTypeForm.test.js → ExportSyncForm.test.js} +4 -4
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{UpstreamServerTypeForm.test.js → NetworkSyncForm.test.js} +8 -8
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/index.js +11 -11
- data/webpack/scenes/Subscriptions/SubscriptionConstants.js +1 -0
- data/webpack/scenes/Subscriptions/SubscriptionsPage.js +8 -7
- data/webpack/scenes/Tasks/TaskActions.js +6 -0
- data/webpack/scenes/Tasks/TaskSelectors.js +11 -0
- data/webpack/scenes/Tasks/helpers.js +33 -5
- data/webpack/utils/helpers.js +2 -0
- metadata +158 -40
- data/app/models/setting/content.rb +0 -201
- data/webpack/components/Table/__test__/useBulkSelect.test.js +0 -99
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard.js +0 -96
- data/webpack/scenes/ContentViews/Details/DetailsContainer.js +0 -36
@@ -1,15 +1,14 @@
|
|
1
1
|
import React, { useState, useEffect, useCallback } from 'react';
|
2
|
-
import useDeepCompareEffect from 'use-deep-compare-effect';
|
3
2
|
import { useDispatch, useSelector } from 'react-redux';
|
4
|
-
import { TableVariant, TableText } from '@patternfly/react-table';
|
3
|
+
import { TableVariant, TableText, Tbody, Thead, Td, Tr, Th } from '@patternfly/react-table';
|
4
|
+
import { Checkbox, Dropdown, DropdownItem, Grid, KebabToggle } from '@patternfly/react-core';
|
5
5
|
import { translate as __ } from 'foremanReact/common/I18n';
|
6
6
|
import { urlBuilder } from 'foremanReact/common/urlHelpers';
|
7
7
|
import { STATUS } from 'foremanReact/constants';
|
8
8
|
import { Link } from 'react-router-dom';
|
9
9
|
import PropTypes from 'prop-types';
|
10
|
-
import {
|
11
|
-
|
12
|
-
import { useSet } from '../../../../components/Table/TableHooks';
|
10
|
+
import { first } from 'lodash';
|
11
|
+
import { useSelectionSet } from '../../../../components/Table/TableHooks';
|
13
12
|
import TableWrapper from '../../../../components/Table/TableWrapper';
|
14
13
|
import InactiveText from '../../components/InactiveText';
|
15
14
|
import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
|
@@ -24,35 +23,51 @@ import {
|
|
24
23
|
import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
|
25
24
|
import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
|
26
25
|
import TaskPresenter from '../../components/TaskPresenter/TaskPresenter';
|
27
|
-
import { startPollingTask, stopPollingTask } from '../../../Tasks/TaskActions';
|
28
26
|
import RemoveCVVersionWizard from './Delete/RemoveCVVersionWizard';
|
29
27
|
import { hasPermission } from '../../helpers';
|
30
|
-
import
|
28
|
+
import BulkDeleteModal from './BulkDelete/BulkDeleteModal';
|
29
|
+
import { selectEnvironmentPathsStatus } from '../../components/EnvironmentPaths/EnvironmentPathSelectors';
|
30
|
+
|
31
31
|
|
32
32
|
const ContentViewVersions = ({ cvId, details }) => {
|
33
33
|
const response = useSelector(state => selectCVVersions(state, cvId));
|
34
34
|
const { results, ...metadata } = response;
|
35
|
+
|
36
|
+
const firstIdWithActiveHistory =
|
37
|
+
results?.find(({ active_history: activeHistory }) =>
|
38
|
+
activeHistory?.length)?.id;
|
39
|
+
|
35
40
|
const status = useSelector(state => selectCVVersionsStatus(state, cvId));
|
36
41
|
const error = useSelector(state => selectCVVersionsError(state, cvId));
|
37
|
-
const
|
38
|
-
|
42
|
+
const envStatus = useSelector(state => selectEnvironmentPathsStatus(state, cvId));
|
43
|
+
|
39
44
|
const dispatch = useDispatch();
|
40
|
-
const [rows, setRows] = useState([]);
|
41
45
|
const [searchQuery, updateSearchQuery] = useState('');
|
42
46
|
const [versionIdToPromote, setVersionIdToPromote] = useState('');
|
43
47
|
const [versionNameToPromote, setVersionNameToPromote] = useState('');
|
44
48
|
const [versionIdToRemove, setVersionIdToRemove] = useState('');
|
45
49
|
const [versionNameToRemove, setVersionNameToRemove] = useState('');
|
46
50
|
const [versionEnvironments, setVersionEnvironments] = useState([]);
|
51
|
+
const [bulkDeleteModalOpen, setBulkDeleteModalOpen] = useState(false);
|
47
52
|
const [promoting, setPromoting] = useState(false);
|
48
53
|
const [removingFromEnv, setRemovingFromEnv] = useState(false);
|
49
54
|
const [deleteVersion, setDeleteVersion] = useState(false);
|
50
55
|
const [currentStep, setCurrentStep] = useState(1);
|
51
56
|
const { permissions } = details;
|
52
|
-
const
|
53
|
-
const
|
57
|
+
const [kebabOpen, setKebabOpen] = useState(false);
|
58
|
+
const hasActionPermissions = hasPermission(permissions, 'promote_or_remove_content_views');
|
59
|
+
const renderActionButtons =
|
60
|
+
hasActionPermissions && status === STATUS.RESOLVED && !!results?.length;
|
61
|
+
const {
|
62
|
+
selectOne, isSelected, isSelectable: _isSelectable,
|
63
|
+
selectedCount, selectionSet, ...selectionSetVars
|
64
|
+
} = useSelectionSet({
|
65
|
+
results,
|
66
|
+
metadata,
|
67
|
+
});
|
54
68
|
|
55
69
|
const columnHeaders = [
|
70
|
+
'',
|
56
71
|
__('Version'),
|
57
72
|
__('Environments'),
|
58
73
|
__('Packages'),
|
@@ -63,22 +78,14 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
63
78
|
|
64
79
|
useEffect(
|
65
80
|
() => {
|
66
|
-
dispatch(getEnvironmentPaths());
|
81
|
+
if (envStatus !== STATUS.RESOLVED) { dispatch(getEnvironmentPaths()); }
|
67
82
|
},
|
83
|
+
// We only want this to fire once
|
84
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
68
85
|
[dispatch],
|
69
86
|
);
|
70
87
|
|
71
|
-
|
72
|
-
return () => {
|
73
|
-
if (pendingTaskSet.size) {
|
74
|
-
pendingTaskSet.forEach(id =>
|
75
|
-
dispatch(stopPollingTask(id)));
|
76
|
-
pendingTaskSet.clear();
|
77
|
-
}
|
78
|
-
};
|
79
|
-
}, [pendingTaskSet, dispatch]);
|
80
|
-
|
81
|
-
const buildCells = useCallback((cvVersion) => {
|
88
|
+
const buildCells = (cvVersion) => {
|
82
89
|
const {
|
83
90
|
version,
|
84
91
|
description,
|
@@ -86,96 +93,50 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
86
93
|
environments,
|
87
94
|
rpm_count: packageCount,
|
88
95
|
errata_counts: errataCounts,
|
89
|
-
} = cvVersion;
|
90
|
-
return [
|
91
|
-
{ title: <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link> },
|
92
|
-
{ title: <ContentViewVersionEnvironments {...{ environments }} /> },
|
93
|
-
{
|
94
|
-
title: Number(packageCount) ?
|
95
|
-
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/rpmPackages`, '')}>{packageCount}</a> :
|
96
|
-
<InactiveText text={__('No packages')} />,
|
97
|
-
},
|
98
|
-
{ title: <ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} /> },
|
99
|
-
{ title: <ContentViewVersionContent {...{ cvId, versionId, cvVersion }} /> },
|
100
|
-
{ title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
|
101
|
-
];
|
102
|
-
}, [cvId]);
|
103
|
-
|
104
|
-
const buildActiveTaskCells = useCallback((cvVersion, pollIntervals) => {
|
105
|
-
const {
|
106
|
-
version,
|
107
|
-
description,
|
108
|
-
id: versionId,
|
109
96
|
active_history: activeHistory,
|
110
97
|
} = cvVersion;
|
111
|
-
const { task } = activeHistory[0];
|
112
|
-
const { result } = task || {};
|
113
98
|
|
114
|
-
if (
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
99
|
+
if (activeHistory?.length) {
|
100
|
+
return [
|
101
|
+
'',
|
102
|
+
<Link disabled to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
|
103
|
+
<TaskPresenter
|
104
|
+
activeHistory={first(activeHistory)}
|
105
|
+
cvId={cvId}
|
106
|
+
allowCallback={firstIdWithActiveHistory === versionId}
|
107
|
+
/>,
|
108
|
+
'',
|
109
|
+
'',
|
110
|
+
'',
|
111
|
+
description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} />,
|
112
|
+
];
|
125
113
|
}
|
126
114
|
|
127
115
|
return [
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
{
|
136
|
-
{
|
137
|
-
|
138
|
-
|
116
|
+
<Checkbox
|
117
|
+
id={versionId}
|
118
|
+
isChecked={isSelected(versionId)}
|
119
|
+
onChange={selected =>
|
120
|
+
selectOne(selected, versionId)
|
121
|
+
}
|
122
|
+
/>,
|
123
|
+
<Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
|
124
|
+
<ContentViewVersionEnvironments {...{ environments }} />,
|
125
|
+
Number(packageCount) ?
|
126
|
+
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/packages`, '')}>{packageCount}</a> :
|
127
|
+
<InactiveText text={__('No packages')} />,
|
128
|
+
<ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} />,
|
129
|
+
<ContentViewVersionContent {...{ cvId, versionId, cvVersion }} />,
|
130
|
+
description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} />,
|
139
131
|
];
|
140
|
-
}
|
141
|
-
|
142
|
-
useDeepCompareEffect(() => {
|
143
|
-
const buildRows = () => {
|
144
|
-
const newRows = [];
|
145
|
-
results.forEach((cvVersion) => {
|
146
|
-
const {
|
147
|
-
version,
|
148
|
-
id: versionId,
|
149
|
-
environments,
|
150
|
-
active_history: activeHistory,
|
151
|
-
} = cvVersion;
|
132
|
+
};
|
152
133
|
|
153
|
-
const cells = activeHistory.length ?
|
154
|
-
buildActiveTaskCells(cvVersion, intervals) :
|
155
|
-
buildCells(cvVersion);
|
156
|
-
newRows.push({
|
157
|
-
cvVersionId: versionId,
|
158
|
-
cvVersionName: version,
|
159
|
-
cvVersionEnvironments: environments,
|
160
|
-
activeHistory,
|
161
|
-
cells,
|
162
|
-
});
|
163
|
-
});
|
164
|
-
return newRows;
|
165
|
-
};
|
166
|
-
|
167
|
-
if (!loading && results) {
|
168
|
-
const newRows = buildRows();
|
169
|
-
setRows(newRows);
|
170
|
-
}
|
171
|
-
}, [response, results, buildActiveTaskCells, buildCells, dispatch, loading, setRows, intervals]);
|
172
134
|
|
173
135
|
const onPromote = ({ cvVersionId, cvVersionName, cvVersionEnvironments }) => {
|
174
136
|
setVersionIdToPromote(cvVersionId);
|
175
137
|
setVersionNameToPromote(cvVersionName);
|
176
138
|
setVersionEnvironments(cvVersionEnvironments);
|
177
139
|
setPromoting(true);
|
178
|
-
setPollingFinished(false);
|
179
140
|
};
|
180
141
|
|
181
142
|
const onRemoveFromEnv = ({
|
@@ -186,46 +147,44 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
186
147
|
setVersionEnvironments(cvVersionEnvironments);
|
187
148
|
setRemovingFromEnv(true);
|
188
149
|
setDeleteVersion(deleting);
|
189
|
-
setPollingFinished(false);
|
190
150
|
};
|
191
151
|
|
192
|
-
const
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
152
|
+
const rowDropdownItems = ({
|
153
|
+
version,
|
154
|
+
id: versionId,
|
155
|
+
environments,
|
156
|
+
}) =>
|
157
|
+
[
|
158
|
+
{
|
159
|
+
title: __('Promote'),
|
160
|
+
onClick: () => {
|
161
|
+
onPromote({
|
162
|
+
cvVersionId: versionId,
|
163
|
+
cvVersionName: version,
|
164
|
+
cvVersionEnvironments: environments,
|
165
|
+
});
|
166
|
+
},
|
202
167
|
},
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
});
|
168
|
+
{
|
169
|
+
title: __('Remove from environments'),
|
170
|
+
onClick: () => {
|
171
|
+
onRemoveFromEnv({
|
172
|
+
cvVersionId: versionId,
|
173
|
+
cvVersionName: version,
|
174
|
+
cvVersionEnvironments: environments,
|
175
|
+
deleting: false,
|
176
|
+
});
|
177
|
+
},
|
214
178
|
},
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
cvVersionName: rowInfo.cvVersionName,
|
223
|
-
cvVersionEnvironments: rowInfo.cvVersionEnvironments,
|
224
|
-
deleting: true,
|
225
|
-
});
|
179
|
+
{
|
180
|
+
title: __('Delete'),
|
181
|
+
onClick: () => {
|
182
|
+
selectionSet.clear();
|
183
|
+
selectOne(true, versionId);
|
184
|
+
setBulkDeleteModalOpen(true);
|
185
|
+
},
|
226
186
|
},
|
227
|
-
|
228
|
-
];
|
187
|
+
];
|
229
188
|
|
230
189
|
const emptyContentTitle = __("You currently don't have any versions for this content view.");
|
231
190
|
const emptyContentBody = __('Versions will appear here when the content view is published.'); // needs link
|
@@ -235,7 +194,6 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
235
194
|
return (
|
236
195
|
<TableWrapper
|
237
196
|
{...{
|
238
|
-
rows,
|
239
197
|
metadata,
|
240
198
|
emptyContentTitle,
|
241
199
|
emptyContentBody,
|
@@ -245,42 +203,109 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
245
203
|
updateSearchQuery,
|
246
204
|
error,
|
247
205
|
status,
|
206
|
+
selectedCount,
|
248
207
|
}}
|
249
|
-
|
250
|
-
cells={columnHeaders}
|
208
|
+
ouiaId="content-view-versions-table"
|
251
209
|
variant={TableVariant.compact}
|
252
210
|
autocompleteEndpoint={`/content_view_versions/auto_complete_search?content_view_id=${cvId}`}
|
253
|
-
fetchItems={useCallback(params =>
|
254
|
-
|
211
|
+
fetchItems={useCallback((params) => {
|
212
|
+
selectionSet.clear();
|
213
|
+
return getContentViewVersions(cvId, params);
|
214
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
215
|
+
}, [cvId])}
|
216
|
+
{...hasActionPermissions ? selectionSetVars : []}
|
255
217
|
actionButtons={
|
256
|
-
|
257
|
-
|
258
|
-
<
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
currentStep={currentStep}
|
276
|
-
setCurrentStep={setCurrentStep}
|
277
|
-
deleteWizard={deleteVersion}
|
278
|
-
aria-label="remove_content_view_version_modal"
|
218
|
+
renderActionButtons && (
|
219
|
+
<Grid>
|
220
|
+
<Dropdown
|
221
|
+
toggle={<KebabToggle aria-label="bulk_actions" onToggle={setKebabOpen} />}
|
222
|
+
isOpen={kebabOpen}
|
223
|
+
isPlain
|
224
|
+
dropdownItems={[
|
225
|
+
<DropdownItem
|
226
|
+
aria-label="bulk_delete"
|
227
|
+
key="bulk_delete"
|
228
|
+
isDisabled={selectedCount < 1}
|
229
|
+
component="button"
|
230
|
+
onClick={() => {
|
231
|
+
setKebabOpen(false);
|
232
|
+
setBulkDeleteModalOpen(true);
|
233
|
+
}}
|
234
|
+
>
|
235
|
+
{__('Delete')}
|
236
|
+
</DropdownItem>]}
|
279
237
|
/>
|
280
|
-
|
281
|
-
|
282
|
-
}
|
283
|
-
|
238
|
+
</Grid>
|
239
|
+
)}
|
240
|
+
displaySelectAllCheckbox={hasActionPermissions}
|
241
|
+
>
|
242
|
+
<Thead>
|
243
|
+
{bulkDeleteModalOpen &&
|
244
|
+
<BulkDeleteModal
|
245
|
+
versions={results?.filter(({ id }) => selectionSet.has(id))}
|
246
|
+
onClose={() => {
|
247
|
+
selectionSet.clear();
|
248
|
+
setBulkDeleteModalOpen(false);
|
249
|
+
}}
|
250
|
+
/>
|
251
|
+
}
|
252
|
+
{promoting &&
|
253
|
+
<ContentViewVersionPromote
|
254
|
+
cvId={cvId}
|
255
|
+
versionIdToPromote={versionIdToPromote}
|
256
|
+
versionNameToPromote={versionNameToPromote}
|
257
|
+
versionEnvironments={versionEnvironments}
|
258
|
+
setIsOpen={setPromoting}
|
259
|
+
aria-label="promote_content_view_modal"
|
260
|
+
/>
|
261
|
+
}
|
262
|
+
{removingFromEnv &&
|
263
|
+
<RemoveCVVersionWizard
|
264
|
+
cvId={cvId}
|
265
|
+
versionIdToRemove={versionIdToRemove}
|
266
|
+
versionNameToRemove={versionNameToRemove}
|
267
|
+
versionEnvironments={versionEnvironments}
|
268
|
+
show={removingFromEnv}
|
269
|
+
setIsOpen={setRemovingFromEnv}
|
270
|
+
currentStep={currentStep}
|
271
|
+
setCurrentStep={setCurrentStep}
|
272
|
+
deleteWizard={deleteVersion}
|
273
|
+
aria-label="remove_content_view_version_modal"
|
274
|
+
/>
|
275
|
+
}
|
276
|
+
<Tr key="version-header">
|
277
|
+
{columnHeaders.map((title, index) => {
|
278
|
+
if (index === 0 && !hasActionPermissions) return undefined;
|
279
|
+
return <Th key={`col-header-${title}`}>{title}</Th>;
|
280
|
+
})}
|
281
|
+
</Tr>
|
282
|
+
</Thead>
|
283
|
+
<Tbody>
|
284
|
+
{results?.map((cvVersion) => {
|
285
|
+
const hasHistory = !!cvVersion?.active_history?.length;
|
286
|
+
const cells = buildCells(cvVersion);
|
287
|
+
return (
|
288
|
+
<Tr key={`column-${cvVersion.id}`}>
|
289
|
+
{cells.map((cell, index) => {
|
290
|
+
if (index === 0 && !hasActionPermissions) return undefined;
|
291
|
+
return (
|
292
|
+
<Td
|
293
|
+
key={`cell-${index + 1}`}
|
294
|
+
style={index === 0 ? { padding: '0px 16px', width: '45px' } : undefined}
|
295
|
+
>
|
296
|
+
{cell}
|
297
|
+
</Td>);
|
298
|
+
})}
|
299
|
+
{(!hasHistory && hasActionPermissions) &&
|
300
|
+
<Td
|
301
|
+
actions={{
|
302
|
+
items: rowDropdownItems(cvVersion),
|
303
|
+
}}
|
304
|
+
/>}
|
305
|
+
</Tr>);
|
306
|
+
})}
|
307
|
+
</Tbody>
|
308
|
+
</TableWrapper >);
|
284
309
|
};
|
285
310
|
|
286
311
|
ContentViewVersions.propTypes = {
|
@@ -17,7 +17,7 @@ import { useSet } from '../../../../../components/Table/TableHooks';
|
|
17
17
|
const RemoveCVVersionWizard = ({
|
18
18
|
cvId, versionIdToRemove, versionNameToRemove,
|
19
19
|
versionEnvironments, show, setIsOpen,
|
20
|
-
currentStep, setCurrentStep, deleteWizard,
|
20
|
+
currentStep, setCurrentStep, deleteWizard,
|
21
21
|
}) => {
|
22
22
|
const [selectedEnvForAK, setSelectedEnvForAK] = useState([]);
|
23
23
|
const [selectedEnvForHost, setSelectedEnvForHost] = useState([]);
|
@@ -78,7 +78,7 @@ const RemoveCVVersionWizard = ({
|
|
78
78
|
component: <CVReassignActivationKeysForm />,
|
79
79
|
enableNext: canReview,
|
80
80
|
canJumpTo: affectedActivationKeys &&
|
81
|
-
|
81
|
+
(affectedHosts ? selectedEnvForHost && selectedCVForHosts : true),
|
82
82
|
};
|
83
83
|
|
84
84
|
const reviewStep = {
|
@@ -133,7 +133,6 @@ const RemoveCVVersionWizard = ({
|
|
133
133
|
selectedEnvForHost,
|
134
134
|
setSelectedEnvForHost,
|
135
135
|
selectedEnvSet,
|
136
|
-
detailsPage,
|
137
136
|
}}
|
138
137
|
>
|
139
138
|
<Wizard
|
@@ -166,14 +165,12 @@ RemoveCVVersionWizard.propTypes = {
|
|
166
165
|
currentStep: PropTypes.number.isRequired,
|
167
166
|
setCurrentStep: PropTypes.func.isRequired,
|
168
167
|
deleteWizard: PropTypes.bool.isRequired,
|
169
|
-
detailsPage: PropTypes.bool,
|
170
168
|
};
|
171
169
|
|
172
170
|
RemoveCVVersionWizard.defaultProps = {
|
173
171
|
versionEnvironments: [],
|
174
172
|
show: false,
|
175
173
|
setIsOpen: null,
|
176
|
-
detailsPage: false,
|
177
174
|
};
|
178
175
|
|
179
176
|
export default RemoveCVVersionWizard;
|
data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionDeleteFinish.js
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
import React, { useState, useContext } from 'react';
|
1
|
+
import React, { useState, useEffect, useContext } from 'react';
|
2
2
|
import { useDispatch, useSelector } from 'react-redux';
|
3
|
-
import {
|
4
|
-
import useDeepCompareEffect from 'use-deep-compare-effect';
|
3
|
+
import { useHistory } from 'react-router-dom';
|
5
4
|
import { STATUS } from 'foremanReact/constants';
|
5
|
+
import useDeepCompareEffect from 'use-deep-compare-effect';
|
6
6
|
import { translate as __ } from 'foremanReact/common/I18n';
|
7
|
-
import {
|
8
|
-
import {
|
7
|
+
import { selectRemoveCVVersionStatus } from '../../../ContentViewDetailSelectors';
|
8
|
+
import getContentViewDetails, { removeContentViewVersion } from '../../../ContentViewDetailActions';
|
9
9
|
import Loading from '../../../../../../components/Loading';
|
10
10
|
import DeleteContext from '../DeleteContext';
|
11
11
|
|
@@ -15,50 +15,27 @@ const CVVersionDeleteFinish = () => {
|
|
15
15
|
setIsOpen, selectedEnvSet,
|
16
16
|
selectedCVForAK, selectedEnvForAK, selectedCVForHosts,
|
17
17
|
selectedEnvForHost, affectedActivationKeys, affectedHosts,
|
18
|
-
deleteFlow, removeDeletionFlow,
|
18
|
+
deleteFlow, removeDeletionFlow,
|
19
19
|
} = useContext(DeleteContext);
|
20
|
-
|
21
|
-
|
20
|
+
|
21
|
+
const dispatch = useDispatch();
|
22
22
|
const removeCVVersionStatus = useSelector(state =>
|
23
23
|
selectRemoveCVVersionStatus(state, versionIdToRemove, versionEnvironments));
|
24
|
-
const removeResolved = removeCVVersionStatus === STATUS.RESOLVED;
|
25
|
-
const dispatch = useDispatch();
|
26
24
|
const [removeDispatched, setRemoveDispatched] = useState(false);
|
27
|
-
const [redirect, setRedirect] = useState(false);
|
28
25
|
const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
|
26
|
+
const { push, location: { pathname } } = useHistory();
|
29
27
|
|
30
|
-
|
31
|
-
if (
|
32
|
-
|
33
|
-
if (detailsPage) {
|
34
|
-
setRedirect(true);
|
35
|
-
} else {
|
36
|
-
setIsOpen(false);
|
37
|
-
}
|
28
|
+
useEffect(() => {
|
29
|
+
if (removeCVVersionStatus === STATUS.ERROR) {
|
30
|
+
setIsOpen(false);
|
38
31
|
}
|
39
|
-
}, [
|
40
|
-
dispatch, cvId, removeDispatched, detailsPage, setRedirect]);
|
41
|
-
|
42
|
-
/*
|
43
|
-
The remove version from environment API takes the following params :
|
44
|
-
id: Content View to remove from environments
|
45
|
-
environment_ids: List of environments to remove CV from
|
32
|
+
}, [setIsOpen, removeCVVersionStatus]);
|
46
33
|
|
47
|
-
If activation keys need to be reassigned, we need to pass:
|
48
|
-
key_content_view_id : New Content view for activation keys
|
49
|
-
key_environment_id: Environment of the CV we are reassigning keys to
|
50
34
|
|
51
|
-
Additionally, if hosts need to be reassigned, we need to pass:
|
52
|
-
system_content_view_id: New Content view for Hosts
|
53
|
-
system_environment_id: Environment of the CV we are reassigning hosts to
|
54
|
-
|
55
|
-
Finally, if we want to delete the version after removing it from all environments,
|
56
|
-
we need to pass content_view_version_ids param, that accepts an array of versions to delete
|
57
|
-
|
58
|
-
This hook forms the params based on selections made in the wizard and dispatches the call.
|
59
|
-
*/
|
60
35
|
useDeepCompareEffect(() => {
|
61
36
|
if (!removeDispatched) {
|
37
|
+
setRemoveDispatched(true);
|
38
|
+
|
62
39
|
const environmentIdParams = (deleteFlow || removeDeletionFlow) ?
|
63
40
|
versionEnvironments.map(env => env.id) :
|
64
41
|
selectedEnv.map(env => env.id);
|
@@ -69,36 +46,44 @@ const CVVersionDeleteFinish = () => {
|
|
69
46
|
};
|
70
47
|
|
71
48
|
if (affectedActivationKeys) {
|
72
|
-
|
49
|
+
params = {
|
50
|
+
...params,
|
73
51
|
key_content_view_id: selectedCVForAK,
|
74
52
|
key_environment_id: selectedEnvForAK[0].id,
|
75
53
|
};
|
76
|
-
params = { ...activationKeysParams, ...params };
|
77
54
|
}
|
78
55
|
|
79
56
|
if (affectedHosts) {
|
80
|
-
|
57
|
+
params = {
|
58
|
+
...params,
|
81
59
|
system_content_view_id: selectedCVForHosts,
|
82
60
|
system_environment_id: selectedEnvForHost[0].id,
|
83
61
|
};
|
84
|
-
params = { ...hostParams, ...params };
|
85
62
|
}
|
86
63
|
|
87
64
|
if (deleteFlow || removeDeletionFlow) {
|
88
|
-
|
89
|
-
|
65
|
+
params = {
|
66
|
+
...params,
|
67
|
+
content_view_version_ids: [versionIdToRemove],
|
68
|
+
};
|
90
69
|
}
|
91
|
-
|
92
|
-
|
70
|
+
|
71
|
+
dispatch(removeContentViewVersion(
|
72
|
+
cvId,
|
73
|
+
versionIdToRemove,
|
74
|
+
versionEnvironments,
|
75
|
+
params,
|
76
|
+
() => {
|
77
|
+
dispatch(getContentViewDetails(cvId));
|
78
|
+
if (pathname !== '/versions') push('/versions');
|
79
|
+
},
|
80
|
+
));
|
93
81
|
}
|
94
|
-
}, [
|
95
|
-
|
96
|
-
|
97
|
-
|
82
|
+
}, [affectedActivationKeys, affectedHosts, cvId, deleteFlow,
|
83
|
+
dispatch, pathname, push, removeDeletionFlow, removeDispatched,
|
84
|
+
selectedCVForAK, selectedCVForHosts, selectedEnv, selectedEnvForAK,
|
85
|
+
selectedEnvForHost, setIsOpen, versionEnvironments, versionIdToRemove]);
|
98
86
|
|
99
|
-
if (redirect) {
|
100
|
-
return (<Redirect to="/versions" />);
|
101
|
-
}
|
102
87
|
return <Loading loadingText={__('Please wait while the task starts..')} />;
|
103
88
|
};
|
104
89
|
|