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
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js
CHANGED
@@ -2,12 +2,11 @@ import React, { useState, useEffect } from 'react';
|
|
2
2
|
import { useDispatch } from 'react-redux';
|
3
3
|
import PropTypes from 'prop-types';
|
4
4
|
import {
|
5
|
+
Grid,
|
5
6
|
GridItem,
|
6
7
|
TextContent,
|
7
8
|
Text,
|
8
|
-
TextList,
|
9
9
|
TextVariants,
|
10
|
-
TextListVariants,
|
11
10
|
Label,
|
12
11
|
Flex,
|
13
12
|
FlexItem,
|
@@ -17,11 +16,11 @@ import {
|
|
17
16
|
DropdownPosition,
|
18
17
|
} from '@patternfly/react-core';
|
19
18
|
import { translate as __ } from 'foremanReact/common/I18n';
|
20
|
-
import EditableTextInput from '../../../../../components/EditableTextInput';
|
21
19
|
import { hasPermission } from '../../../helpers';
|
22
20
|
import ContentViewVersionPromote from '../../Promote/ContentViewVersionPromote';
|
23
21
|
import getEnvironmentPaths from '../../../components/EnvironmentPaths/EnvironmentPathActions';
|
24
22
|
import RemoveCVVersionWizard from '../Delete/RemoveCVVersionWizard';
|
23
|
+
import ActionableDetail from '../../../../../components/ActionableDetail';
|
25
24
|
|
26
25
|
const ContentViewVersionDetailsHeader = ({
|
27
26
|
versionDetails: {
|
@@ -29,6 +28,7 @@ const ContentViewVersionDetailsHeader = ({
|
|
29
28
|
},
|
30
29
|
onEdit,
|
31
30
|
details: { permissions },
|
31
|
+
loading,
|
32
32
|
}) => {
|
33
33
|
const dispatch = useDispatch();
|
34
34
|
useEffect(
|
@@ -72,7 +72,7 @@ const ContentViewVersionDetailsHeader = ({
|
|
72
72
|
];
|
73
73
|
|
74
74
|
return (
|
75
|
-
|
75
|
+
<Grid className="margin-0-24">
|
76
76
|
<GridItem span={10}>
|
77
77
|
<TextContent>
|
78
78
|
<Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
|
@@ -90,25 +90,23 @@ const ContentViewVersionDetailsHeader = ({
|
|
90
90
|
>
|
91
91
|
{__('Actions')}
|
92
92
|
</DropdownToggle>
|
93
|
-
|
93
|
+
}
|
94
94
|
isOpen={dropdownOpen}
|
95
95
|
dropdownItems={dropDownItems}
|
96
96
|
/>
|
97
97
|
</GridItem>
|
98
98
|
<GridItem className="content-view-header-content" span={12}>
|
99
99
|
<TextContent>
|
100
|
-
<
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
/>
|
111
|
-
</TextList>
|
100
|
+
<ActionableDetail
|
101
|
+
key={description} // This fixes a render issue with the initial value
|
102
|
+
textArea
|
103
|
+
attribute="description"
|
104
|
+
loading={loading}
|
105
|
+
placeholder={__('No description')}
|
106
|
+
onEdit={onEdit}
|
107
|
+
disabled={!hasPermission(permissions, 'edit_content_views')}
|
108
|
+
value={description}
|
109
|
+
/>
|
112
110
|
</TextContent>
|
113
111
|
<Flex>
|
114
112
|
{environments?.map(({ name, id: envId }) =>
|
@@ -116,32 +114,32 @@ const ContentViewVersionDetailsHeader = ({
|
|
116
114
|
</Flex>
|
117
115
|
</GridItem>
|
118
116
|
{promoting &&
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
117
|
+
<ContentViewVersionPromote
|
118
|
+
cvId={cvId}
|
119
|
+
versionIdToPromote={id}
|
120
|
+
versionNameToPromote={version}
|
121
|
+
versionEnvironments={environments}
|
122
|
+
setIsOpen={setPromoting}
|
123
|
+
detailsPage
|
124
|
+
aria-label="promote_content_view_modal"
|
125
|
+
/>
|
128
126
|
}
|
129
127
|
{removingFromEnv &&
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
128
|
+
<RemoveCVVersionWizard
|
129
|
+
cvId={cvId}
|
130
|
+
versionIdToRemove={id}
|
131
|
+
versionNameToRemove={version}
|
132
|
+
versionEnvironments={environments}
|
133
|
+
show={removingFromEnv}
|
134
|
+
setIsOpen={setRemovingFromEnv}
|
135
|
+
currentStep={currentStep}
|
136
|
+
setCurrentStep={setCurrentStep}
|
137
|
+
deleteWizard={deleteVersion}
|
138
|
+
detailsPage
|
139
|
+
aria-label="remove_content_view_version_modal"
|
140
|
+
/>
|
143
141
|
}
|
144
|
-
|
142
|
+
</Grid>
|
145
143
|
);
|
146
144
|
};
|
147
145
|
|
@@ -163,6 +161,7 @@ ContentViewVersionDetailsHeader.propTypes = {
|
|
163
161
|
details: PropTypes.shape({
|
164
162
|
permissions: PropTypes.shape({}),
|
165
163
|
}).isRequired,
|
164
|
+
loading: PropTypes.bool.isRequired,
|
166
165
|
};
|
167
166
|
|
168
167
|
export default ContentViewVersionDetailsHeader;
|
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js
CHANGED
@@ -1,21 +1,31 @@
|
|
1
1
|
/* eslint-disable react/no-array-index-key */
|
2
|
-
import React, { useState
|
3
|
-
import { head } from 'lodash';
|
4
|
-
import PropTypes from 'prop-types';
|
5
|
-
import { useSelector, shallowEqual } from 'react-redux';
|
6
|
-
import { Grid, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
|
2
|
+
import React, { useState } from 'react';
|
7
3
|
import { translate as __ } from 'foremanReact/common/I18n';
|
8
|
-
import
|
4
|
+
import PropTypes from 'prop-types';
|
5
|
+
import {
|
6
|
+
shallowEqual,
|
7
|
+
useSelector,
|
8
|
+
} from 'react-redux';
|
9
|
+
import {
|
10
|
+
Grid,
|
11
|
+
Select,
|
12
|
+
SelectOption,
|
13
|
+
SelectVariant,
|
14
|
+
} from '@patternfly/react-core';
|
15
|
+
import {
|
16
|
+
TableVariant,
|
17
|
+
Tbody,
|
18
|
+
Td,
|
19
|
+
Th,
|
20
|
+
Thead,
|
21
|
+
Tr,
|
22
|
+
} from '@patternfly/react-table';
|
23
|
+
import { useUrlParams } from '../../../../../components/Table/TableHooks';
|
9
24
|
import TableWrapper from '../../../../../components/Table/TableWrapper';
|
10
25
|
import { TableType } from './ContentViewVersionDetailConfig';
|
11
26
|
|
12
|
-
const ContentViewVersionDetailsTable = ({
|
13
|
-
|
14
|
-
const [searchQuery, updateSearchQuery] = useState('');
|
15
|
-
const [open, setOpen] = useState(false);
|
16
|
-
const [selected, setSelected] = useState(0);
|
17
|
-
const [selectedList, setSelectedList] = useState([]);
|
18
|
-
const {
|
27
|
+
const ContentViewVersionDetailsTable = ({
|
28
|
+
tableConfig: {
|
19
29
|
name,
|
20
30
|
repoType,
|
21
31
|
responseSelector,
|
@@ -24,33 +34,35 @@ const ContentViewVersionDetailsTable = ({ tableConfig, repositories }) => {
|
|
24
34
|
fetchItems,
|
25
35
|
columnHeaders,
|
26
36
|
disableSearch,
|
27
|
-
}
|
37
|
+
}, repositories,
|
38
|
+
}) => {
|
39
|
+
const ALL_REPOSITORIES = __('All Repositories');
|
40
|
+
const [searchQuery, updateSearchQuery] = useState('');
|
41
|
+
const [open, setOpen] = useState(false);
|
42
|
+
const { repository_id: urlParamId } = useUrlParams();
|
43
|
+
|
44
|
+
const relevantRepositories = repositories
|
45
|
+
.filter(({ content_type: contentType }) => repoType === contentType);
|
46
|
+
|
47
|
+
const selectedList = relevantRepositories.length > 1 ? [
|
48
|
+
{
|
49
|
+
id: undefined,
|
50
|
+
name: ALL_REPOSITORIES,
|
51
|
+
},
|
52
|
+
...relevantRepositories] :
|
53
|
+
relevantRepositories;
|
54
|
+
|
55
|
+
const presetIndex = selectedList
|
56
|
+
.findIndex(({ library_instance_id: id }) =>
|
57
|
+
id === Number(urlParamId));
|
58
|
+
const [selected, setSelected] = useState(presetIndex ?? 0);
|
28
59
|
|
29
60
|
const response = useSelector(responseSelector, shallowEqual);
|
30
61
|
const { results, ...metadata } = response;
|
31
62
|
const status = useSelector(statusSelector, shallowEqual);
|
32
63
|
|
33
|
-
useEffect(() => {
|
34
|
-
const relevantRepositories = repositories
|
35
|
-
.filter(({ content_type: contentType }) => repoType === contentType);
|
36
|
-
|
37
|
-
switch (relevantRepositories.length) {
|
38
|
-
case 1:
|
39
|
-
setSelected(head(relevantRepositories));
|
40
|
-
setSelectedList([...relevantRepositories]);
|
41
|
-
break;
|
42
|
-
default:
|
43
|
-
setSelected(0);
|
44
|
-
setSelectedList([{
|
45
|
-
id: undefined,
|
46
|
-
name: ALL_REPOSITORIES,
|
47
|
-
}, ...relevantRepositories]);
|
48
|
-
break;
|
49
|
-
}
|
50
|
-
}, [repositories, ALL_REPOSITORIES, repoType]);
|
51
|
-
|
52
64
|
const fetchItemsWithRepositoryId = (params) => {
|
53
|
-
if (selectedList
|
65
|
+
if (selectedList?.length === 1) return fetchItems(params);
|
54
66
|
return fetchItems({ repository_id: selectedList[selected]?.id, ...params });
|
55
67
|
};
|
56
68
|
|
data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionRepositoryCell.js
CHANGED
@@ -1,14 +1,18 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import PropTypes from 'prop-types';
|
3
2
|
import { translate as __ } from 'foremanReact/common/I18n';
|
4
3
|
import { urlBuilder } from 'foremanReact/common/urlHelpers';
|
5
|
-
import {
|
4
|
+
import {
|
5
|
+
camelCase,
|
6
|
+
isEmpty,
|
7
|
+
} from 'lodash';
|
8
|
+
import PropTypes from 'prop-types';
|
9
|
+
import { Link } from 'react-router-dom';
|
6
10
|
import {
|
7
11
|
Grid,
|
8
12
|
GridItem,
|
9
13
|
} from '@patternfly/react-core';
|
10
|
-
import InactiveText from '../../../components/InactiveText';
|
11
14
|
import ContentConfig from '../../../../Content/ContentConfig';
|
15
|
+
import InactiveText from '../../../components/InactiveText';
|
12
16
|
|
13
17
|
const ContentViewVersionRepositoryCell = ({
|
14
18
|
data: {
|
@@ -18,92 +22,105 @@ const ContentViewVersionRepositoryCell = ({
|
|
18
22
|
},
|
19
23
|
}) => {
|
20
24
|
const CONTENT_COUNTS = {
|
21
|
-
|
22
|
-
name: __('
|
23
|
-
|
25
|
+
rpm: {
|
26
|
+
name: __('RPM packages'),
|
27
|
+
to: `rpmPackages?repository_id=${libraryInstanceId}`,
|
28
|
+
},
|
29
|
+
module_stream: {
|
30
|
+
name: __('Module streams'),
|
31
|
+
to: `moduleStreams?repository_id=${libraryInstanceId}`,
|
32
|
+
},
|
33
|
+
erratum: {
|
34
|
+
name: __('Errata'),
|
35
|
+
to: `errata?repository_id=${libraryInstanceId}`,
|
24
36
|
},
|
25
37
|
deb: {
|
26
38
|
name: __('Deb packages'),
|
27
|
-
|
39
|
+
to: `debPackages?repository_id=${libraryInstanceId}`,
|
40
|
+
},
|
41
|
+
ansible_collection: {
|
42
|
+
name: __('Ansible collections'),
|
43
|
+
to: `ansibleCollections?repository_id=${libraryInstanceId}`,
|
28
44
|
},
|
29
45
|
docker_manifest: {
|
30
46
|
name: __('Container manifests'),
|
31
|
-
url: `products/${id}/repositories/${libraryInstanceId}/content/
|
47
|
+
url: `products/${id}/repositories/${libraryInstanceId}/content/docker_manifests`,
|
32
48
|
},
|
33
49
|
docker_manifest_list: {
|
34
50
|
name: __('Container manifest lists'),
|
35
|
-
url: `products/${id}/repositories/${libraryInstanceId}/content/
|
51
|
+
url: `products/${id}/repositories/${libraryInstanceId}/content/docker_manifest_lists`,
|
36
52
|
},
|
37
53
|
docker_tag: {
|
38
54
|
name: __('Container image tags'),
|
39
|
-
|
40
|
-
},
|
41
|
-
erratum: {
|
42
|
-
name: __('Errata'),
|
43
|
-
url: `errata?repositoryId=${libraryInstanceId}`,
|
55
|
+
to: `dockerTags?repository_id=${libraryInstanceId}`,
|
44
56
|
},
|
45
57
|
file: {
|
46
58
|
name: __('Files'),
|
47
|
-
|
48
|
-
},
|
49
|
-
module_stream: {
|
50
|
-
name: __('Module streams'),
|
51
|
-
url: `products/${id}/repositories/${libraryInstanceId}/content/module_streams`,
|
52
|
-
},
|
53
|
-
package: {
|
54
|
-
name: __('Packages'),
|
55
|
-
url: `products/${id}/repositories/${libraryInstanceId}/content/packages`,
|
59
|
+
to: `files?repository_id=${libraryInstanceId}`,
|
56
60
|
},
|
57
61
|
package_group: {
|
58
62
|
name: __('Package groups'),
|
59
|
-
|
60
|
-
},
|
61
|
-
rpm: {
|
62
|
-
name: __('Rpm packages'),
|
63
|
-
url: `packages?repositoryId=${libraryInstanceId}`,
|
63
|
+
to: `rpmPackageGroups?repository_id=${libraryInstanceId}`,
|
64
64
|
},
|
65
65
|
srpm: {
|
66
66
|
name: __('Source RPMs'),
|
67
67
|
},
|
68
68
|
};
|
69
69
|
|
70
|
-
ContentConfig
|
70
|
+
ContentConfig.forEach((type) => {
|
71
71
|
CONTENT_COUNTS[type.names.singularLabel] = {
|
72
72
|
name: type.names.pluralLowercase,
|
73
|
-
|
73
|
+
to: `${camelCase(type.names.pluralLabel)}?repository_id=${libraryInstanceId}`,
|
74
74
|
};
|
75
75
|
});
|
76
76
|
|
77
77
|
const getContentSpan = (num) => {
|
78
78
|
switch (true) {
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
79
|
+
case num < 4:
|
80
|
+
return 12;
|
81
|
+
case num > 4 && num < 9:
|
82
|
+
return 6;
|
83
|
+
case num > 9:
|
84
|
+
return 4;
|
85
|
+
default:
|
86
|
+
return 12;
|
87
|
+
}
|
88
|
+
};
|
89
|
+
|
90
|
+
const CountComponent = ({ countKey }) => {
|
91
|
+
const { to, url, name } = CONTENT_COUNTS[countKey];
|
92
|
+
const count = ContentCounts[countKey];
|
93
|
+
switch (true) {
|
94
|
+
case !!url:
|
95
|
+
return (
|
96
|
+
<a href={urlBuilder(url, '')}>
|
97
|
+
{count} {name}
|
98
|
+
</a>);
|
99
|
+
case !!to:
|
100
|
+
return (
|
101
|
+
<Link to={to}>
|
102
|
+
{count} {name}
|
103
|
+
</Link>);
|
104
|
+
default:
|
105
|
+
return `${count} ${name} `;
|
87
106
|
}
|
88
107
|
};
|
89
108
|
|
109
|
+
CountComponent.propTypes = {
|
110
|
+
countKey: PropTypes.string.isRequired,
|
111
|
+
};
|
112
|
+
|
90
113
|
const contentCountArray = Object.keys(CONTENT_COUNTS);
|
91
114
|
const contentCountToShow = contentCountArray.filter(key => !!ContentCounts[key]);
|
92
115
|
const contentSpan = getContentSpan(contentCountToShow.length);
|
116
|
+
|
93
117
|
return (
|
94
118
|
<Grid>
|
95
119
|
{!isEmpty(contentCountToShow) ?
|
96
|
-
contentCountToShow.map(
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
<GridItem key={countKey} span={contentSpan}>
|
101
|
-
{url ?
|
102
|
-
<a href={urlBuilder(url, '')}>
|
103
|
-
{count} {name}
|
104
|
-
</a> : `${count} ${name} `}
|
105
|
-
</GridItem>);
|
106
|
-
}) : <InactiveText text={__('N/A')} />
|
120
|
+
contentCountToShow.map(countKey => (
|
121
|
+
<GridItem key={countKey} span={contentSpan}>
|
122
|
+
<CountComponent countKey={countKey} />
|
123
|
+
</GridItem>)) : <InactiveText text={__('N/A')} />
|
107
124
|
}
|
108
125
|
</Grid >
|
109
126
|
);
|
@@ -176,7 +176,7 @@ const testConfig = [
|
|
176
176
|
last(ContentViewVersionAnsibleCollectionsData.results).checksum],
|
177
177
|
},
|
178
178
|
{
|
179
|
-
name: '
|
179
|
+
name: 'Container tags',
|
180
180
|
countKey: 'docker_tag_count',
|
181
181
|
autoCompleteUrl: '/docker_tags/auto_complete_search',
|
182
182
|
dataUrl: api.getApiUrl('/docker_tags'),
|
@@ -199,8 +199,8 @@ testConfig.forEach(({
|
|
199
199
|
const { version } = ContentViewVersionDetailsData;
|
200
200
|
|
201
201
|
const autocompleteScope = mockAutocomplete(nockInstance, autoCompleteUrl);
|
202
|
-
const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY
|
203
|
-
const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING
|
202
|
+
const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY);
|
203
|
+
const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING);
|
204
204
|
|
205
205
|
const scope = nockInstance
|
206
206
|
.get(cvVersions)
|
@@ -251,8 +251,8 @@ test('Can change repository selector', async (done) => {
|
|
251
251
|
|
252
252
|
const { version } = ContentViewVersionDetailsData;
|
253
253
|
const autocompleteScope = mockAutocomplete(nockInstance, autoCompleteUrl);
|
254
|
-
const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY,
|
255
|
-
const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING
|
254
|
+
const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY, 0);
|
255
|
+
const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING);
|
256
256
|
|
257
257
|
const scope = nockInstance
|
258
258
|
.get(cvVersions)
|
@@ -41,8 +41,8 @@ let envScope;
|
|
41
41
|
beforeEach(() => {
|
42
42
|
const { results } = cvVersionsData;
|
43
43
|
[firstVersion] = results;
|
44
|
-
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
45
|
-
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
44
|
+
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
45
|
+
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
46
46
|
envScope = nockInstance
|
47
47
|
.get(environmentPathsPath)
|
48
48
|
.query(true)
|
@@ -122,7 +122,7 @@ test('Can show package and erratas and link to list page', async () => {
|
|
122
122
|
|
123
123
|
await patientlyWaitFor(() => {
|
124
124
|
expect(getAllByText(8)[0].closest('a'))
|
125
|
-
.toHaveAttribute('href', '/content_views/5#/versions/11/
|
125
|
+
.toHaveAttribute('href', '/content_views/5#/versions/11/rpmPackages/');
|
126
126
|
expect(getAllByText(15)[0].closest('a'))
|
127
127
|
.toHaveAttribute('href', '/content_views/5#/versions/11/errata/');
|
128
128
|
expect(getByText(5)).toBeInTheDocument();
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { Route } from 'react-router-dom';
|
3
|
-
import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
|
3
|
+
import { renderWithRedux, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
|
4
4
|
import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
|
5
5
|
import api from '../../../../services/api';
|
6
6
|
import ContentViewDetails from '../ContentViewDetails';
|
@@ -53,7 +53,7 @@ test('Can edit text details such as name', async (done) => {
|
|
53
53
|
.query(true)
|
54
54
|
.reply(200, cvDetailData);
|
55
55
|
const updatescope = nockInstance
|
56
|
-
.put(cvDetailsPath, { name: newName })
|
56
|
+
.put(cvDetailsPath, { include_permissions: true, name: newName })
|
57
57
|
.reply(200, updatedCVDetails);
|
58
58
|
const afterUpdateScope = nockInstance
|
59
59
|
.get(cvDetailsPath)
|
@@ -81,6 +81,7 @@ test('Can edit text details such as name', async (done) => {
|
|
81
81
|
assertNockRequest(getscope);
|
82
82
|
assertNockRequest(updatescope);
|
83
83
|
assertNockRequest(afterUpdateScope, done);
|
84
|
+
act(done);
|
84
85
|
});
|
85
86
|
|
86
87
|
test('Can edit boolean details such as solve dependencies', async (done) => {
|
@@ -90,7 +91,7 @@ test('Can edit boolean details such as solve dependencies', async (done) => {
|
|
90
91
|
.query(true)
|
91
92
|
.reply(200, cvDetailData);
|
92
93
|
const updatescope = nockInstance
|
93
|
-
.put(cvDetailsPath, { solve_dependencies: true })
|
94
|
+
.put(cvDetailsPath, { include_permissions: true, solve_dependencies: true })
|
94
95
|
.reply(200, updatedCVDetails);
|
95
96
|
const afterUpdateScope = nockInstance
|
96
97
|
.get(cvDetailsPath)
|
@@ -115,6 +116,7 @@ test('Can edit boolean details such as solve dependencies', async (done) => {
|
|
115
116
|
assertNockRequest(getscope);
|
116
117
|
assertNockRequest(updatescope);
|
117
118
|
assertNockRequest(afterUpdateScope, done);
|
119
|
+
act(done);
|
118
120
|
});
|
119
121
|
|
120
122
|
test('Can link to view tasks', async () => {
|
@@ -166,10 +166,10 @@ const ContentViewTable = () => {
|
|
166
166
|
|
167
167
|
const indexToSortVariable = (key) => {
|
168
168
|
switch (key) {
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
169
|
+
case 2:
|
170
|
+
return 'name';
|
171
|
+
default:
|
172
|
+
return undefined;
|
173
173
|
}
|
174
174
|
};
|
175
175
|
|
@@ -191,7 +191,7 @@ const ContentViewTable = () => {
|
|
191
191
|
[sortByIndex, direction],
|
192
192
|
);
|
193
193
|
|
194
|
-
const emptyContentTitle = __("You currently don't have any Content
|
194
|
+
const emptyContentTitle = __("You currently don't have any Content views.");
|
195
195
|
const emptyContentBody = __('A content view can be added by using the "Create content view" button above.');
|
196
196
|
const emptySearchTitle = __('No matching content views found');
|
197
197
|
const emptySearchBody = __('Try changing your search settings.');
|
@@ -26,8 +26,8 @@ beforeEach(() => {
|
|
26
26
|
.get('/api/v2/bookmarks')
|
27
27
|
.query(true)
|
28
28
|
.reply(200, {});
|
29
|
-
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay',
|
30
|
-
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing'
|
29
|
+
searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
|
30
|
+
autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
|
31
31
|
});
|
32
32
|
|
33
33
|
afterEach(() => {
|
@@ -173,7 +173,7 @@ test('Can handle no Content Views being present', async (done) => {
|
|
173
173
|
const { queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
|
174
174
|
|
175
175
|
expect(queryByText(firstCV.name)).toBeNull();
|
176
|
-
await patientlyWaitFor(() => expect(queryByText(/don't have any Content
|
176
|
+
await patientlyWaitFor(() => expect(queryByText(/don't have any Content views/i)).toBeInTheDocument());
|
177
177
|
assertNockRequest(autocompleteScope);
|
178
178
|
assertNockRequest(scope, done);
|
179
179
|
});
|
@@ -101,7 +101,7 @@ const CVBreadcrumb = () => {
|
|
101
101
|
filterDetails, filterDetailsStatus, breadcrumbItems, setBreadcrumbItems]);
|
102
102
|
|
103
103
|
return (
|
104
|
-
<Breadcrumb
|
104
|
+
<Breadcrumb className="margin-bottom-24">
|
105
105
|
{
|
106
106
|
Object.keys(breadcrumbItems)?.sort()?.map(key => (
|
107
107
|
<BreadcrumbItem
|
@@ -5,24 +5,24 @@ const EnvironmentLabels = (environments) => {
|
|
5
5
|
const { environments: singleEnvironment } = environments || {};
|
6
6
|
const { name } = singleEnvironment || {};
|
7
7
|
switch (environments) {
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
8
|
+
case Array:
|
9
|
+
return environments.map(env => (
|
10
|
+
<React.Fragment key={env.id} style={{ marginBottom: '5px' }}>
|
11
|
+
<Label
|
12
|
+
color="purple"
|
13
|
+
isTruncated
|
14
|
+
>{env.name}
|
15
|
+
</Label>
|
16
|
+
</React.Fragment>
|
17
|
+
));
|
18
|
+
default:
|
19
|
+
return (
|
20
|
+
<React.Fragment>
|
21
|
+
<Label color="purple" isTruncated>
|
22
|
+
{name}
|
23
|
+
</Label>
|
24
|
+
</React.Fragment>
|
25
|
+
);
|
26
26
|
}
|
27
27
|
};
|
28
28
|
|
@@ -47,19 +47,19 @@ const EnvironmentPaths = ({
|
|
47
47
|
{index === 0 && <hr />}
|
48
48
|
<FormGroup key={`fg-${index}`} isInline fieldId="environment-checkbox-group">
|
49
49
|
{environments.map(env =>
|
50
|
-
|
51
|
-
|
50
|
+
(<Checkbox
|
51
|
+
isChecked={(publishing && env.library) ||
|
52
52
|
envCheckedInList(env, userCheckedItems) ||
|
53
53
|
envCheckedInList(env, promotedEnvironments)}
|
54
|
-
|
54
|
+
isDisabled={(publishing && env.library)
|
55
55
|
|| envCheckedInList(env, promotedEnvironments)}
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
56
|
+
className="env-path__labels-with-pointer"
|
57
|
+
key={`${env.id}${index}`}
|
58
|
+
id={`${env.id}${index}`}
|
59
|
+
label={<EnvironmentLabels environments={env} />}
|
60
|
+
aria-label={env.label}
|
61
|
+
onChange={checked => oncheckedChange(checked, env)}
|
62
|
+
/>))}
|
63
63
|
</FormGroup>
|
64
64
|
<hr />
|
65
65
|
</div>
|