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
@@ -43,10 +43,12 @@ export const cvDetailsHistoryKey = cvId => `${CONTENT_VIEWS_KEY}_HISTORIES_${cvI
43
43
  export const cvFilterRulesKey = filterId => `CONTENT_VIEW_FILTER_${filterId}_RULES`;
44
44
  export const cvDetailsComponentKey = cvId => `${CONTENT_VIEWS_KEY}_COMPONENTS_${cvId}`;
45
45
  export const cvDetailsVersionKey = cvId => `${CONTENT_VIEWS_KEY}_VERSIONS_${cvId}`;
46
+ export const bulkRemoveVersionKey = cvId => `BULK_REMOVE_CV_VERSION_${cvId}`;
46
47
  export const cvRemoveVersionKey = (versionId, versionEnvironments) => `REMOVE_CV_VERSION_${versionId}_${versionEnvironments.length}`;
47
48
  export const cvVersionPromoteKey = (versionId, environmentIds) => `PROMOTE_CONTENT_VIEW_VERSION_${versionId}_${environmentIds.length}`;
48
49
  export const cvVersionDetailsKey = (cvId, versionId) => `CONTENT_VIEW_VERSION_DETAILS_${cvId}_${versionId}`;
49
50
  export const cvVersionPublishKey = (cvId, versionCount) => `${PUBLISH_CONTENT_VIEW_KEY}_${cvId}_VERSION_${versionCount}`;
51
+ export const cvVersionTaskPollingKey = cvId => `CONTENT_VIEW_VERSION_POLLING_${cvId}`;
50
52
  export const cvAddComponentKey = cvId => `${CONTENT_VIEWS_KEY}_ADD_COMPONENT_${cvId}`;
51
53
  export const cvRemoveComponentKey = cvId => `${CONTENT_VIEWS_KEY}_REMOVE_COMPONENT_${cvId}`;
52
54
 
@@ -56,9 +58,15 @@ export const addComponentSuccessMessage = component => (component ? __('Updated
56
58
 
57
59
 
58
60
  // Repo added to content view status display and key
59
- export const ADDED = 'Added';
60
- export const NOT_ADDED = 'Not added';
61
- export const ALL_STATUSES = 'All';
61
+ export const ADDED = __('Added');
62
+ export const NOT_ADDED = __('Not added');
63
+ export const ALL_STATUSES = __('All');
64
+
65
+ export const STATUS_TRANSLATIONS_ENUM = {
66
+ [ADDED]: 'Added',
67
+ [NOT_ADDED]: 'Not added',
68
+ [ALL_STATUSES]: 'All',
69
+ };
62
70
 
63
71
  export const REPOSITORY_TYPES = 'REPOSITORY_TYPES';
64
72
  export const FILTER_TYPES = ['rpm', 'package_group', 'erratum_date', 'erratum_id', 'docker', 'modulemd'];
@@ -59,6 +59,7 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
59
59
  </FormGroup>
60
60
  <ActionGroup>
61
61
  <Button
62
+ ouiaId="copy-form-submit-button"
62
63
  aria-label="copy_content_view"
63
64
  variant="primary"
64
65
  isDisabled={!name?.length || saving}
@@ -66,7 +67,7 @@ const CopyContentViewForm = ({ cvId, setModalOpen }) => {
66
67
  >
67
68
  {__('Copy content view')}
68
69
  </Button>
69
- <Button variant="link" onClick={() => setModalOpen(false)}>{__('Cancel')}</Button>
70
+ <Button ouiaId="copy-form-cancel" variant="link" onClick={() => setModalOpen(false)}>{__('Cancel')}</Button>
70
71
  </ActionGroup>
71
72
  </Form >
72
73
  );
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { translate as __ } from 'foremanReact/common/I18n';
3
3
  import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
4
4
  import { Tooltip, TooltipPosition, Flex, FlexItem } from '@patternfly/react-core';
5
- import { autoPublishHelpText, dependenciesHelpText, importOnlyHelpText } from '../helpers';
5
+ import { autoPublishHelpText, dependenciesHelpText, importOnlyHelpText, generatedContentViewHelpText } from '../helpers';
6
6
  import ContentViewIcon from '../components/ContentViewIcon';
7
7
 
8
8
  const HelpToolTip = tooltip => (
@@ -56,3 +56,12 @@ export const LabelImportOnly = () => (
56
56
  </FlexItem>
57
57
  </Flex>
58
58
  );
59
+
60
+ export const LabelGenerated = () => (
61
+ <Flex>
62
+ <FlexItem spacer={{ default: 'spacerSm' }}>{__('Generated')}</FlexItem>
63
+ <FlexItem>
64
+ {HelpToolTip(generatedContentViewHelpText)}
65
+ </FlexItem>
66
+ </Flex>
67
+ );
@@ -170,6 +170,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
170
170
  </FormGroup>}
171
171
  <ActionGroup>
172
172
  <Button
173
+ ouiaId="create-content-view-form-submit"
173
174
  aria-label="create_content_view"
174
175
  variant="primary"
175
176
  isDisabled={submitDisabled}
@@ -177,7 +178,7 @@ const CreateContentViewForm = ({ setModalOpen }) => {
177
178
  >
178
179
  {__('Create content view')}
179
180
  </Button>
180
- <Button variant="link" onClick={() => setModalOpen(false)}>
181
+ <Button ouiaId="create-content-view-form-cancel" variant="link" onClick={() => setModalOpen(false)}>
181
182
  {__('Cancel')}
182
183
  </Button>
183
184
  </ActionGroup>
@@ -13,6 +13,7 @@ import {
13
13
  selectCVVersionsStatus,
14
14
  } from '../Details/ContentViewDetailSelectors';
15
15
  import getEnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPathActions';
16
+ import getContentViewDetails, { getContentViewVersions } from '../Details/ContentViewDetailActions';
16
17
  import CVDeletionReassignHostsForm from './Steps/CVDeletionReassignHostsForm';
17
18
  import CVDeletionReassignActivationKeysForm from './Steps/CVDeletionReassignActivationKeysForm';
18
19
  import CVDeletionReview from './Steps/CVDeletionReview';
@@ -23,7 +24,6 @@ import Loading from '../../../components/Loading';
23
24
  const ContentViewDeleteWizard =
24
25
  ({
25
26
  cvId, cvEnvironments, show, setIsOpen,
26
- currentStep, setCurrentStep,
27
27
  }) => {
28
28
  const cvVersionResponse = useSelector(state => selectCVVersions(state, cvId));
29
29
  const cvVersionStatus = useSelector(state => selectCVVersionsStatus(state, cvId));
@@ -39,14 +39,19 @@ const ContentViewDeleteWizard =
39
39
  const [affectedActivationKeys, setAffectedActivationKeys] = useState(false);
40
40
  const [affectedHosts, setAffectedHosts] = useState(false);
41
41
  const [canReview, setCanReview] = useState(false);
42
+ const [currentStep, setCurrentStep] = useState(1);
42
43
 
43
44
  const { name } = cvDetailsResponse ?? {};
44
45
 
45
46
  useEffect(
46
47
  () => {
48
+ if (cvDetailsStatus !== STATUS.RESOLVED) { dispatch(getContentViewDetails(cvId)); }
49
+ if (cvVersionStatus !== STATUS.RESOLVED) { dispatch(getContentViewVersions(cvId)); }
47
50
  dispatch(getEnvironmentPaths());
48
51
  },
49
- [dispatch],
52
+ // We don't want to call this everytime the status changes
53
+ // eslint-disable-next-line react-hooks/exhaustive-deps
54
+ [cvId, dispatch],
50
55
  );
51
56
 
52
57
  useEffect(() => {
@@ -144,7 +149,6 @@ const ContentViewDeleteWizard =
144
149
  startAtStep={currentStep}
145
150
  onClose={() => {
146
151
  setIsOpen(false);
147
- setCurrentStep(0);
148
152
  }}
149
153
  isOpen={show}
150
154
  />
@@ -157,8 +161,6 @@ ContentViewDeleteWizard.propTypes = {
157
161
  cvEnvironments: PropTypes.arrayOf(PropTypes.shape({})),
158
162
  show: PropTypes.bool,
159
163
  setIsOpen: PropTypes.func,
160
- currentStep: PropTypes.number.isRequired,
161
- setCurrentStep: PropTypes.func.isRequired,
162
164
  };
163
165
 
164
166
  ContentViewDeleteWizard.defaultProps = {
@@ -10,9 +10,11 @@ import getContentViews from '../../ContentViewsActions';
10
10
  import CVDeleteContext from '../CVDeleteContext';
11
11
  import Loading from '../../../../components/Loading';
12
12
 
13
+
13
14
  const CVDeletionFinish = () => {
14
15
  const {
15
- cvId, cvEnvironments,
16
+ cvId,
17
+ cvEnvironments,
16
18
  setIsOpen,
17
19
  selectedCVForAK, selectedEnvForAK, selectedCVForHosts,
18
20
  selectedEnvForHost, affectedActivationKeys, affectedHosts,
@@ -21,53 +23,59 @@ const CVDeletionFinish = () => {
21
23
  selectRemoveCVVersionResponse(state, cvId, cvEnvironments));
22
24
  const removeCVStatus = useSelector(state =>
23
25
  selectRemoveCVVersionStatus(state, cvId, cvEnvironments));
24
- const removeResolved = removeCVStatus === STATUS.RESOLVED;
25
26
  const dispatch = useDispatch();
26
27
  const [removeDispatched, setRemoveDispatched] = useState(false);
27
- const { push } = useHistory();
28
+ const { push, location: { pathname } } = useHistory();
28
29
 
29
30
  useDeepCompareEffect(() => {
30
- if (removeResolved && removeDispatched) {
31
- dispatch(getContentViews());
32
- push('/content_views');
33
- setIsOpen(false);
34
- }
35
- if (removeCVStatus === STATUS.ERROR) {
31
+ // If there is an error, we still want to refresh or redirect to show it.
32
+ if (removeDispatched && removeCVStatus === STATUS.ERROR) {
33
+ if (pathname === '/content_views') dispatch(getContentViews());
34
+ else push('/content_views');
36
35
  setIsOpen(false);
37
36
  }
38
- }, [removeCVResponse, removeCVStatus, removeResolved,
39
- setIsOpen, dispatch, cvId, removeDispatched, push]);
37
+ }, [dispatch, pathname, push, removeCVStatus, removeDispatched, setIsOpen]);
40
38
 
41
39
  useDeepCompareEffect(() => {
42
40
  if (!removeDispatched) {
43
41
  let params = {
44
42
  id: cvId,
43
+ destroy_content_view: true,
45
44
  };
46
45
 
47
46
  if (affectedActivationKeys) {
48
- const activationKeysParams = {
47
+ params = {
48
+ ...params,
49
49
  key_content_view_id: selectedCVForAK,
50
50
  key_environment_id: selectedEnvForAK[0].id,
51
51
  };
52
- params = { ...activationKeysParams, ...params };
53
52
  }
54
53
 
55
54
  if (affectedHosts) {
56
- const hostParams = {
55
+ params = {
56
+ ...params,
57
57
  system_content_view_id: selectedCVForHosts,
58
58
  system_environment_id: selectedEnvForHost[0].id,
59
59
  };
60
- params = { ...hostParams, ...params };
61
60
  }
62
61
 
63
- const deletionParams = { destroy_content_view: true };
64
- params = { ...deletionParams, ...params };
65
- dispatch(removeContentViewVersion(cvId, cvId, cvEnvironments, params));
62
+ dispatch(removeContentViewVersion(
63
+ cvId, cvId, cvEnvironments, params,
64
+ // Only when we are on the contentViews page do we need to call getContentViews.
65
+ () => {
66
+ if (pathname === '/content_views') dispatch(getContentViews());
67
+ else push('/content_views');
68
+ setIsOpen(false);
69
+ },
70
+ () => {
71
+ setIsOpen(false);
72
+ },
73
+ ));
66
74
  setRemoveDispatched(true);
67
75
  }
68
- }, [cvId, cvEnvironments, dispatch, affectedActivationKeys,
69
- affectedHosts, selectedCVForAK, selectedCVForHosts,
70
- selectedEnvForAK, selectedEnvForHost, removeCVResponse, removeCVStatus, removeDispatched]);
76
+ }, [cvId, cvEnvironments, dispatch, affectedActivationKeys, affectedHosts,
77
+ selectedCVForAK, selectedCVForHosts, selectedEnvForAK, selectedEnvForHost,
78
+ removeCVResponse, removeCVStatus, removeDispatched, pathname, push, setIsOpen]);
71
79
 
72
80
  return <Loading loadingText={__('Please wait while the task starts..')} />;
73
81
  };
@@ -1,6 +1,6 @@
1
1
  /* eslint-disable no-useless-escape */
2
2
  import React from 'react';
3
- import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
3
+ import { renderWithRedux, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
4
4
  import api, { foremanApi } from '../../../../services/api';
5
5
  import nock, {
6
6
  nockInstance, assertNockRequest, mockAutocomplete, mockSetting, mockForemanAutocomplete,
@@ -16,23 +16,27 @@ import affectedHostData from './affectedHosts.fixtures.json';
16
16
  import cVDropDownOptionsData from '../../Details/Versions/Delete/__tests__/cvDropDownOptionsResponse.fixture.json';
17
17
  import cvDeleteResponse from '../../Details/Versions/Delete/__tests__/cvVersionRemoveResponse.fixture.json';
18
18
 
19
- const cvIndexPath = api.getApiUrl('/content_views?organization_id=1&nondefault=true&include_permissions=true&per_page=20&page=1');
19
+ const cvIndexPath = api.getApiUrl('/content_views');
20
20
  const autocompleteUrl = '/content_views/auto_complete_search';
21
21
  const renderOptions = { apiNamespace: CONTENT_VIEWS_KEY };
22
22
  const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
23
-
24
23
  const cvVersionsPath = api.getApiUrl('/content_view_versions');
25
-
26
24
  const cvDetailsPath = api.getApiUrl('/content_views/20');
27
-
28
25
  const activationKeyURL = api.getApiUrl('/activation_keys');
29
-
30
26
  const hostURL = foremanApi.getApiUrl('/hosts');
31
-
32
27
  const cVDropDownOptionsPath = api.getApiUrl('/content_views?organization_id=1&environment_id=9&include_default=true&include_permissions=true&full_result=true');
33
-
34
28
  const cvDeleteUrl = api.getApiUrl('/content_views/20/remove');
35
29
 
30
+ const baseQuery = {
31
+ organization_id: 1,
32
+ nondefault: true,
33
+ include_permissions: true,
34
+ per_page: 20,
35
+ page: 1,
36
+ sort_by: 'name',
37
+ sort_order: 'asc',
38
+ };
39
+
36
40
  let scopeBookmark;
37
41
  let firstCV;
38
42
  let searchDelayScope;
@@ -58,6 +62,7 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
58
62
  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
59
63
  const scope = nockInstance
60
64
  .get(cvIndexPath)
65
+ .query(baseQuery)
61
66
  .reply(200, cvIndexData);
62
67
 
63
68
  const envPathDeleteScope = nockInstance
@@ -110,6 +115,7 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
110
115
 
111
116
  const scope = nockInstance
112
117
  .get(cvIndexPath)
118
+ .query(true)
113
119
  .reply(200, cvIndexData);
114
120
 
115
121
  const envPathDeleteScope = nockInstance
@@ -243,4 +249,5 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
243
249
  assertNockRequest(cVDropDownOptionsScope);
244
250
  assertNockRequest(cvDeleteScope);
245
251
  assertNockRequest(cvRedirectScope, done);
252
+ act(done);
246
253
  });
@@ -137,8 +137,8 @@ const ComponentContentViewAddModal = ({
137
137
  </Flex>
138
138
  </FormGroup>
139
139
  <ActionGroup>
140
- <Button aria-label="add_component" variant="primary" type="submit">{__('Submit')}</Button>
141
- <Button variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>
140
+ <Button ouiaId="add-component-submit" aria-label="add_component" variant="primary" type="submit">{__('Submit')}</Button>
141
+ <Button ouiaId="add-component-cancel" variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>
142
142
  </ActionGroup>
143
143
  </Form>
144
144
  </Modal >);
@@ -112,8 +112,8 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
112
112
  </Card>
113
113
  ))}
114
114
  <ActionGroup>
115
- <Button aria-label="add_components" variant="primary" type="submit">{__('Add')}</Button>
116
- <Button variant="link" onClick={onClose}>{__('Cancel')}</Button>
115
+ <Button ouiaId="add-components-modal-add" aria-label="add_components" variant="primary" type="submit">{__('Add')}</Button>
116
+ <Button ouiaId="add-components-modal-cancel" variant="link" onClick={onClose}>{__('Cancel')}</Button>
117
117
  </ActionGroup>
118
118
  </Form>
119
119
  </Modal >);
@@ -148,6 +148,7 @@ const ContentViewComponents = ({ cvId, details }) => {
148
148
  {hasPermission(permissions, 'edit_content_views') && componentCvId && cvVersion &&
149
149
  <SplitItem>
150
150
  <Button
151
+ ouiaId={`edit-component-version-${componentCvId}`}
151
152
  className="foreman-edit-icon"
152
153
  aria-label="edit_version"
153
154
  variant="plain"
@@ -244,6 +245,7 @@ const ContentViewComponents = ({ cvId, details }) => {
244
245
  activeFilters,
245
246
  defaultFilters,
246
247
  }}
248
+ ouiaId="content-view-components-table"
247
249
  actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
248
250
  onSelect={onSelect(rows, setRows)}
249
251
  cells={columnHeaders}
@@ -268,7 +270,7 @@ const ContentViewComponents = ({ cvId, details }) => {
268
270
  <SplitItem>
269
271
  <ActionList>
270
272
  <ActionListItem>
271
- <Button onClick={addBulk} isDisabled={!(bulkAddEnabled())} variant="primary" aria-label="bulk_add_components">
273
+ <Button ouiaId="add-content-views" onClick={addBulk} isDisabled={!(bulkAddEnabled())} variant="primary" aria-label="bulk_add_components">
272
274
  {__('Add content views')}
273
275
  </Button>
274
276
  </ActionListItem>
@@ -47,6 +47,8 @@ import {
47
47
  DEB_PACKAGES_CONTENT,
48
48
  DOCKER_TAGS_CONTENT,
49
49
  generatedContentKey,
50
+ STATUS_TRANSLATIONS_ENUM,
51
+ bulkRemoveVersionKey,
50
52
  } from '../ContentViewsConstants';
51
53
  import api, { foremanApi, orgId } from '../../../services/api';
52
54
  import { getResponseErrorMsgs } from '../../../utils/helpers';
@@ -372,7 +374,7 @@ export const getCVFilterRules = (filterId, params) => get({
372
374
  });
373
375
 
374
376
  export const getContentViewComponents = (cvId, params, statusSelected) => {
375
- const apiParams = { ...params, status: statusSelected };
377
+ const apiParams = { ...params, status: STATUS_TRANSLATIONS_ENUM[statusSelected] };
376
378
  const apiUrl = `/content_views/${cvId}/content_view_components/show_all`;
377
379
  return get({
378
380
  key: cvDetailsComponentKey(cvId),
@@ -413,21 +415,45 @@ export const editContentViewVersionDetails = (versionId, cvId, params, handleSuc
413
415
  errorToast: error => __(`Something went wrong while editing version details. ${getResponseErrorMsgs(error.response)}`),
414
416
  });
415
417
 
416
- export const removeContentViewVersion = (cvId, versionId, versionEnvironments, params) => put({
418
+ export const bulkDeleteContentViewVersion = (cvId, params, handleSuccess, handleError) => put({
417
419
  type: API_OPERATIONS.PUT,
418
- key: cvRemoveVersionKey(versionId, versionEnvironments),
419
- url: api.getApiUrl(`/content_views/${cvId}/remove`),
420
+ key: bulkRemoveVersionKey(cvId),
421
+ url: api.getApiUrl(`/content_views/${cvId}/bulk_delete_versions`),
420
422
  params,
421
- handleSuccess: response => renderTaskStartedToast(response.data),
422
- errorToast: error => cvErrorToast(error),
423
+ handleSuccess: (response) => {
424
+ renderTaskStartedToast(response?.data);
425
+ handleSuccess(response);
426
+ },
427
+ handleError,
428
+ errorToast: error => __(`Something went wrong while deleting versions ${getResponseErrorMsgs(error.response)}`),
423
429
  });
424
430
 
425
- export const promoteContentViewVersion = params => post({
431
+ export const removeContentViewVersion =
432
+ (cvId, versionId, versionEnvironments, params, handleSuccess, handleError) =>
433
+ put({
434
+ type: API_OPERATIONS.PUT,
435
+ key: cvRemoveVersionKey(versionId, versionEnvironments),
436
+ url: api.getApiUrl(`/content_views/${cvId}/remove`),
437
+ params,
438
+ handleSuccess: (response) => {
439
+ renderTaskStartedToast(response.data);
440
+ if (handleSuccess) return handleSuccess(response);
441
+ return undefined; // consistent-return
442
+ },
443
+ handleError,
444
+ errorToast: error => cvErrorToast(error),
445
+ });
446
+
447
+
448
+ export const promoteContentViewVersion = (params, handleSuccess) => post({
426
449
  type: API_OPERATIONS.POST,
427
450
  key: cvVersionPromoteKey(params.id, params.versionEnvironments),
428
451
  url: api.getApiUrl(`/content_view_versions/${params.id}/promote`),
429
452
  params,
430
- handleSuccess: response => renderTaskStartedToast(response.data),
453
+ handleSuccess: (response) => {
454
+ if (handleSuccess) return handleSuccess();
455
+ return renderTaskStartedToast(response.data);
456
+ },
431
457
  errorToast: error => cvErrorToast(error),
432
458
  });
433
459
 
@@ -1,42 +1,43 @@
1
+ import { STATUS } from 'foremanReact/constants';
1
2
  import {
2
- selectAPIStatus,
3
3
  selectAPIError,
4
4
  selectAPIResponse,
5
+ selectAPIStatus,
5
6
  } from 'foremanReact/redux/API/APISelectors';
6
- import { STATUS } from 'foremanReact/constants';
7
+ import { pollTaskKey } from '../../Tasks/helpers';
7
8
  import {
9
+ ACTIVATION_KEY_KEY,
10
+ ADD_CONTENT_VIEW_FILTER_RULE,
11
+ bulkRemoveVersionKey,
12
+ CREATE_CONTENT_VIEW_FILTER_KEY,
13
+ cvAddComponentKey,
14
+ cvDetailsComponentKey,
15
+ cvDetailsFiltersKey,
16
+ cvDetailsHistoryKey,
8
17
  cvDetailsKey,
9
18
  cvDetailsRepoKey,
10
- cvDetailsFiltersKey,
19
+ cvDetailsVersionKey,
11
20
  cvFilterDetailsKey,
12
- cvFilterPackageGroupsKey,
13
- cvFilterModuleStreamKey,
14
21
  cvFilterErratumIDKey,
15
- cvDetailsHistoryKey,
22
+ cvFilterModuleStreamKey,
23
+ cvFilterPackageGroupsKey,
24
+ cvFilterRepoKey,
16
25
  cvFilterRulesKey,
17
- cvDetailsVersionKey,
18
- REPOSITORY_TYPES,
19
- cvDetailsComponentKey,
20
- cvAddComponentKey,
21
26
  cvRemoveComponentKey,
22
- CREATE_CONTENT_VIEW_FILTER_KEY,
23
- ADD_CONTENT_VIEW_FILTER_RULE,
24
- ACTIVATION_KEY_KEY,
25
- HOSTS_KEY,
26
- cvFilterRepoKey,
27
- cvVersionDetailsKey,
28
27
  cvRemoveVersionKey,
29
- RPM_PACKAGES_CONTENT,
30
- RPM_PACKAGE_GROUPS_CONTENT,
31
- REPOSITORY_CONTENT,
32
- FILE_CONTENT,
33
- ERRATA_CONTENT,
34
- MODULE_STREAMS_CONTENT,
28
+ cvVersionDetailsKey,
35
29
  DEB_PACKAGES_CONTENT,
36
30
  DOCKER_TAGS_CONTENT,
31
+ ERRATA_CONTENT,
32
+ FILE_CONTENT,
37
33
  generatedContentKey,
34
+ HOSTS_KEY,
35
+ MODULE_STREAMS_CONTENT,
36
+ REPOSITORY_CONTENT,
37
+ REPOSITORY_TYPES,
38
+ RPM_PACKAGE_GROUPS_CONTENT,
39
+ RPM_PACKAGES_CONTENT,
38
40
  } from '../ContentViewsConstants';
39
- import { pollTaskKey } from '../../Tasks/helpers';
40
41
 
41
42
  export const selectCVDetails = (state, cvId) =>
42
43
  selectAPIResponse(state, cvDetailsKey(cvId)) || {};
@@ -212,12 +213,6 @@ export const selectCVVersionDetailsStatus = (state, versionId, cvId) =>
212
213
  export const selectCVVersionDetailsError = (state, versionId, cvId) =>
213
214
  selectAPIError(state, cvVersionDetailsKey(versionId, cvId));
214
215
 
215
- export const selectPublishTaskPoll = (state, cvVersionPublishKey) =>
216
- selectAPIResponse(state, pollTaskKey(cvVersionPublishKey)) || {};
217
-
218
- export const selectPublishTaskPollStatus = (state, cvVersionPublishKey) =>
219
- selectAPIStatus(state, pollTaskKey(cvVersionPublishKey)) || STATUS.PENDING;
220
-
221
216
  export const selectTaskPoll = (state, key) =>
222
217
  selectAPIResponse(state, pollTaskKey(key)) || {};
223
218
 
@@ -275,6 +270,15 @@ export const selectCVHosts = state =>
275
270
  export const selectCVHostsStatus = state =>
276
271
  selectAPIStatus(state, HOSTS_KEY) || STATUS.PENDING;
277
272
 
273
+ export const selectBulkRemoveCVVersionResponse = (state, cvId) =>
274
+ selectAPIResponse(state, bulkRemoveVersionKey(cvId)) || {};
275
+
276
+ export const selectBulkRemoveCVVersionStatus = (state, cvId) =>
277
+ selectAPIStatus(state, bulkRemoveVersionKey(cvId)) || STATUS.PENDING;
278
+
279
+ export const selectBulkRemoveCVVersionError = (state, cvId) =>
280
+ selectAPIError(state, bulkRemoveVersionKey(cvId));
281
+
278
282
  export const selectRemoveCVVersionResponse = (state, versionId, versionEnvironments) =>
279
283
  selectAPIResponse(state, cvRemoveVersionKey(versionId, versionEnvironments)) || {};
280
284