katello 4.3.0.rc4 → 4.4.0.rc2
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/assets/javascripts/katello/common/vendor.js +0 -1
- data/app/controllers/katello/api/v2/api_controller.rb +13 -4
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +4 -1
- data/app/controllers/katello/api/v2/content_views_controller.rb +46 -0
- data/app/controllers/katello/api/v2/host_packages_controller.rb +21 -1
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +30 -1
- data/app/controllers/katello/api/v2/organizations_controller.rb +10 -6
- data/app/controllers/katello/api/v2/packages_controller.rb +4 -0
- data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb +10 -1
- data/app/controllers/katello/api/v2/repositories_controller.rb +42 -14
- data/app/controllers/katello/api/v2/repository_sets_controller.rb +7 -0
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +3 -0
- data/app/controllers/katello/concerns/hosts_controller_extensions.rb +32 -0
- data/app/controllers/katello/remote_execution_controller.rb +5 -4
- data/app/graphql/types/host_collection.rb +18 -0
- data/app/helpers/katello/content_source_helper.rb +43 -0
- data/app/helpers/katello/hosts_and_hostgroups_helper.rb +4 -0
- data/app/lib/actions/katello/cdn_configuration/update.rb +5 -7
- data/app/lib/actions/katello/content_view/publish.rb +5 -0
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +17 -3
- data/app/lib/actions/katello/repository/discover.rb +1 -14
- data/app/lib/actions/katello/repository/errata_mail.rb +4 -5
- data/app/lib/actions/katello/repository/filtered_index_content.rb +1 -1
- data/app/lib/actions/katello/repository/sync.rb +2 -2
- data/app/lib/actions/pulp3/abstract.rb +1 -1
- data/app/lib/actions/pulp3/abstract_async_task.rb +1 -1
- data/app/lib/actions/pulp3/content_view/delete_repository_references.rb +14 -4
- data/app/lib/actions/pulp3/content_view_version/create_import_history.rb +1 -2
- data/app/lib/actions/pulp3/content_view_version/import.rb +7 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +7 -5
- data/app/lib/actions/pulp3/repository/copy_content.rb +1 -1
- data/app/lib/actions/pulp3/repository/reclaim_space.rb +3 -10
- data/app/lib/actions/pulp3/repository/save_artifact.rb +1 -0
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +11 -0
- data/app/lib/katello/errors.rb +3 -3
- data/app/lib/katello/logging.rb +6 -1
- data/app/lib/katello/repo_discovery.rb +27 -19
- data/app/lib/katello/resources/cdn/katello_cdn.rb +41 -3
- data/app/lib/katello/resources/cdn.rb +4 -2
- data/app/lib/katello/util/deduplication_migrator.rb +105 -0
- data/app/lib/katello/util/pulpcore_content_filters.rb +2 -1
- data/app/models/katello/candlepin/repository_mapper.rb +3 -2
- data/app/models/katello/cdn_configuration.rb +38 -6
- data/app/models/katello/concerns/audit_comment_extensions.rb +17 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +34 -2
- data/app/models/katello/concerns/organization_extensions.rb +5 -1
- data/app/models/katello/concerns/pulp_database_unit.rb +59 -173
- data/app/models/katello/concerns/remote_execution_proxy_selector_extensions.rb +11 -0
- data/app/models/katello/concerns/smart_proxy_extensions.rb +2 -1
- data/app/models/katello/content_view.rb +4 -4
- data/app/models/katello/content_view_filter.rb +1 -1
- data/app/models/katello/content_view_history.rb +1 -1
- data/app/models/katello/content_view_version.rb +6 -2
- data/app/models/katello/content_view_version_export_history.rb +3 -2
- data/app/models/katello/content_view_version_import_history.rb +4 -4
- data/app/models/katello/deb.rb +1 -3
- data/app/models/katello/docker_meta_tag.rb +1 -1
- data/app/models/katello/erratum.rb +0 -15
- data/app/models/katello/glue/provider.rb +1 -1
- data/app/models/katello/glue/pulp/repos.rb +3 -1
- data/app/models/katello/host/content_facet.rb +2 -27
- data/app/models/katello/host/info_provider.rb +9 -0
- data/app/models/katello/host/subscription_facet.rb +2 -2
- data/app/models/katello/host_available_module_stream.rb +10 -0
- data/app/models/katello/hostgroup/content_facet.rb +2 -2
- data/app/models/katello/installed_package.rb +1 -0
- data/app/models/katello/product.rb +1 -1
- data/app/models/katello/product_content.rb +2 -2
- data/app/models/katello/repository.rb +13 -12
- data/app/models/katello/root_repository.rb +65 -16
- data/app/models/katello/rpm.rb +8 -2
- data/app/models/setting/content.rb +15 -5
- data/app/services/cert/rhsm_client.rb +1 -5
- data/app/services/katello/component_view_presenter.rb +1 -1
- data/app/services/katello/content_unit_indexer.rb +166 -0
- data/app/services/katello/organization_creator.rb +23 -8
- data/app/services/katello/pulp/repository/docker.rb +1 -1
- data/app/services/katello/pulp/repository/yum.rb +0 -54
- data/app/services/katello/pulp/repository.rb +0 -6
- data/app/services/katello/pulp3/ansible_collection.rb +26 -10
- data/app/services/katello/pulp3/api/apt.rb +7 -0
- data/app/services/katello/pulp3/api/yum.rb +4 -0
- data/app/services/katello/pulp3/content_view_version/import.rb +11 -2
- data/app/services/katello/pulp3/content_view_version/metadata_generator.rb +1 -1
- data/app/services/katello/pulp3/deb.rb +10 -9
- data/app/services/katello/pulp3/docker_manifest.rb +6 -5
- data/app/services/katello/pulp3/docker_manifest_list.rb +23 -6
- data/app/services/katello/pulp3/docker_tag.rb +16 -7
- data/app/services/katello/pulp3/erratum.rb +51 -56
- data/app/services/katello/pulp3/file_unit.rb +9 -6
- data/app/services/katello/pulp3/generic_content_unit.rb +11 -12
- data/app/services/katello/pulp3/module_stream.rb +76 -30
- data/app/services/katello/pulp3/package_group.rb +5 -5
- data/app/services/katello/pulp3/pulp_content_unit.rb +19 -11
- data/app/services/katello/pulp3/repository/apt.rb +5 -3
- data/app/services/katello/pulp3/repository/docker.rb +14 -7
- data/app/services/katello/pulp3/repository/generic.rb +1 -1
- data/app/services/katello/pulp3/repository/yum.rb +23 -16
- data/app/services/katello/pulp3/repository.rb +31 -10
- data/app/services/katello/pulp3/repository_mirror.rb +18 -4
- data/app/services/katello/pulp3/rpm.rb +13 -13
- data/app/services/katello/pulp3/srpm.rb +10 -9
- data/app/services/katello/registration_manager.rb +1 -1
- data/app/services/katello/repository_type.rb +15 -4
- data/app/services/katello/repository_type_manager.rb +1 -1
- data/app/services/katello/ui_notifications/subscriptions/manifest_expired_warning.rb +1 -1
- data/app/services/katello/upstream_connection_checker.rb +2 -2
- data/app/views/foreman/job_templates/change_content_source.erb +1 -31
- data/app/views/foreman/job_templates/install_errata.erb +6 -9
- data/app/views/foreman/job_templates/install_errata_by_search_query.erb +26 -0
- data/app/views/foreman/job_templates/install_packages_by_search_query.erb +19 -0
- data/app/views/foreman/job_templates/remove_packages_by_search_query.erb +19 -0
- data/app/views/foreman/job_templates/update_packages_by_search_query.erb +19 -0
- data/app/views/katello/api/v2/cdn_configurations/show.json.rabl +1 -1
- data/app/views/katello/api/v2/content_views/base.json.rabl +8 -4
- data/app/views/katello/api/v2/environments/show.json.rabl +9 -0
- data/app/views/katello/api/v2/host_module_streams/base.json.rabl +1 -0
- data/app/views/katello/api/v2/repositories/base.json.rabl +1 -0
- data/app/views/katello/api/v2/repositories/show.json.rabl +3 -1
- data/app/views/katello/layouts/react.html.erb +0 -1
- data/app/views/katello/sync_management/_repo.html.erb +36 -25
- data/config/initializers/monkeys.rb +0 -1
- data/config/routes/api/v2.rb +1 -0
- data/config/routes/overrides.rb +3 -0
- data/config/routes.rb +2 -0
- data/db/migrate/20150930183738_migrate_content_hosts.rb +1 -1
- data/db/migrate/20180612164926_add_content_org_id.rb +2 -2
- data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb +2 -0
- data/db/migrate/20211019192121_create_cdn_configuration.katello.rb +11 -2
- data/db/migrate/20211201154845_add_unique_indexes.rb +20 -0
- data/db/migrate/20211202172358_add_repository_mirroring_policy.rb +26 -0
- data/db/migrate/20211208034230_add_content_view_and_lifecycle_environment.rb +6 -0
- data/db/migrate/20211220185935_clean_duplicate_content_units.rb +144 -0
- data/db/migrate/20220110223754_update_disconnected_settings.rb +20 -0
- data/db/migrate/20220120163252_fix_docker_download_policy.rb +11 -0
- data/db/migrate/20220124191056_add_type_to_cdn_configuration.rb +22 -0
- data/db/migrate/20220127120843_fix_debian_download_policy.rb +11 -0
- data/db/migrate/20220204171908_rename_docker_tags_whitelist_and_add_exclude_tags.rb +8 -0
- data/db/migrate/20220207140355_change_deb_attributes_size_limit.rb +7 -0
- data/db/migrate/20220209205137_expand_sync_timeout_settings.rb +23 -0
- data/db/seeds.d/111-upgrade_tasks.rb +2 -1
- data/engines/bastion/app/views/bastion/layouts/application.html.erb +0 -1
- data/engines/bastion/app/views/bastion/layouts/assets.html.erb +0 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credentials.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-products.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-repositories.controller.js +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html +26 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js +10 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +212 -152
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +29 -10
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js +2 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +8 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +49 -35
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/mirroring-policy.service.js +30 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +29 -6
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +48 -23
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js +5 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js +4 -3
- data/lib/katello/engine.rb +4 -0
- data/lib/katello/permission_creator.rb +1 -1
- data/lib/katello/permissions/host_permissions.rb +3 -1
- data/lib/katello/plugin.rb +9 -1
- data/lib/katello/repository_types/deb.rb +0 -1
- data/lib/katello/repository_types/docker.rb +4 -4
- data/lib/katello/repository_types/file.rb +0 -1
- data/lib/katello/repository_types/ostree.rb +4 -6
- data/lib/katello/repository_types/python.rb +5 -1
- data/lib/katello/repository_types/yum.rb +2 -9
- data/lib/katello/tasks/content_view_import_only.rake +34 -0
- data/lib/katello/tasks/import_applicability.rake +1 -1
- data/lib/katello/tasks/jenkins.rake +0 -2
- data/lib/katello/tasks/repository.rake +4 -1
- data/lib/katello/tasks/upgrades/4.4/publish_import_cvvs.rake +17 -0
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +8 -7
- data/locale/bn/katello.po +1402 -650
- data/locale/cs/katello.po +1217 -96
- data/locale/de/katello.po +2359 -1347
- data/locale/en/katello.po +1216 -94
- data/locale/es/katello.po +2201 -1172
- data/locale/fr/katello.po +2601 -1615
- data/locale/gu/katello.po +1564 -814
- data/locale/hi/katello.po +1563 -810
- data/locale/it/katello.po +1311 -282
- data/locale/ja/katello.po +2534 -1518
- data/locale/katello.pot +3430 -1326
- data/locale/kn/katello.po +1564 -812
- data/locale/ko/katello.po +1441 -409
- data/locale/mr/katello.po +1564 -776
- data/locale/or/katello.po +1565 -813
- data/locale/pa/katello.po +1559 -792
- data/locale/pt/katello.po +1314 -277
- data/locale/pt_BR/katello.po +2226 -1181
- data/locale/ru/katello.po +1587 -563
- data/locale/ta/katello.po +1373 -619
- data/locale/te/katello.po +1564 -810
- data/locale/zh_CN/katello.po +2936 -1890
- data/locale/zh_TW/katello.po +1508 -606
- data/webpack/__mocks__/foremanReact/{redux/actions/toasts.js → components/ToastsList/index.js} +3 -2
- data/webpack/components/ActionableDetail.js +35 -21
- data/webpack/components/Content/Details/ContentDetails.js +1 -1
- data/webpack/components/Content/Details/__tests__/ContentDetailInfo.test.js +0 -2
- data/webpack/components/Content/Details/__tests__/ContentDetailRepositories.test.js +0 -2
- data/webpack/components/Content/Details/__tests__/ContentDetails.test.js +0 -2
- data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap +1 -1
- data/webpack/components/Content/__tests__/ContentPage.test.js +0 -2
- data/webpack/components/Content/__tests__/ContentTable.test.js +0 -2
- data/webpack/components/EditableSwitch.js +8 -2
- data/webpack/components/EditableTextInput/EditableTextInput.js +44 -86
- data/webpack/components/EditableTextInput/__tests__/editableTextInput.test.js +3 -3
- data/webpack/components/Errata/index.js +95 -29
- data/webpack/components/ErratumTypeLabel.js +16 -16
- data/webpack/components/MultiSelect/index.js +2 -2
- data/webpack/components/Packages/index.js +1 -1
- data/webpack/components/RoutedTabs/index.js +2 -1
- data/webpack/components/Search/Search.js +5 -2
- data/webpack/components/Search/__tests__/search.test.js +2 -3
- data/webpack/components/Select/Select.js +1 -1
- data/webpack/components/SelectOrg/SelectOrgReducer.js +15 -15
- data/webpack/components/SelectOrg/SetOrganization.js +2 -2
- data/webpack/components/Table/PageControls.js +3 -6
- data/webpack/components/Table/TableHooks.js +47 -7
- data/webpack/components/Table/TableWrapper.js +25 -7
- data/webpack/components/TypeAhead/TypeAhead.js +5 -1
- data/webpack/components/TypeAhead/helpers/commonPropTypes.js +1 -1
- data/webpack/components/TypeAhead/helpers/helpers.js +14 -14
- data/webpack/components/TypeAhead/pf3Search/TypeAheadSearch.js +1 -1
- data/webpack/components/TypeAhead/pf4Search/TypeAheadInput.js +4 -1
- data/webpack/components/TypeAhead/pf4Search/TypeAheadSearch.js +2 -1
- data/webpack/components/WithOrganization/withOrganization.js +3 -3
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard.js +1 -1
- data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.js +108 -0
- data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js +56 -0
- data/webpack/components/extensions/HostDetails/HostDetailsActions.js +2 -0
- data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesActions.js +49 -2
- data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesConstants.js +14 -1
- data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js +6 -4
- data/webpack/components/extensions/HostDetails/Tabs/ContentTab/constants.js +1 -0
- data/webpack/components/extensions/HostDetails/Tabs/ContentTab/index.js +1 -0
- data/webpack/components/extensions/HostDetails/Tabs/{ErrataTab.js → ErrataTab/ErrataTab.js} +86 -75
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.scss +11 -0
- data/webpack/components/extensions/HostDetails/Tabs/{ErratumExpansionContents.js → ErrataTab/ErratumExpansionContents.js} +3 -3
- data/webpack/components/extensions/HostDetails/Tabs/{ErratumExpansionDetail.js → ErrataTab/ErratumExpansionDetail.js} +0 -0
- data/webpack/components/extensions/HostDetails/{HostErrata → Tabs/ErrataTab}/HostErrataActions.js +3 -3
- data/webpack/components/extensions/HostDetails/{HostErrata → Tabs/ErrataTab}/HostErrataConstants.js +11 -0
- data/webpack/components/extensions/HostDetails/{HostErrata → Tabs/ErrataTab}/HostErrataSelectors.js +0 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsActions.js +16 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsConstants.js +3 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsSelectors.js +19 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js +241 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/moduleStreamsTab.test.js +108 -0
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/modules.fixtures.json +34 -0
- data/webpack/components/extensions/HostDetails/Tabs/PackageInstallModal.js +279 -0
- data/webpack/components/extensions/HostDetails/Tabs/PackageInstallModal.scss +3 -0
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab.js +357 -64
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab.scss +3 -7
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js +103 -4
- data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionConstants.js +6 -1
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js +45 -42
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.scss +3 -3
- data/webpack/components/extensions/HostDetails/Tabs/{EnableTracerEmptyState.js → TracesTab/EnableTracerEmptyState.js} +0 -0
- data/webpack/components/extensions/HostDetails/Tabs/{EnableTracerModal.js → TracesTab/EnableTracerModal.js} +3 -2
- data/webpack/components/extensions/HostDetails/Tabs/{HostTracesActions.js → TracesTab/HostTracesActions.js} +2 -2
- data/webpack/components/extensions/HostDetails/Tabs/{HostTracesConstants.js → TracesTab/HostTracesConstants.js} +0 -0
- data/webpack/components/extensions/HostDetails/Tabs/{HostTracesSelectors.js → TracesTab/HostTracesSelectors.js} +0 -0
- data/webpack/components/extensions/HostDetails/Tabs/{TracesTab.js → TracesTab/TracesTab.js} +66 -61
- data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.scss +11 -0
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js +17 -18
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js +385 -0
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/packages.fixtures.json +1 -1
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js +312 -11
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js +2 -2
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js +26 -30
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/yumInstallablePackages.fixtures.json +72 -0
- data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js +25 -5
- data/webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesActions.js +18 -0
- data/webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesConstants.js +3 -0
- data/webpack/components/extensions/HostDetails/YumInstallablePackages/YumInstallablePackagesSelectors.js +16 -0
- data/webpack/components/extensions/HostDetails/hostDetailsHelpers.js +19 -0
- data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap +4 -0
- data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js +1 -1
- data/webpack/components/extensions/RegistrationCommands/fields/LifecycleEnvironment.js +1 -1
- data/webpack/components/extensions/about/SystemStatuses.js +1 -1
- data/webpack/components/extensions/about/SystemStatusesReducer.js +10 -10
- data/webpack/components/pf3Table/components/Table.js +4 -5
- data/webpack/components/pf3Table/components/Table.test.js +0 -3
- data/webpack/components/pf3Table/components/TableBody.js +2 -2
- data/webpack/components/pf3Table/components/__snapshots__/Table.test.js.snap +9 -8
- data/webpack/containers/Application/config.js +6 -1
- data/webpack/containers/Application/overrides.scss +56 -7
- data/webpack/global_index.js +4 -1
- data/webpack/global_test_setup.js +1 -1
- data/webpack/index.js +7 -0
- data/webpack/redux/OrganizationProducts/OrganizationProductsReducer.js +15 -15
- data/webpack/redux/reducers/RedHatRepositories/enabled.js +43 -43
- data/webpack/redux/reducers/RedHatRepositories/repositorySetRepositories.js +43 -43
- data/webpack/redux/reducers/RedHatRepositories/sets.js +31 -31
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsReducer.js +26 -26
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsReducer.js +19 -19
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.test.js +0 -2
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionPage.test.js +0 -2
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsTable.test.js +0 -2
- data/webpack/scenes/Content/ContentConfig.js +55 -5
- data/webpack/scenes/Content/ContentPage.js +5 -5
- data/webpack/scenes/Content/Details/ContentDetails.js +23 -21
- data/webpack/scenes/Content/Details/ContentInfo.js +2 -2
- data/webpack/scenes/Content/Details/ContentRepositories.js +1 -1
- data/webpack/scenes/Content/Details/__tests__/contentDetail.test.js +4 -4
- data/webpack/scenes/Content/Table/ContentTable.js +2 -2
- data/webpack/scenes/Content/__tests__/contentTable.test.js +3 -3
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +5 -4
- data/webpack/scenes/ContentViews/ContentViewsPage.js +17 -13
- data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js +1 -1
- data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js +3 -2
- data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignHostsForm.js +2 -2
- data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js +6 -6
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js +22 -11
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js +31 -18
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +1 -1
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +2 -2
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +22 -28
- data/webpack/scenes/ContentViews/Details/ContentViewDetailReducer.js +8 -8
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +5 -5
- data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +32 -30
- data/webpack/scenes/ContentViews/Details/ContentViewInfo.js +9 -4
- data/webpack/scenes/ContentViews/Details/DetailsContainer.js +14 -17
- data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +3 -0
- data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js +1 -1
- data/webpack/scenes/ContentViews/Details/Filters/ArtifactsWithNoErrata.js +8 -8
- data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js +4 -4
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js +6 -6
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js +16 -9
- data/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js +46 -46
- data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js +17 -17
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +17 -17
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +4 -4
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetails.js +2 -2
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js +17 -11
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +1 -1
- data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js +2 -2
- data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js +17 -17
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js +2 -3
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +2 -9
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js +3 -5
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js +2 -10
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js +2 -3
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js +2 -3
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +2 -2
- data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js +1 -1
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +24 -3
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +11 -5
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js +28 -28
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVEnvironmentSelectionForm.js +18 -18
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js +3 -3
- data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignHostsForm.js +3 -3
- data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js +6 -6
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js +1 -1
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js +31 -35
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js +9 -8
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.scss +5 -2
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js +39 -40
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js +46 -34
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionRepositoryCell.js +66 -49
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js +5 -5
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +3 -3
- data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js +5 -3
- data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js +2 -2
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +5 -5
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +3 -3
- data/webpack/scenes/ContentViews/components/CVBreadCrumb.js +1 -1
- data/webpack/scenes/ContentViews/components/ContentViewsCounter.js +1 -1
- data/webpack/scenes/ContentViews/components/EnvironmentLabels.js +18 -18
- data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js +10 -10
- data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js +2 -2
- data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js +8 -8
- data/webpack/scenes/Hosts/ChangeContentSource/actions.js +43 -0
- data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceForm.js +87 -0
- data/webpack/scenes/Hosts/ChangeContentSource/components/ContentSourceTemplate.js +90 -0
- data/webpack/scenes/Hosts/ChangeContentSource/components/FormField.js +43 -0
- data/webpack/scenes/Hosts/ChangeContentSource/constants.js +3 -0
- data/webpack/scenes/Hosts/ChangeContentSource/helpers.js +27 -0
- data/webpack/scenes/Hosts/ChangeContentSource/index.js +126 -0
- data/webpack/scenes/Hosts/ChangeContentSource/selectors.js +42 -0
- data/webpack/scenes/Hosts/ChangeContentSource/styles.scss +11 -0
- data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailsReducer.js +18 -18
- data/webpack/scenes/ModuleStreams/Details/Profiles/__tests__/ModuleStreamDetailProfiles.test.js +0 -1
- data/webpack/scenes/ModuleStreams/Details/__tests__/ModuleStreamDetails.test.js +0 -2
- data/webpack/scenes/ModuleStreams/ModuleStreamsReducer.js +26 -26
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamPage.test.js +0 -2
- data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsTable.test.js +0 -2
- data/webpack/scenes/Organizations/OrganizationActions.js +5 -1
- data/webpack/scenes/Organizations/OrganizationReducer.js +8 -8
- data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +31 -1
- data/webpack/scenes/RedHatRepositories/__tests__/RedHatRepositoriesPage.test.js +16 -0
- data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap +11 -2
- data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepositoryContent.js +4 -4
- data/webpack/scenes/RedHatRepositories/components/RepositorySetRepositories.js +1 -1
- data/webpack/scenes/RedHatRepositories/helpers.js +5 -5
- data/webpack/scenes/RedHatRepositories/index.js +11 -3
- data/webpack/scenes/Settings/SettingsReducer.js +14 -14
- data/webpack/scenes/Settings/Tables/TableReducer.js +23 -23
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailInfo.js +2 -2
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailProductContent.js +15 -15
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailProducts.js +1 -1
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetailReducer.js +34 -34
- data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js +13 -13
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/AirGappedTypeForm.js +81 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js +13 -0
- data/webpack/scenes/Subscriptions/Manifest/{CdnConfigurationForm.scss → CdnConfigurationTab/CdnConfigurationForm.scss} +0 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnTypeForm.js +106 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/UpstreamServerTypeForm.js +259 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/AirGappedTypeForm.test.js +44 -0
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/CdnTypeForm.test.js +67 -0
- data/webpack/scenes/Subscriptions/Manifest/{__tests__/CdnConfigurationForm.test.js → CdnConfigurationTab/__tests__/UpstreamServerTypeForm.test.js} +46 -17
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/index.js +97 -0
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +11 -6
- data/webpack/scenes/Subscriptions/Manifest/ManifestHistoryReducer.js +16 -16
- data/webpack/scenes/Subscriptions/SubscriptionReducer.js +149 -149
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsReducer.js +41 -41
- data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/UpstreamSubscriptionsPage.test.js +0 -1
- data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js +0 -1
- data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsActions.test.js.snap +3 -2
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/SubscriptionsTable.test.js +4 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionsTable.test.js.snap +9 -0
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/DeleteDialog.js +6 -6
- data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js +12 -12
- data/webpack/scenes/Tasks/TaskActions.js +1 -1
- data/webpack/scenes/Tasks/__tests__/__snapshots__/TaskActions.test.js.snap +3 -2
- data/webpack/services/api/testHelpers.js +5 -3
- data/webpack/services/index.js +36 -36
- data/webpack/utils/helpers.js +11 -8
- metadata +98 -60
- data/app/services/katello/pulp/deb.rb +0 -55
- data/app/services/katello/pulp/distribution.rb +0 -7
- data/app/services/katello/pulp/docker_blob.rb +0 -7
- data/app/services/katello/pulp/docker_manifest.rb +0 -13
- data/app/services/katello/pulp/docker_manifest_list.rb +0 -14
- data/app/services/katello/pulp/docker_tag.rb +0 -14
- data/app/services/katello/pulp/erratum.rb +0 -129
- data/app/services/katello/pulp/file_unit.rb +0 -21
- data/app/services/katello/pulp/module_stream.rb +0 -39
- data/app/services/katello/pulp/package_category.rb +0 -7
- data/app/services/katello/pulp/package_group.rb +0 -20
- data/app/services/katello/pulp/pulp_content_unit.rb +0 -156
- data/app/services/katello/pulp/rpm.rb +0 -57
- data/app/services/katello/pulp/srpm.rb +0 -29
- data/app/services/katello/pulp/yum_metadata_file.rb +0 -30
- data/lib/monkeys/pulp3_13_checksumfix.rb +0 -17
- data/webpack/__mocks__/foremanReact/components/Pagination/PaginationHooks.js +0 -2
- data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js +0 -2
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab.scss +0 -16
- data/webpack/components/extensions/HostDetails/Tabs/TracesTab.scss +0 -12
- data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationForm.js +0 -185
@@ -18,8 +18,8 @@ let autoSearchScope;
|
|
18
18
|
beforeEach(() => {
|
19
19
|
const { results } = historyData;
|
20
20
|
[firstHistory] = results;
|
21
|
-
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
22
|
-
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
21
|
+
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
22
|
+
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
23
23
|
});
|
24
24
|
|
25
25
|
afterEach(() => {
|
@@ -41,7 +41,7 @@ const ContentCounts = ({ productId, repoId, counts }) => {
|
|
41
41
|
Object.keys(counts).forEach((type) => {
|
42
42
|
const count = counts[type];
|
43
43
|
let info = repoLabels[type];
|
44
|
-
const config = ContentConfig
|
44
|
+
const config = ContentConfig.find(typeConfig =>
|
45
45
|
typeConfig.names.singularLabel === type);
|
46
46
|
|
47
47
|
if (config) {
|
@@ -143,14 +143,35 @@ const ContentViewRepositories = ({ cvId, details }) => {
|
|
143
143
|
|
144
144
|
const onAdd = (repos) => {
|
145
145
|
const { repository_ids: repositoryIds = [] } = details;
|
146
|
-
dispatch(updateContentView(
|
146
|
+
dispatch(updateContentView(
|
147
|
+
cvId,
|
148
|
+
{ repository_ids: repositoryIds.concat(repos) },
|
149
|
+
() =>
|
150
|
+
dispatch(getContentViewRepositories(
|
151
|
+
cvId,
|
152
|
+
typeSelected !== 'All repositories' ? {
|
153
|
+
content_type: repoTypes[typeSelected],
|
154
|
+
} : {},
|
155
|
+
statusSelected,
|
156
|
+
)),
|
157
|
+
));
|
147
158
|
};
|
148
159
|
|
149
160
|
const onRemove = (repos) => {
|
150
161
|
const reposToDelete = [].concat(repos);
|
151
162
|
const { repository_ids: repositoryIds = [] } = details;
|
152
163
|
const deletedRepos = repositoryIds.filter(x => !reposToDelete.includes(x));
|
153
|
-
dispatch(updateContentView(
|
164
|
+
dispatch(updateContentView(
|
165
|
+
cvId, { repository_ids: deletedRepos },
|
166
|
+
() =>
|
167
|
+
dispatch(getContentViewRepositories(
|
168
|
+
cvId,
|
169
|
+
typeSelected !== 'All repositories' ? {
|
170
|
+
content_type: repoTypes[typeSelected],
|
171
|
+
} : {},
|
172
|
+
statusSelected,
|
173
|
+
)),
|
174
|
+
));
|
154
175
|
};
|
155
176
|
|
156
177
|
const addBulk = () => {
|
@@ -263,7 +284,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
|
|
263
284
|
<SplitItem>
|
264
285
|
<ActionList>
|
265
286
|
<ActionListItem>
|
266
|
-
<Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="
|
287
|
+
<Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="primary" aria-label="add_repositories">
|
267
288
|
{__('Add repositories')}
|
268
289
|
</Button>
|
269
290
|
</ActionListItem>
|
data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
|
2
|
+
import { renderWithRedux, patientlyWaitFor, act } from 'react-testing-lib-wrapper';
|
3
3
|
|
4
4
|
import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
|
5
5
|
import api from '../../../../../services/api';
|
@@ -23,8 +23,8 @@ let autoSearchScope;
|
|
23
23
|
beforeEach(() => {
|
24
24
|
const { results } = repoData;
|
25
25
|
[firstRepo] = results;
|
26
|
-
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
27
|
-
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
26
|
+
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
27
|
+
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
28
28
|
nockInstance
|
29
29
|
.persist() // match any query to this endpoint, gets cleaned up by `nock.cleanAll()`
|
30
30
|
.get(api.getApiUrl('/repositories/repository_types'))
|
@@ -66,7 +66,7 @@ test('Can enable and disable add repositories button', async (done) => {
|
|
66
66
|
|
67
67
|
test('Can add repositories', async (done) => {
|
68
68
|
const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
|
69
|
-
const cvAddparams = { repository_ids: [58, 62, 64, 106] };
|
69
|
+
const cvAddparams = { include_permissions: true, repository_ids: [58, 62, 64, 106] };
|
70
70
|
|
71
71
|
const repoAddscope = nockInstance
|
72
72
|
.put(cvDetailsPath, cvAddparams)
|
@@ -92,16 +92,19 @@ test('Can add repositories', async (done) => {
|
|
92
92
|
expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
|
93
93
|
getByLabelText('Select all rows').click();
|
94
94
|
getByLabelText('add_repositories').click();
|
95
|
+
await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
|
96
|
+
|
95
97
|
assertNockRequest(repoAddscope);
|
96
98
|
|
97
99
|
assertNockRequest(cvDetailScope);
|
98
100
|
assertNockRequest(autocompleteScope);
|
99
101
|
assertNockRequest(scope, done);
|
102
|
+
act(done);
|
100
103
|
});
|
101
104
|
|
102
105
|
test('Can remove repositories', async (done) => {
|
103
106
|
const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
|
104
|
-
const cvRemoveParams = { repository_ids: [58, 62, 64] };
|
107
|
+
const cvRemoveParams = { include_permissions: true, repository_ids: [58, 62, 64] };
|
105
108
|
const scope = nockInstance
|
106
109
|
.get(cvAllRepos)
|
107
110
|
.query(true)
|
@@ -131,9 +134,12 @@ test('Can remove repositories', async (done) => {
|
|
131
134
|
expect(getByLabelText('bulk_remove')).toBeInTheDocument();
|
132
135
|
});
|
133
136
|
getByLabelText('bulk_remove').click();
|
137
|
+
await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
|
138
|
+
|
134
139
|
assertNockRequest(repoRemoveScope);
|
135
140
|
|
136
141
|
assertNockRequest(autocompleteScope);
|
137
142
|
assertNockRequest(cvDetailScope);
|
138
143
|
assertNockRequest(scope, done);
|
144
|
+
act(done);
|
139
145
|
});
|
@@ -1,9 +1,10 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import PropTypes from 'prop-types';
|
3
|
-
import { Link } from 'react-router-dom';
|
4
2
|
import { translate as __ } from 'foremanReact/common/I18n';
|
5
3
|
import { urlBuilder } from 'foremanReact/common/urlHelpers';
|
6
|
-
import
|
4
|
+
import { camelCase } from 'lodash';
|
5
|
+
import PropTypes from 'prop-types';
|
6
|
+
import { Link } from 'react-router-dom';
|
7
|
+
import ContentConfig from '../../../Content/ContentConfig';
|
7
8
|
import InactiveText from '../../components/InactiveText';
|
8
9
|
|
9
10
|
const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
|
@@ -17,24 +18,26 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
|
|
17
18
|
} = cvVersion;
|
18
19
|
|
19
20
|
|
20
|
-
const
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
21
|
+
const contentConfigTypes = ContentConfig.filter(({ names: { singularLabel } }) =>
|
22
|
+
!!cvVersion[`${singularLabel}_count`])
|
23
|
+
.map(({
|
24
|
+
names: {
|
25
|
+
singularLabel, singularLowercase, pluralLowercase, pluralLabel,
|
26
|
+
},
|
27
|
+
}) => {
|
28
|
+
const countParam = `${singularLabel}_count`;
|
29
|
+
const count = cvVersion[countParam];
|
30
|
+
return {
|
31
|
+
pluralLabel,
|
32
|
+
label: count > 1 ? pluralLowercase : singularLowercase,
|
33
|
+
count,
|
34
|
+
};
|
35
|
+
});
|
33
36
|
|
34
37
|
const noCounts =
|
35
38
|
!Number(debCount) && !Number(dockerManifestCount) && !Number(dockerTagCount) &&
|
36
39
|
!Number(fileCount) && !Number(moduleStreamCount) && !Number(ansibleCollectionCount) &&
|
37
|
-
!
|
40
|
+
!contentConfigTypes?.length;
|
38
41
|
|
39
42
|
if (noCounts) {
|
40
43
|
return <InactiveText text={__('No content')} />;
|
@@ -59,7 +62,7 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
|
|
59
62
|
{dockerManifestCount > 0 && dockerTagCount > 0 &&
|
60
63
|
<>
|
61
64
|
<Link to={`/versions/${versionId}/dockerTags`}>
|
62
|
-
{`${dockerTagCount}
|
65
|
+
{`${dockerTagCount} Container tags`}
|
63
66
|
</Link><br />
|
64
67
|
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/dockerTags`, '')}>{`${dockerManifestCount} Container manifests`}</a><br />
|
65
68
|
</>
|
@@ -69,16 +72,13 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
|
|
69
72
|
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/files`, '')}>{`${fileCount} Files`}</a><br />
|
70
73
|
</>
|
71
74
|
}
|
72
|
-
{
|
73
|
-
|
74
|
-
<
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
<span key={label} style={{ whiteSpace: 'pre-line' }}>
|
80
|
-
{`${count} ${label}`}
|
81
|
-
</span>))
|
75
|
+
{contentConfigTypes?.length > 0 &&
|
76
|
+
contentConfigTypes.map(({ label, count, pluralLabel }) => (
|
77
|
+
<React.Fragment key={label}>
|
78
|
+
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/${camelCase(pluralLabel)}`, '')}>
|
79
|
+
{`${count} ${label}`}
|
80
|
+
</a><br />
|
81
|
+
</React.Fragment>))
|
82
82
|
}
|
83
83
|
</>
|
84
84
|
);
|
@@ -92,7 +92,7 @@ const ContentViewVersions = ({ cvId, details }) => {
|
|
92
92
|
{ title: <ContentViewVersionEnvironments {...{ environments }} /> },
|
93
93
|
{
|
94
94
|
title: Number(packageCount) ?
|
95
|
-
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/
|
95
|
+
<a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/rpmPackages`, '')}>{packageCount}</a> :
|
96
96
|
<InactiveText text={__('No packages')} />,
|
97
97
|
},
|
98
98
|
{ title: <ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} /> },
|
data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVEnvironmentSelectionForm.js
CHANGED
@@ -96,24 +96,24 @@ const CVEnvironmentSelectionForm = () => {
|
|
96
96
|
id, name, activation_key_count: akCount,
|
97
97
|
host_count: hostCount,
|
98
98
|
}, rowIndex) =>
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
99
|
+
(
|
100
|
+
<Tr key={`${name}_${id}`}>
|
101
|
+
<Td
|
102
|
+
key={`${name}__${id}_select`}
|
103
|
+
select={{
|
104
|
+
rowIndex,
|
105
|
+
onSelect: (event, isSelected) => onSelect(event, isSelected, id),
|
106
|
+
isSelected: selectedEnvSet.has(id) || deleteFlow || removeDeletionFlow,
|
107
|
+
disable: deleteFlow || removeDeletionFlow,
|
108
|
+
}}
|
109
|
+
/>
|
110
|
+
<Td>
|
111
|
+
{name}
|
112
|
+
</Td>
|
113
|
+
<Td>{hostCount}</Td>
|
114
|
+
<Td>{akCount}</Td>
|
115
|
+
</Tr>
|
116
|
+
))
|
117
117
|
}
|
118
118
|
</Tbody>
|
119
119
|
</TableComposable>}
|
@@ -34,8 +34,8 @@ let envScope;
|
|
34
34
|
beforeEach(() => {
|
35
35
|
const { results } = cvVersionsData;
|
36
36
|
[firstVersion] = results;
|
37
|
-
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
38
|
-
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
37
|
+
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
38
|
+
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
39
39
|
envScope = nockInstance
|
40
40
|
.get(environmentPathsPath)
|
41
41
|
.query(true)
|
@@ -131,8 +131,8 @@ test('Can open Remove wizard and remove version from environment with hosts', as
|
|
131
131
|
const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
|
132
132
|
const hostAutocompleteUrl = '/hosts/auto_complete_search';
|
133
133
|
const hostAutocompleteScope = mockForemanAutocomplete(nockInstance, hostAutocompleteUrl);
|
134
|
-
const hostSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
135
|
-
const hostAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
134
|
+
const hostSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
135
|
+
const hostAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
136
136
|
|
137
137
|
const scope = nockInstance
|
138
138
|
.get(cvVersions)
|
@@ -223,8 +223,8 @@ test('Can open Remove wizard and remove version from environment with activation
|
|
223
223
|
const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
|
224
224
|
const akAutocompleteUrl = '/activation_keys/auto_complete_search';
|
225
225
|
const akAutocompleteScope = mockAutocomplete(nockInstance, akAutocompleteUrl);
|
226
|
-
const akSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
227
|
-
const akAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
226
|
+
const akSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
227
|
+
const akAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
228
228
|
|
229
229
|
const scope = nockInstance
|
230
230
|
.get(cvVersions)
|
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js
CHANGED
@@ -3,14 +3,13 @@ import PropTypes from 'prop-types';
|
|
3
3
|
import { translate as __ } from 'foremanReact/common/I18n';
|
4
4
|
import { urlBuilder } from 'foremanReact/common/urlHelpers';
|
5
5
|
import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
|
6
|
-
import { startCase } from 'lodash';
|
6
|
+
import { startCase, camelCase } from 'lodash';
|
7
7
|
import {
|
8
8
|
BugIcon,
|
9
9
|
SecurityIcon,
|
10
10
|
EnhancementIcon,
|
11
11
|
} from '@patternfly/react-icons';
|
12
12
|
import {
|
13
|
-
getAnsibleCollections,
|
14
13
|
getContentViewVersions,
|
15
14
|
getDebPackages,
|
16
15
|
getDockerTags,
|
@@ -20,10 +19,9 @@ import {
|
|
20
19
|
getPackageGroups,
|
21
20
|
getRepositories,
|
22
21
|
getRPMPackages,
|
22
|
+
getContent,
|
23
23
|
} from '../../ContentViewDetailActions';
|
24
24
|
import {
|
25
|
-
selectAnsibleCollections,
|
26
|
-
selectAnsibleCollectionsStatus,
|
27
25
|
selectCVVersions,
|
28
26
|
selectCVVersionsStatus,
|
29
27
|
selectDebPackages,
|
@@ -42,11 +40,15 @@ import {
|
|
42
40
|
selectRPMPackageGroupsStatus,
|
43
41
|
selectRPMPackages,
|
44
42
|
selectRPMPackagesStatus,
|
43
|
+
selectContent,
|
44
|
+
selectContentStatus,
|
45
45
|
} from '../../ContentViewDetailSelectors';
|
46
46
|
import ContentViewVersionRepositoryCell from './ContentViewVersionRepositoryCell';
|
47
|
+
import ContentConfig from '../../../../Content/ContentConfig';
|
47
48
|
|
48
49
|
export const TableType = PropTypes.shape({
|
49
50
|
name: PropTypes.string,
|
51
|
+
route: PropTypes.string,
|
50
52
|
getCountKey: PropTypes.func,
|
51
53
|
repoType: PropTypes.string,
|
52
54
|
responseSelector: PropTypes.func,
|
@@ -64,6 +66,7 @@ export const TableType = PropTypes.shape({
|
|
64
66
|
export default ({ cvId, versionId }) => [
|
65
67
|
{
|
66
68
|
name: __('Components'),
|
69
|
+
route: 'components',
|
67
70
|
getCountKey: item => item?.component_view_count,
|
68
71
|
responseSelector: state => selectCVVersions(state, cvId),
|
69
72
|
statusSelector: state => selectCVVersionsStatus(state, cvId),
|
@@ -91,6 +94,7 @@ export default ({ cvId, versionId }) => [
|
|
91
94
|
},
|
92
95
|
{
|
93
96
|
name: __('Repositories'),
|
97
|
+
route: 'repositories',
|
94
98
|
getCountKey: item => item?.repositories?.length,
|
95
99
|
responseSelector: state => selectRepositories(state),
|
96
100
|
statusSelector: state => selectRepositoriesStatus(state),
|
@@ -127,6 +131,7 @@ export default ({ cvId, versionId }) => [
|
|
127
131
|
},
|
128
132
|
{
|
129
133
|
name: __('RPM Packages'),
|
134
|
+
route: 'rpmPackages',
|
130
135
|
repoType: 'yum',
|
131
136
|
getCountKey: item => item?.rpm_count,
|
132
137
|
responseSelector: state => selectRPMPackages(state),
|
@@ -148,6 +153,7 @@ export default ({ cvId, versionId }) => [
|
|
148
153
|
},
|
149
154
|
{
|
150
155
|
name: __('RPM Package Groups'),
|
156
|
+
route: 'rpmPackageGroups',
|
151
157
|
repoType: 'yum',
|
152
158
|
getCountKey: item => item?.package_group_count,
|
153
159
|
responseSelector: state => selectRPMPackageGroups(state),
|
@@ -161,6 +167,7 @@ export default ({ cvId, versionId }) => [
|
|
161
167
|
},
|
162
168
|
{
|
163
169
|
name: __('Files'),
|
170
|
+
route: 'files',
|
164
171
|
repoType: 'file',
|
165
172
|
getCountKey: item => item?.file_count,
|
166
173
|
responseSelector: state => selectFiles(state),
|
@@ -180,6 +187,7 @@ export default ({ cvId, versionId }) => [
|
|
180
187
|
},
|
181
188
|
{
|
182
189
|
name: __('Errata'),
|
190
|
+
route: 'errata',
|
183
191
|
repoType: 'yum',
|
184
192
|
getCountKey: item => item?.erratum_count,
|
185
193
|
responseSelector: state => selectErrata(state),
|
@@ -233,6 +241,7 @@ export default ({ cvId, versionId }) => [
|
|
233
241
|
},
|
234
242
|
{
|
235
243
|
name: __('Module Streams'),
|
244
|
+
route: 'moduleStreams',
|
236
245
|
repoType: 'yum',
|
237
246
|
getCountKey: item => item?.module_stream_count,
|
238
247
|
responseSelector: state => selectModuleStreams(state),
|
@@ -255,6 +264,7 @@ export default ({ cvId, versionId }) => [
|
|
255
264
|
},
|
256
265
|
{
|
257
266
|
name: __('Deb Packages'),
|
267
|
+
route: 'debPackages',
|
258
268
|
repoType: 'deb',
|
259
269
|
getCountKey: item => item?.deb_count,
|
260
270
|
responseSelector: state => selectDebPackages(state),
|
@@ -274,37 +284,8 @@ export default ({ cvId, versionId }) => [
|
|
274
284
|
],
|
275
285
|
},
|
276
286
|
{
|
277
|
-
name: __('
|
278
|
-
|
279
|
-
getCountKey: item => item?.ansible_collection_count,
|
280
|
-
responseSelector: state => selectAnsibleCollections(state),
|
281
|
-
statusSelector: state => selectAnsibleCollectionsStatus(state),
|
282
|
-
autocompleteEndpoint: `/ansible_collections/auto_complete_search?content_view_version_id=${versionId}`,
|
283
|
-
fetchItems: params => getAnsibleCollections({ content_view_version_id: versionId, ...params }),
|
284
|
-
columnHeaders: [
|
285
|
-
{
|
286
|
-
title: __('Name'),
|
287
|
-
getProperty: item => (
|
288
|
-
<a href={urlBuilder(`ansible_collections/${item?.id}`, '')}>
|
289
|
-
{item?.name}
|
290
|
-
</a>),
|
291
|
-
},
|
292
|
-
{
|
293
|
-
title: __('Author'),
|
294
|
-
getProperty: item => item?.namespace,
|
295
|
-
},
|
296
|
-
{
|
297
|
-
title: __('Version'),
|
298
|
-
getProperty: item => item?.version,
|
299
|
-
},
|
300
|
-
{
|
301
|
-
title: __('Checksum'),
|
302
|
-
getProperty: item => item?.checksum,
|
303
|
-
},
|
304
|
-
],
|
305
|
-
},
|
306
|
-
{
|
307
|
-
name: __('Docker Tags'),
|
287
|
+
name: __('Container tags'),
|
288
|
+
route: 'dockerTags',
|
308
289
|
repoType: 'docker',
|
309
290
|
getCountKey: item => item?.docker_tag_count,
|
310
291
|
responseSelector: state => selectDockerTags(state),
|
@@ -329,4 +310,19 @@ export default ({ cvId, versionId }) => [
|
|
329
310
|
{ title: __('Product Name'), getProperty: item => item?.product?.name },
|
330
311
|
],
|
331
312
|
},
|
313
|
+
...ContentConfig.map(({
|
314
|
+
names: { pluralTitle, pluralLabel, singularLabel },
|
315
|
+
columnHeaders,
|
316
|
+
}) => ({
|
317
|
+
name: pluralTitle,
|
318
|
+
route: camelCase(pluralLabel),
|
319
|
+
repoType: singularLabel,
|
320
|
+
getCountKey: item => item[`${singularLabel}_count`],
|
321
|
+
responseSelector: state => selectContent(pluralLabel, state),
|
322
|
+
statusSelector: state => selectContentStatus(pluralLabel, state),
|
323
|
+
autocompleteEndpoint: `/${pluralLabel}/auto_complete_search?content_view_version_id=${versionId}`,
|
324
|
+
fetchItems: params =>
|
325
|
+
getContent(pluralLabel, { content_view_version_id: versionId, ...params }),
|
326
|
+
columnHeaders,
|
327
|
+
})),
|
332
328
|
];
|
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js
CHANGED
@@ -3,7 +3,7 @@ import useDeepCompareEffect from 'use-deep-compare-effect';
|
|
3
3
|
import { useParams, Route, useHistory, useLocation, Redirect, Switch } from 'react-router-dom';
|
4
4
|
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
|
5
5
|
import { STATUS } from 'foremanReact/constants';
|
6
|
-
import { isEmpty,
|
6
|
+
import { isEmpty, first } from 'lodash';
|
7
7
|
import { Grid, Tabs, Tab, TabTitleText, Label } from '@patternfly/react-core';
|
8
8
|
import { number, shape } from 'prop-types';
|
9
9
|
import './ContentViewVersionDetails.scss';
|
@@ -68,13 +68,14 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
|
|
68
68
|
const filteredTableConfigs = tableConfigs.filter(({ getCountKey }) => !!getCountKey(response));
|
69
69
|
const { repositories } = versionDetails;
|
70
70
|
const showTabs = filteredTableConfigs.length > 0 && repositories;
|
71
|
-
const getCurrentActiveKey = tab ??
|
71
|
+
const getCurrentActiveKey = tab ?? first(filteredTableConfigs)?.route;
|
72
72
|
|
73
73
|
return (
|
74
74
|
<Grid>
|
75
75
|
<ContentViewVersionDetailsHeader
|
76
76
|
versionDetails={versionDetails}
|
77
77
|
onEdit={editDiscription}
|
78
|
+
loading={status === STATUS.PENDING}
|
78
79
|
details={details}
|
79
80
|
/>
|
80
81
|
{showTabs &&
|
@@ -84,10 +85,10 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
|
|
84
85
|
onSelect={onSelect}
|
85
86
|
isVertical
|
86
87
|
>
|
87
|
-
{filteredTableConfigs.map(({ name, getCountKey }) => (
|
88
|
+
{filteredTableConfigs.map(({ route, name, getCountKey }) => (
|
88
89
|
<Tab
|
89
|
-
key={
|
90
|
-
eventKey={
|
90
|
+
key={route}
|
91
|
+
eventKey={route}
|
91
92
|
title={
|
92
93
|
<>
|
93
94
|
<TabTitleText>{name}</TabTitleText>
|
@@ -100,9 +101,9 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
|
|
100
101
|
<Switch>
|
101
102
|
{filteredTableConfigs.map(config => (
|
102
103
|
<Route
|
103
|
-
key={
|
104
|
+
key={config.route}
|
104
105
|
exact
|
105
|
-
path={`/versions/:versionId([0-9]+)/${
|
106
|
+
path={`/versions/:versionId([0-9]+)/${config.route}`}
|
106
107
|
>
|
107
108
|
<ContentViewVersionDetailsTable
|
108
109
|
tableConfig={config}
|
@@ -111,7 +112,7 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
|
|
111
112
|
</Route>))
|
112
113
|
}
|
113
114
|
<Redirect
|
114
|
-
to={`/versions/${versionId}/${
|
115
|
+
to={`/versions/${versionId}/${first(filteredTableConfigs).route}`}
|
115
116
|
/>
|
116
117
|
</Switch>
|
117
118
|
</div>
|
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.scss
CHANGED
@@ -20,16 +20,20 @@
|
|
20
20
|
.pf-c-tabs.pf-m-vertical {
|
21
21
|
max-width: 230px;
|
22
22
|
border-right: 1px solid #d2d2d2;
|
23
|
+
|
23
24
|
.pf-c-tabs__item {
|
24
25
|
margin-top: 0;
|
26
|
+
|
25
27
|
button {
|
26
28
|
align-items: center;
|
29
|
+
|
27
30
|
.pf-c-label__content {
|
28
31
|
&::before {
|
29
32
|
border: none;
|
30
33
|
}
|
31
34
|
}
|
32
35
|
}
|
36
|
+
|
33
37
|
&.pf-m-current .pf-c-label__content {
|
34
38
|
font-weight: bold;
|
35
39
|
}
|
@@ -37,8 +41,7 @@
|
|
37
41
|
}
|
38
42
|
|
39
43
|
.pf-l-grid.pf-m-gutter {
|
40
|
-
padding: 24px;
|
41
44
|
display: initial;
|
42
45
|
width: 100%;
|
43
46
|
}
|
44
|
-
}
|
47
|
+
}
|