katello 4.5.0 → 4.6.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/controllers/katello/api/rhsm/candlepin_dynflow_proxy_controller.rb +10 -0
- data/app/controllers/katello/api/v2/activation_keys_controller.rb +7 -0
- data/app/controllers/katello/api/v2/alternate_content_sources_controller.rb +52 -22
- data/app/controllers/katello/api/v2/content_exports_controller.rb +33 -3
- data/app/controllers/katello/api/v2/content_uploads_controller.rb +2 -0
- data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb +1 -1
- data/app/controllers/katello/api/v2/content_view_filters_controller.rb +1 -1
- data/app/controllers/katello/api/v2/debs_controller.rb +42 -10
- data/app/controllers/katello/api/v2/host_collections_controller.rb +5 -1
- data/app/controllers/katello/api/v2/host_errata_controller.rb +1 -0
- data/app/controllers/katello/api/v2/host_module_streams_controller.rb +9 -1
- data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +8 -1
- data/app/controllers/katello/api/v2/organizations_controller.rb +3 -1
- data/app/controllers/katello/api/v2/simple_content_access_controller.rb +8 -0
- data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb +34 -11
- data/app/controllers/katello/concerns/organizations_controller_extensions.rb +7 -16
- data/app/lib/actions/katello/alternate_content_source/alternate_content_source_common.rb +16 -0
- data/app/lib/actions/katello/alternate_content_source/create.rb +11 -5
- data/app/lib/actions/katello/alternate_content_source/destroy.rb +3 -4
- data/app/lib/actions/katello/alternate_content_source/refresh.rb +3 -5
- data/app/lib/actions/katello/alternate_content_source/update.rb +57 -13
- data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb +2 -2
- data/app/lib/actions/katello/content_view/promote_to_environment.rb +4 -2
- data/app/lib/actions/katello/content_view/publish.rb +5 -2
- data/app/lib/actions/katello/organization/environment_contents_refresh.rb +20 -0
- data/app/lib/actions/katello/organization/manifest_refresh.rb +10 -4
- data/app/lib/actions/katello/organization/simple_content_access/toggle.rb +1 -9
- data/app/lib/actions/katello/repository/create.rb +9 -0
- data/app/lib/actions/katello/repository/destroy.rb +21 -0
- data/app/lib/actions/katello/repository/errata_mail.rb +3 -3
- data/app/lib/actions/katello/repository/refresh_repository.rb +3 -0
- data/app/lib/actions/katello/repository/update.rb +33 -0
- data/app/lib/actions/katello/repository/update_redhat_repository.rb +1 -1
- data/app/lib/actions/pulp3/alternate_content_source/create.rb +5 -4
- data/app/lib/actions/pulp3/alternate_content_source/create_remote.rb +5 -4
- data/app/lib/actions/pulp3/alternate_content_source/delete.rb +4 -4
- data/app/lib/actions/pulp3/alternate_content_source/delete_remote.rb +4 -4
- data/app/lib/actions/pulp3/alternate_content_source/refresh.rb +4 -4
- data/app/lib/actions/pulp3/alternate_content_source/update.rb +4 -4
- data/app/lib/actions/pulp3/alternate_content_source/update_remote.rb +5 -5
- data/app/lib/actions/pulp3/capsule_content/reclaim_space.rb +1 -0
- data/app/lib/actions/pulp3/content_view_version/create_export_history.rb +3 -1
- data/app/lib/actions/pulp3/content_view_version/create_exporter.rb +9 -2
- data/app/lib/actions/pulp3/content_view_version/create_syncable_export_history.rb +45 -0
- data/app/lib/actions/pulp3/content_view_version/destroy_exporter.rb +6 -1
- data/app/lib/actions/pulp3/content_view_version/export.rb +8 -3
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/create.rb +3 -3
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/delete.rb +6 -7
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/refresh.rb +2 -2
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/refresh_remote.rb +18 -0
- data/app/lib/actions/pulp3/orchestration/alternate_content_source/update.rb +3 -3
- data/app/lib/actions/pulp3/orchestration/content_view_version/export.rb +28 -13
- data/app/lib/actions/pulp3/orchestration/content_view_version/export_library.rb +4 -2
- data/app/lib/actions/pulp3/orchestration/content_view_version/export_repository.rb +4 -2
- data/app/lib/actions/pulp3/orchestration/content_view_version/syncable_export.rb +82 -0
- data/app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb +1 -1
- data/app/lib/katello/concerns/base_template_scope_extensions.rb +1 -1
- data/app/lib/katello/errors.rb +1 -1
- data/app/lib/katello/resources/candlepin/owner.rb +9 -2
- data/app/lib/katello/validators/alternate_content_source_products_validator.rb +17 -0
- data/app/models/katello/alternate_content_source.rb +39 -8
- data/app/models/katello/alternate_content_source_product.rb +13 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +13 -2
- data/app/models/katello/concerns/pulp_database_unit.rb +2 -2
- data/app/models/katello/concerns/smart_proxy_extensions.rb +5 -6
- data/app/models/katello/content_view.rb +41 -29
- data/app/models/katello/content_view_deb_filter.rb +51 -0
- data/app/models/katello/content_view_deb_filter_rule.rb +24 -0
- data/app/models/katello/content_view_filter.rb +10 -3
- data/app/models/katello/glue/candlepin/owner.rb +0 -1
- data/app/models/katello/installed_package.rb +1 -0
- data/app/models/katello/product.rb +3 -0
- data/app/models/katello/repository.rb +2 -0
- data/app/models/katello/smart_proxy_alternate_content_source.rb +6 -0
- data/app/services/cert/certs.rb +8 -16
- data/app/services/katello/organization_creator.rb +18 -7
- data/app/services/katello/pulp/server.rb +2 -2
- data/app/services/katello/pulp3/alternate_content_source.rb +22 -4
- data/app/services/katello/pulp3/api/apt.rb +12 -0
- data/app/services/katello/pulp3/api/core.rb +8 -0
- data/app/services/katello/pulp3/content_view_version/export.rb +38 -11
- data/app/services/katello/pulp3/content_view_version/metadata_generator.rb +3 -1
- data/app/services/katello/pulp3/content_view_version/syncable_format_export.rb +34 -0
- data/app/services/katello/pulp3/deb.rb +3 -1
- data/app/services/katello/pulp3/pulp_content_unit.rb +2 -0
- data/app/services/katello/pulp3/repository/apt.rb +186 -2
- data/app/services/katello/pulp3/repository.rb +4 -3
- data/app/services/katello/pulp3/service_common.rb +1 -1
- data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb +1 -1
- data/app/views/foreman/smart_proxies/show.html.erb +3 -3
- data/app/views/katello/api/v2/alternate_content_sources/base.json.rabl +18 -3
- data/app/views/katello/api/v2/alternate_content_sources/show.json.rabl +20 -0
- data/app/views/katello/api/v2/ansible_collections/compare.json.rabl +10 -0
- data/app/views/katello/api/v2/content_view_filters/base.json.rabl +5 -0
- data/app/views/katello/api/v2/module_streams/compare.json.rabl +10 -0
- data/app/views/katello/api/v2/repository_sets/show.json.rabl +4 -0
- data/app/views/katello/layouts/foreman_with_bastion.html.erb +1 -1
- data/app/views/katello/layouts/react.html.erb +1 -1
- data/app/views/overrides/organizations/_edit_override.html.erb +5 -8
- data/app/views/overrides/organizations/_index_row_override.html.erb +1 -1
- data/app/views/overrides/organizations/_step_1_override.html.erb +5 -0
- data/ca/redhat-uep.pem +18 -23
- data/config/katello.yaml.example +0 -2
- data/config/routes/api/v2.rb +2 -0
- data/config/routes/overrides.rb +1 -0
- data/db/migrate/20201116161820_create_content_view_deb_filter_rules.rb +17 -0
- data/db/migrate/20211220185935_clean_duplicate_content_units.rb +11 -9
- data/db/migrate/20220524132259_remove_last_refreshed_from_katello_alternate_content_sources.rb +5 -0
- data/db/migrate/20220601163911_add_vendor_to_katello_installed_packages.rb +5 -0
- data/db/migrate/20220610165621_add_repositories_and_products_to_acs.rb +23 -0
- data/engines/bastion/app/views/bastion/layouts/application.html.erb +1 -1
- data/engines/bastion/app/views/bastion/layouts/application_ie.html.erb +1 -1
- data/engines/bastion/app/views/bastion/layouts/assets.html.erb +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment-content.controller.js +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js +2 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html +3 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +4 -5
- data/engines/bastion_katello/lib/bastion_katello/engine.rb +0 -1
- data/lib/katello/engine.rb +1 -2
- data/lib/katello/permission_creator.rb +2 -2
- data/lib/katello/permissions/host_permissions.rb +1 -0
- data/lib/katello/plugin.rb +6 -12
- data/lib/katello/version.rb +1 -1
- data/locale/action_names.rb +49 -46
- data/locale/bn/katello.po +361 -53
- data/locale/cs/katello.po +361 -53
- data/locale/de/katello.po +366 -58
- data/locale/en/katello.po +361 -53
- data/locale/es/katello.po +364 -56
- data/locale/fr/katello.po +374 -66
- data/locale/gu/katello.po +361 -53
- data/locale/hi/katello.po +361 -53
- data/locale/it/katello.po +361 -53
- data/locale/ja/katello.po +374 -66
- data/locale/katello.pot +1626 -1079
- data/locale/kn/katello.po +361 -53
- data/locale/ko/katello.po +361 -53
- data/locale/mr/katello.po +361 -53
- data/locale/or/katello.po +361 -53
- data/locale/pa/katello.po +361 -53
- data/locale/pt/katello.po +361 -53
- data/locale/pt_BR/katello.po +364 -56
- data/locale/ru/katello.po +361 -53
- data/locale/ta/katello.po +361 -53
- data/locale/te/katello.po +361 -53
- data/locale/zh_CN/katello.po +374 -66
- data/locale/zh_TW/katello.po +361 -53
- data/webpack/components/EditableTextInput/EditableTextInput.js +3 -16
- data/webpack/components/EditableTextInput/PencilEditButton.js +33 -0
- data/webpack/components/Errata/index.js +18 -3
- data/webpack/components/Loading.js +1 -1
- data/webpack/components/RoutedTabs/index.js +1 -17
- data/webpack/components/Search/Search.js +0 -1
- data/webpack/components/Search/__tests__/search.test.js +1 -2
- data/webpack/components/SelectAllCheckbox/index.js +7 -4
- data/webpack/components/SelectableDropdown/SelectableDropdown.js +1 -0
- data/webpack/components/Table/EmptyStateMessage.js +77 -2
- data/webpack/components/Table/MainTable.js +46 -4
- data/webpack/components/Table/TableHooks.js +8 -4
- data/webpack/components/Table/TableWrapper.js +14 -8
- data/webpack/components/TypeAhead/TypeAhead.js +26 -11
- data/webpack/components/TypeAhead/pf3Search/TypeAheadItems.js +1 -1
- data/webpack/components/TypeAhead/pf4Search/TypeAheadInput.js +1 -0
- data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js +2 -1
- data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsModal.js +9 -4
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeActions.js +37 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard.js +173 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard.scss +6 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeConstants.js +6 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeEditModal.js +301 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeSelectors.js +25 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeCard.test.js +108 -0
- data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeEditModal.test.js +161 -0
- data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js +12 -12
- data/webpack/components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard.js +100 -0
- data/webpack/components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions.js +26 -4
- data/webpack/components/extensions/HostDetails/HostDetailsConstants.js +3 -1
- data/webpack/components/extensions/HostDetails/HostDetailsReducer.js +14 -0
- data/webpack/components/extensions/HostDetails/HostDetailsSelectors.js +8 -2
- data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js +9 -1
- data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js +23 -8
- data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js +11 -9
- data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js +58 -8
- data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js +2 -0
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js +30 -3
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySets.fixtures.json +3 -0
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js +48 -20
- data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js +1 -10
- data/webpack/components/extensions/HostDetails/hostDetailsHelpers.js +1 -1
- data/webpack/components/extensions/RegistrationCommands/index.js +49 -17
- data/webpack/containers/Application/config.js +5 -10
- data/webpack/global_index.js +19 -7
- data/webpack/global_test_setup.js +14 -2
- data/webpack/ouia_id_check.js +95 -0
- data/webpack/redux/actions/RedHatRepositories/helpers.js +2 -0
- data/webpack/redux/reducers/index.js +2 -4
- data/webpack/scenes/AlternateContentSources/ACSActions.js +36 -3
- data/webpack/scenes/AlternateContentSources/ACSConstants.js +3 -0
- data/webpack/scenes/AlternateContentSources/ACSSelectors.js +15 -6
- data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js +73 -42
- data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCreateFinish.js +26 -10
- data/webpack/scenes/AlternateContentSources/Create/Steps/ACSProducts.js +44 -0
- data/webpack/scenes/AlternateContentSources/Create/Steps/ACSReview.js +59 -45
- data/webpack/scenes/AlternateContentSources/Create/Steps/ACSSmartProxies.js +4 -3
- data/webpack/scenes/AlternateContentSources/Create/Steps/AcsUrlPaths.js +0 -1
- data/webpack/scenes/AlternateContentSources/Create/Steps/SelectSource.js +35 -19
- data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js +120 -13
- data/webpack/scenes/AlternateContentSources/Create/__tests__/products.fixtures.json +92 -0
- data/webpack/scenes/AlternateContentSources/Details/ACSExpandableDetails.js +459 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditCredentials.js +354 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditDetails.js +104 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditProducts.js +120 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditSmartProxies.js +118 -0
- data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditURLPaths.js +118 -0
- data/webpack/scenes/AlternateContentSources/Details/__tests__/ACSEdits.test.js +242 -0
- data/webpack/scenes/AlternateContentSources/Details/__tests__/ACSExpandableDetails.test.js +106 -0
- data/webpack/scenes/AlternateContentSources/Details/__tests__/acsDetails.fixtures.json +49 -0
- data/webpack/scenes/AlternateContentSources/Details/__tests__/acsProducts.fixtures.json +95 -0
- data/webpack/scenes/AlternateContentSources/Details/__tests__/simplifiedAcsDetails.fixtures.json +39 -0
- data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js +215 -87
- data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.scss +3 -0
- data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js +1 -2
- data/webpack/scenes/Content/__tests__/contentTable.test.js +1 -2
- data/webpack/scenes/ContentViews/ContentViewsConstants.js +15 -4
- data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +2 -0
- data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +113 -0
- data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +89 -0
- data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +32 -9
- data/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterAdd.test.js +13 -3
- data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js +39 -27
- data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js +236 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js +1 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js +10 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js +3 -0
- data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +3 -1
- data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +17 -4
- data/webpack/scenes/ContentViews/Details/Filters/ContentType.js +1 -0
- data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +34 -22
- data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVDebMatchContentModal.js +97 -0
- data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Filters/Rules/DebPackage/AddEditDebPackageRuleModal.js +128 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js +56 -3
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +62 -8
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js +1 -5
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js +32 -2
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilter.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/emptyCVContainerImageFilterContent.fixtures.json +13 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/emptyCVPackageFilterRules.fixtures.json +13 -0
- data/webpack/scenes/ContentViews/Details/Filters/__tests__/emptyContentViewFilters.fixtures.json +13 -0
- data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +5 -1
- data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteModal.test.js +3 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompare.js +143 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompare.scss +51 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareConfig.js +314 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareHeader.js +186 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js +74 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/AnsibleCollectionsCompareAllContentData.fixtures.json +63 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/CVVersionCompare.test.js +657 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/CVVersionEmptyContentCompareData.fixtures.json +14 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/ContainerTagsCompareAllContentData.fixtures.json +95 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/DebPackagesCompareAllContentData.fixtures.json +87 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/ErrataCompareAllContentData.fixtures.json +319 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/ErrataCompareThreeContentTypesData.fixtures.json +131 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/FilesCompareAllContentData.fixtures.json +51 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/FilesCompareThreeContentTypesData.fixtures.json +48 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/ModuleStreamsCompareAllContentData.fixtures.json +239 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/PackageGroupsCompareAllContentData.fixtures.json +51 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/PythonPackagesCompareAllContentData.fixtures.json +315 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/RPMPackagesCompareAllContentData.fixtures.json +470 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/RPMPackagesCompareThreeContentTypesData.fixtures.json +475 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewDetails.fixtures.json +160 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionOneDetials.fixtures.json +161 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionThreeDetails.fixtures.json +154 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionTwoDetails.fixtures.json +211 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersions.fixtures.json +1013 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionOneDetails.fixtures.json +145 -0
- data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionTwoDetails.fixtures.json +145 -0
- data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +102 -36
- data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js +4 -2
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js +1 -2
- data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +113 -40
- data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +96 -81
- data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js +1 -2
- data/webpack/scenes/ContentViews/__tests__/mockDetails.fixtures.json +7 -2
- data/webpack/scenes/SmartProxy/SmartProxyContentActions.js +1 -1
- data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js +0 -30
- data/webpack/test-utils/nockWrapper.js +7 -0
- metadata +82 -167
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.controller.js +0 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js +0 -751
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-deletion.controller.js +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js +0 -81
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-confirm.controller.js +0 -65
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-content-hosts.controller.js +0 -82
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-environments.controller.js +0 -76
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion.controller.js +0 -160
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/content-view-deletion.html +0 -58
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-activation-keys.html +0 -94
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-confirm.html +0 -76
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-content-hosts.html +0 -88
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-environments.html +0 -73
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-component.factory.js +0 -32
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-available-content-views.controller.js +0 -75
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-content-views-list.controller.js +0 -68
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html +0 -81
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html +0 -81
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite.html +0 -24
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-deb-repositories.controller.js +0 -50
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-docker-repositories.controller.js +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-file-repositories.controller.js +0 -50
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-ostree-repositories.controller.js +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-repositories.controller.js +0 -45
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-deb-repositories-list.controller.js +0 -48
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-details.controller.js +0 -100
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-docker-repositories-list.controller.js +0 -49
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-file-repositories-list.controller.js +0 -48
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-ostree-repositories-list.controller.js +0 -49
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js +0 -129
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js +0 -46
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-repositories-list.controller.js +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-repositories.service.js +0 -91
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-versions.controller.js +0 -240
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-errata-filter.controller.js +0 -115
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-module-stream-filter.controller.js +0 -68
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-package-group-filter.controller.js +0 -66
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js +0 -77
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/docker-tag-filter.controller.js +0 -137
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/edit-filter.controller.js +0 -36
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter-list.controller.js +0 -78
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter.controller.js +0 -74
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-content-type.filter.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-details.controller.js +0 -34
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js +0 -30
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js +0 -86
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-rule-matching-package-modal.controller.js +0 -37
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-type.filter.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter.factory.js +0 -66
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js +0 -85
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/module-stream-list-filter.controller.js +0 -73
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js +0 -100
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-filter.controller.js +0 -179
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/package-group-list-filter.controller.js +0 -75
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/date-type-errata-filter.html +0 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/date-type-errata.html +0 -75
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/docker-filter.html +0 -28
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/docker-tag-filter-details.html +0 -65
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/edit-filter.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html +0 -63
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter.html +0 -50
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-details.html +0 -9
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-repositories.html +0 -121
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-rule-matching-package-modal.html +0 -43
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filters.html +0 -85
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter-details.html +0 -58
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/module-stream-filter.html +0 -43
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/new-filter.html +0 -62
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html +0 -182
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter.html +0 -28
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter-details.html +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter.html +0 -43
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/partials/filter-repositories-count.html +0 -2
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js +0 -47
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.factory.js +0 -22
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html +0 -36
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-copy.html +0 -20
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-deb-repositories.html +0 -87
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details-tasks.html +0 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html +0 -144
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html +0 -114
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html +0 -87
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html +0 -63
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-ostree-repositories.html +0 -87
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-promotion.html +0 -59
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-publish.html +0 -58
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-repositories.html +0 -116
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html +0 -126
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/content-view-new.controller.js +0 -78
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html +0 -127
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js +0 -138
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.controller.js +0 -59
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-apt.html +0 -25
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-components.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-deb.html +0 -19
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-details.html +0 -15
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-docker.html +0 -23
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html +0 -48
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-file.html +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-module-streams.html +0 -8
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-package-groups.html +0 -21
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-packages.html +0 -27
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html +0 -42
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html +0 -83
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/views/content-views.html +0 -74
- data/lib/katello/tasks/reset.rake.bak +0 -67
- data/locale/bn/LC_MESSAGES/katello.mo +0 -0
- data/locale/cs/LC_MESSAGES/katello.mo +0 -0
- data/locale/de/LC_MESSAGES/katello.mo +0 -0
- data/locale/en/LC_MESSAGES/katello.mo +0 -0
- data/locale/es/LC_MESSAGES/katello.mo +0 -0
- data/locale/fr/LC_MESSAGES/katello.mo +0 -0
- data/locale/gu/LC_MESSAGES/katello.mo +0 -0
- data/locale/hi/LC_MESSAGES/katello.mo +0 -0
- data/locale/it/LC_MESSAGES/katello.mo +0 -0
- data/locale/ja/LC_MESSAGES/katello.mo +0 -0
- data/locale/kn/LC_MESSAGES/katello.mo +0 -0
- data/locale/ko/LC_MESSAGES/katello.mo +0 -0
- data/locale/mr/LC_MESSAGES/katello.mo +0 -0
- data/locale/or/LC_MESSAGES/katello.mo +0 -0
- data/locale/pa/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt/LC_MESSAGES/katello.mo +0 -0
- data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
- data/locale/ru/LC_MESSAGES/katello.mo +0 -0
- data/locale/ta/LC_MESSAGES/katello.mo +0 -0
- data/locale/te/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
- data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsActions.js +0 -30
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsConstants.js +0 -3
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsPage.js +0 -80
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsReducer.js +0 -39
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTableSchema.js +0 -60
- data/webpack/scenes/AnsibleCollections/AnsibleCollectionsTables.scss +0 -0
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js +0 -94
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsActions.js +0 -23
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsConstants.js +0 -3
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsReducer.js +0 -30
- data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionsSchema.js +0 -35
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailInfo.test.js +0 -16
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.fixtures.js +0 -25
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetails.test.js +0 -27
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsActions.test.js +0 -41
- data/webpack/scenes/AnsibleCollections/Details/__tests__/AnsibleCollectionDetailsReducer.test.js +0 -33
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailInfo.test.js.snap +0 -83
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetails.test.js.snap +0 -190
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsActions.test.js.snap +0 -58
- data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsReducer.test.js.snap +0 -50
- data/webpack/scenes/AnsibleCollections/Details/index.js +0 -17
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionPage.test.js +0 -23
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollections.fixtures.js +0 -52
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsActions.test.js +0 -48
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsReducer.test.js +0 -46
- data/webpack/scenes/AnsibleCollections/__tests__/AnsibleCollectionsTable.test.js +0 -25
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionPage.test.js.snap +0 -73
- data/webpack/scenes/AnsibleCollections/__tests__/__snapshots__/AnsibleCollectionsTable.test.js.snap +0 -81
- data/webpack/scenes/AnsibleCollections/index.js +0 -17
- data/webpack/scenes/Subscriptions/Manifest/__tests__/ManageManifestModal.test.js +0 -123
@@ -7,8 +7,6 @@ import SetOrganization from '../../components/SelectOrg/SetOrganization';
|
|
7
7
|
import WithOrganization from '../../components/WithOrganization/withOrganization';
|
8
8
|
import ModuleStreams from '../../scenes/ModuleStreams';
|
9
9
|
import ModuleStreamDetails from '../../scenes/ModuleStreams/Details';
|
10
|
-
import AnsibleCollections from '../../scenes/AnsibleCollections';
|
11
|
-
import AnsibleCollectionDetails from '../../scenes/AnsibleCollections/Details';
|
12
10
|
import ContentViews from '../../scenes/ContentViews';
|
13
11
|
import ContentViewDetails from '../../scenes/ContentViews/Details';
|
14
12
|
import Content from '../../scenes/Content';
|
@@ -48,14 +46,6 @@ export const links = [
|
|
48
46
|
path: 'module_streams/:id([0-9]+)',
|
49
47
|
component: WithOrganization(withHeader(ModuleStreamDetails, { title: __('Module Stream Details') })),
|
50
48
|
},
|
51
|
-
{
|
52
|
-
path: 'legacy_ansible_collections',
|
53
|
-
component: WithOrganization(withHeader(AnsibleCollections, { title: __('Ansible Collections') })),
|
54
|
-
},
|
55
|
-
{
|
56
|
-
path: 'legacy_ansible_collections/:id([0-9]+)',
|
57
|
-
component: WithOrganization(withHeader(AnsibleCollectionDetails, { title: __('Ansible Collection Details') })),
|
58
|
-
},
|
59
49
|
{
|
60
50
|
path: 'content_views',
|
61
51
|
component: WithOrganization(withHeader(ContentViews, { title: __('Content views') })),
|
@@ -85,4 +75,9 @@ export const links = [
|
|
85
75
|
path: 'labs/alternate_content_sources',
|
86
76
|
component: WithOrganization(withHeader(AlternateContentSource, { title: __('Alternate Content Sources') })),
|
87
77
|
},
|
78
|
+
{
|
79
|
+
path: 'labs/alternate_content_sources/:id([0-9]+)',
|
80
|
+
component: WithOrganization(withHeader(AlternateContentSource, { title: __('Alternate Content Sources') })),
|
81
|
+
exact: false,
|
82
|
+
},
|
88
83
|
];
|
data/webpack/global_index.js
CHANGED
@@ -4,52 +4,63 @@ import { registerReducer } from 'foremanReact/common/MountingService';
|
|
4
4
|
import { translate as __ } from 'foremanReact/common/I18n';
|
5
5
|
|
6
6
|
import SystemStatuses from './components/extensions/about';
|
7
|
-
import
|
7
|
+
import {
|
8
|
+
RegistrationCommands,
|
9
|
+
RegistrationActivationKeys,
|
10
|
+
} from './components/extensions/RegistrationCommands';
|
8
11
|
import ContentTab from './components/extensions/HostDetails/Tabs/ContentTab';
|
9
12
|
import ContentViewDetailsCard from './components/extensions/HostDetails/Cards/ContentViewDetailsCard/ContentViewDetailsCard';
|
10
13
|
import ErrataOverviewCard from './components/extensions/HostDetails/Cards/ErrataOverviewCard';
|
11
14
|
import InstalledProductsCard from './components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard';
|
12
15
|
import RegistrationCard from './components/extensions/HostDetails/DetailsTabCards/RegistrationCard';
|
16
|
+
import HwPropertiesCard from './components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard';
|
13
17
|
|
14
18
|
import TracesTab from './components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js';
|
15
19
|
import extendReducer from './components/extensions/reducers';
|
16
20
|
import rootReducer from './redux/reducers';
|
17
21
|
import HostCollectionsCard from './components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsCard';
|
18
22
|
import { hostIsNotRegistered } from './components/extensions/HostDetails/hostDetailsHelpers';
|
19
|
-
import
|
23
|
+
import {
|
24
|
+
SystemPropertiesCardSubscription,
|
25
|
+
SystemPropertiesCardTracer,
|
26
|
+
} from './components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions';
|
20
27
|
import HostActionsBar from './components/extensions/HostDetails/ActionsBar';
|
21
28
|
import RecentCommunicationCardExtensions from './components/extensions/HostDetails/DetailsTabCards/RecentCommunicationCardExtensions';
|
29
|
+
import SystemPurposeCard from './components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard';
|
22
30
|
|
23
31
|
registerReducer('katelloExtends', extendReducer);
|
24
32
|
registerReducer('katello', rootReducer);
|
25
33
|
|
26
34
|
addGlobalFill('aboutFooterSlot', '[katello]AboutSystemStatuses', <SystemStatuses key="katello-system-statuses" />, 100);
|
27
35
|
addGlobalFill('registrationAdvanced', '[katello]RegistrationCommands', <RegistrationCommands key="katello-reg" />, 100);
|
36
|
+
addGlobalFill('registrationGeneral', '[katello]RegistrationActivationKeys', <RegistrationActivationKeys key="katello-reg-ak" />, 100);
|
28
37
|
|
29
38
|
// Host details page tabs
|
30
39
|
addGlobalFill('host-details-page-tabs', 'Content', <ContentTab key="content" />, 900, { title: __('Content'), hideTab: hostIsNotRegistered });
|
31
40
|
addGlobalFill('host-details-page-tabs', 'Traces', <TracesTab key="traces" />, 800, { title: __('Traces'), hideTab: hostIsNotRegistered });
|
32
41
|
|
33
|
-
// Overview tab cards
|
42
|
+
// Overview tab cards & card extensions
|
34
43
|
addGlobalFill(
|
35
44
|
'host-overview-cards',
|
36
45
|
'Content view details',
|
37
46
|
<ContentViewDetailsCard key="content-view-details" />,
|
38
|
-
|
47
|
+
3800,
|
39
48
|
);
|
40
49
|
addGlobalFill(
|
41
50
|
'host-overview-cards',
|
42
51
|
'Host collections',
|
43
52
|
<HostCollectionsCard key="host-collections-details" />,
|
44
|
-
|
53
|
+
2600,
|
45
54
|
);
|
46
|
-
addGlobalFill('host-overview-cards', 'Installable errata', <ErrataOverviewCard key="errata-overview" />,
|
55
|
+
addGlobalFill('host-overview-cards', 'Installable errata', <ErrataOverviewCard key="errata-overview" />, 3600);
|
56
|
+
addGlobalFill('host-overview-cards', 'System purpose', <SystemPurposeCard key="system-purpose" />, 1400);
|
47
57
|
addGlobalFill('recent-communication-card-item', 'Recent communication', <RecentCommunicationCardExtensions key="recent-communication" />, 3000);
|
48
58
|
|
49
59
|
// Details tab cards & card extensions
|
50
60
|
addGlobalFill('host-tab-details-cards', 'Installed products', <InstalledProductsCard key="installed-products" />, 100);
|
51
61
|
addGlobalFill('host-tab-details-cards', 'Registration details', <RegistrationCard key="registration-details" />, 200);
|
52
|
-
addGlobalFill('host-details-tab-properties-1', 'Subscription UUID', <
|
62
|
+
addGlobalFill('host-details-tab-properties-1', 'Subscription UUID', <SystemPropertiesCardSubscription key="subscription-uuid" />);
|
63
|
+
addGlobalFill('host-details-tab-properties-2', 'Tracer', <SystemPropertiesCardTracer key="tracer-status" />);
|
53
64
|
|
54
65
|
addGlobalFill(
|
55
66
|
'host-details-kebab',
|
@@ -57,3 +68,4 @@ addGlobalFill(
|
|
57
68
|
<HostActionsBar key="katello-host-details-kebab" />,
|
58
69
|
100,
|
59
70
|
);
|
71
|
+
addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="hw-properties" />, 200);
|
@@ -1,4 +1,5 @@
|
|
1
1
|
import nock from 'nock';
|
2
|
+
// import checkForOuiaIds from './ouia_id_check';
|
2
3
|
|
3
4
|
// runs before each test to make sure console.error output will
|
4
5
|
// fail a test (i.e. default PropType missing). Check the error
|
@@ -8,12 +9,18 @@ global.console.error = (error, stack) => {
|
|
8
9
|
originalConsoleError(error); // ensure error is printed to console
|
9
10
|
/* eslint-disable-next-line no-console */
|
10
11
|
if (stack) console.log(stack); // Prints out original stack trace
|
11
|
-
throw new Error(error);
|
12
|
+
throw new Error(error); // comment this and uncomment the next line when checking for ouia ids
|
13
|
+
// if (!error.includes('Failed prop type')) throw new Error(error);
|
12
14
|
};
|
13
15
|
|
14
16
|
// Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
|
15
17
|
jest.setTimeout(process.env.JEST_TIMEOUT || 15000);
|
16
18
|
|
19
|
+
// uncomment this to see if tests are trying to make real API requests
|
20
|
+
// beforeAll(() => {
|
21
|
+
// nock.disableNetConnect();
|
22
|
+
// });
|
23
|
+
|
17
24
|
afterAll(() => {
|
18
25
|
jest.resetModules();
|
19
26
|
if (global.gc) global.gc();
|
@@ -23,7 +30,12 @@ beforeEach(() => {
|
|
23
30
|
if (!nock.isActive()) { nock.activate(); }
|
24
31
|
});
|
25
32
|
|
33
|
+
// To see where you need to add ouiaIds:
|
34
|
+
// 1. uncomment this and the import above
|
35
|
+
// checkForOuiaIds();
|
36
|
+
// 2. (optional) uncomment the line in global.console.error function above
|
37
|
+
|
26
38
|
afterEach(() => {
|
27
|
-
nock.
|
39
|
+
nock.cleanAll();
|
28
40
|
});
|
29
41
|
|
@@ -0,0 +1,95 @@
|
|
1
|
+
import PropTypes from 'prop-types';
|
2
|
+
import {
|
3
|
+
Alert,
|
4
|
+
Breadcrumb,
|
5
|
+
Button,
|
6
|
+
Card,
|
7
|
+
Checkbox,
|
8
|
+
Chip,
|
9
|
+
ChipGroup,
|
10
|
+
ContextSelector,
|
11
|
+
Dropdown,
|
12
|
+
DropdownItem,
|
13
|
+
DropdownSeparator,
|
14
|
+
DropdownToggle,
|
15
|
+
DropdownToggleCheckbox,
|
16
|
+
FormSelect,
|
17
|
+
Menu,
|
18
|
+
Modal,
|
19
|
+
ModalContent,
|
20
|
+
Nav,
|
21
|
+
NavExpandable,
|
22
|
+
NavItem,
|
23
|
+
OptionsMenu,
|
24
|
+
Pagination,
|
25
|
+
Radio,
|
26
|
+
Select,
|
27
|
+
Switch,
|
28
|
+
TabButton,
|
29
|
+
TabContent,
|
30
|
+
Tabs,
|
31
|
+
Text,
|
32
|
+
TextInput,
|
33
|
+
Title,
|
34
|
+
Toolbar,
|
35
|
+
} from '@patternfly/react-core';
|
36
|
+
import {
|
37
|
+
RowWrapper,
|
38
|
+
Table,
|
39
|
+
TableComposable,
|
40
|
+
Tr,
|
41
|
+
} from '@patternfly/react-table';
|
42
|
+
|
43
|
+
const checkForOuiaIds = () => {
|
44
|
+
const ouiaSupportedPFComponents = [
|
45
|
+
Alert,
|
46
|
+
Breadcrumb,
|
47
|
+
Button,
|
48
|
+
Card,
|
49
|
+
Checkbox,
|
50
|
+
Chip,
|
51
|
+
ChipGroup,
|
52
|
+
ContextSelector,
|
53
|
+
Dropdown,
|
54
|
+
DropdownItem,
|
55
|
+
DropdownSeparator,
|
56
|
+
DropdownToggle,
|
57
|
+
DropdownToggleCheckbox,
|
58
|
+
FormSelect,
|
59
|
+
Menu,
|
60
|
+
Modal,
|
61
|
+
ModalContent,
|
62
|
+
Nav,
|
63
|
+
NavExpandable,
|
64
|
+
NavItem,
|
65
|
+
OptionsMenu,
|
66
|
+
Pagination,
|
67
|
+
Radio,
|
68
|
+
Select,
|
69
|
+
Switch,
|
70
|
+
TabButton,
|
71
|
+
TabContent,
|
72
|
+
Tabs,
|
73
|
+
Text,
|
74
|
+
TextInput,
|
75
|
+
Title,
|
76
|
+
Toolbar,
|
77
|
+
RowWrapper,
|
78
|
+
Table,
|
79
|
+
TableComposable,
|
80
|
+
Tr,
|
81
|
+
];
|
82
|
+
beforeEach(() => {
|
83
|
+
// eslint-disable-next-line no-restricted-syntax
|
84
|
+
for (const Component of ouiaSupportedPFComponents) {
|
85
|
+
// eslint-disable-next-line no-continue
|
86
|
+
if (!Component) continue;
|
87
|
+
Component.propTypes = {
|
88
|
+
...Component.propTypes,
|
89
|
+
ouiaId: PropTypes.string.isRequired,
|
90
|
+
};
|
91
|
+
}
|
92
|
+
});
|
93
|
+
};
|
94
|
+
|
95
|
+
export default checkForOuiaIds;
|
@@ -10,6 +10,8 @@ const repoTypeSearchQueryMap = {
|
|
10
10
|
};
|
11
11
|
|
12
12
|
const recommendedRepositoriesRHEL = [
|
13
|
+
'rhel-9-for-x86_64-baseos-rpms',
|
14
|
+
'rhel-9-for-x86_64-appstream-rpms',
|
13
15
|
'rhel-8-for-x86_64-baseos-rpms',
|
14
16
|
'rhel-8-for-x86_64-baseos-kickstart',
|
15
17
|
'rhel-8-for-x86_64-appstream-rpms',
|
@@ -11,9 +11,8 @@ import { moduleStreams } from '../../scenes/ModuleStreams';
|
|
11
11
|
import { reducers as organizationProductsReducers } from '../OrganizationProducts';
|
12
12
|
import { moduleStreamDetails } from '../../scenes/ModuleStreams/Details';
|
13
13
|
import { reducers as systemStatuses } from '../../components/extensions/about';
|
14
|
-
import { ansibleCollections } from '../../scenes/AnsibleCollections';
|
15
|
-
import { ansibleCollectionDetails } from '../../scenes/AnsibleCollections/Details';
|
16
14
|
import { contentViewDetails } from '../../scenes/ContentViews/Details';
|
15
|
+
import hostDetails from '../../components/extensions/HostDetails/HostDetailsReducer';
|
17
16
|
|
18
17
|
export default combineReducers({
|
19
18
|
organization,
|
@@ -26,9 +25,8 @@ export default combineReducers({
|
|
26
25
|
setOrganization,
|
27
26
|
moduleStreams,
|
28
27
|
moduleStreamDetails,
|
29
|
-
ansibleCollections,
|
30
|
-
ansibleCollectionDetails,
|
31
28
|
contentViewDetails,
|
29
|
+
hostDetails,
|
32
30
|
...organizationProductsReducers,
|
33
31
|
...systemStatuses,
|
34
32
|
});
|
@@ -1,7 +1,14 @@
|
|
1
1
|
import { API_OPERATIONS, APIActions, get, post } from 'foremanReact/redux/API';
|
2
2
|
import { translate as __ } from 'foremanReact/common/I18n';
|
3
3
|
import api, { orgId } from '../../services/api';
|
4
|
-
import ACS_KEY, {
|
4
|
+
import ACS_KEY, {
|
5
|
+
acsDetailsKey,
|
6
|
+
acsRefreshKey,
|
7
|
+
CREATE_ACS_KEY,
|
8
|
+
DELETE_ACS_KEY,
|
9
|
+
EDIT_ACS_KEY,
|
10
|
+
PRODUCTS_KEY,
|
11
|
+
} from './ACSConstants';
|
5
12
|
import { getResponseErrorMsgs } from '../../utils/helpers';
|
6
13
|
import { renderTaskStartedToast } from '../Tasks/helpers';
|
7
14
|
|
@@ -30,6 +37,13 @@ const getAlternateContentSources = (extraParams, id = '') => get({
|
|
30
37
|
params: createACSParams(extraParams),
|
31
38
|
});
|
32
39
|
|
40
|
+
export const getACSDetails = (acsId, extraParams = {}) => get({
|
41
|
+
type: API_OPERATIONS.GET,
|
42
|
+
key: acsDetailsKey(acsId),
|
43
|
+
params: { organization_id: orgId(), include_permissions: true, ...extraParams },
|
44
|
+
url: api.getApiUrl(`/alternate_content_sources/${acsId}`),
|
45
|
+
});
|
46
|
+
|
33
47
|
export const createACS = params => post({
|
34
48
|
type: API_OPERATIONS.POST,
|
35
49
|
key: CREATE_ACS_KEY,
|
@@ -59,7 +73,26 @@ export const refreshACS = (acsId, handleSuccess) => post({
|
|
59
73
|
},
|
60
74
|
errorToast: error => __(`Something went wrong while refreshing this alternate content source! ${getResponseErrorMsgs(error.response)}`),
|
61
75
|
});
|
76
|
+
|
77
|
+
export const getProducts = () => get({
|
78
|
+
type: API_OPERATIONS.GET,
|
79
|
+
key: PRODUCTS_KEY,
|
80
|
+
url: api.getApiUrl('/products'),
|
81
|
+
params: {
|
82
|
+
organization_id: orgId(), full_result: true, enabled: true, non_empty: true,
|
83
|
+
},
|
84
|
+
});
|
85
|
+
|
86
|
+
export const editACS = (acsId, params, handleSuccess, handleError) => APIActions.put({
|
87
|
+
type: API_OPERATIONS.PUT,
|
88
|
+
key: EDIT_ACS_KEY,
|
89
|
+
url: api.getApiUrl(`/alternate_content_sources/${acsId}`),
|
90
|
+
params,
|
91
|
+
handleSuccess,
|
92
|
+
handleError,
|
93
|
+
successToast: () => __('Alternate content source edited'),
|
94
|
+
errorToast: error => __(`Something went wrong while editing the alternate content source! ${getResponseErrorMsgs(error.response)}`),
|
95
|
+
});
|
96
|
+
|
62
97
|
export default getAlternateContentSources;
|
63
98
|
|
64
|
-
// acs = Katello::AlternateContentSource.new
|
65
|
-
// (name:"acs", label:"acs", alternate_content_source_type:"custom", base_url:"abcdef")
|
@@ -2,10 +2,13 @@ import { translate as __ } from 'foremanReact/common/I18n';
|
|
2
2
|
|
3
3
|
const ACS_KEY = 'ACS';
|
4
4
|
export const CREATE_ACS_KEY = 'ACS_CREATE';
|
5
|
+
export const EDIT_ACS_KEY = 'ACS_EDIT';
|
5
6
|
export const DELETE_ACS_KEY = 'ACS_DELETE';
|
6
7
|
export const SMART_PROXY_KEY = 'SMART_PROXY';
|
8
|
+
export const PRODUCTS_KEY = 'PRODUCTS';
|
7
9
|
export const SSL_CERTS = 'SSL_CERTS';
|
8
10
|
export const acsRefreshKey = acsId => `${ACS_KEY}_REFRESH_${acsId}`;
|
11
|
+
export const acsDetailsKey = acsId => `${ACS_KEY}_DETAILS_${acsId}`;
|
9
12
|
|
10
13
|
export const YUM = __('Yum');
|
11
14
|
export const FILE = __('File');
|
@@ -1,10 +1,6 @@
|
|
1
|
-
import {
|
2
|
-
selectAPIStatus,
|
3
|
-
selectAPIError,
|
4
|
-
selectAPIResponse,
|
5
|
-
} from 'foremanReact/redux/API/APISelectors';
|
1
|
+
import { selectAPIError, selectAPIResponse, selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
|
6
2
|
import { STATUS } from 'foremanReact/constants';
|
7
|
-
import ACS_KEY, { CREATE_ACS_KEY } from './ACSConstants';
|
3
|
+
import ACS_KEY, { acsDetailsKey, CREATE_ACS_KEY, PRODUCTS_KEY } from './ACSConstants';
|
8
4
|
|
9
5
|
export const selectAlternateContentSources = (state, index = '') => selectAPIResponse(state, ACS_KEY + index) || {};
|
10
6
|
|
@@ -22,3 +18,16 @@ export const selectCreateACSStatus = state =>
|
|
22
18
|
|
23
19
|
export const selectCreateACSError = state =>
|
24
20
|
selectAPIError(state, CREATE_ACS_KEY);
|
21
|
+
|
22
|
+
export const selectACSDetails = (state, acsId) =>
|
23
|
+
selectAPIResponse(state, acsDetailsKey(acsId)) || {};
|
24
|
+
|
25
|
+
export const selectACSDetailsStatus =
|
26
|
+
(state, acsId) => selectAPIStatus(state, acsDetailsKey(acsId)) || STATUS.PENDING;
|
27
|
+
|
28
|
+
export const selectACSDetailsError =
|
29
|
+
(state, acsId) => selectAPIError(state, acsDetailsKey(acsId));
|
30
|
+
|
31
|
+
export const selectProducts = state => selectAPIResponse(state, PRODUCTS_KEY) || {};
|
32
|
+
|
33
|
+
export const selectProductsStatus = state => selectAPIStatus(state, PRODUCTS_KEY) || STATUS.PENDING;
|
@@ -14,6 +14,8 @@ import ACSCreateFinish from './Steps/ACSCreateFinish';
|
|
14
14
|
import { getContentCredentials } from '../../ContentCredentials/ContentCredentialActions';
|
15
15
|
import { getSmartProxies } from '../../SmartProxy/SmartProxyContentActions';
|
16
16
|
import { CONTENT_CREDENTIAL_CERT_TYPE } from '../../ContentCredentials/ContentCredentialConstants';
|
17
|
+
import { getProducts } from '../ACSActions';
|
18
|
+
import ACSProducts from './Steps/ACSProducts';
|
17
19
|
|
18
20
|
const ACSCreateWizard = ({ show, setIsOpen }) => {
|
19
21
|
const [acsType, setAcsType] = useState(null);
|
@@ -33,6 +35,8 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
|
|
33
35
|
const [password, setPassword] = useState('');
|
34
36
|
const [caCert, setCACert] = useState('');
|
35
37
|
const [caCertName, setCACertName] = useState('');
|
38
|
+
const [productIds, setProductIds] = useState([]);
|
39
|
+
const [productNames, setProductNames] = useState([]);
|
36
40
|
const [currentStep, setCurrentStep] = useState(1);
|
37
41
|
const dispatch = useDispatch();
|
38
42
|
|
@@ -40,53 +44,76 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
|
|
40
44
|
() => {
|
41
45
|
dispatch(getContentCredentials({ content_type: CONTENT_CREDENTIAL_CERT_TYPE }));
|
42
46
|
dispatch(getSmartProxies());
|
47
|
+
dispatch(getProducts());
|
43
48
|
},
|
44
49
|
[dispatch],
|
45
50
|
);
|
46
51
|
|
47
|
-
const
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
},
|
54
|
-
{
|
55
|
-
id: 2,
|
56
|
-
name: __('Name source'),
|
57
|
-
component: <NameACS />,
|
58
|
-
enableNext: name !== '',
|
59
|
-
},
|
60
|
-
{
|
61
|
-
id: 3,
|
62
|
-
name: __('Select smart proxy'),
|
63
|
-
component: <ACSSmartProxies />,
|
64
|
-
enableNext: smartProxies.length,
|
65
|
-
},
|
66
|
-
{
|
67
|
-
id: 4,
|
68
|
-
name: __('URL and paths'),
|
69
|
-
component: <AcsUrlPaths />,
|
70
|
-
enableNext: url !== '' && subpaths !== '',
|
71
|
-
},
|
72
|
-
{
|
73
|
-
id: 5,
|
74
|
-
name: __('Credentials'),
|
75
|
-
component: <ACSCredentials />,
|
76
|
-
},
|
77
|
-
{
|
78
|
-
id: 6,
|
79
|
-
name: __('Review details'),
|
80
|
-
component: <ACSReview />,
|
81
|
-
nextButtonText: __('Add'),
|
82
|
-
},
|
83
|
-
{
|
84
|
-
id: 7,
|
85
|
-
name: __('Create ACS'),
|
86
|
-
component: <ACSCreateFinish />,
|
87
|
-
isFinishedStep: true,
|
88
|
-
},
|
52
|
+
const sourceTypeStep = {
|
53
|
+
id: 1,
|
54
|
+
name: __('Select source type'),
|
55
|
+
component: <SelectSource />,
|
56
|
+
enableNext: acsType && contentType,
|
57
|
+
};
|
89
58
|
|
59
|
+
const nameStep = {
|
60
|
+
id: 2,
|
61
|
+
name: __('Name source'),
|
62
|
+
component: <NameACS />,
|
63
|
+
enableNext: name !== '',
|
64
|
+
};
|
65
|
+
|
66
|
+
const smartProxyStep = {
|
67
|
+
id: 3,
|
68
|
+
name: __('Select smart proxy'),
|
69
|
+
component: <ACSSmartProxies />,
|
70
|
+
enableNext: smartProxies.length,
|
71
|
+
};
|
72
|
+
|
73
|
+
const productStep = {
|
74
|
+
id: 4,
|
75
|
+
name: __('Select products'),
|
76
|
+
component: <ACSProducts />,
|
77
|
+
enableNext: productIds.length,
|
78
|
+
};
|
79
|
+
|
80
|
+
const urlPathStep = {
|
81
|
+
id: 5,
|
82
|
+
name: __('URL and paths'),
|
83
|
+
component: <AcsUrlPaths />,
|
84
|
+
enableNext: url !== '',
|
85
|
+
};
|
86
|
+
|
87
|
+
const credentialsStep = {
|
88
|
+
id: 6,
|
89
|
+
name: __('Credentials'),
|
90
|
+
component: <ACSCredentials />,
|
91
|
+
enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
|
92
|
+
};
|
93
|
+
|
94
|
+
const reviewStep = {
|
95
|
+
id: 7,
|
96
|
+
name: __('Review details'),
|
97
|
+
component: <ACSReview />,
|
98
|
+
nextButtonText: __('Add'),
|
99
|
+
enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
|
100
|
+
};
|
101
|
+
|
102
|
+
const finishStep = {
|
103
|
+
id: 8,
|
104
|
+
name: __('Create ACS'),
|
105
|
+
component: <ACSCreateFinish />,
|
106
|
+
isFinishedStep: true,
|
107
|
+
};
|
108
|
+
|
109
|
+
const steps = [
|
110
|
+
sourceTypeStep,
|
111
|
+
nameStep,
|
112
|
+
smartProxyStep,
|
113
|
+
...(acsType === 'custom' ? [urlPathStep, credentialsStep] : []),
|
114
|
+
...(acsType === 'simplified' ? [productStep] : []),
|
115
|
+
reviewStep,
|
116
|
+
finishStep,
|
90
117
|
];
|
91
118
|
|
92
119
|
return (
|
@@ -105,6 +132,10 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
|
|
105
132
|
setDescription,
|
106
133
|
smartProxies,
|
107
134
|
setSmartProxies,
|
135
|
+
productIds,
|
136
|
+
setProductIds,
|
137
|
+
productNames,
|
138
|
+
setProductNames,
|
108
139
|
url,
|
109
140
|
setUrl,
|
110
141
|
subpaths,
|
@@ -1,14 +1,16 @@
|
|
1
|
-
import React, { useContext, useState } from 'react';
|
1
|
+
import React, { useCallback, useContext, useState } from 'react';
|
2
2
|
import { useDispatch, useSelector } from 'react-redux';
|
3
|
+
import { useHistory } from 'react-router-dom';
|
3
4
|
import useDeepCompareEffect from 'use-deep-compare-effect';
|
4
5
|
import { translate as __ } from 'foremanReact/common/I18n';
|
5
6
|
import { STATUS } from 'foremanReact/constants';
|
6
7
|
import ACSCreateContext from '../ACSCreateContext';
|
7
8
|
import { selectCreateACS, selectCreateACSError, selectCreateACSStatus } from '../../ACSSelectors';
|
8
|
-
import
|
9
|
+
import { createACS } from '../../ACSActions';
|
9
10
|
import Loading from '../../../../components/Loading';
|
10
11
|
|
11
12
|
const ACSCreateFinish = () => {
|
13
|
+
const { push } = useHistory();
|
12
14
|
const {
|
13
15
|
currentStep,
|
14
16
|
setIsOpen,
|
@@ -26,6 +28,7 @@ const ACSCreateFinish = () => {
|
|
26
28
|
username,
|
27
29
|
password,
|
28
30
|
caCert,
|
31
|
+
productIds,
|
29
32
|
} = useContext(ACSCreateContext);
|
30
33
|
const dispatch = useDispatch();
|
31
34
|
const response = useSelector(state => selectCreateACS(state));
|
@@ -34,20 +37,33 @@ const ACSCreateFinish = () => {
|
|
34
37
|
const [createACSDispatched, setCreateACSDispatched] = useState(false);
|
35
38
|
const [saving, setSaving] = useState(true);
|
36
39
|
|
40
|
+
const acsTypeParams = useCallback((params, type) => {
|
41
|
+
let acsParams = params;
|
42
|
+
if (type === 'custom') {
|
43
|
+
acsParams = {
|
44
|
+
base_url: url, verify_ssl: verifySSL, ssl_ca_cert_id: caCert, ...acsParams,
|
45
|
+
};
|
46
|
+
if (subpaths !== '') {
|
47
|
+
acsParams = { subpaths: subpaths.split(','), ...acsParams };
|
48
|
+
}
|
49
|
+
}
|
50
|
+
if (type === 'simplified') {
|
51
|
+
acsParams = { product_ids: productIds, ...acsParams };
|
52
|
+
}
|
53
|
+
return acsParams;
|
54
|
+
}, [caCert, productIds, subpaths, url, verifySSL]);
|
55
|
+
|
37
56
|
useDeepCompareEffect(() => {
|
38
|
-
if (currentStep ===
|
57
|
+
if (currentStep === 8 && !createACSDispatched) {
|
39
58
|
setCreateACSDispatched(true);
|
40
59
|
let params = {
|
41
60
|
name,
|
42
61
|
description,
|
43
|
-
base_url: url,
|
44
|
-
subpaths: subpaths.split(','),
|
45
62
|
smart_proxy_names: smartProxies,
|
46
63
|
content_type: contentType,
|
47
64
|
alternate_content_source_type: acsType,
|
48
|
-
verify_ssl: verifySSL,
|
49
|
-
ssl_ca_cert_id: caCert,
|
50
65
|
};
|
66
|
+
params = acsTypeParams(params, acsType);
|
51
67
|
if (authentication === 'content_credentials') {
|
52
68
|
params = { ssl_client_cert_id: sslCert, ssl_client_key_id: sslKey, ...params };
|
53
69
|
}
|
@@ -59,19 +75,19 @@ const ACSCreateFinish = () => {
|
|
59
75
|
}, [dispatch, createACSDispatched, setCreateACSDispatched,
|
60
76
|
acsType, authentication, name, description, url, subpaths,
|
61
77
|
smartProxies, contentType, verifySSL, caCert, sslCert, sslKey,
|
62
|
-
username, password, currentStep]);
|
78
|
+
username, password, currentStep, acsTypeParams]);
|
63
79
|
|
64
80
|
useDeepCompareEffect(() => {
|
65
81
|
const { id } = response;
|
66
82
|
if (id && status === STATUS.RESOLVED && saving) {
|
67
83
|
setSaving(false);
|
68
|
-
|
84
|
+
push(`/labs/alternate_content_sources/${id}/details`);
|
69
85
|
setIsOpen(false);
|
70
86
|
} else if (status === STATUS.ERROR) {
|
71
87
|
setSaving(false);
|
72
88
|
setIsOpen(false);
|
73
89
|
}
|
74
|
-
}, [response, status, error, saving, dispatch, setIsOpen]);
|
90
|
+
}, [response, status, error, push, saving, dispatch, setIsOpen]);
|
75
91
|
|
76
92
|
return <Loading loadingText={__('Saving alternate content source...')} />;
|
77
93
|
};
|
@@ -0,0 +1,44 @@
|
|
1
|
+
import React, { useContext, useState } from 'react';
|
2
|
+
import { useSelector } from 'react-redux';
|
3
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
4
|
+
import { DualListSelector } from '@patternfly/react-core';
|
5
|
+
import ACSCreateContext from '../ACSCreateContext';
|
6
|
+
import WizardHeader from '../../../ContentViews/components/WizardHeader';
|
7
|
+
import { selectProducts } from '../../ACSSelectors';
|
8
|
+
|
9
|
+
const ACSProducts = () => {
|
10
|
+
const {
|
11
|
+
setProductIds, productNames, setProductNames,
|
12
|
+
} = useContext(ACSCreateContext);
|
13
|
+
const availableProducts = useSelector(selectProducts);
|
14
|
+
const { results } = availableProducts;
|
15
|
+
const [availableOptions, setAvailableOptions] = useState(results?.map(product =>
|
16
|
+
product.name)?.filter(pName => !productNames.includes(pName)));
|
17
|
+
const onListChange = (newAvailableOptions, newChosenOptions) => {
|
18
|
+
setAvailableOptions(newAvailableOptions);
|
19
|
+
setProductNames(newChosenOptions);
|
20
|
+
setProductIds(results?.filter(product =>
|
21
|
+
newChosenOptions.includes(product.name))?.map(p => p?.id));
|
22
|
+
};
|
23
|
+
|
24
|
+
return (
|
25
|
+
<>
|
26
|
+
<WizardHeader
|
27
|
+
title={__('Select products')}
|
28
|
+
description={__('Select products to associate to this source.')}
|
29
|
+
/>
|
30
|
+
<DualListSelector
|
31
|
+
isSearchable
|
32
|
+
availableOptions={availableOptions}
|
33
|
+
chosenOptions={productNames}
|
34
|
+
addAll={onListChange}
|
35
|
+
removeAll={onListChange}
|
36
|
+
addSelected={onListChange}
|
37
|
+
removeSelected={onListChange}
|
38
|
+
id="product_selector"
|
39
|
+
/>
|
40
|
+
</>
|
41
|
+
);
|
42
|
+
};
|
43
|
+
|
44
|
+
export default ACSProducts;
|