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
@@ -2,14 +2,15 @@ import React, { useState, useEffect } from 'react';
|
|
2
2
|
import Downshift from 'downshift';
|
3
3
|
import PropTypes from 'prop-types';
|
4
4
|
import { translate as __ } from 'foremanReact/common/I18n';
|
5
|
-
|
5
|
+
import { useDispatch, useSelector } from 'react-redux';
|
6
6
|
import TypeAheadSearch from './pf3Search/TypeAheadSearch';
|
7
7
|
// eslint-disable-next-line import/no-named-default
|
8
8
|
import { default as TypeAheadSearchPf4 } from './pf4Search/TypeAheadSearch';
|
9
9
|
import { getActiveItems } from './helpers/helpers';
|
10
|
-
|
11
10
|
import './TypeAhead.scss';
|
12
11
|
import useDebounce from '../../utils/useDebounce';
|
12
|
+
import { selectHostDetailsClearSearch } from '../extensions/HostDetails/HostDetailsSelectors';
|
13
|
+
|
13
14
|
|
14
15
|
const TypeAhead = ({
|
15
16
|
items,
|
@@ -17,7 +18,6 @@ const TypeAhead = ({
|
|
17
18
|
onInputUpdate,
|
18
19
|
onSearch,
|
19
20
|
actionText,
|
20
|
-
initialInputValue,
|
21
21
|
patternfly4,
|
22
22
|
autoSearchEnabled,
|
23
23
|
autoSearchDelay,
|
@@ -26,10 +26,12 @@ const TypeAhead = ({
|
|
26
26
|
placeholder,
|
27
27
|
isTextInput,
|
28
28
|
setTextInputValue,
|
29
|
+
initialInputValue,
|
29
30
|
}) => {
|
30
31
|
const [inputValue, setInputValue] = useState(initialInputValue);
|
31
|
-
|
32
32
|
const debouncedValue = useDebounce(inputValue, autoSearchDelay);
|
33
|
+
const dispatch = useDispatch();
|
34
|
+
const existingClearSearch = useSelector(selectHostDetailsClearSearch);
|
33
35
|
useEffect(
|
34
36
|
() => {
|
35
37
|
onInputUpdate(debouncedValue);
|
@@ -37,21 +39,34 @@ const TypeAhead = ({
|
|
37
39
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
38
40
|
[debouncedValue],
|
39
41
|
);
|
42
|
+
// eslint-disable-next-line arrow-body-style
|
43
|
+
useEffect(() => {
|
44
|
+
return function cleanupClearSearch() {
|
45
|
+
dispatch({
|
46
|
+
type: 'SET_CLEAR_SEARCH',
|
47
|
+
payload: {},
|
48
|
+
});
|
49
|
+
};
|
50
|
+
}, [dispatch]);
|
51
|
+
|
52
|
+
const clearSearch = () => {
|
53
|
+
setInputValue('');
|
54
|
+
onSearch('');
|
55
|
+
};
|
40
56
|
|
41
57
|
const handleStateChange = ({ inputValue: value }) => {
|
42
58
|
if (typeof value === 'string') {
|
43
59
|
setInputValue(value);
|
44
60
|
if (setTextInputValue) setTextInputValue(value);
|
45
61
|
}
|
62
|
+
if (typeof existingClearSearch !== 'function') {
|
63
|
+
dispatch({
|
64
|
+
type: 'SET_CLEAR_SEARCH',
|
65
|
+
payload: clearSearch,
|
66
|
+
});
|
67
|
+
}
|
46
68
|
};
|
47
|
-
|
48
|
-
const clearSearch = () => {
|
49
|
-
setInputValue('');
|
50
|
-
onSearch('');
|
51
|
-
};
|
52
|
-
|
53
69
|
const activeItems = getActiveItems(items);
|
54
|
-
|
55
70
|
return (
|
56
71
|
<Downshift
|
57
72
|
onStateChange={handleStateChange}
|
@@ -6,7 +6,7 @@ import { commonItemPropTypes } from '../helpers/commonPropTypes';
|
|
6
6
|
const TypeAheadItems = ({
|
7
7
|
items, activeItems, getItemProps, highlightedIndex,
|
8
8
|
}) => (
|
9
|
-
<Dropdown.Menu className="typeahead-dropdown">
|
9
|
+
<Dropdown.Menu className="typeahead-dropdown" ouiaId="typeahead-dropdown">
|
10
10
|
{items.map(({ text, type, disabled = false }, index) => {
|
11
11
|
if (type === 'header') {
|
12
12
|
return (
|
data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js
CHANGED
@@ -168,7 +168,8 @@ const ChangeHostCVModal = ({
|
|
168
168
|
title={__('No content views available for the selected environment')}
|
169
169
|
style={{ marginBottom: '1rem' }}
|
170
170
|
>
|
171
|
-
{__('View the Content Views page
|
171
|
+
<a href="/content_views">{__('View the Content Views page')}</a>
|
172
|
+
{__(' to manage and promote content views, or select a different environment.')}
|
172
173
|
</Alert>
|
173
174
|
}
|
174
175
|
<EnvironmentPaths
|
data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsModal.js
CHANGED
@@ -13,7 +13,7 @@ import { useSelectionSet } from '../../../../Table/TableHooks';
|
|
13
13
|
import { selectAvailableHostCollections, selectAvailableHostCollectionsStatus, selectRemovableHostCollections, selectRemovableHostCollectionsStatus } from './HostCollectionsSelectors';
|
14
14
|
import hostIdNotReady from '../../HostDetailsActions';
|
15
15
|
import { alterHostCollections, getHostAvailableHostCollections, getHostRemovableHostCollections } from './HostCollectionsActions';
|
16
|
-
import { MODAL_TYPES } from './HostCollectionsConstants';
|
16
|
+
import { MODAL_TYPES, AVAILABLE_HOST_COLLECTIONS_KEY, REMOVABLE_HOST_COLLECTIONS_KEY } from './HostCollectionsConstants';
|
17
17
|
import { truncate } from '../../../../../utils/helpers';
|
18
18
|
|
19
19
|
export const HostCollectionsAddModal =
|
@@ -29,7 +29,9 @@ export const HostCollectionsModal = ({
|
|
29
29
|
const emptySearchTitle = __('No matching host collections found');
|
30
30
|
const emptySearchBody = __('Try changing your search settings.');
|
31
31
|
const errorSearchTitle = __('Problem searching host collections');
|
32
|
-
|
32
|
+
const primaryActionTitle = __('Create host collection');
|
33
|
+
const showPrimaryAction = true;
|
34
|
+
const primaryActionLink = '/host_collections/new';
|
33
35
|
const columnHeaders = ['', __('Host collection'), __('Capacity'), __('Description')];
|
34
36
|
const adding = (modalType === MODAL_TYPES.ADD);
|
35
37
|
|
@@ -122,10 +124,9 @@ export const HostCollectionsModal = ({
|
|
122
124
|
{adding ? __('Add') : __('Remove')}
|
123
125
|
</Button>,
|
124
126
|
<Button key="cancel" variant="link" onClick={handleModalCancel}>
|
125
|
-
Cancel
|
127
|
+
{__('Cancel')}
|
126
128
|
</Button>,
|
127
129
|
]);
|
128
|
-
|
129
130
|
return (
|
130
131
|
<Modal
|
131
132
|
isOpen={isOpen}
|
@@ -158,6 +159,9 @@ export const HostCollectionsModal = ({
|
|
158
159
|
updateSearchQuery,
|
159
160
|
selectedCount,
|
160
161
|
selectNone,
|
162
|
+
showPrimaryAction,
|
163
|
+
primaryActionTitle,
|
164
|
+
primaryActionLink,
|
161
165
|
}
|
162
166
|
}
|
163
167
|
ouiaId="host-collections-table"
|
@@ -168,6 +172,7 @@ export const HostCollectionsModal = ({
|
|
168
172
|
variant={TableVariant.compact}
|
169
173
|
{...selectAll}
|
170
174
|
displaySelectAllCheckbox={results?.length > 0}
|
175
|
+
requestKey={adding ? AVAILABLE_HOST_COLLECTIONS_KEY : REMOVABLE_HOST_COLLECTIONS_KEY}
|
171
176
|
>
|
172
177
|
<Thead>
|
173
178
|
<Tr>
|
data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeActions.js
ADDED
@@ -0,0 +1,37 @@
|
|
1
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
2
|
+
import { API_OPERATIONS, put } from 'foremanReact/redux/API';
|
3
|
+
import api, { foremanApi } from '../../../../../services/api';
|
4
|
+
import HOST_DETAILS_KEY from '../../HostDetailsConstants';
|
5
|
+
import { ORGANIZATION, AVAILABLE_RELEASE_VERSIONS } from './SystemPurposeConstants';
|
6
|
+
import { errorToast } from '../../../../../scenes/Tasks/helpers';
|
7
|
+
|
8
|
+
export const getOrganization = ({ orgId }) => ({
|
9
|
+
type: 'API_GET',
|
10
|
+
payload: {
|
11
|
+
key: `${ORGANIZATION}_${orgId}`,
|
12
|
+
url: api.getApiUrl(`/organizations/${orgId}`),
|
13
|
+
},
|
14
|
+
});
|
15
|
+
|
16
|
+
export const getAvailableReleaseVersions = ({ hostId }) => ({
|
17
|
+
type: 'API_GET',
|
18
|
+
payload: {
|
19
|
+
key: `${AVAILABLE_RELEASE_VERSIONS}_${hostId}`,
|
20
|
+
url: foremanApi.getApiUrl(`/hosts/${hostId}/subscriptions/available_release_versions`),
|
21
|
+
},
|
22
|
+
});
|
23
|
+
|
24
|
+
export const updateSystemPurposeAttributes = ({ hostId, attributes, refreshHostDetails }) => put({
|
25
|
+
type: API_OPERATIONS.PUT,
|
26
|
+
key: HOST_DETAILS_KEY,
|
27
|
+
url: foremanApi.getApiUrl(`/hosts/${hostId}`),
|
28
|
+
params: {
|
29
|
+
id: hostId,
|
30
|
+
host: {
|
31
|
+
subscription_facet_attributes: attributes,
|
32
|
+
},
|
33
|
+
},
|
34
|
+
successToast: () => __('System purpose attributes updated'),
|
35
|
+
errorToast,
|
36
|
+
handleSuccess: refreshHostDetails,
|
37
|
+
});
|
@@ -0,0 +1,173 @@
|
|
1
|
+
import React, { useState } from 'react';
|
2
|
+
import { useSelector } from 'react-redux';
|
3
|
+
import PropTypes from 'prop-types';
|
4
|
+
import { STATUS } from 'foremanReact/constants';
|
5
|
+
import {
|
6
|
+
Button,
|
7
|
+
Card,
|
8
|
+
CardHeader,
|
9
|
+
CardTitle,
|
10
|
+
CardBody,
|
11
|
+
DescriptionList,
|
12
|
+
DescriptionListGroup,
|
13
|
+
DescriptionListDescription,
|
14
|
+
DescriptionListTerm,
|
15
|
+
Flex,
|
16
|
+
FlexItem,
|
17
|
+
GridItem,
|
18
|
+
Label,
|
19
|
+
List,
|
20
|
+
ListItem,
|
21
|
+
Tooltip,
|
22
|
+
Skeleton,
|
23
|
+
} from '@patternfly/react-core';
|
24
|
+
import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
|
25
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
26
|
+
import { propsToCamelCase } from 'foremanReact/common/helpers';
|
27
|
+
import './SystemPurposeCard.scss';
|
28
|
+
import SystemPurposeEditModal from './SystemPurposeEditModal';
|
29
|
+
import { selectHostDetailsStatus } from '../../HostDetailsSelectors';
|
30
|
+
import { hasRequiredPermissions } from '../../hostDetailsHelpers';
|
31
|
+
|
32
|
+
const SystemPurposeCard = ({ hostDetails }) => {
|
33
|
+
const showEditButton = hasRequiredPermissions(['edit_hosts'], hostDetails?.permissions);
|
34
|
+
const orgId = hostDetails.organization_id;
|
35
|
+
const subscriptionFacetAttributes = hostDetails?.subscription_facet_attributes;
|
36
|
+
const {
|
37
|
+
purposeRole, purposeUsage, purposeAddons, releaseVersion, serviceLevel,
|
38
|
+
} = propsToCamelCase(subscriptionFacetAttributes ?? {});
|
39
|
+
const sysPurposeProps = {
|
40
|
+
purposeRole,
|
41
|
+
purposeUsage,
|
42
|
+
purposeAddons,
|
43
|
+
releaseVersion,
|
44
|
+
serviceLevel,
|
45
|
+
};
|
46
|
+
const hostDetailsStatus = useSelector(selectHostDetailsStatus);
|
47
|
+
const dataIsLoading = hostDetailsStatus === STATUS.PENDING;
|
48
|
+
|
49
|
+
const [editing, setEditing] = useState(false);
|
50
|
+
if (!hostDetails?.id) {
|
51
|
+
return (
|
52
|
+
<GridItem rowSpan={1} md={6} lg={4} xl2={3}>
|
53
|
+
<Card isHoverable ouiaId="system-purpose-card">
|
54
|
+
<Skeleton />
|
55
|
+
</Card>
|
56
|
+
</GridItem>
|
57
|
+
);
|
58
|
+
}
|
59
|
+
|
60
|
+
return (
|
61
|
+
<GridItem rowSpan={1} md={6} lg={4} xl2={3}>
|
62
|
+
<Card isHoverable ouiaId="system-purpose-card">
|
63
|
+
<CardHeader>
|
64
|
+
<Flex
|
65
|
+
alignItems={{ default: 'alignItemsCenter' }}
|
66
|
+
justifyContent={{ default: 'justifyContentSpaceBetween' }}
|
67
|
+
style={{ width: '100%' }}
|
68
|
+
>
|
69
|
+
<FlexItem>
|
70
|
+
<Flex
|
71
|
+
alignItems={{ default: 'alignItemsCenter' }}
|
72
|
+
justifyContent={{ default: 'justifyContentSpaceBetween' }}
|
73
|
+
>
|
74
|
+
<FlexItem style={{ marginRight: '0.5em' }}>
|
75
|
+
<CardTitle>{__('System purpose')}</CardTitle>
|
76
|
+
</FlexItem>
|
77
|
+
<FlexItem>
|
78
|
+
<Tooltip
|
79
|
+
content={__('System purpose allows you to set the system\'s intended use on your network and improves the reporting of usage in Subscription Watch.')}
|
80
|
+
position="top"
|
81
|
+
enableFlip
|
82
|
+
isContentLeftAligned
|
83
|
+
>
|
84
|
+
<OutlinedQuestionCircleIcon style={{ marginTop: '7px' }} color="gray" />
|
85
|
+
</Tooltip>
|
86
|
+
</FlexItem>
|
87
|
+
</Flex>
|
88
|
+
</FlexItem>
|
89
|
+
{showEditButton && (
|
90
|
+
<FlexItem>
|
91
|
+
<Button variant="link" isSmall ouiaId="syspurpose-edit-button" onClick={() => setEditing(val => !val)}>{__('Edit')}</Button>
|
92
|
+
</FlexItem>)
|
93
|
+
}
|
94
|
+
</Flex>
|
95
|
+
</CardHeader>
|
96
|
+
<CardBody className="system-purpose-card-body">
|
97
|
+
<DescriptionList isHorizontal>
|
98
|
+
<DescriptionListGroup>
|
99
|
+
<DescriptionListTerm>{__('Role')}</DescriptionListTerm>
|
100
|
+
<DescriptionListDescription>
|
101
|
+
{dataIsLoading ? <Skeleton /> : purposeRole}
|
102
|
+
</DescriptionListDescription>
|
103
|
+
<DescriptionListTerm>{__('SLA')}</DescriptionListTerm>
|
104
|
+
<DescriptionListDescription>
|
105
|
+
{serviceLevel && (dataIsLoading ? <Skeleton /> : (
|
106
|
+
<Label color="blue">{serviceLevel}</Label>
|
107
|
+
))}
|
108
|
+
</DescriptionListDescription>
|
109
|
+
<DescriptionListTerm>{__('Usage type')}</DescriptionListTerm>
|
110
|
+
<DescriptionListDescription>
|
111
|
+
{purposeUsage && (dataIsLoading ? <Skeleton /> : (
|
112
|
+
<Label color="blue">{purposeUsage}</Label>
|
113
|
+
))}
|
114
|
+
</DescriptionListDescription>
|
115
|
+
<DescriptionListTerm>{__('Release version')}</DescriptionListTerm>
|
116
|
+
<DescriptionListDescription>
|
117
|
+
{dataIsLoading ? <Skeleton /> : releaseVersion}
|
118
|
+
</DescriptionListDescription>
|
119
|
+
{!!purposeAddons?.length && (
|
120
|
+
<>
|
121
|
+
<DescriptionListTerm>{__('Add-ons')}</DescriptionListTerm>
|
122
|
+
{dataIsLoading ? <Skeleton /> : (
|
123
|
+
<DescriptionListDescription>
|
124
|
+
<List isPlain>
|
125
|
+
{purposeAddons.map(addon => (
|
126
|
+
<ListItem key={addon}>{addon}</ListItem>
|
127
|
+
))}
|
128
|
+
</List>
|
129
|
+
</DescriptionListDescription>
|
130
|
+
)}
|
131
|
+
</>
|
132
|
+
)
|
133
|
+
}
|
134
|
+
</DescriptionListGroup>
|
135
|
+
</DescriptionList>
|
136
|
+
{showEditButton && (
|
137
|
+
<SystemPurposeEditModal
|
138
|
+
isOpen={editing}
|
139
|
+
orgId={orgId}
|
140
|
+
closeModal={() => setEditing(false)}
|
141
|
+
hostName={hostDetails.name}
|
142
|
+
hostId={hostDetails.id}
|
143
|
+
{...sysPurposeProps}
|
144
|
+
/>
|
145
|
+
)}
|
146
|
+
</CardBody>
|
147
|
+
</Card>
|
148
|
+
</GridItem>
|
149
|
+
);
|
150
|
+
};
|
151
|
+
|
152
|
+
SystemPurposeCard.propTypes = {
|
153
|
+
hostDetails: PropTypes.shape({
|
154
|
+
name: PropTypes.string,
|
155
|
+
organization_id: PropTypes.number,
|
156
|
+
id: PropTypes.number,
|
157
|
+
subscription_facet_attributes: PropTypes.shape({
|
158
|
+
installed_products: PropTypes.arrayOf(PropTypes.shape({
|
159
|
+
productId: PropTypes.string,
|
160
|
+
productName: PropTypes.string,
|
161
|
+
})),
|
162
|
+
}),
|
163
|
+
permissions: PropTypes.shape({
|
164
|
+
edit_hosts: PropTypes.bool,
|
165
|
+
}),
|
166
|
+
}),
|
167
|
+
};
|
168
|
+
|
169
|
+
SystemPurposeCard.defaultProps = {
|
170
|
+
hostDetails: {},
|
171
|
+
};
|
172
|
+
|
173
|
+
export default SystemPurposeCard;
|
data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeConstants.js
ADDED
@@ -0,0 +1,6 @@
|
|
1
|
+
export const defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
|
2
|
+
export const defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
|
3
|
+
export const defaultServiceLevels = ['Self-Support', 'Standard', 'Premium'];
|
4
|
+
|
5
|
+
export const ORGANIZATION = 'ORGANIZATION';
|
6
|
+
export const AVAILABLE_RELEASE_VERSIONS = 'AVAILABLE_RELEASE_VERSIONS';
|
data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeEditModal.js
ADDED
@@ -0,0 +1,301 @@
|
|
1
|
+
import React, { useState, useEffect } from 'react';
|
2
|
+
import { useSelector, useDispatch } from 'react-redux';
|
3
|
+
import { isEqual } from 'lodash';
|
4
|
+
import PropTypes from 'prop-types';
|
5
|
+
import { STATUS } from 'foremanReact/constants';
|
6
|
+
import { propsToCamelCase } from 'foremanReact/common/helpers';
|
7
|
+
import {
|
8
|
+
Modal,
|
9
|
+
Button,
|
10
|
+
Form,
|
11
|
+
FormGroup,
|
12
|
+
FormSelect,
|
13
|
+
FormSelectOption,
|
14
|
+
Select,
|
15
|
+
SelectOption,
|
16
|
+
SelectVariant,
|
17
|
+
} from '@patternfly/react-core';
|
18
|
+
import { FormattedMessage } from 'react-intl';
|
19
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
20
|
+
import { selectOrganizationStatus, selectOrganization, selectAvailableReleaseVersions, selectAvailableReleaseVersionsStatus } from './SystemPurposeSelectors';
|
21
|
+
import { getAvailableReleaseVersions, getOrganization, updateSystemPurposeAttributes } from './SystemPurposeActions';
|
22
|
+
import HOST_DETAILS_KEY from '../../HostDetailsConstants';
|
23
|
+
import { defaultUsages, defaultRoles, defaultServiceLevels } from './SystemPurposeConstants';
|
24
|
+
|
25
|
+
const SystemPurposeEditModal = ({
|
26
|
+
closeModal, hostName, purposeRole, purposeUsage, purposeAddons,
|
27
|
+
serviceLevel, releaseVersion, isOpen, orgId, hostId,
|
28
|
+
}) => {
|
29
|
+
const initialPurposeRole = purposeRole ?? '';
|
30
|
+
const initialServiceLevel = serviceLevel ?? '';
|
31
|
+
const initialPurposeUsage = purposeUsage ?? '';
|
32
|
+
const initialReleaseVersion = releaseVersion ?? '';
|
33
|
+
const initialPurposeAddons = purposeAddons ?? [];
|
34
|
+
const [selectedRole, setSelectedRole] = useState(initialPurposeRole);
|
35
|
+
const [selectedServiceLevel, setSelectedServiceLevel] = useState(initialServiceLevel);
|
36
|
+
const [selectedUsage, setSelectedUsage] = useState(initialPurposeUsage);
|
37
|
+
const [addonSelectOpen, setAddonSelectOpen] = useState(false);
|
38
|
+
const [selectedAddons, setSelectedAddons] = useState(initialPurposeAddons);
|
39
|
+
const [selectedReleaseVersion, setSelectedReleaseVersion] = useState(initialReleaseVersion);
|
40
|
+
|
41
|
+
const unmodified = (
|
42
|
+
selectedRole === initialPurposeRole &&
|
43
|
+
selectedServiceLevel === initialServiceLevel &&
|
44
|
+
selectedUsage === initialPurposeUsage &&
|
45
|
+
selectedReleaseVersion === initialReleaseVersion &&
|
46
|
+
isEqual(selectedAddons, initialPurposeAddons)
|
47
|
+
);
|
48
|
+
const dispatch = useDispatch();
|
49
|
+
|
50
|
+
const orgStatus = useSelector(state => selectOrganizationStatus(state, orgId));
|
51
|
+
const organizationDetails = useSelector(state => selectOrganization(state, orgId));
|
52
|
+
const orgDetails = propsToCamelCase(organizationDetails ?? { systemPurposes: {} });
|
53
|
+
const availableSyspurposeAttributes = orgDetails?.systemPurposes ?? {};
|
54
|
+
const availableServiceLevels = orgDetails?.serviceLevels ?? [];
|
55
|
+
const { addons: availableAddons, roles: availableRoles, usage: availableUsages }
|
56
|
+
= availableSyspurposeAttributes;
|
57
|
+
|
58
|
+
const availableReleaseVersionsStatus
|
59
|
+
= useSelector(state => selectAvailableReleaseVersionsStatus(state, orgId));
|
60
|
+
const availableReleaseVersions = useSelector(state =>
|
61
|
+
selectAvailableReleaseVersions(state, hostId))?.results ?? [];
|
62
|
+
useEffect(() => {
|
63
|
+
if (orgId && orgStatus !== STATUS.RESOLVED) {
|
64
|
+
dispatch(getOrganization({ orgId }));
|
65
|
+
}
|
66
|
+
}, [orgId, orgStatus, dispatch]);
|
67
|
+
|
68
|
+
useEffect(() => {
|
69
|
+
if (hostId && availableReleaseVersionsStatus !== STATUS.RESOLVED) {
|
70
|
+
dispatch(getAvailableReleaseVersions({ hostId }));
|
71
|
+
}
|
72
|
+
}, [hostId, availableReleaseVersionsStatus, dispatch]);
|
73
|
+
|
74
|
+
const toggleAddonSelect = isOpenState => setAddonSelectOpen(isOpenState);
|
75
|
+
|
76
|
+
const onAddonSelect = (_event, selected) => {
|
77
|
+
const newSelectedAddons = new Set(selectedAddons);
|
78
|
+
if (!selected) return;
|
79
|
+
if (newSelectedAddons.has(selected)) {
|
80
|
+
newSelectedAddons.delete(selected);
|
81
|
+
} else {
|
82
|
+
newSelectedAddons.add(selected);
|
83
|
+
}
|
84
|
+
setSelectedAddons([...newSelectedAddons]);
|
85
|
+
};
|
86
|
+
|
87
|
+
const refreshHostDetails = () => dispatch({
|
88
|
+
type: 'API_GET',
|
89
|
+
payload: {
|
90
|
+
key: HOST_DETAILS_KEY,
|
91
|
+
url: `/api/hosts/${hostName}`,
|
92
|
+
},
|
93
|
+
});
|
94
|
+
|
95
|
+
// Building the dropdown options is a bit complex because they come from several sources:
|
96
|
+
// 1. The hard-coded set of default values (defaultOptions)
|
97
|
+
// 2. The set of available values from the API (additionalOptions)
|
98
|
+
// 3. The value actually set on the host (initialOption - this need not be a value from 1 or 2)
|
99
|
+
// We then need to combine these values into a single set of options, and ensure that
|
100
|
+
// (a) (unset) appears first;
|
101
|
+
// (b) there are no duplicate options;
|
102
|
+
// (c) that the currently selected option always appears (currentSelected); and
|
103
|
+
// (d) that the order of the items doesn't change unexpectedly.
|
104
|
+
const buildOptions = (defaultOptions, additionalOptions, currentSelected, initialOption) => {
|
105
|
+
const optionToObject = option => ({ label: option || __('(unset)'), value: option });
|
106
|
+
const uniqOptions = new Set(['', ...defaultOptions ?? [], ...additionalOptions ?? [], currentSelected, initialOption]);
|
107
|
+
uniqOptions.delete(null);
|
108
|
+
uniqOptions.delete(undefined);
|
109
|
+
return [...[...uniqOptions]?.map(optionToObject)];
|
110
|
+
};
|
111
|
+
|
112
|
+
const roleOptions =
|
113
|
+
buildOptions(defaultRoles, availableRoles, selectedRole, purposeRole);
|
114
|
+
const usageOptions =
|
115
|
+
buildOptions(defaultUsages, availableUsages, selectedUsage, purposeUsage);
|
116
|
+
|
117
|
+
// addons may be present on the host but not available from subscriptions,
|
118
|
+
// so we combine the options here
|
119
|
+
const addonToObject = addon => ({ label: addon, value: addon });
|
120
|
+
const addonsOptions =
|
121
|
+
[...new Set([ // don't repeat addons if they are already selected
|
122
|
+
...purposeAddons.map(addonToObject), ...availableAddons?.map(addonToObject) ?? [],
|
123
|
+
])];
|
124
|
+
|
125
|
+
const serviceLevelOptions =
|
126
|
+
buildOptions(defaultServiceLevels, availableServiceLevels, selectedServiceLevel, serviceLevel);
|
127
|
+
|
128
|
+
const releaseVersionOptions =
|
129
|
+
buildOptions([], availableReleaseVersions, selectedReleaseVersion, releaseVersion);
|
130
|
+
|
131
|
+
const handleSave = (event) => {
|
132
|
+
event.preventDefault();
|
133
|
+
closeModal();
|
134
|
+
const optionsToValue = (options, stateValue) =>
|
135
|
+
options.find(option => option.value === stateValue)?.value;
|
136
|
+
dispatch(updateSystemPurposeAttributes({
|
137
|
+
hostId,
|
138
|
+
attributes: {
|
139
|
+
autoheal: true,
|
140
|
+
purpose_role: optionsToValue(roleOptions, selectedRole),
|
141
|
+
purpose_usage: optionsToValue(usageOptions, selectedUsage),
|
142
|
+
purpose_addons: selectedAddons,
|
143
|
+
release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),
|
144
|
+
service_level: optionsToValue(serviceLevelOptions, selectedServiceLevel),
|
145
|
+
},
|
146
|
+
refreshHostDetails,
|
147
|
+
}));
|
148
|
+
};
|
149
|
+
|
150
|
+
const handleCancel = () => {
|
151
|
+
setSelectedRole(initialPurposeRole);
|
152
|
+
setSelectedServiceLevel(initialServiceLevel);
|
153
|
+
setSelectedUsage(initialPurposeUsage);
|
154
|
+
setSelectedAddons(initialPurposeAddons);
|
155
|
+
setSelectedReleaseVersion(initialReleaseVersion);
|
156
|
+
closeModal();
|
157
|
+
};
|
158
|
+
|
159
|
+
const modalActions = ([
|
160
|
+
<Button ouiaId="save-syspurpose" key="save-syspurpose" variant="primary" onClick={handleSave} isDisabled={unmodified}>
|
161
|
+
{__('Save')}
|
162
|
+
</Button>,
|
163
|
+
<Button ouiaId="cancel-syspurpose" key="cancel" variant="link" onClick={handleCancel}>
|
164
|
+
{__('Cancel')}
|
165
|
+
</Button>,
|
166
|
+
]);
|
167
|
+
|
168
|
+
|
169
|
+
return (
|
170
|
+
<Modal
|
171
|
+
isOpen={isOpen}
|
172
|
+
onClose={handleCancel}
|
173
|
+
title={__('Edit system purpose attributes')}
|
174
|
+
width="40%"
|
175
|
+
position="top"
|
176
|
+
actions={modalActions}
|
177
|
+
id="syspurpose-edit-modal"
|
178
|
+
>
|
179
|
+
<FormattedMessage
|
180
|
+
className="syspurpose-edit-modal-blurb"
|
181
|
+
id="syspurpose-edit-modal-blurb"
|
182
|
+
defaultMessage={__('Select system purpose attributes for host {hostName}.')}
|
183
|
+
values={{
|
184
|
+
hostName: <strong>{hostName}</strong>,
|
185
|
+
}}
|
186
|
+
/>
|
187
|
+
<Form isHorizontal style={{ marginTop: '1.3rem' }}>
|
188
|
+
<FormGroup label={__('Role')} fieldId="role">
|
189
|
+
<FormSelect
|
190
|
+
id="role"
|
191
|
+
name="role"
|
192
|
+
value={selectedRole}
|
193
|
+
onChange={setSelectedRole}
|
194
|
+
>
|
195
|
+
{roleOptions.map(option => (
|
196
|
+
<FormSelectOption
|
197
|
+
key={option.value}
|
198
|
+
value={option.value}
|
199
|
+
label={option.label}
|
200
|
+
/>
|
201
|
+
))}
|
202
|
+
</FormSelect>
|
203
|
+
</FormGroup>
|
204
|
+
<FormGroup label={__('SLA')} fieldId="serviceLevel">
|
205
|
+
<FormSelect
|
206
|
+
id="serviceLevel"
|
207
|
+
name="serviceLevel"
|
208
|
+
value={selectedServiceLevel}
|
209
|
+
onChange={setSelectedServiceLevel}
|
210
|
+
>
|
211
|
+
{serviceLevelOptions.map(option => (
|
212
|
+
<FormSelectOption
|
213
|
+
key={option.value}
|
214
|
+
value={option.value}
|
215
|
+
label={option.label}
|
216
|
+
/>
|
217
|
+
))}
|
218
|
+
</FormSelect>
|
219
|
+
</FormGroup>
|
220
|
+
<FormGroup label={__('Usage')} fieldId="usage">
|
221
|
+
<FormSelect
|
222
|
+
id="usage"
|
223
|
+
name="usage"
|
224
|
+
value={selectedUsage}
|
225
|
+
onChange={setSelectedUsage}
|
226
|
+
>
|
227
|
+
{usageOptions.map(option => (
|
228
|
+
<FormSelectOption
|
229
|
+
key={option.value}
|
230
|
+
value={option.value}
|
231
|
+
label={option.label}
|
232
|
+
/>
|
233
|
+
))}
|
234
|
+
</FormSelect>
|
235
|
+
</FormGroup>
|
236
|
+
<FormGroup label={__('Release version')} fieldId="releaseVersion">
|
237
|
+
<FormSelect
|
238
|
+
id="release_version"
|
239
|
+
name="release_version"
|
240
|
+
value={selectedReleaseVersion}
|
241
|
+
onChange={setSelectedReleaseVersion}
|
242
|
+
>
|
243
|
+
{releaseVersionOptions.map(option => (
|
244
|
+
<FormSelectOption
|
245
|
+
key={option.value}
|
246
|
+
value={option.value}
|
247
|
+
label={option.label}
|
248
|
+
/>
|
249
|
+
))}
|
250
|
+
</FormSelect>
|
251
|
+
</FormGroup>
|
252
|
+
<FormGroup label={__('Add-ons')} fieldId="addons">
|
253
|
+
<span id="syspurpose-addons-title" hidden>
|
254
|
+
Checkbox Title
|
255
|
+
</span>
|
256
|
+
<Select
|
257
|
+
variant={SelectVariant.typeaheadMulti}
|
258
|
+
aria-label="syspurpose-addons"
|
259
|
+
onToggle={toggleAddonSelect}
|
260
|
+
onSelect={onAddonSelect}
|
261
|
+
selections={selectedAddons}
|
262
|
+
isOpen={addonSelectOpen}
|
263
|
+
placeholderText={__('Select add-ons')}
|
264
|
+
aria-labelledby="syspurpose-addons-title"
|
265
|
+
menuAppendTo="parent"
|
266
|
+
>
|
267
|
+
{addonsOptions.map(option => (
|
268
|
+
<SelectOption
|
269
|
+
key={option.value}
|
270
|
+
value={option.value}
|
271
|
+
label={option.label}
|
272
|
+
/>
|
273
|
+
))}
|
274
|
+
</Select>
|
275
|
+
</FormGroup>
|
276
|
+
</Form>
|
277
|
+
</Modal>
|
278
|
+
);
|
279
|
+
};
|
280
|
+
|
281
|
+
export default SystemPurposeEditModal;
|
282
|
+
|
283
|
+
SystemPurposeEditModal.propTypes = {
|
284
|
+
closeModal: PropTypes.func.isRequired,
|
285
|
+
hostName: PropTypes.string,
|
286
|
+
purposeRole: PropTypes.string.isRequired,
|
287
|
+
purposeUsage: PropTypes.string.isRequired,
|
288
|
+
purposeAddons: PropTypes.arrayOf(PropTypes.string).isRequired,
|
289
|
+
serviceLevel: PropTypes.string.isRequired,
|
290
|
+
releaseVersion: PropTypes.string,
|
291
|
+
isOpen: PropTypes.bool.isRequired,
|
292
|
+
orgId: PropTypes.number,
|
293
|
+
hostId: PropTypes.number,
|
294
|
+
};
|
295
|
+
|
296
|
+
SystemPurposeEditModal.defaultProps = {
|
297
|
+
hostName: '',
|
298
|
+
orgId: null,
|
299
|
+
hostId: null,
|
300
|
+
releaseVersion: '',
|
301
|
+
};
|