katello 4.4.1 → 4.5.0

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.

Files changed (488) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/katello/hosts/activation_key_edit.js +9 -2
  3. data/app/controllers/katello/api/registry/registry_proxies_controller.rb +3 -0
  4. data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb +5 -1
  5. data/app/controllers/katello/api/v2/alternate_content_sources_bulk_actions_controller.rb +44 -0
  6. data/app/controllers/katello/api/v2/alternate_content_sources_controller.rb +121 -0
  7. data/app/controllers/katello/api/v2/content_export_incrementals_controller.rb +39 -3
  8. data/app/controllers/katello/api/v2/content_exports_controller.rb +19 -0
  9. data/app/controllers/katello/api/v2/content_imports_controller.rb +13 -16
  10. data/app/controllers/katello/api/v2/content_view_components_controller.rb +1 -1
  11. data/app/controllers/katello/api/v2/content_view_repositories_controller.rb +1 -1
  12. data/app/controllers/katello/api/v2/content_view_versions_controller.rb +0 -12
  13. data/app/controllers/katello/api/v2/content_views_controller.rb +13 -0
  14. data/app/controllers/katello/api/v2/environments_controller.rb +1 -1
  15. data/app/controllers/katello/api/v2/host_module_streams_controller.rb +8 -2
  16. data/app/controllers/katello/api/v2/host_subscriptions_controller.rb +25 -3
  17. data/app/controllers/katello/api/v2/organizations_controller.rb +4 -2
  18. data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb +1 -1
  19. data/app/controllers/katello/api/v2/repositories_controller.rb +1 -1
  20. data/app/controllers/katello/api/v2/repository_sets_controller.rb +40 -7
  21. data/app/controllers/katello/api/v2/subscriptions_controller.rb +2 -2
  22. data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb +1 -1
  23. data/app/helpers/katello/concerns/smart_proxy_helper_extensions.rb +4 -0
  24. data/app/helpers/katello/hosts_and_hostgroups_helper.rb +21 -3
  25. data/app/lib/actions/katello/alternate_content_source/create.rb +24 -0
  26. data/app/lib/actions/katello/alternate_content_source/destroy.rb +27 -0
  27. data/app/lib/actions/katello/alternate_content_source/refresh.rb +27 -0
  28. data/app/lib/actions/katello/alternate_content_source/update.rb +41 -0
  29. data/app/lib/actions/katello/cdn_configuration/update.rb +3 -3
  30. data/app/lib/actions/katello/content_view/destroy.rb +2 -1
  31. data/app/lib/actions/katello/content_view/incremental_updates.rb +7 -3
  32. data/app/lib/actions/katello/content_view/publish.rb +8 -10
  33. data/app/lib/actions/katello/content_view_version/auto_create_products.rb +4 -4
  34. data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb +6 -4
  35. data/app/lib/actions/katello/content_view_version/auto_create_repositories.rb +6 -4
  36. data/app/lib/actions/katello/content_view_version/import.rb +25 -22
  37. data/app/lib/actions/katello/content_view_version/import_library.rb +0 -1
  38. data/app/lib/actions/katello/content_view_version/import_repository.rb +21 -0
  39. data/app/lib/actions/katello/content_view_version/incremental_update.rb +85 -93
  40. data/app/lib/actions/katello/content_view_version/reset_content_view_repositories_from_metadata.rb +2 -2
  41. data/app/lib/actions/katello/organization/manifest_refresh.rb +1 -1
  42. data/app/lib/actions/katello/product/content_create.rb +10 -8
  43. data/app/lib/actions/katello/repository/destroy.rb +36 -12
  44. data/app/lib/actions/katello/repository_set/disable_repository.rb +8 -3
  45. data/app/lib/actions/pulp3/alternate_content_source/create.rb +20 -0
  46. data/app/lib/actions/pulp3/alternate_content_source/create_remote.rb +20 -0
  47. data/app/lib/actions/pulp3/alternate_content_source/delete.rb +16 -0
  48. data/app/lib/actions/pulp3/alternate_content_source/delete_remote.rb +16 -0
  49. data/app/lib/actions/pulp3/alternate_content_source/refresh.rb +23 -0
  50. data/app/lib/actions/pulp3/alternate_content_source/update.rb +16 -0
  51. data/app/lib/actions/pulp3/alternate_content_source/update_remote.rb +17 -0
  52. data/app/lib/actions/pulp3/content_view_version/{import.rb → create_import.rb} +5 -5
  53. data/app/lib/actions/pulp3/content_view_version/create_importer.rb +4 -3
  54. data/app/lib/actions/pulp3/content_view_version/destroy_importer.rb +12 -1
  55. data/app/lib/actions/pulp3/orchestration/alternate_content_source/create.rb +16 -0
  56. data/app/lib/actions/pulp3/orchestration/alternate_content_source/delete.rb +23 -0
  57. data/app/lib/actions/pulp3/orchestration/alternate_content_source/refresh.rb +15 -0
  58. data/app/lib/actions/pulp3/orchestration/alternate_content_source/update.rb +16 -0
  59. data/app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb +1 -1
  60. data/app/lib/actions/pulp3/orchestration/content_view_version/export_repository.rb +51 -0
  61. data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +5 -2
  62. data/app/lib/actions/pulp3/repository/save_artifact.rb +1 -1
  63. data/app/lib/katello/api/v2/error_handling.rb +1 -0
  64. data/app/lib/katello/concerns/base_template_scope_extensions.rb +24 -11
  65. data/app/lib/katello/resources/cdn/katello_cdn.rb +3 -1
  66. data/app/lib/katello/util/errata.rb +2 -3
  67. data/app/lib/katello/validators/alternate_content_source_path_validator.rb +29 -0
  68. data/app/lib/katello/validators/content_default_http_proxy_setting_validator.rb +12 -0
  69. data/app/lib/katello/validators/content_view_environment_validator.rb +10 -5
  70. data/app/models/katello/alternate_content_source.rb +71 -0
  71. data/app/models/katello/authorization/alternate_content_source.rb +33 -0
  72. data/app/models/katello/authorization/repository.rb +5 -3
  73. data/app/models/katello/candlepin/repository_mapper.rb +13 -6
  74. data/app/models/katello/cdn_configuration.rb +15 -15
  75. data/app/models/katello/concerns/content_facet_host_extensions.rb +25 -0
  76. data/app/models/katello/concerns/host_managed_extensions.rb +7 -6
  77. data/app/models/katello/concerns/http_proxy_extensions.rb +14 -0
  78. data/app/models/katello/concerns/organization_extensions.rb +4 -2
  79. data/app/models/katello/concerns/setting_extensions.rb +14 -0
  80. data/app/models/katello/concerns/smart_proxy_extensions.rb +2 -1
  81. data/app/models/katello/content.rb +1 -0
  82. data/app/models/katello/content_credential.rb +6 -0
  83. data/app/models/katello/content_override.rb +7 -3
  84. data/app/models/katello/content_view.rb +33 -2
  85. data/app/models/katello/content_view_erratum_filter.rb +26 -12
  86. data/app/models/katello/content_view_filter.rb +4 -0
  87. data/app/models/katello/content_view_version.rb +12 -0
  88. data/app/models/katello/content_view_version_export_history.rb +3 -1
  89. data/app/models/katello/erratum.rb +9 -5
  90. data/app/models/katello/events/delete_latest_content_view_version.rb +40 -0
  91. data/app/models/katello/host/content_facet.rb +14 -0
  92. data/app/models/katello/host_available_module_stream.rb +12 -0
  93. data/app/models/katello/product_content.rb +1 -0
  94. data/app/models/katello/purpose_sla_status.rb +1 -1
  95. data/app/models/katello/purpose_status.rb +2 -2
  96. data/app/models/katello/repository.rb +7 -4
  97. data/app/models/katello/root_repository.rb +1 -1
  98. data/app/models/katello/smart_proxy_alternate_content_source.rb +8 -0
  99. data/app/models/katello/sync_plan.rb +1 -1
  100. data/app/presenters/katello/product_content_presenter.rb +15 -0
  101. data/app/services/katello/applicable_host_queue.rb +1 -1
  102. data/app/services/katello/product_content_finder.rb +12 -2
  103. data/app/services/katello/pulp3/alternate_content_source.rb +123 -0
  104. data/app/services/katello/pulp3/api/file.rb +8 -0
  105. data/app/services/katello/pulp3/api/yum.rb +8 -0
  106. data/app/services/katello/pulp3/content_view_version/export.rb +27 -5
  107. data/app/services/katello/pulp3/content_view_version/import.rb +104 -71
  108. data/app/services/katello/pulp3/content_view_version/import_export_common.rb +4 -4
  109. data/app/services/katello/pulp3/content_view_version/import_gpg_keys.rb +13 -11
  110. data/app/services/katello/pulp3/content_view_version/import_validator.rb +67 -72
  111. data/app/services/katello/pulp3/content_view_version/importable_products.rb +40 -24
  112. data/app/services/katello/pulp3/content_view_version/importable_repositories.rb +102 -38
  113. data/app/services/katello/pulp3/content_view_version/metadata_generator.rb +2 -2
  114. data/app/services/katello/pulp3/content_view_version/metadata_map.rb +117 -0
  115. data/app/services/katello/pulp3/pulp_content_unit.rb +6 -1
  116. data/app/services/katello/pulp3/repository/yum.rb +70 -12
  117. data/app/services/katello/pulp3/repository.rb +6 -62
  118. data/app/services/katello/pulp3/service_common.rb +66 -0
  119. data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb +4 -1
  120. data/app/services/katello/ui_notifications/content_view/delete_latest_version_failure.rb +22 -0
  121. data/app/views/foreman/job_templates/change_content_source.erb +1 -1
  122. data/app/views/foreman/job_templates/install_errata.erb +5 -5
  123. data/app/views/foreman/job_templates/install_errata_by_search_query.erb +10 -8
  124. data/app/views/foreman/job_templates/install_group.erb +4 -4
  125. data/app/views/foreman/job_templates/install_package.erb +4 -4
  126. data/app/views/foreman/job_templates/install_packages_by_search_query.erb +3 -3
  127. data/app/views/foreman/job_templates/remove_group.erb +4 -4
  128. data/app/views/foreman/job_templates/remove_package.erb +4 -4
  129. data/app/views/foreman/job_templates/remove_packages_by_search_query.erb +3 -3
  130. data/app/views/foreman/job_templates/resolve_traces.erb +2 -2
  131. data/app/views/foreman/job_templates/restart_services.erb +3 -3
  132. data/app/views/foreman/job_templates/update_group.erb +4 -4
  133. data/app/views/foreman/job_templates/update_package.erb +4 -4
  134. data/app/views/foreman/job_templates/update_packages_by_search_query.erb +3 -3
  135. data/app/views/katello/api/v2/alternate_content_sources/base.json.rabl +24 -0
  136. data/app/views/katello/api/v2/alternate_content_sources/index.json.rabl +7 -0
  137. data/app/views/katello/api/v2/alternate_content_sources/show.json.rabl +3 -0
  138. data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl +1 -1
  139. data/app/views/katello/api/v2/content_facet/show.json.rabl +12 -0
  140. data/app/views/katello/api/v2/content_view_version_export_histories/show.json.rabl +2 -3
  141. data/app/views/katello/api/v2/content_view_versions/base.json.rabl +1 -1
  142. data/app/views/katello/api/v2/content_views/base.json.rabl +1 -0
  143. data/app/views/katello/api/v2/environments/show.json.rabl +2 -0
  144. data/app/views/katello/api/v2/errata/_counts.json.rabl +2 -2
  145. data/app/views/katello/api/v2/host_module_streams/base.json.rabl +2 -2
  146. data/app/views/katello/api/v2/hosts/host_collections.json.rabl +1 -1
  147. data/app/views/katello/api/v2/organizations/show.json.rabl +7 -1
  148. data/app/views/katello/api/v2/repositories/show.json.rabl +2 -1
  149. data/app/views/katello/api/v2/repository_sets/show.json.rabl +4 -0
  150. data/app/views/katello/sync_management/_repo.html.erb +8 -29
  151. data/config/routes/api/v2.rb +19 -0
  152. data/db/migrate/20150930183738_migrate_content_hosts.rb +0 -399
  153. data/db/migrate/20171025163149_remove_use_pulp_oauth_setting.rb +1 -1
  154. data/db/migrate/20171114150937_cleanup_installed_packages.rb +1 -1
  155. data/db/migrate/20180402160223_clean_up_force_post_sync_action_setting.rb +1 -1
  156. data/db/migrate/20211129200124_remove_dependency_solving_algorithm_setting.rb +1 -1
  157. data/db/migrate/20211220185935_clean_duplicate_content_units.rb +1 -1
  158. data/db/migrate/20220110223754_update_disconnected_settings.rb +5 -5
  159. data/db/migrate/20220117151612_add_alternate_content_sources.rb +48 -0
  160. data/db/migrate/20220124191056_add_type_to_cdn_configuration.rb +9 -4
  161. data/db/migrate/20220209203251_add_generated_for_to_content_views.rb +13 -0
  162. data/db/migrate/20220209205137_expand_sync_timeout_settings.rb +7 -7
  163. data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb +12 -0
  164. data/db/migrate/20220303160220_remove_duplicate_errata.rb +1 -1
  165. data/db/migrate/20220404190836_delete_old_setting_data.rb +9 -0
  166. data/db/migrate/20220405220616_update_cdn_configuration_type.rb +11 -0
  167. data/db/migrate/20220419193414_content_settings_to_dsl_category.rb +5 -0
  168. data/db/migrate/20220428203334_add_last_refreshed_to_katello_alternate_content_sources.rb +5 -0
  169. data/db/seeds.d/110-content-view-autopublish.rb +13 -0
  170. data/db/seeds.d/150-module_job_templates.rb +1 -1
  171. data/engines/bastion/README.md +1 -0
  172. data/engines/bastion/app/assets/javascripts/bastion/components/bst-modal.directive.js +1 -0
  173. data/engines/bastion/app/views/bastion/layouts/assets.html.erb +1 -0
  174. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js +1 -1
  175. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js +4 -2
  176. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html +1 -1
  177. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js +11 -6
  178. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-module-streams.controller.js +1 -0
  179. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js +1 -0
  180. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js +11 -3
  181. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js +1 -0
  182. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html +1 -1
  183. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html +1 -1
  184. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js +8 -0
  185. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js +4 -2
  186. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html +2 -2
  187. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js +10 -0
  188. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-deb-repositories.html +26 -0
  189. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-debs.html +27 -0
  190. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js +1 -0
  191. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.routes.js +22 -0
  192. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html +13 -7
  193. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +63 -17
  194. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js +7 -8
  195. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details.controller.js +10 -1
  196. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-details.html +21 -3
  197. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +8 -12
  198. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js +7 -5
  199. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +2 -1
  200. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-create.controller.js +1 -1
  201. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html +1 -1
  202. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.routes.js +1 -0
  203. data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html +6 -1
  204. data/lib/katello/engine.rb +1 -5
  205. data/lib/katello/permission_creator.rb +34 -4
  206. data/lib/katello/plugin.rb +377 -3
  207. data/lib/katello/tasks/refresh_alternate_content_sources.rake +15 -0
  208. data/lib/katello/tasks/reset.rake.bak +67 -0
  209. data/lib/katello/tasks/update_content_default_http_proxy.rake +2 -3
  210. data/lib/katello/version.rb +1 -1
  211. data/locale/action_names.rb +47 -41
  212. data/locale/bn/LC_MESSAGES/katello.mo +0 -0
  213. data/locale/bn/katello.po +820 -106
  214. data/locale/bn/katello.po.time_stamp +0 -0
  215. data/locale/cs/LC_MESSAGES/katello.mo +0 -0
  216. data/locale/cs/katello.po +818 -104
  217. data/locale/cs/katello.po.time_stamp +0 -0
  218. data/locale/de/LC_MESSAGES/katello.mo +0 -0
  219. data/locale/de/katello.po +893 -179
  220. data/locale/de/katello.po.time_stamp +0 -0
  221. data/locale/en/LC_MESSAGES/katello.mo +0 -0
  222. data/locale/en/katello.po +817 -103
  223. data/locale/en/katello.po.time_stamp +0 -0
  224. data/locale/es/LC_MESSAGES/katello.mo +0 -0
  225. data/locale/es/katello.po +882 -168
  226. data/locale/es/katello.po.time_stamp +0 -0
  227. data/locale/fr/LC_MESSAGES/katello.mo +0 -0
  228. data/locale/fr/katello.po +1219 -505
  229. data/locale/fr/katello.po.time_stamp +0 -0
  230. data/locale/gu/LC_MESSAGES/katello.mo +0 -0
  231. data/locale/gu/katello.po +826 -112
  232. data/locale/gu/katello.po.time_stamp +0 -0
  233. data/locale/hi/LC_MESSAGES/katello.mo +0 -0
  234. data/locale/hi/katello.po +826 -112
  235. data/locale/hi/katello.po.time_stamp +0 -0
  236. data/locale/it/LC_MESSAGES/katello.mo +0 -0
  237. data/locale/it/katello.po +863 -148
  238. data/locale/it/katello.po.time_stamp +0 -0
  239. data/locale/ja/LC_MESSAGES/katello.mo +0 -0
  240. data/locale/ja/katello.po +1216 -499
  241. data/locale/ja/katello.po.time_stamp +0 -0
  242. data/locale/katello.pot +3847 -2507
  243. data/locale/kn/LC_MESSAGES/katello.mo +0 -0
  244. data/locale/kn/katello.po +826 -112
  245. data/locale/kn/katello.po.time_stamp +0 -0
  246. data/locale/ko/LC_MESSAGES/katello.mo +0 -0
  247. data/locale/ko/katello.po +912 -198
  248. data/locale/ko/katello.po.time_stamp +0 -0
  249. data/locale/mr/LC_MESSAGES/katello.mo +0 -0
  250. data/locale/mr/katello.po +826 -112
  251. data/locale/mr/katello.po.time_stamp +0 -0
  252. data/locale/or/LC_MESSAGES/katello.mo +0 -0
  253. data/locale/or/katello.po +826 -112
  254. data/locale/or/katello.po.time_stamp +0 -0
  255. data/locale/pa/LC_MESSAGES/katello.mo +0 -0
  256. data/locale/pa/katello.po +826 -112
  257. data/locale/pa/katello.po.time_stamp +0 -0
  258. data/locale/pt/LC_MESSAGES/katello.mo +0 -0
  259. data/locale/pt/katello.po +817 -103
  260. data/locale/pt/katello.po.time_stamp +0 -0
  261. data/locale/pt_BR/LC_MESSAGES/katello.mo +0 -0
  262. data/locale/pt_BR/katello.po +879 -165
  263. data/locale/pt_BR/katello.po.time_stamp +0 -0
  264. data/locale/ru/LC_MESSAGES/katello.mo +0 -0
  265. data/locale/ru/katello.po +927 -213
  266. data/locale/ru/katello.po.time_stamp +0 -0
  267. data/locale/ta/LC_MESSAGES/katello.mo +0 -0
  268. data/locale/ta/katello.po +820 -106
  269. data/locale/ta/katello.po.time_stamp +0 -0
  270. data/locale/te/LC_MESSAGES/katello.mo +0 -0
  271. data/locale/te/katello.po +826 -112
  272. data/locale/te/katello.po.time_stamp +0 -0
  273. data/locale/zh_CN/LC_MESSAGES/katello.mo +0 -0
  274. data/locale/zh_CN/katello.po +1202 -486
  275. data/locale/zh_CN/katello.po.time_stamp +0 -0
  276. data/locale/zh_TW/LC_MESSAGES/katello.mo +0 -0
  277. data/locale/zh_TW/katello.po +856 -142
  278. data/locale/zh_TW/katello.po.time_stamp +0 -0
  279. data/webpack/components/Bookmark/index.js +22 -14
  280. data/webpack/components/EditableTextInput/EditableTextInput.js +20 -5
  281. data/webpack/components/Errata/index.js +38 -8
  282. data/webpack/components/Packages/index.js +1 -4
  283. data/webpack/components/Search/Search.js +22 -3
  284. data/webpack/components/SelectAllCheckbox/index.js +1 -0
  285. data/webpack/components/SelectableDropdown/SelectableDropdown.js +4 -2
  286. data/webpack/components/Table/EmptyStateMessage.js +21 -7
  287. data/webpack/components/Table/MainTable.js +29 -4
  288. data/webpack/components/Table/MainTable.scss +5 -1
  289. data/webpack/components/Table/TableHooks.js +65 -20
  290. data/webpack/components/Table/TableWrapper.js +9 -3
  291. data/webpack/components/Table/components/SortableColumnHeaders.js +19 -0
  292. data/webpack/components/Table/components/TranslatedPlural.js +57 -0
  293. data/webpack/components/TypeAhead/TypeAhead.js +12 -0
  294. data/webpack/components/TypeAhead/pf4Search/TypeAheadInput.js +13 -11
  295. data/webpack/components/TypeAhead/pf4Search/TypeAheadSearch.js +7 -2
  296. data/webpack/components/extensions/HostDetails/ActionsBar/index.js +27 -0
  297. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ChangeHostCVModal.js +250 -0
  298. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/ContentViewDetailsCard.js +232 -0
  299. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/HostContentViewActions.js +19 -0
  300. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/HostContentViewConstants.js +2 -0
  301. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/changeHostCVModal.test.js +131 -0
  302. data/webpack/components/extensions/HostDetails/Cards/{__tests__ → ContentViewDetailsCard/__tests__}/contentViewDetailsCard.test.js +22 -0
  303. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/contentViews.fixtures.json +443 -0
  304. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard/__tests__/envPaths.fixtures.json +320 -0
  305. data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.js +57 -33
  306. data/webpack/components/extensions/HostDetails/Cards/ErrataOverviewCard.scss +3 -0
  307. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsActions.js +30 -0
  308. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsCard.js +206 -0
  309. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsConstants.js +7 -0
  310. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsModal.js +227 -0
  311. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsSelectors.js +18 -0
  312. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/availableHostCollections.fixtures.json +106 -0
  313. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/hostCollectionsCard.test.js +118 -0
  314. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/hostCollectionsModal.test.js +235 -0
  315. data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/removableHostCollections.fixtures.json +45 -0
  316. data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js +33 -8
  317. data/webpack/components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard.js +44 -0
  318. data/webpack/components/extensions/HostDetails/DetailsTabCards/RecentCommunicationCardExtensions.js +37 -0
  319. data/webpack/components/extensions/HostDetails/DetailsTabCards/RegistrationCard.js +107 -0
  320. data/webpack/components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions.js +38 -0
  321. data/webpack/components/extensions/HostDetails/HostDetailsActions.js +11 -0
  322. data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js +4 -0
  323. data/webpack/components/extensions/HostDetails/Tabs/ContentTab/constants.js +2 -0
  324. data/webpack/components/extensions/HostDetails/Tabs/ContentTab/index.js +6 -1
  325. data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js +176 -72
  326. data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/HostErrataActions.js +1 -7
  327. data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsActions.js +1 -3
  328. data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsConstants.js +28 -0
  329. data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js +522 -118
  330. data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesActions.js +1 -7
  331. data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackageInstallModal.js +6 -4
  332. data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js +164 -58
  333. data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js +59 -49
  334. data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionConstants.js +1 -0
  335. data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionHooks.js +85 -0
  336. data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsActions.js +33 -54
  337. data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsConstants.js +20 -0
  338. data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js +298 -107
  339. data/webpack/components/extensions/HostDetails/Tabs/TracesTab/EnableTracerModal.js +14 -7
  340. data/webpack/components/extensions/HostDetails/Tabs/TracesTab/HostTracesActions.js +2 -1
  341. data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesEnabler.js +104 -0
  342. data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js +134 -57
  343. data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js +37 -32
  344. data/webpack/components/extensions/HostDetails/Tabs/{ModuleStreamsTab/__tests__/modules.fixtures.json → __tests__/moduleStreams.fixtures.json} +6 -3
  345. data/webpack/components/extensions/HostDetails/Tabs/__tests__/moduleStreamsTab.test.js +261 -0
  346. data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js +21 -15
  347. data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js +44 -1
  348. data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySets.fixtures.json +4 -1
  349. data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySetsTab.test.js +105 -6
  350. data/webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js +25 -6
  351. data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js +6 -0
  352. data/webpack/components/extensions/HostDetails/hostDetailsHelpers.js +18 -0
  353. data/webpack/containers/Application/config.js +5 -0
  354. data/webpack/global_index.js +32 -9
  355. data/webpack/global_test_setup.js +13 -0
  356. data/webpack/redux/actions/RedHatRepositories/enabled.js +2 -1
  357. data/webpack/redux/actions/RedHatRepositories/helpers.js +13 -8
  358. data/webpack/scenes/AlternateContentSources/ACSActions.js +65 -0
  359. data/webpack/scenes/AlternateContentSources/ACSConstants.js +18 -0
  360. data/webpack/scenes/AlternateContentSources/ACSIndexPage.js +23 -0
  361. data/webpack/scenes/AlternateContentSources/ACSSelectors.js +24 -0
  362. data/webpack/scenes/AlternateContentSources/Create/ACSCreateContext.js +4 -0
  363. data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js +160 -0
  364. data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCreateFinish.js +79 -0
  365. data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCredentials.js +199 -0
  366. data/webpack/scenes/AlternateContentSources/Create/Steps/ACSReview.js +104 -0
  367. data/webpack/scenes/AlternateContentSources/Create/Steps/ACSSmartProxies.js +41 -0
  368. data/webpack/scenes/AlternateContentSources/Create/Steps/AcsUrlPaths.js +71 -0
  369. data/webpack/scenes/AlternateContentSources/Create/Steps/NameACS.js +57 -0
  370. data/webpack/scenes/AlternateContentSources/Create/Steps/SelectSource.js +77 -0
  371. data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js +149 -0
  372. data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreateData.fixtures.json +3 -0
  373. data/webpack/scenes/AlternateContentSources/Create/__tests__/contentCredentials.fixtures.json +69 -0
  374. data/webpack/scenes/AlternateContentSources/Create/__tests__/smartProxy.fixtures.json +65 -0
  375. data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js +162 -0
  376. data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsIndex.fixtures.json +91 -0
  377. data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js +67 -0
  378. data/webpack/scenes/AlternateContentSources/index.js +4 -0
  379. data/webpack/scenes/Content/Details/ContentRepositories.js +1 -0
  380. data/webpack/scenes/Content/Table/ContentTable.js +1 -0
  381. data/webpack/scenes/ContentCredentials/ContentCredentialSelectors.js +4 -1
  382. data/webpack/scenes/ContentViews/ContentViewsActions.js +6 -2
  383. data/webpack/scenes/ContentViews/ContentViewsConstants.js +11 -3
  384. data/webpack/scenes/ContentViews/Copy/CopyContentViewForm.js +2 -1
  385. data/webpack/scenes/ContentViews/Create/ContentViewFormComponents.js +10 -1
  386. data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js +2 -1
  387. data/webpack/scenes/ContentViews/Delete/ContentViewDeleteWizard.js +7 -5
  388. data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionFinish.js +29 -21
  389. data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js +15 -8
  390. data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js +2 -2
  391. data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js +2 -2
  392. data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js +3 -1
  393. data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js +34 -8
  394. data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js +33 -29
  395. data/webpack/scenes/ContentViews/Details/ContentViewDetails.js +130 -79
  396. data/webpack/scenes/ContentViews/Details/ContentViewInfo.js +16 -2
  397. data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js +2 -1
  398. data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js +2 -1
  399. data/webpack/scenes/ContentViews/Details/Filters/CVContainerImageFilterContent.js +6 -1
  400. data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js +41 -21
  401. data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js +38 -20
  402. data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js +2 -0
  403. data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js +8 -1
  404. data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js +9 -1
  405. data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js +2 -1
  406. data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js +1 -0
  407. data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js +27 -12
  408. data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js +39 -17
  409. data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js +27 -10
  410. data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js +46 -23
  411. data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js +3 -2
  412. data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js +5 -2
  413. data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js +161 -108
  414. data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js +7 -7
  415. data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json +1 -0
  416. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/ActionSummary.js +58 -0
  417. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteContextWrapper.js +45 -0
  418. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteHelpers.js +30 -0
  419. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/BulkDeleteModal.js +56 -0
  420. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ConfirmBulkDelete.js +126 -0
  421. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/FinishBulkDelete.js +61 -0
  422. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignActivationKeys.js +196 -0
  423. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignHosts.js +220 -0
  424. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReviewEnvironments.js +104 -0
  425. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteModal.test.js +122 -0
  426. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/BulkDeleteVersions.fixtures.json +600 -0
  427. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/contentView.fixtures.json +1504 -0
  428. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/contentViewVersion.fixtures.json +936 -0
  429. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/environmentPaths.fixtures.json +261 -0
  430. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/hosts.fixtures.json +163 -0
  431. data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/bulkDeleteSteps.js +79 -0
  432. data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js +192 -167
  433. data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveCVVersionWizard.js +2 -5
  434. data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionDeleteFinish.js +38 -53
  435. data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js +1 -1
  436. data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js +6 -12
  437. data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js +1 -0
  438. data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js +1 -0
  439. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js +1 -0
  440. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js +8 -20
  441. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js +23 -13
  442. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js +3 -0
  443. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json +4 -4
  444. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js +0 -3
  445. data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js +4 -4
  446. data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js +12 -14
  447. data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json +1 -0
  448. data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js +96 -117
  449. data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js +13 -19
  450. data/webpack/scenes/ContentViews/Publish/__tests__/publishContentView.test.js +9 -20
  451. data/webpack/scenes/ContentViews/Table/ContentViewsTable.js +165 -148
  452. data/webpack/scenes/ContentViews/Table/tableDataGenerator.js +2 -0
  453. data/webpack/scenes/ContentViews/components/ContentViewIcon.js +14 -3
  454. data/webpack/scenes/ContentViews/components/EnvironmentLabels.js +4 -3
  455. data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.js +10 -6
  456. data/webpack/scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths.scss +6 -1
  457. data/webpack/scenes/ContentViews/components/TaskPresenter/TaskPresenter.js +40 -35
  458. data/webpack/scenes/ContentViews/expansions/RelatedCompositeContentViewsModal.js +1 -1
  459. data/webpack/scenes/ContentViews/expansions/RelatedContentViewComponentsModal.js +2 -2
  460. data/webpack/scenes/ContentViews/helpers.js +3 -0
  461. data/webpack/scenes/Hosts/ChangeContentSource/helpers.js +5 -0
  462. data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js +3 -3
  463. data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js +2 -1
  464. data/webpack/scenes/RedHatRepositories/components/EnabledRepository/__tests__/EnabledRepository.test.js +2 -0
  465. data/webpack/scenes/RedHatRepositories/components/Search.js +4 -4
  466. data/webpack/scenes/SmartProxy/SmartProxyContentActions.js +9 -2
  467. data/webpack/scenes/SmartProxy/SmartProxyContentConstants.js +1 -1
  468. data/webpack/scenes/SmartProxy/SmartProxyContentSelectors.js +10 -1
  469. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js +3 -3
  470. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnTypeForm.js +2 -0
  471. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{AirGappedTypeForm.js → ExportSyncForm.js} +7 -6
  472. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/{UpstreamServerTypeForm.js → NetworkSyncForm.js} +15 -7
  473. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{AirGappedTypeForm.test.js → ExportSyncForm.test.js} +4 -4
  474. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/__tests__/{UpstreamServerTypeForm.test.js → NetworkSyncForm.test.js} +8 -8
  475. data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/index.js +11 -11
  476. data/webpack/scenes/Subscriptions/SubscriptionConstants.js +1 -0
  477. data/webpack/scenes/Subscriptions/SubscriptionsPage.js +8 -7
  478. data/webpack/scenes/Tasks/TaskActions.js +6 -0
  479. data/webpack/scenes/Tasks/TaskSelectors.js +11 -0
  480. data/webpack/scenes/Tasks/helpers.js +60 -5
  481. data/webpack/utils/helpers.js +2 -0
  482. metadata +183 -38
  483. data/app/models/setting/content.rb +0 -201
  484. data/db/seeds.d/107-enable_dynflow.rb +0 -8
  485. data/webpack/components/extensions/HostDetails/Cards/ContentViewDetailsCard.js +0 -96
  486. data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/__tests__/moduleStreamsTab.test.js +0 -108
  487. data/webpack/components/extensions/HostDetails/Tabs/TracesTab/EnableTracerEmptyState.js +0 -42
  488. data/webpack/scenes/ContentViews/Details/DetailsContainer.js +0 -36
@@ -0,0 +1,250 @@
1
+ import React, { useState, useCallback } from 'react';
2
+ import PropTypes from 'prop-types';
3
+ import { FormattedMessage } from 'react-intl';
4
+ import { useDispatch, useSelector } from 'react-redux';
5
+ import { Modal, Button, Select, SelectOption, Alert, Flex } from '@patternfly/react-core';
6
+ import {
7
+ global_palette_black_600 as pfDescriptionColor,
8
+ } from '@patternfly/react-tokens';
9
+ import { translate as __ } from 'foremanReact/common/I18n';
10
+ import { STATUS } from 'foremanReact/constants';
11
+ import { useAPI } from 'foremanReact/common/hooks/API/APIHooks';
12
+ import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
13
+ import EnvironmentPaths from '../../../../../scenes/ContentViews/components/EnvironmentPaths/EnvironmentPaths';
14
+ import { ENVIRONMENT_PATHS_KEY } from '../../../../../scenes/ContentViews/components/EnvironmentPaths/EnvironmentPathConstants';
15
+ import api from '../../../../../services/api';
16
+ import getContentViews from '../../../../../scenes/ContentViews/ContentViewsActions';
17
+ import { selectContentViews, selectContentViewStatus } from '../../../../../scenes/ContentViews/ContentViewSelectors';
18
+ import { uniq } from '../../../../../utils/helpers';
19
+ import ContentViewIcon from '../../../../../scenes/ContentViews/components/ContentViewIcon';
20
+ import updateHostContentViewAndEnvironment from './HostContentViewActions';
21
+ import HOST_CV_AND_ENV_KEY from './HostContentViewConstants';
22
+ import { getHostDetails } from '../../HostDetailsActions';
23
+
24
+ const ENV_PATH_OPTIONS = { key: ENVIRONMENT_PATHS_KEY };
25
+
26
+ const ContentViewDescription = ({ cv, versionNumber }) => {
27
+ const descriptionStyle = {
28
+ fontSize: '12px',
29
+ fontWeight: 400,
30
+ color: pfDescriptionColor.value,
31
+ };
32
+ if (cv.default) return <span style={descriptionStyle}>{__('Library')}</span>;
33
+ return (
34
+ <span style={descriptionStyle}>
35
+ <FormattedMessage
36
+ id={`content-view-${cv.id}-version-${cv.latest_version}`}
37
+ defaultMessage="Version {versionNumber}"
38
+ values={{ versionNumber }}
39
+ />
40
+ </span>
41
+ );
42
+ };
43
+
44
+ ContentViewDescription.propTypes = {
45
+ cv: PropTypes.shape({
46
+ default: PropTypes.bool.isRequired,
47
+ id: PropTypes.number.isRequired,
48
+ latest_version: PropTypes.string.isRequired,
49
+ }).isRequired,
50
+ versionNumber: PropTypes.string.isRequired,
51
+ };
52
+
53
+ const ChangeHostCVModal = ({
54
+ isOpen,
55
+ closeModal,
56
+ hostEnvId,
57
+ orgId,
58
+ hostId,
59
+ hostName,
60
+ }) => {
61
+ const [selectedEnvForHost, setSelectedEnvForHost]
62
+ = useState([]);
63
+
64
+ const [selectedCVForHost, setSelectedCVForHost] = useState(null);
65
+ const [cvSelectOpen, setCVSelectOpen] = useState(false);
66
+ const dispatch = useDispatch();
67
+ const contentViewsInEnvResponse = useSelector(state => selectContentViews(state, `FOR_ENV_${hostEnvId}`));
68
+ const contentViewsInEnvStatus = useSelector(state => selectContentViewStatus(state, `FOR_ENV_${hostEnvId}`));
69
+ const hostUpdateStatus = useSelector(state => selectAPIStatus(state, HOST_CV_AND_ENV_KEY));
70
+ useAPI( // No TableWrapper here, so we can useAPI from Foreman
71
+ 'get',
72
+ api.getApiUrl(`/organizations/${orgId}/environments/paths?permission_type=promotable`),
73
+ ENV_PATH_OPTIONS,
74
+ );
75
+
76
+ const handleModalClose = () => {
77
+ setCVSelectOpen(false);
78
+ setSelectedCVForHost(null);
79
+ setSelectedEnvForHost([]);
80
+ closeModal();
81
+ };
82
+
83
+ const selectedEnv = selectedEnvForHost?.[0];
84
+ const selectedEnvId = selectedEnv?.id;
85
+
86
+ const handleCVSelect = (event, selection) => {
87
+ setSelectedCVForHost(selection);
88
+ setCVSelectOpen(false);
89
+ };
90
+
91
+ const handleEnvSelect = (selection) => {
92
+ dispatch(getContentViews({
93
+ environment_id: selection[0].id,
94
+ include_default: true,
95
+ full_result: true,
96
+ order: 'default DESC', // show Default Organization View first
97
+ }, `FOR_ENV_${hostEnvId}`));
98
+ setSelectedCVForHost(null);
99
+ setSelectedEnvForHost(selection);
100
+ };
101
+ const { results: contentViewsInEnv = [] } = contentViewsInEnvResponse;
102
+ const canSave = !!(selectedCVForHost && selectedEnvForHost.length);
103
+
104
+ const relevantVersionObjFromCv = (cv, env) => { // returns the entire version object
105
+ const versions = cv.versions.filter(version => new Set(version.environment_ids).has(env.id));
106
+ return uniq(versions)?.[0];
107
+ };
108
+ const relevantVersionFromCv = (cv, env) =>
109
+ relevantVersionObjFromCv(cv, env)?.version; // returns the version text e.g. "1.0"
110
+
111
+ const refreshHostDetails = () => {
112
+ handleModalClose();
113
+ return dispatch(getHostDetails({ hostname: hostName }));
114
+ };
115
+
116
+ const handleSave = () => {
117
+ const requestBody = {
118
+ id: hostId,
119
+ host: {
120
+ content_facet_attributes: {
121
+ content_view_id: selectedCVForHost,
122
+ lifecycle_environment_id: selectedEnvId,
123
+ },
124
+ },
125
+ };
126
+ dispatch(updateHostContentViewAndEnvironment(
127
+ requestBody, hostId,
128
+ refreshHostDetails, handleModalClose,
129
+ ));
130
+ };
131
+
132
+ const cvPlaceholderText = useCallback(() => {
133
+ if (contentViewsInEnvStatus === STATUS.PENDING) return __('Loading...');
134
+ if (contentViewsInEnvStatus === STATUS.ERROR) return __('Error loading content views');
135
+ return (contentViewsInEnv.length === 0) ? __('No content views available') : __('Select a content view');
136
+ }, [contentViewsInEnv.length, contentViewsInEnvStatus]);
137
+
138
+ const modalActions = ([
139
+ <Button
140
+ key="add"
141
+ variant="primary"
142
+ onClick={handleSave}
143
+ isDisabled={!canSave}
144
+ isLoading={hostUpdateStatus === STATUS.PENDING}
145
+ >
146
+ {__('Save')}
147
+ </Button>,
148
+ <Button key="cancel" variant="link" onClick={handleModalClose}>
149
+ Cancel
150
+ </Button>,
151
+ ]);
152
+ return (
153
+ <Modal
154
+ isOpen={isOpen}
155
+ onClose={handleModalClose}
156
+ onEscapePress={handleModalClose}
157
+ title={__('Edit content view assignment')}
158
+ width="50%"
159
+ position="top"
160
+ actions={modalActions}
161
+ id="change-host-cv-modal"
162
+ >
163
+ {contentViewsInEnvStatus === STATUS.RESOLVED &&
164
+ !!selectedEnvForHost.length && contentViewsInEnv.length === 0 &&
165
+ <Alert
166
+ variant="warning"
167
+ isInline
168
+ title={__('No content views available for the selected environment')}
169
+ style={{ marginBottom: '1rem' }}
170
+ >
171
+ {__('View the Content Views page to manage and promote content views, or select a different environment.')}
172
+ </Alert>
173
+ }
174
+ <EnvironmentPaths
175
+ userCheckedItems={selectedEnvForHost}
176
+ setUserCheckedItems={handleEnvSelect}
177
+ publishing={false}
178
+ multiSelect={false}
179
+ headerText={__('Select environment')}
180
+ isDisabled={hostUpdateStatus === STATUS.PENDING}
181
+ />
182
+ {selectedEnvForHost.length > 0 &&
183
+ <div style={{ marginTop: '1em' }}>
184
+ <h3>{__('Select content view')}</h3>
185
+ <Select
186
+ selections={selectedCVForHost}
187
+ onSelect={handleCVSelect}
188
+ isOpen={cvSelectOpen}
189
+ menuAppendTo="parent"
190
+ isDisabled={contentViewsInEnv.length === 0 || hostUpdateStatus === STATUS.PENDING}
191
+ onToggle={isExpanded => setCVSelectOpen(isExpanded)}
192
+ ouiaId="select-content-view"
193
+ id="selectCV"
194
+ name="selectCV"
195
+ aria-label="selectCV"
196
+ placeholderText={cvPlaceholderText()}
197
+ >
198
+ {contentViewsInEnv?.map(cv => (
199
+ <SelectOption
200
+ key={cv.id}
201
+ value={cv.id}
202
+ >
203
+ <Flex
204
+ direction={{ default: 'row', sm: 'row' }}
205
+ flexWrap={{ default: 'nowrap' }}
206
+ alignItems={{ default: 'alignItemsCenter', sm: 'alignItemsCenter' }}
207
+ >
208
+ <ContentViewIcon
209
+ composite={cv.composite}
210
+ size="sm"
211
+ />
212
+ <Flex
213
+ direction={{ default: 'column', sm: 'column' }}
214
+ flexWrap={{ default: 'nowrap' }}
215
+ alignItems={{ default: 'alignItemsFlexStart', sm: 'alignItemsFlexStart' }}
216
+ >
217
+ {cv.name}
218
+ <ContentViewDescription
219
+ cv={cv}
220
+ versionNumber={relevantVersionFromCv(cv, selectedEnv)}
221
+ />
222
+ </Flex>
223
+ </Flex>
224
+ </SelectOption>
225
+ ))
226
+ }
227
+ </Select>
228
+ </div>
229
+ }
230
+ </Modal>
231
+ );
232
+ };
233
+
234
+ ChangeHostCVModal.propTypes = {
235
+ isOpen: PropTypes.bool,
236
+ closeModal: PropTypes.func,
237
+ hostEnvId: PropTypes.number,
238
+ orgId: PropTypes.number.isRequired,
239
+ hostId: PropTypes.number.isRequired,
240
+ hostName: PropTypes.string.isRequired,
241
+ };
242
+
243
+ ChangeHostCVModal.defaultProps = {
244
+ isOpen: false,
245
+ closeModal: () => {},
246
+ hostEnvId: null,
247
+ };
248
+
249
+
250
+ export default ChangeHostCVModal;
@@ -0,0 +1,232 @@
1
+ import React, { useState } from 'react';
2
+ import {
3
+ Card,
4
+ CardHeader,
5
+ CardTitle,
6
+ CardBody,
7
+ Dropdown,
8
+ DropdownItem,
9
+ Flex,
10
+ FlexItem,
11
+ GridItem,
12
+ KebabToggle,
13
+ Label,
14
+ Tooltip,
15
+ } from '@patternfly/react-core';
16
+ import { FormattedMessage } from 'react-intl';
17
+
18
+ import { urlBuilder } from 'foremanReact/common/urlHelpers';
19
+ import { translate as __ } from 'foremanReact/common/I18n';
20
+ import { propsToCamelCase } from 'foremanReact/common/helpers';
21
+ import PropTypes from 'prop-types';
22
+ import ContentViewIcon from '../../../../../scenes/ContentViews/components/ContentViewIcon';
23
+ import { hasRequiredPermissions, hostIsRegistered } from '../../hostDetailsHelpers';
24
+ import ChangeHostCVModal from './ChangeHostCVModal';
25
+
26
+ const requiredPermissions = [
27
+ 'view_lifecycle_environments', 'view_content_views',
28
+ 'promote_or_remove_content_views_to_environments',
29
+ ];
30
+
31
+ const HostContentViewDetails = ({
32
+ contentView, lifecycleEnvironment, contentViewVersionId, contentViewDefault,
33
+ contentViewVersion, contentViewVersionLatest, hostId, hostName, orgId, hostEnvId,
34
+ hostPermissions, permissions,
35
+ }) => {
36
+ let versionLabel = `Version ${contentViewVersion}`;
37
+ if (contentViewVersionLatest) {
38
+ versionLabel += ' (latest)';
39
+ }
40
+
41
+ const [isDropdownOpen, setIsDropdownOpen] = useState(false);
42
+ const toggleHamburger = () => setIsDropdownOpen(prev => !prev);
43
+ const [isModalOpen, setIsModalOpen] = useState(false);
44
+ const closeModal = () => setIsModalOpen(false);
45
+ const openModal = () => {
46
+ setIsDropdownOpen(false);
47
+ setIsModalOpen(true);
48
+ };
49
+
50
+ const userPermissions = { ...hostPermissions, ...permissions };
51
+ const showKebab = hasRequiredPermissions(requiredPermissions, userPermissions);
52
+
53
+ const dropdownItems = [
54
+ <DropdownItem
55
+ aria-label="change-host-content-view"
56
+ key="change-host-content-view"
57
+ component="button"
58
+ onClick={openModal}
59
+ >
60
+ {__('Edit content view assignment')}
61
+ </DropdownItem>,
62
+ ];
63
+
64
+ return (
65
+ <GridItem rowSpan={1} md={6} lg={4} xl2={3} >
66
+ <Card isHoverable>
67
+ <CardHeader>
68
+ <Flex
69
+ alignItems={{ default: 'alignItemsCenter' }}
70
+ justifyContent={{ default: 'justifyContentSpaceBetween' }}
71
+ style={{ width: '100%' }}
72
+ >
73
+ <FlexItem>
74
+ <Flex
75
+ alignItems={{ default: 'alignItemsCenter' }}
76
+ justifyContent={{ default: 'justifyContentSpaceBetween' }}
77
+ >
78
+ <FlexItem>
79
+ <CardTitle>{__('Content view details')}</CardTitle>
80
+ </FlexItem>
81
+ </Flex>
82
+ </FlexItem>
83
+ {showKebab && (
84
+ <FlexItem>
85
+ <Dropdown
86
+ toggle={<KebabToggle aria-label="change_content_view_hamburger" onToggle={toggleHamburger} />}
87
+ isOpen={isDropdownOpen}
88
+ isPlain
89
+ ouiaId="change-host-content-view-kebab"
90
+ position="right"
91
+ dropdownItems={dropdownItems}
92
+ />
93
+ </FlexItem>
94
+ )}
95
+ </Flex>
96
+ </CardHeader>
97
+ <CardBody>
98
+ <Flex direction={{ default: 'column' }}>
99
+ <Flex
100
+ direction={{ default: 'row', sm: 'row' }}
101
+ flexWrap={{ default: 'nowrap' }}
102
+ alignItems={{ default: 'alignItemsCenter', sm: 'alignItemsCenter' }}
103
+ >
104
+ <ContentViewIcon composite={contentView.composite} style={{ marginRight: '2px' }} position="left" />
105
+ <h3>{__('Content view')}</h3>
106
+ </Flex>
107
+ <Flex direction={{ default: 'row', sm: 'row' }} flexWrap={{ default: 'wrap' }}>
108
+ <a style={{ fontSize: '14px' }} href={`/content_views/${contentView.id}`}>{`${contentView.name}`}</a>
109
+ <Tooltip
110
+ position="top"
111
+ enableFlip
112
+ entryDelay={400}
113
+ content={<FormattedMessage
114
+ id="cv-card-lce-tooltip"
115
+ defaultMessage={__('Lifecycle environment: {lce}')}
116
+ values={{
117
+ lce: lifecycleEnvironment.name,
118
+ }}
119
+ />}
120
+ >
121
+ <Label isTruncated color="purple" href={`/lifecycle_environments/${lifecycleEnvironment.id}`}>{`${lifecycleEnvironment.name}`}</Label>
122
+ </Tooltip>
123
+ </Flex>
124
+ </Flex>
125
+ {!contentViewDefault &&
126
+ <Flex direction={{ default: 'column' }}>
127
+ <FlexItem>
128
+ <h3>{__('Version in use')}</h3>
129
+ <a style={{ fontSize: '14px' }} href={urlBuilder(`content_views/${contentView.id}/versions/${contentViewVersionId}`, '')}>
130
+ {versionLabel}
131
+ </a>
132
+ </FlexItem>
133
+ </Flex>
134
+ }
135
+ </CardBody>
136
+ </Card>
137
+ {hostId &&
138
+ <ChangeHostCVModal
139
+ isOpen={isModalOpen}
140
+ closeModal={closeModal}
141
+ hostId={hostId}
142
+ hostName={hostName}
143
+ hostEnvId={hostEnvId}
144
+ orgId={orgId}
145
+ key={`cv-change-modal-${hostId}`}
146
+ />
147
+ }
148
+ </GridItem>
149
+ );
150
+ };
151
+
152
+ const ContentViewDetailsCard = ({ hostDetails }) => {
153
+ if (hostIsRegistered({ hostDetails })
154
+ && hostDetails.content_facet_attributes && hostDetails.organization_id) {
155
+ return (<HostContentViewDetails
156
+ hostId={hostDetails.id}
157
+ hostName={hostDetails.name}
158
+ orgId={hostDetails.organization_id}
159
+ hostEnvId={hostDetails.content_facet_attributes.lifecycle_environment_id}
160
+ hostPermissions={hostDetails.permissions}
161
+ {...propsToCamelCase(hostDetails.content_facet_attributes)}
162
+ />);
163
+ }
164
+ return null;
165
+ };
166
+
167
+ HostContentViewDetails.propTypes = {
168
+ contentView: PropTypes.shape({
169
+ name: PropTypes.string,
170
+ id: PropTypes.number,
171
+ composite: PropTypes.bool,
172
+ }).isRequired,
173
+ contentViewDefault: PropTypes.bool,
174
+ lifecycleEnvironment: PropTypes.shape({
175
+ name: PropTypes.string,
176
+ id: PropTypes.number,
177
+ }).isRequired,
178
+ contentViewVersionId: PropTypes.number.isRequired,
179
+ contentViewVersion: PropTypes.string.isRequired,
180
+ contentViewVersionLatest: PropTypes.bool.isRequired,
181
+ id: PropTypes.number,
182
+ name: PropTypes.string,
183
+ hostId: PropTypes.number,
184
+ hostName: PropTypes.string,
185
+ orgId: PropTypes.number,
186
+ hostEnvId: PropTypes.number,
187
+ hostPermissions: PropTypes.shape({
188
+ edit_hosts: PropTypes.bool,
189
+ }),
190
+ permissions: PropTypes.shape({
191
+ view_content_views: PropTypes.bool,
192
+ view_lifecycle_environments: PropTypes.bool,
193
+ promote_or_remove_content_views_to_environments: PropTypes.bool,
194
+ }),
195
+ };
196
+
197
+ HostContentViewDetails.defaultProps = {
198
+ id: null,
199
+ name: '',
200
+ hostEnvId: null,
201
+ hostId: null,
202
+ hostName: '',
203
+ orgId: null,
204
+ contentViewDefault: false,
205
+ hostPermissions: {},
206
+ permissions: {},
207
+ };
208
+
209
+ ContentViewDetailsCard.propTypes = {
210
+ hostDetails: PropTypes.shape({
211
+ id: PropTypes.number,
212
+ name: PropTypes.string,
213
+ organization_id: PropTypes.number,
214
+ content_facet_attributes: PropTypes.shape({
215
+ lifecycle_environment_id: PropTypes.number,
216
+ permissions: PropTypes.shape({
217
+ view_content_views: PropTypes.bool,
218
+ view_lifecycle_environments: PropTypes.bool,
219
+ promote_or_remove_content_views_to_environments: PropTypes.bool,
220
+ }),
221
+ }),
222
+ permissions: PropTypes.shape({
223
+ edit_hosts: PropTypes.bool,
224
+ }),
225
+ }),
226
+ };
227
+
228
+ ContentViewDetailsCard.defaultProps = {
229
+ hostDetails: {},
230
+ };
231
+
232
+ export default ContentViewDetailsCard;
@@ -0,0 +1,19 @@
1
+ import { translate as __ } from 'foremanReact/common/I18n';
2
+ import { API_OPERATIONS, put } from 'foremanReact/redux/API';
3
+ import { errorToast } from '../../../../../scenes/Tasks/helpers';
4
+ import { foremanApi } from '../../../../../services/api';
5
+ import HOST_CV_AND_ENV_KEY from './HostContentViewConstants';
6
+
7
+ const updateHostContentViewAndEnvironment = (params, hostId, handleSuccess, handleError) => put({
8
+ type: API_OPERATIONS.PUT,
9
+ key: HOST_CV_AND_ENV_KEY,
10
+ url: foremanApi.getApiUrl(`/hosts/${hostId}`),
11
+ successToast: () => __('Host content view and environment updated'),
12
+ handleSuccess,
13
+ handleError,
14
+ errorToast,
15
+ params,
16
+ });
17
+
18
+ export default updateHostContentViewAndEnvironment;
19
+
@@ -0,0 +1,2 @@
1
+ const HOST_CV_AND_ENV_KEY = 'HOST_CV_AND_ENV';
2
+ export default HOST_CV_AND_ENV_KEY;
@@ -0,0 +1,131 @@
1
+ import React from 'react';
2
+ import { renderWithRedux, patientlyWaitFor, act } from 'react-testing-lib-wrapper';
3
+ import userEvent from '@testing-library/user-event';
4
+ import ChangeHostCVModal from '../ChangeHostCVModal';
5
+ import mockEnvPaths from './envPaths.fixtures.json';
6
+ import mockContentViews from './contentViews.fixtures.json';
7
+ import HOST_CV_AND_ENV_KEY from '../HostContentViewConstants';
8
+ import { assertNockRequest, nockInstance } from '../../../../../../test-utils/nockWrapper';
9
+ import katelloApi from '../../../../../../services/api';
10
+
11
+ const contentViews = katelloApi.getApiUrl('/content_views');
12
+ // const hostDetailsUrl = '/api/hosts/test-host';
13
+
14
+ const renderOptions = () => ({
15
+ apiNamespace: HOST_CV_AND_ENV_KEY,
16
+ initialState: {
17
+ API: {
18
+ HOST_DETAILS: {
19
+ response: {
20
+ id: 1,
21
+ name: 'test-host',
22
+ content_facet_attributes: {
23
+ content_view_id: 1,
24
+ lifecycle_environment_id: 1,
25
+ },
26
+ organization_id: 1,
27
+ },
28
+ status: 'RESOLVED',
29
+ },
30
+ ENVIRONMENT_PATHS: {
31
+ response: mockEnvPaths,
32
+ status: 'RESOLVED',
33
+ },
34
+ },
35
+ },
36
+ });
37
+
38
+ let firstEnvPath;
39
+ let firstCV;
40
+ let secondCV;
41
+ let firstEnv;
42
+
43
+ const cvQuery = {
44
+ organization_id: 1,
45
+ include_permissions: true,
46
+ include_default: true,
47
+ environment_id: 1,
48
+ full_result: true,
49
+ order: 'default DESC',
50
+ };
51
+
52
+ beforeEach(() => {
53
+ const { results } = mockEnvPaths;
54
+ [firstEnvPath] = results;
55
+ const { environments: envResults } = firstEnvPath;
56
+ [firstEnv] = envResults;
57
+ const { results: cvResults } = mockContentViews;
58
+ [firstCV, secondCV] = cvResults;
59
+ });
60
+
61
+ jest.mock('foremanReact/common/hooks/API/APIHooks', () => ({
62
+ useAPI: jest.fn(),
63
+ }));
64
+
65
+ test('Displays environment paths', async (done) => {
66
+ const { getAllByText }
67
+ = renderWithRedux(<ChangeHostCVModal
68
+ isOpen
69
+ closeModal={jest.fn()}
70
+ hostId={1}
71
+ hostName="test-host"
72
+ hostEnvId={1}
73
+ orgId={1}
74
+ />, renderOptions());
75
+
76
+ await patientlyWaitFor(() =>
77
+ expect(getAllByText(firstEnv.name)[0]).toBeInTheDocument());
78
+ done();
79
+ });
80
+
81
+ test('Select an env > call CV API > select a CV > Save button is enabled', async (done) => {
82
+ const contentViewsScope = nockInstance
83
+ .get(contentViews)
84
+ .query(cvQuery)
85
+ .reply(200, mockContentViews);
86
+
87
+ const {
88
+ getAllByText, getByText,
89
+ findByText, getAllByRole,
90
+ } = renderWithRedux(<ChangeHostCVModal
91
+ isOpen
92
+ closeModal={jest.fn()}
93
+ hostId={1}
94
+ hostName="test-host"
95
+ hostEnvId={1}
96
+ orgId={1}
97
+ />, renderOptions());
98
+
99
+ await patientlyWaitFor(() => {
100
+ const envLabel = getAllByText(firstEnv.name)[0];
101
+ expect(envLabel).toBeInTheDocument();
102
+ });
103
+
104
+ const envRadio = getAllByRole('radio', { name: firstEnv.name })[0];
105
+ expect(envRadio).toBeInTheDocument();
106
+
107
+ await act(async () => {
108
+ userEvent.click(envRadio); // Select the Library environment
109
+
110
+ const cvDropdown = await findByText('Select a content view');
111
+ expect(cvDropdown).toBeInTheDocument();
112
+
113
+ userEvent.click(cvDropdown); // Open the CV dropdown
114
+
115
+
116
+ [firstCV, secondCV].forEach((cv) => {
117
+ expect(getByText(cv.name)).toBeInTheDocument(); // the content view names should be showing
118
+ });
119
+
120
+
121
+ userEvent.click(getByText(secondCV.name)); // Select the second content view
122
+ });
123
+
124
+ // find the Save button and assert that it is enabled
125
+ const saveButton = getAllByRole('button', { name: 'Save' })[0];
126
+ expect(saveButton).toBeInTheDocument();
127
+ expect(saveButton).toHaveAttribute('aria-disabled', 'false');
128
+
129
+ assertNockRequest(contentViewsScope, done);
130
+ act(done);
131
+ });
@@ -3,11 +3,13 @@ import { render } from 'react-testing-lib-wrapper';
3
3
  import ContentViewDetailsCard from '../ContentViewDetailsCard';
4
4
 
5
5
  const baseHostDetails = {
6
+ organization_id: 1,
6
7
  content_facet_attributes: {
7
8
  content_view: {
8
9
  name: 'CV',
9
10
  id: 100,
10
11
  composite: false,
12
+ content_view_default: false,
11
13
  },
12
14
  lifecycle_environment: {
13
15
  name: 'ENV',
@@ -50,3 +52,23 @@ test('shows when the CV in use is not the latest version', () => {
50
52
  expect(getByText('Version 1.0')).toBeInTheDocument();
51
53
  expect(queryByText('Version 1.0 (latest)')).toBeNull();
52
54
  });
55
+
56
+ test('does not show version info when using Default Organization View', () => {
57
+ const hostDetails = {
58
+ ...baseHostDetails,
59
+ content_facet_attributes: {
60
+ ...baseHostDetails.content_facet_attributes,
61
+ content_view:
62
+ {
63
+ ...baseHostDetails.content_facet_attributes.content_view,
64
+ content_view_default: true,
65
+ name: 'Default Organization View',
66
+ },
67
+ },
68
+ };
69
+
70
+ const { queryByText } = render(<ContentViewDetailsCard hostDetails={hostDetails} />);
71
+ expect(queryByText('Default Organization View')).toBeInTheDocument();
72
+ expect(queryByText('Version 1.0')).toBeNull();
73
+ });
74
+