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,13 +1,12 @@
|
|
1
1
|
import React, { useState, useCallback } from 'react';
|
2
|
-
import useDeepCompareEffect from 'use-deep-compare-effect';
|
3
2
|
import { useSelector, useDispatch } from 'react-redux';
|
4
|
-
import {
|
3
|
+
import { Link } from 'react-router-dom';
|
4
|
+
import { omit } from 'lodash';
|
5
5
|
import { translate as __ } from 'foremanReact/common/I18n';
|
6
|
-
import
|
6
|
+
import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
|
7
7
|
import { Button } from '@patternfly/react-core';
|
8
|
-
import { TableVariant } from '@patternfly/react-table';
|
8
|
+
import { TableVariant, Thead, Tbody, Th, Tr, Td, ExpandableRowContent } from '@patternfly/react-table';
|
9
9
|
import TableWrapper from '../../../components/Table/TableWrapper';
|
10
|
-
import tableDataGenerator from './tableDataGenerator';
|
11
10
|
import getContentViews from '../ContentViewsActions';
|
12
11
|
import CreateContentViewModal from '../Create/CreateContentViewModal';
|
13
12
|
import CopyContentViewModal from '../Copy/CopyContentViewModal';
|
@@ -15,180 +14,115 @@ import PublishContentViewWizard from '../Publish/PublishContentViewWizard';
|
|
15
14
|
import { selectContentViews, selectContentViewStatus, selectContentViewError } from '../ContentViewSelectors';
|
16
15
|
import ContentViewVersionPromote from '../Details/Promote/ContentViewVersionPromote';
|
17
16
|
import getEnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPathActions';
|
18
|
-
import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
|
19
|
-
import getContentViewDetails, { getContentViewVersions } from '../Details/ContentViewDetailActions';
|
20
17
|
import { hasPermission } from '../helpers';
|
18
|
+
import { useSet, useTableSort } from '../../../components/Table/TableHooks';
|
19
|
+
import ContentViewIcon from '../components/ContentViewIcon';
|
20
|
+
import { urlBuilder } from '../../../__mocks__/foremanReact/common/urlHelpers';
|
21
|
+
import LastSync from '../Details/Repositories/LastSync';
|
22
|
+
import InactiveText from '../components/InactiveText';
|
23
|
+
import ContentViewVersionCell from './ContentViewVersionCell';
|
24
|
+
import DetailsExpansion from '../expansions/DetailsExpansion';
|
25
|
+
import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
|
21
26
|
|
22
27
|
const ContentViewTable = () => {
|
23
28
|
const response = useSelector(selectContentViews);
|
24
29
|
const status = useSelector(selectContentViewStatus);
|
25
30
|
const error = useSelector(selectContentViewError);
|
26
|
-
const [table, setTable] = useState({ rows: [], columns: [] });
|
27
|
-
const [sortBy, setSortBy] = useState({});
|
28
|
-
const [rowMappingIds, setRowMappingIds] = useState([]);
|
29
31
|
const [searchQuery, updateSearchQuery] = useState('');
|
30
|
-
const loadingResponse = status === STATUS.PENDING;
|
31
32
|
const [isModalOpen, setIsModalOpen] = useState(false);
|
32
33
|
const [copy, setCopy] = useState(false);
|
33
|
-
const
|
34
|
-
const
|
34
|
+
const expandedTableRows = useSet([]);
|
35
|
+
const tableRowIsExpanded = id => expandedTableRows.has(id);
|
35
36
|
const [isPublishModalOpen, setIsPublishModalOpen] = useState(false);
|
36
37
|
const [isPromoteModalOpen, setIsPromoteModalOpen] = useState(false);
|
37
38
|
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
|
38
39
|
const [actionableCvDetails, setActionableCvDetails] = useState({});
|
39
40
|
const [actionableCvId, setActionableCvId] = useState('');
|
40
41
|
const [actionableCvName, setActionableCvName] = useState('');
|
41
|
-
const [currentStep, setCurrentStep] = useState(1);
|
42
42
|
const dispatch = useDispatch();
|
43
43
|
const metadata = omit(response, ['results']);
|
44
|
-
const { can_create: canCreate = false } = response;
|
44
|
+
const { can_create: canCreate = false, results } = response;
|
45
|
+
const columnHeaders = [
|
46
|
+
__('Type'),
|
47
|
+
__('Name'),
|
48
|
+
__('Last published'),
|
49
|
+
__('Last task'),
|
50
|
+
__('Latest version'),
|
51
|
+
];
|
52
|
+
const COLUMNS_TO_SORT_PARAMS = {
|
53
|
+
[columnHeaders[1]]: 'name',
|
54
|
+
};
|
55
|
+
const {
|
56
|
+
pfSortParams, apiSortParams,
|
57
|
+
activeSortColumn, activeSortDirection,
|
58
|
+
} = useTableSort({
|
59
|
+
allColumns: columnHeaders,
|
60
|
+
columnsToSortParams: COLUMNS_TO_SORT_PARAMS,
|
61
|
+
initialSortColumnName: 'Name',
|
62
|
+
});
|
45
63
|
|
46
64
|
const openForm = () => setIsModalOpen(true);
|
47
65
|
|
48
|
-
const openPublishModal = (
|
49
|
-
setActionableCvDetails(
|
50
|
-
id: rowInfo.cvId.toString(),
|
51
|
-
name: rowInfo.cvName,
|
52
|
-
composite: rowInfo.cvComposite,
|
53
|
-
version_count: rowInfo.cvVersionCount,
|
54
|
-
next_version: rowInfo.cvNextVersion,
|
55
|
-
});
|
66
|
+
const openPublishModal = (cvInfo) => {
|
67
|
+
setActionableCvDetails(cvInfo);
|
56
68
|
setIsPublishModalOpen(true);
|
57
69
|
};
|
58
70
|
|
59
|
-
const openPromoteModal = (
|
71
|
+
const openPromoteModal = (cvInfo) => {
|
60
72
|
dispatch(getEnvironmentPaths());
|
61
|
-
setActionableCvDetails(
|
62
|
-
id: rowInfo.cvId.toString(),
|
63
|
-
latestVersionId: rowInfo.latestVersionId,
|
64
|
-
latestVersionEnvironments: rowInfo.latestVersionEnvironments,
|
65
|
-
latestVersionName: rowInfo.latestVersionName,
|
66
|
-
});
|
73
|
+
setActionableCvDetails(cvInfo);
|
67
74
|
setIsPromoteModalOpen(true);
|
68
75
|
};
|
69
76
|
|
70
|
-
const openDeleteModal = (
|
71
|
-
|
72
|
-
dispatch(getContentViewVersions(rowInfo.cvId));
|
73
|
-
setActionableCvDetails({
|
74
|
-
id: rowInfo.cvId.toString(),
|
75
|
-
name: rowInfo.cvName,
|
76
|
-
environments: rowInfo.environments,
|
77
|
-
versions: rowInfo.versions,
|
78
|
-
});
|
77
|
+
const openDeleteModal = (cvInfo) => {
|
78
|
+
setActionableCvDetails(cvInfo);
|
79
79
|
setIsDeleteModalOpen(true);
|
80
80
|
};
|
81
81
|
|
82
|
-
|
83
|
-
|
84
|
-
// Prevents flash of "No Content" before rows are loaded
|
85
|
-
const tableStatus = () => {
|
86
|
-
if (typeof cvResults === 'undefined' || status === STATUS.ERROR) return status; // will handle errored state
|
87
|
-
const resultsIds = Array.from(cvResults.map(result => result.id));
|
88
|
-
// All results are accounted for in row mapping, the page is ready to load
|
89
|
-
if (resultsIds.length === rowMappingIds.length &&
|
90
|
-
resultsIds.every(id => rowMappingIds.includes(id))) {
|
91
|
-
return status;
|
92
|
-
}
|
93
|
-
return STATUS.PENDING; // Fallback to pending
|
94
|
-
};
|
95
|
-
|
96
|
-
const { results } = response;
|
97
|
-
if (status === STATUS.ERROR) {
|
98
|
-
setCvTableStatus(tableStatus());
|
99
|
-
}
|
100
|
-
if (!loadingResponse && results) {
|
101
|
-
setCvResults(results);
|
102
|
-
setCurrentStep(1);
|
103
|
-
const { newRowMappingIds, ...tableData } = tableDataGenerator(results);
|
104
|
-
setTable(tableData);
|
105
|
-
setRowMappingIds(newRowMappingIds);
|
106
|
-
setCvTableStatus(tableStatus());
|
107
|
-
}
|
108
|
-
return () => {
|
109
|
-
// This sets the loading state so that the table doesn't flicker on return
|
110
|
-
setCvTableStatus(STATUS.PENDING);
|
111
|
-
};
|
112
|
-
},
|
113
|
-
[response, status, loadingResponse, setTable, setRowMappingIds,
|
114
|
-
setCvResults, setCvTableStatus, setCurrentStep, cvResults, rowMappingIds],
|
115
|
-
);
|
116
|
-
|
117
|
-
const onCollapse = (_event, rowId, isOpen) => {
|
118
|
-
let rows;
|
119
|
-
if (rowId === -1) {
|
120
|
-
rows = table.rows.map(row => ({ ...row, isOpen }));
|
121
|
-
} else {
|
122
|
-
rows = [...table.rows];
|
123
|
-
rows[rowId].isOpen = isOpen;
|
124
|
-
}
|
82
|
+
const actionsWithPermissions = (cvInfo) => {
|
83
|
+
const { version_count: cvVersionCount, generated_for: generatedFor, permissions } = cvInfo;
|
125
84
|
|
126
|
-
setTable(prevTable => ({ ...prevTable, rows }));
|
127
|
-
};
|
128
|
-
|
129
|
-
const actionResolver = (rowData, { _rowIndex }) => {
|
130
|
-
// don't show actions for the expanded parts
|
131
|
-
if (rowData.parent !== undefined || rowData.compoundParent || rowData.noactions) return null;
|
132
85
|
const publishAction = {
|
133
86
|
title: __('Publish'),
|
134
|
-
|
135
|
-
|
136
|
-
},
|
87
|
+
isDisabled: generatedFor !== 'none',
|
88
|
+
onClick: () => openPublishModal(cvInfo),
|
137
89
|
};
|
138
90
|
|
139
91
|
const promoteAction = {
|
140
92
|
title: __('Promote'),
|
141
|
-
isDisabled: !
|
142
|
-
onClick: (
|
93
|
+
isDisabled: !cvVersionCount,
|
94
|
+
onClick: () => openPromoteModal(cvInfo),
|
143
95
|
};
|
144
96
|
|
145
97
|
const copyAction = {
|
146
98
|
title: __('Copy'),
|
147
|
-
onClick: (
|
99
|
+
onClick: () => {
|
148
100
|
setCopy(true);
|
149
|
-
setActionableCvId(
|
150
|
-
setActionableCvName(
|
101
|
+
setActionableCvId(cvInfo.id.toString());
|
102
|
+
setActionableCvName(cvInfo.name);
|
151
103
|
},
|
152
104
|
};
|
153
105
|
|
154
106
|
const deleteAction = {
|
155
107
|
title: __('Delete'),
|
156
|
-
onClick: (
|
108
|
+
onClick: () => openDeleteModal(cvInfo),
|
157
109
|
};
|
158
110
|
|
159
111
|
return [
|
160
|
-
...(hasPermission(
|
161
|
-
...(hasPermission(
|
112
|
+
...(hasPermission(permissions, 'publish_content_views') ? [publishAction] : []),
|
113
|
+
...(hasPermission(permissions, 'promote_or_remove_content_views') ? [promoteAction] : []),
|
162
114
|
...(canCreate ? [copyAction] : []),
|
163
|
-
...(hasPermission(
|
115
|
+
...(hasPermission(permissions, 'destroy_content_views') ? [deleteAction] : []),
|
164
116
|
];
|
165
117
|
};
|
166
118
|
|
167
|
-
const indexToSortVariable = (key) => {
|
168
|
-
switch (key) {
|
169
|
-
case 2:
|
170
|
-
return 'name';
|
171
|
-
default:
|
172
|
-
return undefined;
|
173
|
-
}
|
174
|
-
};
|
175
|
-
|
176
|
-
const onSort = (_event, index, direction) => {
|
177
|
-
setCvTableStatus(STATUS.PENDING);
|
178
|
-
setSortBy({ index, direction });
|
179
|
-
};
|
180
|
-
|
181
|
-
const { index: sortByIndex, direction } = sortBy;
|
182
119
|
const fetchItems = useCallback(
|
183
120
|
params =>
|
184
121
|
getContentViews({
|
122
|
+
...apiSortParams,
|
185
123
|
...params,
|
186
|
-
...sortByIndex ? {
|
187
|
-
sort_by: indexToSortVariable(sortByIndex),
|
188
|
-
sort_order: upperCase(direction),
|
189
|
-
} : {},
|
190
124
|
}),
|
191
|
-
[
|
125
|
+
[apiSortParams],
|
192
126
|
);
|
193
127
|
|
194
128
|
const emptyContentTitle = __("You currently don't have any Content views.");
|
@@ -197,43 +131,36 @@ const ContentViewTable = () => {
|
|
197
131
|
const emptySearchBody = __('Try changing your search settings.');
|
198
132
|
const {
|
199
133
|
id,
|
200
|
-
latestVersionId,
|
201
|
-
latestVersionName,
|
202
|
-
latestVersionEnvironments,
|
134
|
+
latest_version_id: latestVersionId,
|
135
|
+
latest_version: latestVersionName,
|
136
|
+
latest_version_environments: latestVersionEnvironments,
|
203
137
|
environments,
|
204
138
|
versions,
|
205
139
|
} = actionableCvDetails;
|
206
140
|
|
207
|
-
const { rows, columns } = table;
|
208
141
|
return (
|
209
142
|
<TableWrapper
|
210
143
|
{...{
|
211
|
-
rows,
|
212
144
|
error,
|
213
145
|
metadata,
|
214
146
|
emptyContentTitle,
|
215
147
|
emptyContentBody,
|
216
148
|
emptySearchTitle,
|
217
149
|
emptySearchBody,
|
218
|
-
actionResolver,
|
219
150
|
searchQuery,
|
220
151
|
updateSearchQuery,
|
221
152
|
fetchItems,
|
222
153
|
}}
|
223
|
-
|
224
|
-
|
225
|
-
onSort={onSort}
|
154
|
+
ouiaId="content-views-table"
|
155
|
+
additionalListeners={[activeSortColumn, activeSortDirection]}
|
226
156
|
bookmarkController="katello_content_views"
|
227
157
|
variant={TableVariant.compact}
|
228
|
-
status={
|
229
|
-
onCollapse={onCollapse}
|
230
|
-
canSelectAll={false}
|
231
|
-
cells={columns}
|
158
|
+
status={status}
|
232
159
|
autocompleteEndpoint="/content_views/auto_complete_search"
|
233
160
|
actionButtons={
|
234
161
|
<>
|
235
162
|
{canCreate &&
|
236
|
-
<Button onClick={openForm} variant="primary" aria-label="create_content_view">
|
163
|
+
<Button ouiaId="create-content-view" onClick={openForm} variant="primary" aria-label="create_content_view">
|
237
164
|
{__('Create content view')}
|
238
165
|
</Button>
|
239
166
|
}
|
@@ -243,9 +170,12 @@ const ContentViewTable = () => {
|
|
243
170
|
<PublishContentViewWizard
|
244
171
|
details={actionableCvDetails}
|
245
172
|
show={isPublishModalOpen}
|
246
|
-
|
247
|
-
|
248
|
-
|
173
|
+
onClose={(makeCallback) => {
|
174
|
+
if (makeCallback) {
|
175
|
+
dispatch(getContentViews(apiSortParams));
|
176
|
+
}
|
177
|
+
setIsPublishModalOpen(false);
|
178
|
+
}}
|
249
179
|
aria-label="publish_content_view_modal"
|
250
180
|
/>
|
251
181
|
}
|
@@ -258,19 +188,106 @@ const ContentViewTable = () => {
|
|
258
188
|
setIsOpen={setIsPromoteModalOpen}
|
259
189
|
/>
|
260
190
|
}
|
261
|
-
{isDeleteModalOpen &&
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
/>}
|
191
|
+
{isDeleteModalOpen &&
|
192
|
+
<ContentViewDeleteWizard
|
193
|
+
cvId={id && Number(id)}
|
194
|
+
cvEnvironments={environments}
|
195
|
+
cvVersions={versions}
|
196
|
+
show={isDeleteModalOpen}
|
197
|
+
setIsOpen={setIsDeleteModalOpen}
|
198
|
+
aria-label="delete_content_view_modal"
|
199
|
+
/>}
|
271
200
|
</>
|
272
201
|
}
|
273
|
-
|
202
|
+
>
|
203
|
+
<Thead>
|
204
|
+
<Tr>
|
205
|
+
<Th key="expand-carat" />
|
206
|
+
{columnHeaders.map(col => (
|
207
|
+
<Th
|
208
|
+
key={col}
|
209
|
+
sort={COLUMNS_TO_SORT_PARAMS[col] ? pfSortParams(col) : undefined}
|
210
|
+
>
|
211
|
+
{col}
|
212
|
+
</Th>
|
213
|
+
))}
|
214
|
+
<Th key="action-menu" />
|
215
|
+
</Tr>
|
216
|
+
</Thead>
|
217
|
+
{results?.map((cvInfo, rowIndex) => {
|
218
|
+
const {
|
219
|
+
composite,
|
220
|
+
name,
|
221
|
+
id: cvId,
|
222
|
+
last_published: lastPublished,
|
223
|
+
latest_version: latestVersion,
|
224
|
+
latest_version_id: cvLatestVersionId,
|
225
|
+
latest_version_environments: cvLatestVersionEnvironments,
|
226
|
+
last_task: lastTask,
|
227
|
+
activation_keys: activationKeys,
|
228
|
+
hosts,
|
229
|
+
related_cv_count: relatedCVCount,
|
230
|
+
related_composite_cvs: relatedCompositeCVs,
|
231
|
+
description,
|
232
|
+
createdAt,
|
233
|
+
} = cvInfo;
|
234
|
+
const { last_sync_words: lastSyncWords, started_at: startedAt } = lastTask ?? {};
|
235
|
+
const isExpanded = tableRowIsExpanded(cvId);
|
236
|
+
return (
|
237
|
+
<Tbody isExpanded={isExpanded} key={`${cvId}_${createdAt}`}>
|
238
|
+
<Tr key={cvId}>
|
239
|
+
<Td
|
240
|
+
expand={{
|
241
|
+
rowIndex,
|
242
|
+
isExpanded,
|
243
|
+
onToggle: (_event, _rInx, isOpen) =>
|
244
|
+
expandedTableRows.onToggle(isOpen, cvId),
|
245
|
+
}}
|
246
|
+
/>
|
247
|
+
<Td><ContentViewIcon position="right" composite={composite} /></Td>
|
248
|
+
<Td><Link to={`${urlBuilder('content_views', '')}${cvId}`}>{name}</Link></Td>
|
249
|
+
<Td>{lastPublished ? <LongDateTime date={lastPublished} showRelativeTimeTooltip /> : <InactiveText text={__('Not yet published')} />}</Td>
|
250
|
+
<Td><LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /></Td>
|
251
|
+
<Td>{latestVersion ?
|
252
|
+
<ContentViewVersionCell {...{
|
253
|
+
id: cvId,
|
254
|
+
latestVersion,
|
255
|
+
latestVersionId: cvLatestVersionId,
|
256
|
+
latestVersionEnvironments: cvLatestVersionEnvironments,
|
257
|
+
}}
|
258
|
+
/> :
|
259
|
+
<InactiveText style={{ marginTop: '0.5em', marginBottom: '0.5em' }} text={__('Not yet published')} />}
|
260
|
+
</Td>
|
261
|
+
<Td
|
262
|
+
key={`rowActions-${id}`}
|
263
|
+
actions={{
|
264
|
+
items: actionsWithPermissions(cvInfo),
|
265
|
+
}}
|
266
|
+
/>
|
267
|
+
</Tr>
|
268
|
+
<Tr key="child_row" isExpanded={isExpanded}>
|
269
|
+
<Td colSpan={2}>
|
270
|
+
<ExpandableRowContent>
|
271
|
+
<DetailsExpansion
|
272
|
+
cvId={cvId}
|
273
|
+
cvName={name}
|
274
|
+
cvComposite={composite}
|
275
|
+
{...{
|
276
|
+
activationKeys, hosts, relatedCVCount, relatedCompositeCVs,
|
277
|
+
}}
|
278
|
+
/>
|
279
|
+
</ExpandableRowContent>
|
280
|
+
</Td>
|
281
|
+
<Td colSpan={4}>
|
282
|
+
<ExpandableRowContent>
|
283
|
+
{description || <InactiveText text={__('No description')} />}
|
284
|
+
</ExpandableRowContent>
|
285
|
+
</Td>
|
286
|
+
</Tr>
|
287
|
+
</Tbody>
|
288
|
+
);
|
289
|
+
})}
|
290
|
+
</TableWrapper>
|
274
291
|
);
|
275
292
|
};
|
276
293
|
|
@@ -64,6 +64,7 @@ const buildExpandableRows = (contentViews) => {
|
|
64
64
|
environments,
|
65
65
|
versions,
|
66
66
|
permissions,
|
67
|
+
generated_for: generatedFor,
|
67
68
|
related_cv_count: relatedCVCount,
|
68
69
|
related_composite_cvs: relatedCompositeCVs,
|
69
70
|
} = contentView;
|
@@ -80,6 +81,7 @@ const buildExpandableRows = (contentViews) => {
|
|
80
81
|
environments,
|
81
82
|
versions,
|
82
83
|
permissions,
|
84
|
+
generatedFor,
|
83
85
|
isOpen: false,
|
84
86
|
cells,
|
85
87
|
};
|
@@ -43,14 +43,14 @@ test('Can call API for CVs and show on screen on page load', async (done) => {
|
|
43
43
|
.query(true)
|
44
44
|
.reply(200, cvIndexData);
|
45
45
|
|
46
|
-
const { queryByText
|
46
|
+
const { queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
|
47
47
|
|
48
48
|
expect(queryByText(firstCV.name)).toBeNull();
|
49
49
|
|
50
50
|
// Assert that the CV name is now showing on the screen, but wait for it to appear.
|
51
51
|
await patientlyWaitFor(() => {
|
52
52
|
expect(queryByText(firstCV.name)).toBeInTheDocument();
|
53
|
-
expect(
|
53
|
+
expect(queryByText('Component content views')).toBeInTheDocument();
|
54
54
|
expect(queryByText('Composite content views')).toBeInTheDocument();
|
55
55
|
});
|
56
56
|
|
@@ -354,7 +354,7 @@ test('Displays Create Content View and opens modal with Form', async () => {
|
|
354
354
|
expect(queryByText('Name')).not.toBeInTheDocument();
|
355
355
|
expect(queryByText('Label')).not.toBeInTheDocument();
|
356
356
|
expect(queryByText('Composite content view')).not.toBeInTheDocument();
|
357
|
-
expect(queryByText('
|
357
|
+
expect(queryByText('Component content view')).not.toBeInTheDocument();
|
358
358
|
expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
|
359
359
|
expect(queryByText('Auto publish')).not.toBeInTheDocument();
|
360
360
|
expect(queryByText('Import only')).not.toBeInTheDocument();
|
@@ -365,7 +365,7 @@ test('Displays Create Content View and opens modal with Form', async () => {
|
|
365
365
|
expect(getByText('Name')).toBeInTheDocument();
|
366
366
|
expect(getByText('Label')).toBeInTheDocument();
|
367
367
|
expect(getByText('Composite content view')).toBeInTheDocument();
|
368
|
-
expect(getByText('
|
368
|
+
expect(getByText('Component content view')).toBeInTheDocument();
|
369
369
|
expect(getByText('Solve dependencies')).toBeInTheDocument();
|
370
370
|
expect(queryByText('Auto publish')).not.toBeInTheDocument();
|
371
371
|
expect(getByText('Import only')).toBeInTheDocument();
|
@@ -1,20 +1,31 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { translate as __ } from 'foremanReact/common/I18n';
|
3
3
|
import PropTypes from 'prop-types';
|
4
|
+
import { Tooltip } from '@patternfly/react-core';
|
4
5
|
import { EnterpriseIcon, RegistryIcon } from '@patternfly/react-icons';
|
5
6
|
import './contentViewIcon.scss';
|
6
7
|
|
7
8
|
const ContentViewIcon = ({
|
8
|
-
composite, count, description, style,
|
9
|
+
composite, count, description, style, ...toolTipProps
|
9
10
|
}) => {
|
10
11
|
const props = {
|
11
|
-
title: composite ? __('Composite') : __('Component'),
|
12
12
|
className: composite ? 'svg-icon-composite' : 'svg-icon-component',
|
13
13
|
};
|
14
|
+
const cvIcon = (
|
15
|
+
<Tooltip
|
16
|
+
position="auto"
|
17
|
+
enableFlip
|
18
|
+
entryDelay={400}
|
19
|
+
content={composite ? __('Composite content view') : __('Component content view')}
|
20
|
+
{...toolTipProps}
|
21
|
+
>
|
22
|
+
{composite ? <RegistryIcon size="md" {...props} /> : <EnterpriseIcon size="sm" {...props} />}
|
23
|
+
</Tooltip>
|
24
|
+
);
|
14
25
|
return (
|
15
26
|
<div aria-label="content_view_icon" className="svg-centered-container" style={style}>
|
16
27
|
{count && <span className="composite-component-count">{count}</span>}
|
17
|
-
{
|
28
|
+
{cvIcon}
|
18
29
|
<span>{description}</span>
|
19
30
|
</div>
|
20
31
|
);
|
@@ -18,7 +18,7 @@ const ContentViewsCounter = () => {
|
|
18
18
|
<b>
|
19
19
|
<Flex>
|
20
20
|
<FlexItem spacer={{ default: 'spacerXs' }}>
|
21
|
-
<ContentViewIcon composite={false} description={__('
|
21
|
+
<ContentViewIcon composite={false} description={__('Component content views')} count={(component || component === 0) ? component : <InProgressIcon />} />
|
22
22
|
</FlexItem>
|
23
23
|
<FlexItem>
|
24
24
|
<Tooltip
|
@@ -2,14 +2,15 @@ import React from 'react';
|
|
2
2
|
import { Label } from '@patternfly/react-core';
|
3
3
|
|
4
4
|
const EnvironmentLabels = (environments) => {
|
5
|
-
const { environments: singleEnvironment } = environments || {};
|
5
|
+
const { environments: singleEnvironment, isDisabled } = environments || {};
|
6
6
|
const { name } = singleEnvironment || {};
|
7
|
+
const labelColor = isDisabled ? 'grey' : 'purple';
|
7
8
|
switch (environments) {
|
8
9
|
case Array:
|
9
10
|
return environments.map(env => (
|
10
11
|
<React.Fragment key={env.id} style={{ marginBottom: '5px' }}>
|
11
12
|
<Label
|
12
|
-
color=
|
13
|
+
color={labelColor}
|
13
14
|
isTruncated
|
14
15
|
>{env.name}
|
15
16
|
</Label>
|
@@ -18,7 +19,7 @@ const EnvironmentLabels = (environments) => {
|
|
18
19
|
default:
|
19
20
|
return (
|
20
21
|
<React.Fragment>
|
21
|
-
<Label color=
|
22
|
+
<Label color={labelColor} isTruncated>
|
22
23
|
{name}
|
23
24
|
</Label>
|
24
25
|
</React.Fragment>
|
@@ -3,18 +3,20 @@ import { useSelector } from 'react-redux';
|
|
3
3
|
import { STATUS } from 'foremanReact/constants';
|
4
4
|
import PropTypes from 'prop-types';
|
5
5
|
import { translate as __ } from 'foremanReact/common/I18n';
|
6
|
-
import { FormGroup, Checkbox, TextContent } from '@patternfly/react-core';
|
6
|
+
import { FormGroup, Checkbox, Radio, TextContent } from '@patternfly/react-core';
|
7
7
|
import { selectEnvironmentPaths, selectEnvironmentPathsStatus } from './EnvironmentPathSelectors';
|
8
8
|
import EnvironmentLabels from '../EnvironmentLabels';
|
9
9
|
import './EnvironmentPaths.scss';
|
10
10
|
import Loading from '../../../../components/Loading';
|
11
11
|
|
12
12
|
const EnvironmentPaths = ({
|
13
|
-
userCheckedItems, setUserCheckedItems, promotedEnvironments,
|
13
|
+
userCheckedItems, setUserCheckedItems, promotedEnvironments,
|
14
|
+
publishing, headerText, multiSelect, isDisabled,
|
14
15
|
}) => {
|
15
16
|
const environmentPathResponse = useSelector(selectEnvironmentPaths);
|
16
17
|
const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
|
17
18
|
const environmentPathLoading = environmentPathStatus === STATUS.PENDING;
|
19
|
+
const CheckboxOrRadio = multiSelect ? Checkbox : Radio;
|
18
20
|
|
19
21
|
const oncheckedChange = (checked, env) => {
|
20
22
|
if (checked) {
|
@@ -47,16 +49,16 @@ const EnvironmentPaths = ({
|
|
47
49
|
{index === 0 && <hr />}
|
48
50
|
<FormGroup key={`fg-${index}`} isInline fieldId="environment-checkbox-group">
|
49
51
|
{environments.map(env =>
|
50
|
-
(<
|
52
|
+
(<CheckboxOrRadio
|
51
53
|
isChecked={(publishing && env.library) ||
|
52
54
|
envCheckedInList(env, userCheckedItems) ||
|
53
55
|
envCheckedInList(env, promotedEnvironments)}
|
54
|
-
isDisabled={(publishing && env.library)
|
56
|
+
isDisabled={isDisabled || (publishing && env.library)
|
55
57
|
|| envCheckedInList(env, promotedEnvironments)}
|
56
58
|
className="env-path__labels-with-pointer"
|
57
59
|
key={`${env.id}${index}`}
|
58
60
|
id={`${env.id}${index}`}
|
59
|
-
label={<EnvironmentLabels environments={env} />}
|
61
|
+
label={<EnvironmentLabels environments={env} isDisabled={isDisabled} />}
|
60
62
|
aria-label={env.label}
|
61
63
|
onChange={checked => oncheckedChange(checked, env)}
|
62
64
|
/>))}
|
@@ -79,6 +81,7 @@ EnvironmentPaths.propTypes = {
|
|
79
81
|
publishing: PropTypes.bool,
|
80
82
|
headerText: PropTypes.string,
|
81
83
|
multiSelect: PropTypes.bool,
|
84
|
+
isDisabled: PropTypes.bool,
|
82
85
|
};
|
83
86
|
|
84
87
|
EnvironmentPaths.defaultProps = {
|
@@ -86,5 +89,6 @@ EnvironmentPaths.defaultProps = {
|
|
86
89
|
publishing: true,
|
87
90
|
headerText: __('Select a lifecycle environment from the available promotion paths to promote new version.'),
|
88
91
|
multiSelect: true,
|
92
|
+
isDisabled: false,
|
89
93
|
};
|
90
94
|
export default EnvironmentPaths;
|
@@ -6,12 +6,17 @@
|
|
6
6
|
.env-path__labels-with-pointer {
|
7
7
|
&:not(:last-child):after {
|
8
8
|
content: '>';
|
9
|
-
margin-top:
|
9
|
+
margin-top: 0px;
|
10
|
+
margin-right: 0.5rem;
|
10
11
|
}
|
11
12
|
|
12
13
|
display: inline-flex;
|
13
14
|
margin: 3px 1px;
|
14
15
|
align-items: center;
|
16
|
+
|
17
|
+
input {
|
18
|
+
margin-top: 0px;
|
19
|
+
}
|
15
20
|
}
|
16
21
|
|
17
22
|
hr {
|