decidim-core 0.31.2 → 0.32.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (516) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -13
  3. data/app/cells/decidim/amendable/amend_button_card/show.erb +2 -2
  4. data/app/cells/decidim/amendable/amend_button_card_cell.rb +1 -1
  5. data/app/cells/decidim/author_cell.rb +0 -4
  6. data/app/cells/decidim/card_metadata_cell.rb +1 -1
  7. data/app/cells/decidim/comments_button_cell.rb +9 -1
  8. data/app/cells/decidim/content_blocks/announcement_settings_form/show.erb +5 -0
  9. data/app/cells/decidim/content_blocks/announcement_settings_form_cell.rb +17 -0
  10. data/app/cells/decidim/content_blocks/cta_settings_form/show.erb +1 -1
  11. data/app/cells/decidim/content_blocks/hero_settings_form/show.erb +1 -1
  12. data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb +1 -1
  13. data/app/cells/decidim/content_blocks/highlighted_content_banner_settings_form/show.erb +1 -1
  14. data/app/cells/decidim/content_blocks/highlighted_elements_with_cell_for_list_cell.rb +5 -1
  15. data/app/cells/decidim/content_blocks/highlighted_participatory_spaces_cell.rb +1 -1
  16. data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
  17. data/app/cells/decidim/content_blocks/html_cell.rb +1 -1
  18. data/app/cells/decidim/content_blocks/participatory_space_announcement_cell.rb +1 -3
  19. data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb +1 -5
  20. data/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb +1 -1
  21. data/app/cells/decidim/content_blocks/static_page/section_cell.rb +1 -1
  22. data/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb +3 -1
  23. data/app/cells/decidim/content_blocks/static_page/summary_cell.rb +1 -1
  24. data/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb +3 -1
  25. data/app/cells/decidim/content_blocks/static_page/two_pane_section_cell.rb +2 -2
  26. data/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb +4 -2
  27. data/app/cells/decidim/data_consent/category.erb +25 -38
  28. data/app/cells/decidim/footer_topics/show.erb +5 -8
  29. data/app/cells/decidim/{participatory_space_private_user → member}/show.erb +6 -6
  30. data/app/cells/decidim/{participatory_space_private_user_cell.rb → member_cell.rb} +1 -5
  31. data/app/cells/decidim/nav_links/show.erb +3 -3
  32. data/app/cells/decidim/onboarding_action_message_cell.rb +1 -0
  33. data/app/cells/decidim/profile/details.erb +1 -1
  34. data/app/cells/decidim/profile_cell.rb +1 -0
  35. data/app/cells/decidim/profile_member_of/show.erb +13 -0
  36. data/app/cells/decidim/profile_member_of_cell.rb +35 -0
  37. data/app/cells/decidim/report_button/already_reported_modal.erb +1 -1
  38. data/app/cells/decidim/report_button/flag_modal.erb +1 -1
  39. data/app/cells/decidim/report_user_button/already_reported_modal.erb +1 -1
  40. data/app/cells/decidim/report_user_button/flag_modal.erb +1 -1
  41. data/app/cells/decidim/resource_types_filter/show.erb +2 -2
  42. data/app/cells/decidim/share_text_widget/modal.erb +1 -1
  43. data/app/cells/decidim/share_widget/qr_code_modal.erb +1 -1
  44. data/app/cells/decidim/tags_cell.rb +1 -1
  45. data/app/cells/decidim/upload_modal/files.erb +5 -1
  46. data/app/cells/decidim/upload_modal_cell.rb +15 -1
  47. data/app/cells/decidim/versions_list/show.erb +25 -0
  48. data/app/commands/decidim/create_follow.rb +3 -5
  49. data/app/commands/decidim/create_user_report.rb +1 -1
  50. data/app/commands/decidim/destroy_account.rb +15 -4
  51. data/app/commands/decidim/multiple_attachments_methods.rb +42 -24
  52. data/app/commands/decidim/search.rb +5 -5
  53. data/app/controllers/concerns/decidim/ajax_permission_handler.rb +1 -1
  54. data/app/controllers/concerns/decidim/devise_controllers.rb +9 -0
  55. data/app/controllers/concerns/decidim/direct_upload.rb +3 -2
  56. data/app/controllers/concerns/decidim/ephemeral_session_checker.rb +1 -1
  57. data/app/controllers/concerns/decidim/force_authentication.rb +10 -1
  58. data/app/controllers/concerns/decidim/impersonate_users.rb +4 -0
  59. data/app/controllers/concerns/decidim/locale_switcher.rb +52 -2
  60. data/app/controllers/concerns/decidim/needs_tos_accepted.rb +1 -1
  61. data/app/controllers/concerns/decidim/participatory_space/has_members_page.rb +27 -0
  62. data/app/controllers/concerns/decidim/participatory_space_context.rb +1 -5
  63. data/app/controllers/decidim/account_controller.rb +1 -1
  64. data/app/controllers/decidim/amendments_controller.rb +5 -4
  65. data/app/controllers/decidim/components/base_controller.rb +20 -3
  66. data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +1 -1
  67. data/app/controllers/decidim/devise/passwords_controller.rb +1 -1
  68. data/app/controllers/decidim/devise/registrations_controller.rb +1 -1
  69. data/app/controllers/decidim/devise/sessions_controller.rb +1 -1
  70. data/app/controllers/decidim/download_your_data_controller.rb +2 -2
  71. data/app/controllers/decidim/editor_images_controller.rb +1 -1
  72. data/app/controllers/decidim/follows_controller.rb +4 -3
  73. data/app/controllers/decidim/geolocation_controller.rb +1 -1
  74. data/app/controllers/decidim/likes_controller.rb +2 -1
  75. data/app/controllers/decidim/locales_controller.rb +3 -11
  76. data/app/controllers/decidim/messaging/conversations_controller.rb +3 -3
  77. data/app/controllers/decidim/newsletters_controller.rb +1 -1
  78. data/app/controllers/decidim/notifications_settings_controller.rb +1 -1
  79. data/app/controllers/decidim/notifications_subscriptions_controller.rb +8 -0
  80. data/app/controllers/decidim/open_data_controller.rb +1 -1
  81. data/app/controllers/decidim/private_downloads_controller.rb +29 -0
  82. data/app/controllers/decidim/report_users_controller.rb +2 -2
  83. data/app/controllers/decidim/reports_controller.rb +1 -1
  84. data/app/controllers/decidim/user_activities_controller.rb +1 -2
  85. data/app/events/decidim/amendable/amendment_base_event.rb +7 -1
  86. data/app/events/decidim/welcome_notification_event.rb +1 -1
  87. data/app/forms/decidim/upload_validation_form.rb +1 -1
  88. data/app/helpers/concerns/decidim/flash_helper_extensions.rb +1 -0
  89. data/app/helpers/decidim/active_link_to_helper.rb +136 -0
  90. data/app/helpers/decidim/amendments_helper.rb +3 -3
  91. data/app/helpers/decidim/check_boxes_tree_helper.rb +2 -2
  92. data/app/helpers/decidim/component_path_helper.rb +9 -4
  93. data/app/helpers/decidim/filters_helper.rb +0 -2
  94. data/app/helpers/decidim/mailer_helper.rb +36 -0
  95. data/app/helpers/decidim/menu_helper.rb +4 -5
  96. data/app/helpers/decidim/meta_tags_helper.rb +0 -2
  97. data/app/helpers/decidim/newsletters_helper.rb +4 -22
  98. data/app/helpers/decidim/paginate_helper.rb +14 -1
  99. data/app/helpers/decidim/sanitize_helper.rb +1 -0
  100. data/app/helpers/decidim/short_link_helper.rb +5 -5
  101. data/app/helpers/decidim/translations_helper.rb +4 -4
  102. data/app/jobs/decidim/delete_inactive_participants_job.rb +2 -2
  103. data/app/jobs/decidim/find_and_update_descendants_job.rb +8 -2
  104. data/app/jobs/decidim/process_inactive_participant_job.rb +0 -7
  105. data/app/jobs/decidim/update_search_indexes_job.rb +2 -2
  106. data/app/mailers/decidim/application_mailer.rb +11 -2
  107. data/app/mailers/decidim/decidim_devise_mailer.rb +1 -0
  108. data/app/mailers/decidim/delete_user_mailer.rb +14 -0
  109. data/app/mailers/decidim/participants_account_mailer.rb +0 -16
  110. data/app/mailers/decidim/reported_mailer.rb +4 -1
  111. data/app/models/decidim/action_log.rb +1 -1
  112. data/app/models/decidim/attachment.rb +20 -2
  113. data/app/models/decidim/authorization.rb +7 -0
  114. data/app/models/decidim/authorization_transfer.rb +1 -1
  115. data/app/models/decidim/component.rb +6 -9
  116. data/app/models/decidim/content_block.rb +3 -3
  117. data/app/models/decidim/moderation.rb +1 -1
  118. data/app/models/decidim/newsletter.rb +2 -2
  119. data/app/models/decidim/participatory_space/member.rb +55 -0
  120. data/app/models/decidim/private_download.rb +61 -0
  121. data/app/models/decidim/private_export.rb +6 -0
  122. data/app/models/decidim/resource_link.rb +1 -1
  123. data/app/models/decidim/short_link.rb +1 -1
  124. data/app/models/decidim/user.rb +2 -2
  125. data/app/models/decidim/user_base_entity.rb +17 -2
  126. data/app/models/decidim/user_moderation.rb +1 -1
  127. data/app/packs/src/decidim/a11y.js +29 -0
  128. data/app/packs/src/decidim/a11y.test.js +81 -0
  129. data/app/packs/src/decidim/confirm.js +8 -1
  130. data/app/packs/src/decidim/confirm.test.js +225 -0
  131. data/app/packs/src/decidim/controllers/accordion/accordion.test.js +272 -0
  132. data/app/packs/src/decidim/controllers/accordion/controller.js +117 -17
  133. data/app/packs/src/decidim/controllers/assign_role/assign_role.test.js +80 -0
  134. data/app/packs/src/decidim/controllers/assign_role/controller.js +27 -0
  135. data/app/packs/src/decidim/controllers/breadcrumb_truncate/breadcrumb_truncate.test.js +230 -0
  136. data/app/packs/src/decidim/controllers/breadcrumb_truncate/controller.js +172 -0
  137. data/app/packs/src/decidim/controllers/dropdown/controller.js +32 -0
  138. data/app/packs/src/decidim/controllers/dropdown/dropdown.test.js +215 -0
  139. data/app/packs/src/decidim/controllers/form_validator/form_validator.js +9 -8
  140. data/app/packs/src/decidim/controllers/form_validator/form_validator.test.js +28 -1
  141. data/app/packs/src/decidim/controllers/language_change/controller.js +1 -0
  142. data/app/packs/src/decidim/controllers/language_change/language_change.test.js +13 -0
  143. data/app/packs/src/decidim/controllers/main_menu/controller.js +152 -0
  144. data/app/packs/src/decidim/controllers/main_menu/main_menu.test.js +285 -0
  145. data/app/packs/src/decidim/controllers/mention/controller.js +296 -140
  146. data/app/packs/src/decidim/controllers/mention/input_mentions.test.js +120 -457
  147. data/app/packs/src/decidim/controllers/multiple_mentions/controller.js +68 -32
  148. data/app/packs/src/decidim/controllers/multiple_mentions/input_multiple_mentions.test.js +30 -23
  149. data/app/packs/src/decidim/controllers/password_toggler/controller.js +22 -1
  150. data/app/packs/src/decidim/controllers/password_toggler/password_toggler.test.js +11 -20
  151. data/app/packs/src/decidim/datepicker/datepicker_functions.js +26 -0
  152. data/app/packs/src/decidim/datepicker/generate_datepicker.js +3 -14
  153. data/app/packs/src/decidim/datepicker/generate_timepicker.js +3 -2
  154. data/app/packs/src/decidim/datepicker/test/datepicker_functions_adjust_picker_position.test.js +234 -0
  155. data/app/packs/src/decidim/direct_uploads/upload_field.js +4 -4
  156. data/app/packs/src/decidim/direct_uploads/upload_modal.js +12 -7
  157. data/app/packs/src/decidim/editor/common/suggestion.js +4 -2
  158. data/app/packs/src/decidim/editor/extensions/decidim_kit/index.js +4 -1
  159. data/app/packs/src/decidim/editor/extensions/image/index.js +57 -16
  160. data/app/packs/src/decidim/editor/extensions/image/node_view.js +9 -1
  161. data/app/packs/src/decidim/editor/extensions/indent/index.js +9 -0
  162. data/app/packs/src/decidim/editor/extensions/link/bubble_menu.js +34 -6
  163. data/app/packs/src/decidim/editor/extensions/link/index.js +53 -12
  164. data/app/packs/src/decidim/editor/extensions/mention/index.js +18 -5
  165. data/app/packs/src/decidim/editor/extensions/mention_resource/index.js +16 -7
  166. data/app/packs/src/decidim/editor/test/extensions/decidim_kit.test.js +13 -4
  167. data/app/packs/src/decidim/editor/test/extensions/heading.test.js +1 -1
  168. data/app/packs/src/decidim/editor/test/extensions/image.test.js +26 -28
  169. data/app/packs/src/decidim/editor/test/extensions/image_links.test.js +161 -0
  170. data/app/packs/src/decidim/editor/test/extensions/mention.test.js +6 -2
  171. data/app/packs/src/decidim/editor/test/extensions/video_embed.test.js +27 -15
  172. data/app/packs/src/decidim/editor/test/helpers.js +8 -10
  173. data/app/packs/src/decidim/editor/test/toolbar/full.test.js +15 -4
  174. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_block.js +8 -4
  175. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting.js +5 -1
  176. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent.js +9 -5
  177. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js +5 -1
  178. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_list.js +8 -4
  179. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling.js +13 -9
  180. data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_content_styling.js +6 -2
  181. data/app/packs/src/decidim/geocoding/reverse_geocoding.js +15 -5
  182. data/app/packs/src/decidim/geocoding/reverse_geocoding.test.js +197 -0
  183. data/app/packs/src/decidim/index.js +4 -4
  184. data/app/packs/src/decidim/map/controller.js +10 -1
  185. data/app/packs/src/decidim/refactor/moved/focus_guard.js +16 -16
  186. data/app/packs/src/decidim/refactor/moved/focus_guard.test.js +136 -0
  187. data/app/packs/src/decidim/sw/push-permissions.js +48 -13
  188. data/app/packs/src/decidim/sw/sw.js +1 -1
  189. data/app/packs/src/decidim/utilities/text.js +6 -6
  190. data/app/packs/stylesheets/decidim/_cards.scss +15 -6
  191. data/app/packs/stylesheets/decidim/_conversations.scss +14 -0
  192. data/app/packs/stylesheets/decidim/_cookies.scss +13 -5
  193. data/app/packs/stylesheets/decidim/_datepicker.scss +0 -8
  194. data/app/packs/stylesheets/decidim/_documents.scss +1 -1
  195. data/app/packs/stylesheets/decidim/_dropdown.scss +22 -32
  196. data/app/packs/stylesheets/decidim/_editor_suggestions.scss +49 -0
  197. data/app/packs/stylesheets/decidim/_flash.scss +1 -1
  198. data/app/packs/stylesheets/decidim/_floating_help.scss +1 -1
  199. data/app/packs/stylesheets/decidim/_footer.scss +27 -31
  200. data/app/packs/stylesheets/decidim/_forms.scss +5 -1
  201. data/app/packs/stylesheets/decidim/_header.scss +183 -48
  202. data/app/packs/stylesheets/decidim/_language_chooser.scss +79 -0
  203. data/app/packs/stylesheets/decidim/_participatory_spaces.scss +1 -1
  204. data/app/packs/stylesheets/decidim/_rich_text.scss +17 -0
  205. data/app/packs/stylesheets/decidim/_tom_select.scss +23 -0
  206. data/app/packs/stylesheets/decidim/application.scss +3 -0
  207. data/app/packs/stylesheets/decidim/editor.scss +12 -33
  208. data/app/packs/stylesheets/decidim/geocoding_addons.scss +10 -2
  209. data/app/presenters/decidim/admin_log/participatory_space/member_presenter.rb +40 -0
  210. data/app/presenters/decidim/admin_log/static_page_resource_presenter.rb +1 -1
  211. data/app/presenters/decidim/authorization_transfer_presenter.rb +1 -1
  212. data/app/presenters/decidim/breadcrumb_root_menu_item_presenter.rb +3 -3
  213. data/app/presenters/decidim/footer_menu_presenter.rb +2 -4
  214. data/app/presenters/decidim/log/user_presenter.rb +1 -0
  215. data/app/presenters/decidim/log/value_types/access_mode_presenter.rb +45 -0
  216. data/app/presenters/decidim/menu_item_presenter.rb +15 -3
  217. data/app/presenters/decidim/participatory_space/member_presenter.rb +48 -0
  218. data/app/presenters/decidim/resource_locator_presenter.rb +22 -3
  219. data/app/presenters/decidim/stats_presenter.rb +1 -1
  220. data/app/queries/decidim/last_activity.rb +1 -1
  221. data/app/resolvers/decidim/meta_image_url_resolver.rb +7 -0
  222. data/app/serializers/decidim/exporters/participatory_space_serializer.rb +15 -1
  223. data/app/services/decidim/email_notification_generator.rb +2 -0
  224. data/app/services/decidim/notification_generator.rb +4 -0
  225. data/app/services/decidim/notifications_subscriptions_persistor.rb +6 -0
  226. data/app/services/decidim/push_subscription_endpoint_validator.rb +34 -0
  227. data/app/services/decidim/send_push_notification.rb +5 -1
  228. data/app/uploaders/decidim/image_uploader.rb +1 -1
  229. data/app/uploaders/decidim/organization_favicon_uploader.rb +4 -9
  230. data/app/validators/uploader_image_dimensions_validator.rb +13 -11
  231. data/app/views/decidim/delete_user_mailer/delete.html.erb +6 -0
  232. data/app/views/decidim/devise/invitations/edit.html.erb +3 -3
  233. data/app/views/decidim/devise/registrations/new.html.erb +1 -0
  234. data/app/views/decidim/devise/shared/_tos_fields.html.erb +3 -3
  235. data/app/views/decidim/gamification/badges/index.html.erb +1 -1
  236. data/app/views/decidim/homepage/show.html.erb +2 -2
  237. data/app/views/decidim/last_activities/index.html.erb +1 -1
  238. data/app/views/decidim/messaging/conversations/_error_modal.html.erb +11 -19
  239. data/app/views/decidim/messaging/conversations/_new_conversation_button.html.erb +1 -1
  240. data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
  241. data/app/views/decidim/messaging/conversations/error.js.erb +12 -7
  242. data/app/views/decidim/messaging/conversations/new.html.erb +1 -1
  243. data/app/views/decidim/messaging/conversations/show.html.erb +2 -2
  244. data/app/views/decidim/newsletters/unsubscribe.html.erb +1 -1
  245. data/app/views/decidim/notification_mailer/event_received.html.erb +3 -3
  246. data/app/views/decidim/notifications_settings/show.html.erb +5 -5
  247. data/app/views/decidim/offline/show.html.erb +1 -1
  248. data/app/views/decidim/pages/_tabbed.html.erb +3 -3
  249. data/app/views/decidim/pages/index.html.erb +1 -1
  250. data/app/views/decidim/participatory_space/members/_member.html.erb +1 -0
  251. data/app/views/decidim/profiles/show.html.erb +1 -1
  252. data/app/views/decidim/searches/_filters.html.erb +1 -1
  253. data/app/views/decidim/shared/_filters.html.erb +5 -5
  254. data/app/views/decidim/shared/_resource_actions.html.erb +4 -4
  255. data/app/views/decidim/shared/_results_per_page.html.erb +1 -1
  256. data/app/views/decidim/shared/filters/_check_boxes_tree.html.erb +2 -2
  257. data/app/views/decidim/shared/filters/_collection.html.erb +1 -1
  258. data/app/views/decidim/shared/filters/_dropdown_label.html.erb +4 -3
  259. data/app/views/decidim/user_activities/index.html.erb +1 -1
  260. data/app/views/devise/mailer/{invite_private_user.html.erb → invite_member.html.erb} +2 -2
  261. data/app/views/devise/mailer/{invite_private_user.text.erb → invite_member.text.erb} +2 -2
  262. data/app/views/layouts/decidim/_head.html.erb +2 -2
  263. data/app/views/layouts/decidim/_wrapper.html.erb +3 -3
  264. data/app/views/layouts/decidim/footer/_focus_mode_main.html.erb +0 -1
  265. data/app/views/layouts/decidim/footer/_main.html.erb +1 -2
  266. data/app/views/layouts/decidim/footer/_main_links.html.erb +56 -28
  267. data/app/views/layouts/decidim/header/_focus_mode_back_button.html.erb +4 -1
  268. data/app/views/layouts/decidim/header/_main.html.erb +17 -8
  269. data/app/views/layouts/decidim/header/_main_language_chooser.html.erb +24 -0
  270. data/app/views/layouts/decidim/header/_main_links_desktop.html.erb +56 -56
  271. data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +2 -2
  272. data/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb +3 -1
  273. data/app/views/layouts/decidim/header/_main_menu_mobile.html.erb +18 -5
  274. data/app/views/layouts/decidim/header/_main_search.html.erb +3 -3
  275. data/app/views/layouts/decidim/header/_menu.html.erb +5 -5
  276. data/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb +40 -12
  277. data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile.html.erb +33 -0
  278. data/app/views/layouts/decidim/shared/_layout_center.html.erb +1 -1
  279. data/app/views/layouts/decidim/shared/_layout_item.html.erb +1 -1
  280. data/app/views/layouts/decidim/shared/_layout_two_col.html.erb +1 -1
  281. data/config/initializers/decidim_locale_aware_named_route_helper.rb +16 -0
  282. data/config/initializers/devise.rb +6 -0
  283. data/config/initializers/invisible_captcha.rb +1 -0
  284. data/config/locales/ar.yml +6 -38
  285. data/config/locales/bg.yml +3 -39
  286. data/config/locales/ca-IT.yml +91 -58
  287. data/config/locales/ca.yml +91 -58
  288. data/config/locales/cs.yml +54 -58
  289. data/config/locales/de.yml +45 -68
  290. data/config/locales/el.yml +3 -31
  291. data/config/locales/en.yml +88 -55
  292. data/config/locales/es-MX.yml +93 -60
  293. data/config/locales/es-PY.yml +93 -60
  294. data/config/locales/es.yml +95 -62
  295. data/config/locales/eu.yml +124 -92
  296. data/config/locales/fi-plain.yml +93 -55
  297. data/config/locales/fi.yml +96 -58
  298. data/config/locales/fr-CA.yml +70 -52
  299. data/config/locales/fr.yml +71 -54
  300. data/config/locales/ga-IE.yml +3 -1
  301. data/config/locales/gl.yml +3 -31
  302. data/config/locales/hu.yml +7 -40
  303. data/config/locales/id-ID.yml +3 -30
  304. data/config/locales/is-IS.yml +0 -6
  305. data/config/locales/it.yml +15 -33
  306. data/config/locales/ja.yml +105 -71
  307. data/config/locales/lb.yml +3 -33
  308. data/config/locales/lt.yml +4 -37
  309. data/config/locales/lv.yml +3 -30
  310. data/config/locales/nl.yml +3 -33
  311. data/config/locales/no.yml +3 -33
  312. data/config/locales/pl.yml +7 -41
  313. data/config/locales/pt-BR.yml +24 -65
  314. data/config/locales/pt.yml +3 -33
  315. data/config/locales/ro-RO.yml +12 -55
  316. data/config/locales/ru.yml +0 -16
  317. data/config/locales/sk.yml +1417 -32
  318. data/config/locales/sv.yml +44 -62
  319. data/config/locales/tr-TR.yml +20 -37
  320. data/config/locales/uk.yml +0 -9
  321. data/config/locales/zh-CN.yml +3 -30
  322. data/config/locales/zh-TW.yml +4 -35
  323. data/config/routes.rb +140 -76
  324. data/db/data/20251213075429_rename_members_in_action_log.rb +22 -0
  325. data/db/data/20260319145808_rename_send_to_members_in_newsletter.rb +27 -0
  326. data/db/migrate/20200730142511_add_file_upload_settings_to_decidim_organizations.rb +13 -15
  327. data/db/migrate/20250217192438_convert_user_groups_into_users.rb +3 -2
  328. data/db/migrate/20250523104311_move_cta_to_hero_content_block.rb +1 -1
  329. data/db/migrate/20250527122040_move_highlighted_content_banner_settings_to_content_block.rb +1 -1
  330. data/db/migrate/20250819110800_convert_private_exports_id_to_uuid.rb +2 -2
  331. data/db/migrate/20251112132305_remove_legacy_images_from_core_module.rb +27 -0
  332. data/db/migrate/20251205122428_rename_participatory_space_private_users_to_members.rb +9 -0
  333. data/db/migrate/20251216185133_rename_privatable_to_to_participatory_space_in_members.rb +10 -0
  334. data/db/migrate/20260208201405_remove_user_group_core.rb +21 -0
  335. data/db/migrate/20260208201406_remove_user_group_memberships.rb +30 -0
  336. data/db/migrate/20260208201407_remove_user_group_organizations.rb +11 -0
  337. data/db/migrate/20260217152425_remove_enable_participatory_space_filters_from_decidim_organizations.rb +7 -0
  338. data/db/migrate/20260314081619_add_index_on_decidim_members.rb +25 -0
  339. data/decidim-core.gemspec +28 -28
  340. data/lib/decidim/acts_as_tree.rb +12 -12
  341. data/lib/decidim/admin_filters_registry.rb +1 -1
  342. data/lib/decidim/amendable.rb +5 -1
  343. data/lib/decidim/api/functions/category_list.rb +1 -0
  344. data/lib/decidim/api/functions/component_finder_base.rb +1 -1
  345. data/lib/decidim/api/functions/component_list.rb +3 -1
  346. data/lib/decidim/api/functions/component_list_base.rb +1 -0
  347. data/lib/decidim/api/functions/participatory_space_finder_base.rb +1 -1
  348. data/lib/decidim/api/functions/participatory_space_list_base.rb +1 -0
  349. data/lib/decidim/api/functions/user_entity_list.rb +2 -1
  350. data/lib/decidim/api/interfaces/amendable_entity_interface.rb +1 -0
  351. data/lib/decidim/api/interfaces/amendable_interface.rb +1 -0
  352. data/lib/decidim/api/interfaces/attachable_collection_interface.rb +1 -0
  353. data/lib/decidim/api/interfaces/attachable_interface.rb +1 -0
  354. data/lib/decidim/api/interfaces/author_interface.rb +2 -1
  355. data/lib/decidim/api/interfaces/authorable_interface.rb +1 -0
  356. data/lib/decidim/api/interfaces/categories_container_interface.rb +1 -0
  357. data/lib/decidim/api/interfaces/categorizable_interface.rb +1 -0
  358. data/lib/decidim/api/interfaces/coauthorable_interface.rb +1 -0
  359. data/lib/decidim/api/interfaces/component_interface.rb +9 -8
  360. data/lib/decidim/api/interfaces/fingerprint_interface.rb +1 -0
  361. data/lib/decidim/api/interfaces/followable_interface.rb +2 -0
  362. data/lib/decidim/api/interfaces/likeable_interface.rb +2 -2
  363. data/lib/decidim/api/interfaces/localizable_interface.rb +1 -0
  364. data/lib/decidim/api/interfaces/participatory_space_interface.rb +1 -0
  365. data/lib/decidim/api/interfaces/referable_interface.rb +1 -0
  366. data/lib/decidim/api/interfaces/scopable_interface.rb +1 -0
  367. data/lib/decidim/api/interfaces/taxonomizable_interface.rb +1 -0
  368. data/lib/decidim/api/interfaces/timestamps_interface.rb +1 -0
  369. data/lib/decidim/api/interfaces/traceable_interface.rb +1 -0
  370. data/lib/decidim/api/types/attachment_collection_type.rb +5 -3
  371. data/lib/decidim/api/types/attachment_type.rb +11 -4
  372. data/lib/decidim/api/types/badge_score_type.rb +28 -0
  373. data/lib/decidim/api/types/moderation_type.rb +25 -0
  374. data/lib/decidim/api/types/participant_details_type.rb +17 -0
  375. data/lib/decidim/api/types/reportable_type.rb +18 -0
  376. data/lib/decidim/api/types/reportable_user_type.rb +17 -0
  377. data/lib/decidim/api/types/static_page_topic_type.rb +16 -0
  378. data/lib/decidim/api/types/static_page_type.rb +22 -0
  379. data/lib/decidim/api/types/taxonomy_type.rb +2 -0
  380. data/lib/decidim/api/types/user_moderation_type.rb +36 -0
  381. data/lib/decidim/api/types/user_type.rb +13 -0
  382. data/lib/decidim/asset_router/pipeline.rb +1 -1
  383. data/lib/decidim/asset_router/storage.rb +9 -9
  384. data/lib/decidim/assets/tailwind/tailwind.config.js.erb +4 -1
  385. data/lib/decidim/attachment_attributes.rb +58 -9
  386. data/lib/decidim/attribute_encryptor.rb +51 -10
  387. data/lib/decidim/attribute_object/model.rb +0 -5
  388. data/lib/decidim/block_registry.rb +1 -1
  389. data/lib/decidim/coauthorable.rb +2 -1
  390. data/lib/decidim/command.rb +2 -1
  391. data/lib/decidim/content_parsers/blob_parser.rb +3 -3
  392. data/lib/decidim/content_processor.rb +1 -1
  393. data/lib/decidim/content_renderers/base_renderer.rb +112 -0
  394. data/lib/decidim/content_renderers/blob_renderer.rb +6 -9
  395. data/lib/decidim/content_renderers/mention_resource_renderer.rb +10 -6
  396. data/lib/decidim/content_renderers/resource_renderer.rb +16 -7
  397. data/lib/decidim/content_renderers/user_renderer.rb +11 -9
  398. data/lib/decidim/core/api.rb +8 -0
  399. data/lib/decidim/core/content_blocks/registry_manager.rb +4 -10
  400. data/lib/decidim/core/engine.rb +10 -34
  401. data/lib/decidim/core/menu.rb +0 -26
  402. data/lib/decidim/core/test/factories.rb +32 -18
  403. data/lib/decidim/core/test/shared_examples/access_mode_restricted_participatory_spaces.rb +175 -0
  404. data/lib/decidim/core/test/shared_examples/access_mode_transparent_participatory_spaces.rb +244 -0
  405. data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +10 -10
  406. data/lib/decidim/core/test/shared_examples/amendable/amendment_event_examples.rb +2 -2
  407. data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb +3 -3
  408. data/lib/decidim/core/test/shared_examples/comments_examples.rb +147 -117
  409. data/lib/decidim/core/test/shared_examples/fingerprint_examples.rb +2 -0
  410. data/lib/decidim/core/test/shared_examples/has_members.rb +63 -0
  411. data/lib/decidim/core/test/shared_examples/has_space_in_mcell_examples.rb +2 -1
  412. data/lib/decidim/core/test/shared_examples/manage_share_tokens_examples.rb +1 -1
  413. data/lib/decidim/core/test/shared_examples/map_examples.rb +1 -1
  414. data/lib/decidim/core/test/shared_examples/participant_details_examples.rb +16 -0
  415. data/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb +10 -10
  416. data/lib/decidim/core/test/shared_examples/participatory_space_members_shared_examples.rb +121 -0
  417. data/lib/decidim/core/test/shared_examples/resource_liked_event_examples.rb +3 -3
  418. data/lib/decidim/core/test/shared_examples/resource_locator_presenter_examples.rb +7 -7
  419. data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +3 -3
  420. data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +2 -2
  421. data/lib/decidim/core/test/shared_examples/simple_event.rb +1 -0
  422. data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
  423. data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +1 -1
  424. data/lib/decidim/core/test.rb +2 -1
  425. data/lib/decidim/core/version.rb +1 -1
  426. data/lib/decidim/core.rb +222 -335
  427. data/lib/decidim/download_your_data_serializers/{download_your_data_participatory_space_private_user_serializer.rb → download_your_data_member_serializer.rb} +6 -6
  428. data/lib/decidim/download_your_data_serializers.rb +2 -2
  429. data/lib/decidim/engine_router.rb +31 -6
  430. data/lib/decidim/exporters/csv.rb +1 -1
  431. data/lib/decidim/filter_form_builder.rb +1 -1
  432. data/lib/decidim/form_builder.rb +58 -36
  433. data/{app/controllers/concerns → lib}/decidim/form_factory.rb +11 -1
  434. data/lib/decidim/has_settings.rb +2 -2
  435. data/lib/decidim/legacy_form_builder.rb +1 -0
  436. data/lib/decidim/locale_router_detector.rb +41 -0
  437. data/lib/decidim/maintenance/import_models/scope.rb +1 -1
  438. data/lib/decidim/maintenance/import_models.rb +0 -2
  439. data/lib/decidim/maintenance/taxonomy_importer.rb +1 -1
  440. data/lib/decidim/map/autocomplete.rb +4 -3
  441. data/lib/decidim/map/dynamic_map.rb +3 -1
  442. data/lib/decidim/map/frontend.rb +1 -1
  443. data/lib/decidim/map/geocoding.rb +2 -2
  444. data/lib/decidim/map/static_map.rb +10 -22
  445. data/lib/decidim/map/utility.rb +3 -6
  446. data/lib/decidim/map.rb +2 -2
  447. data/lib/decidim/menu.rb +1 -1
  448. data/lib/decidim/menu_item.rb +1 -0
  449. data/lib/decidim/menu_registry.rb +1 -1
  450. data/lib/decidim/moderation_tools.rb +1 -1
  451. data/lib/decidim/newsletter_encryptor.rb +5 -8
  452. data/lib/decidim/organization_settings.rb +2 -2
  453. data/lib/decidim/participable.rb +1 -0
  454. data/lib/decidim/participatory_space/has_members.rb +61 -0
  455. data/lib/decidim/participatory_space_manifest.rb +0 -4
  456. data/lib/decidim/participatory_space_resourceable.rb +10 -1
  457. data/lib/decidim/participatory_space_user.rb +1 -1
  458. data/lib/decidim/routes/locale_redirects.rb +47 -0
  459. data/lib/decidim/routes.rb +7 -0
  460. data/lib/decidim/search_resource_fields_mapper.rb +3 -4
  461. data/lib/decidim/searchable.rb +9 -4
  462. data/lib/decidim/seeds.rb +17 -0
  463. data/lib/decidim/shakapacker/runner.rb +4 -4
  464. data/lib/decidim/shakapacker/shakapacker.yml +28 -3
  465. data/lib/decidim/taxonomizable.rb +1 -1
  466. data/lib/decidim/translatable_attributes.rb +9 -3
  467. data/lib/decidim/view_model.rb +5 -1
  468. data/lib/devise/models/decidim_newsletterable.rb +1 -1
  469. data/lib/tasks/decidim_mailers_tasks.rake +31 -9
  470. data/lib/tasks/decidim_procfile.rake +1 -1
  471. data/lib/tasks/decidim_tasks.rake +0 -1
  472. data/lib/tasks/decidim_taxonomies.rake +1 -1
  473. data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake +0 -1
  474. data/lib/tasks/upgrade/decidim_encryption.rake +12 -0
  475. data/lib/tasks/upgrade/decidim_migrate_wysiwyg_content.rake +0 -1
  476. data/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake +1 -1
  477. data/lib/tasks/upgrade/{fix_deleted_private_follows.rake → fix_deleted_members_follows.rake} +5 -5
  478. data/lib/tasks/upgrade/migrations.rake +0 -1
  479. data/lib/tasks/upgrade/user_groups_migration.rake +0 -1
  480. metadata +244 -132
  481. data/app/cells/decidim/content_blocks/global_menu/show.erb +0 -11
  482. data/app/cells/decidim/content_blocks/global_menu_cell.rb +0 -35
  483. data/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity/show.erb +0 -10
  484. data/app/cells/decidim/content_blocks/menu_breadcrumb_last_activity_cell.rb +0 -49
  485. data/app/cells/decidim/participatory_space_dropdown_metadata/links.erb +0 -9
  486. data/app/cells/decidim/participatory_space_dropdown_metadata/metadata.erb +0 -1
  487. data/app/cells/decidim/participatory_space_dropdown_metadata/show.erb +0 -11
  488. data/app/cells/decidim/participatory_space_dropdown_metadata_cell.rb +0 -26
  489. data/app/commands/decidim/gallery_methods.rb +0 -107
  490. data/app/controllers/concerns/decidim/has_members_page.rb +0 -25
  491. data/app/jobs/decidim/newsletters_opt_in_job.rb +0 -11
  492. data/app/jobs/decidim/user_report_job.rb +0 -11
  493. data/app/models/decidim/participatory_space_private_user.rb +0 -51
  494. data/app/packs/src/decidim/controllers/sticky_header/controller.js +0 -116
  495. data/app/packs/src/decidim/controllers/sticky_header/sticky_header.test.js +0 -320
  496. data/app/packs/src/decidim/dropdown_menu.js +0 -18
  497. data/app/packs/src/decidim/identity_selector_dialog.js +0 -33
  498. data/app/packs/src/decidim/vendor/tribute.js +0 -1890
  499. data/app/packs/stylesheets/decidim/_tribute.scss +0 -36
  500. data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb +0 -38
  501. data/app/presenters/decidim/participatory_space_private_user_presenter.rb +0 -46
  502. data/app/views/decidim/participants_account_mailer/removal_notification.html.erb +0 -11
  503. data/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb +0 -1
  504. data/app/views/layouts/decidim/footer/_main_language_chooser.html.erb +0 -26
  505. data/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb +0 -34
  506. data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_desktop.html.erb +0 -10
  507. data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_mobile.html.erb +0 -17
  508. data/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb +0 -2
  509. data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +0 -33
  510. data/app/views/layouts/decidim/header/_mobile_language_choose.html.erb +0 -25
  511. data/lib/decidim/core/test/shared_examples/has_private_users.rb +0 -63
  512. data/lib/decidim/core/test/shared_examples/participatory_space_dropdown_metadata_cell_examples.rb +0 -81
  513. data/lib/decidim/has_private_users.rb +0 -57
  514. data/lib/decidim/maintenance/import_models/assembly_type.rb +0 -49
  515. data/lib/decidim/maintenance/import_models/participatory_process_type.rb +0 -21
  516. data/lib/decidim/query_extensions.rb +0 -64
@@ -1,5 +1,5 @@
1
1
  import Link from "@tiptap/extension-link";
2
- import { Plugin } from "prosemirror-state";
2
+ import { Plugin, NodeSelection } from "prosemirror-state";
3
3
 
4
4
  import { getDictionary } from "src/decidim/refactor/moved/i18n";
5
5
  import InputDialog from "src/decidim/editor/common/input_dialog";
@@ -33,6 +33,14 @@ export default Link.extend({
33
33
  }
34
34
  },
35
35
 
36
+ renderHTML({ HTMLAttributes }) {
37
+ const attrs = { ...HTMLAttributes };
38
+ if (attrs.target === "") {
39
+ Reflect.deleteProperty(attrs, "target");
40
+ }
41
+ return ["a", attrs, 0];
42
+ },
43
+
36
44
  addCommands() {
37
45
  const i18n = getDictionary("editor.extensions.link");
38
46
 
@@ -40,31 +48,55 @@ export default Link.extend({
40
48
  ...this.parent?.(),
41
49
 
42
50
  toggleLinkBubble: () => ({ dispatch }) => {
51
+ const { selection } = this.editor.state;
52
+ const isImageSelection = selection instanceof NodeSelection && selection.node.type.name === "image";
53
+ const imageHasLink = isImageSelection && Boolean(selection.node.attrs.href);
54
+
43
55
  if (dispatch) {
44
- if (this.editor.isActive("link")) {
45
- this.storage.bubbleMenu.show();
56
+ if (this.editor.isActive("link") || (isImageSelection && imageHasLink)) {
57
+ this.storage.bubbleMenu.handleSelectionChange(this.editor.view);
46
58
  return true;
47
59
  }
48
60
 
49
61
  this.storage.bubbleMenu.hide();
50
62
  return false;
51
63
  }
64
+
65
+ if (isImageSelection) {
66
+ return imageHasLink;
67
+ }
68
+
52
69
  return this.editor.isActive("link");
53
70
  },
54
71
 
55
72
  linkDialog: () => async ({ dispatch, commands }) => {
56
73
  if (dispatch) {
57
- // If the cursor is within the link but the link is not selected, the
58
- // link would not be correctly updated. Also if only a part of the
59
- // link is selected, the link would be split to separate links, only
60
- // the current selection getting the updated link URL.
61
- commands.extendMarkRange("link");
74
+ const { state } = this.editor;
75
+ const { selection } = state;
76
+ const isImageSelection = selection instanceof NodeSelection && selection.node.type.name === "image";
77
+ const nodeType = (() => {
78
+ if (isImageSelection) {
79
+ return "image";
80
+ }
81
+ return "link";
82
+ })();
83
+
84
+ if (!isImageSelection) {
85
+ // If the cursor is within the link but the link is not selected, the
86
+ // link would not be correctly updated. Also if only a part of the
87
+ // link is selected, the link would be split to separate links, only
88
+ // the current selection getting the updated link URL.
89
+ commands.extendMarkRange("link");
90
+ }
62
91
 
63
92
  this.storage.bubbleMenu.hide();
64
93
 
65
94
  const { allowTargetControl } = this.options;
66
95
 
67
- let { href, target } = this.editor.getAttributes("link");
96
+ let href = null;
97
+ let target = null;
98
+
99
+ ({ href, target } = this.editor.getAttributes(nodeType));
68
100
 
69
101
  const inputs = { href: { type: "text", label: i18n.hrefLabel } };
70
102
  if (allowTargetControl) {
@@ -88,16 +120,25 @@ export default Link.extend({
88
120
  target = null;
89
121
  }
90
122
 
123
+ const buildChain = () => this.editor.chain().focus(null, { scrollIntoView: false });
124
+
91
125
  if (dialogState !== "save") {
92
- this.editor.chain().focus(null, { scrollIntoView: false }).toggleLinkBubble().run();
126
+ buildChain().toggleLinkBubble().run();
93
127
  return false;
94
128
  }
95
129
 
96
130
  if (!href || href.trim().length < 1) {
97
- return this.editor.chain().focus(null, { scrollIntoView: false }).unsetLink().run();
131
+ if (isImageSelection) {
132
+ return buildChain().updateAttributes("image", { href: null, target: null }).run();
133
+ }
134
+ return buildChain().unsetLink().run();
135
+ }
136
+
137
+ if (isImageSelection) {
138
+ return buildChain().updateAttributes("image", { href: href, target }).toggleLinkBubble().run();
98
139
  }
99
140
 
100
- return this.editor.chain().focus(null, { scrollIntoView: false }).setLink({ href, target }).toggleLinkBubble().run();
141
+ return buildChain().setLink({ href: href, target }).toggleLinkBubble().run();
101
142
  }
102
143
 
103
144
  return true;
@@ -32,11 +32,10 @@ export default Mention.extend({
32
32
 
33
33
  return {
34
34
  ...parentOptions,
35
- renderLabel({ node }) {
36
- // The labels are formed based on the nicknames returned by the API
37
- // which already contain the suggestion character, so there is no need
38
- // to display it twice.
39
- return `${node.attrs.label ?? node.attrs.id}`
35
+ renderText({ node }) {
36
+ // renderText is used to create the DOM representation
37
+ const label = node.attrs.label ?? node.attrs.id;
38
+ return label;
40
39
  },
41
40
  suggestion: {
42
41
  ...parentOptions?.suggestion,
@@ -59,6 +58,20 @@ export default Mention.extend({
59
58
  };
60
59
  },
61
60
 
61
+ renderHTML({ node }) {
62
+ // renderHTML is used for visual rendering getHTML()
63
+ const label = node.attrs.label ?? node.attrs.id;
64
+ return [
65
+ "span",
66
+ {
67
+ "data-type": "mention",
68
+ "data-id": node.attrs.id,
69
+ "data-label": node.attrs.label
70
+ },
71
+ label
72
+ ];
73
+ },
74
+
62
75
  addNodeView() {
63
76
  return createNodeView(this);
64
77
  }
@@ -27,18 +27,14 @@ const searchResources = async (queryText) => {
27
27
 
28
28
  export default Mention.extend({
29
29
  name: "mentionResource",
30
-
31
30
  addOptions() {
32
31
  const options = this.parent?.();
33
32
  const suggestion = options?.suggestion;
34
-
35
33
  return {
36
34
  ...options,
37
- renderLabel({ node }) {
38
- // The labels are formed based on the titles returned by the API
39
- // which already contain the suggestion character, so there is no need
40
- // to display it twice.
41
- return `${node.attrs.label ?? node.attrs.id}`
35
+ renderText({ node }) {
36
+ // renderText is used to create the DOM representation
37
+ return node.attrs.label ?? node.attrs.id;
42
38
  },
43
39
  suggestion: {
44
40
  ...suggestion,
@@ -63,6 +59,19 @@ export default Mention.extend({
63
59
  };
64
60
  },
65
61
 
62
+ renderHTML({ node }) {
63
+ // renderHTML is used for visual rendering getHTML()
64
+ return [
65
+ "span",
66
+ {
67
+ "data-type": "mentionResource",
68
+ "data-id": node.attrs.id,
69
+ "data-label": node.attrs.label
70
+ },
71
+ node.attrs.label ?? node.attrs.id
72
+ ];
73
+ },
74
+
66
75
  addNodeView() {
67
76
  return createNodeView(this);
68
77
  }
@@ -32,15 +32,24 @@ describe("DecidimKit", () => {
32
32
  "code",
33
33
  "doc",
34
34
  "dropCursor",
35
- "gapCursor",
36
35
  "hardBreak",
37
- "history",
36
+ "paragraph",
37
+ "link",
38
+ "decidimKit",
39
+ "starterKit",
38
40
  "horizontalRule",
39
41
  "italic",
40
42
  "listItem",
41
- "paragraph",
42
43
  "strike",
43
- "text"
44
+ "text",
45
+ "characterCount",
46
+ "bold",
47
+ "dialog",
48
+ "indent",
49
+ "orderedList",
50
+ "codeBlock",
51
+ "underline",
52
+ "heading"
44
53
  ].forEach((name) => expect(extensions).toContain(name));
45
54
  });
46
55
 
@@ -51,6 +51,6 @@ describe("Heading", () => {
51
51
  editorElement.focus();
52
52
  await updateContent(editorElement, "# ");
53
53
 
54
- expect(editor.getHTML()).toMatchHtml("<h2></h2>");
54
+ expect(editor.getHTML()).toMatchHtml("<p># </p>");
55
55
  });
56
56
  });
@@ -28,24 +28,7 @@ describe("Image", () => {
28
28
  let uploadFilePath = "/path/to/image.jpg";
29
29
  let uploadDialogElement = null;
30
30
  let editorInnerHTML = (dim, src, alt) => {
31
- return `
32
- <div data-image-resizer="" class="ProseMirror-selectednode" draggable="true">
33
- <div data-image-resizer-wrapper="">
34
- <button type="button" data-image-resizer-control="top-left"></button>
35
- <button type="button" data-image-resizer-control="top-right"></button>
36
- <button type="button" data-image-resizer-control="bottom-left"></button>
37
- <button type="button" data-image-resizer-control="bottom-right"></button>
38
- <div data-image-resizer-dimensions="">
39
- <span data-image-resizer-dimension="width" data-image-resizer-dimension-value="${dim}"></span>
40
- ×
41
- <span data-image-resizer-dimension="height" data-image-resizer-dimension-value="${dim}"></span>
42
- </div>
43
- <div class="editor-content-image" data-image="">
44
- <img src="${src}" alt="${alt}">
45
- </div>
46
- </div>
47
- </div>
48
- `
31
+ return `<div data-image-resizer="" class="ProseMirror-selectednode" draggable="true"><div data-image-resizer-wrapper=""><button type="button" data-image-resizer-control="top-left"></button><button type="button" data-image-resizer-control="top-right"></button><button type="button" data-image-resizer-control="bottom-left"></button><button type="button" data-image-resizer-control="bottom-right"></button><div data-image-resizer-dimensions=""><span data-image-resizer-dimension="width" data-image-resizer-dimension-value="${dim}"></span>×<span data-image-resizer-dimension="height" data-image-resizer-dimension-value="${dim}"></span></div><div class="editor-content-image" data-image=""><img src="${src}" alt="${alt}"></div></div></div>`;
49
32
  }
50
33
 
51
34
  const updateFile = async (path, alt) => {
@@ -63,6 +46,10 @@ describe("Image", () => {
63
46
  await sleep(0);
64
47
  }
65
48
 
49
+ const normalizeHTML = (html) => {
50
+ return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "").replace(/<p><\/p>/g, "");
51
+ };
52
+
66
53
  beforeEach(() => {
67
54
  document.body.innerHTML = "";
68
55
 
@@ -109,7 +96,8 @@ describe("Image", () => {
109
96
  it("editing setting the image through the dialog", async () => {
110
97
  editorElement.focus();
111
98
  await updateContent(editorElement,
112
- '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
99
+ '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>',
100
+ editor
113
101
  );
114
102
 
115
103
  editor.commands.imageDialog();
@@ -117,7 +105,7 @@ describe("Image", () => {
117
105
  await updateFile("/path/to/image_updated.jpg", "Updated text")
118
106
  expect(editorElement.classList.contains("dialog-open")).toBe(false);
119
107
 
120
- expect(editorElement.innerHTML).toMatchHtml(editorInnerHTML("null", "/path/to/image_updated.jpg", "Updated text"));
108
+ expect(normalizeHTML(editorElement.innerHTML)).toMatchHtml(editorInnerHTML("null", "/path/to/image_updated.jpg", "Updated text"));
121
109
  expect(editor.getHTML()).toMatchHtml(`
122
110
  <div class="editor-content-image" data-image=""><img src="/path/to/image_updated.jpg" alt="Updated text"></div>
123
111
  `);
@@ -126,16 +114,26 @@ describe("Image", () => {
126
114
  it("allows double clicking the image", async () => {
127
115
  editorElement.focus();
128
116
  await updateContent(editorElement,
129
- '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
117
+ '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>',
118
+ editor
130
119
  );
131
120
 
132
121
  jest.spyOn(uploadDialogElement.dialog, "open");
133
122
 
134
123
  // Position calculations do not work with JSDom / Jest
135
- editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 1, inside: -1 });
136
- editorElement.dispatchEvent(new MouseEvent("mousedown", { button: 0, clientX: 10, clientY: 10 }));
137
- editorElement.dispatchEvent(new MouseEvent("mousedown", { button: 0, clientX: 10, clientY: 10 }));
138
- await updateFile("/path/to/image_updated.jpg", "Updated text")
124
+ editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 0, inside: 0 });
125
+
126
+ const mockEvent = new MouseEvent("dblclick", {
127
+ button: 0,
128
+ clientX: 10,
129
+ clientY: 10
130
+ });
131
+
132
+ editor.view.someProp("handleDoubleClick", (click) => click(editor.view, 0, mockEvent));
133
+
134
+ await sleep(0);
135
+
136
+ await updateFile("/path/to/image_updated.jpg", "Updated text");
139
137
 
140
138
  expect(uploadDialogElement.dialog.open).toHaveBeenCalled();
141
139
  expect(editor.getHTML()).toMatchHtml(`
@@ -283,9 +281,9 @@ describe("Image", () => {
283
281
  });
284
282
 
285
283
  editorElement.focus();
286
- await updateContent(editorElement,
287
- '<div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test text"></div>'
288
- );
284
+
285
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test text" });
286
+ await sleep(0);
289
287
  });
290
288
  describe("with mouse", () => behavesLikeImageResizer("mouse"));
291
289
 
@@ -0,0 +1,161 @@
1
+ /* global jest, global */
2
+
3
+ import { createBasicEditor, updateContent, sleep } from "src/decidim/editor/test/helpers";
4
+
5
+ import Dialog from "src/decidim/editor/extensions/dialog";
6
+ import Image from "src/decidim/editor/extensions/image";
7
+ import uploadTemplates from "src/decidim/editor/test/fixtures/upload_templates";
8
+
9
+ class DummyDialog {
10
+ constructor(element) { this.element = element; }
11
+
12
+ open() { this.element.dataset.dialogOpen = true; }
13
+
14
+ close() { this.element.dataset.dialogOpen = null; }
15
+ }
16
+
17
+ // Not implemented in Jest
18
+ global.Touch = class Touch {
19
+ constructor(options) {
20
+ this.pageX = options.pageX;
21
+ this.pageY = options.pageY;
22
+ }
23
+ }
24
+
25
+ describe("Image (links)", () => {
26
+ let editor = null;
27
+ let editorElement = null;
28
+ let uploadDialogElement = null;
29
+
30
+ beforeEach(() => {
31
+ document.body.innerHTML = "";
32
+
33
+ const dialogWrapper = document.createElement("div");
34
+ dialogWrapper.innerHTML = uploadTemplates.redesign;
35
+ uploadDialogElement = dialogWrapper.firstElementChild;
36
+ uploadDialogElement.dataset.dialog = "testDialog";
37
+ uploadDialogElement.dialog = new DummyDialog(uploadDialogElement);
38
+ window.Decidim.currentDialogs = { testDialog: uploadDialogElement.dialog };
39
+ document.body.append(uploadDialogElement);
40
+
41
+ editor = createBasicEditor({
42
+ extensions: [Dialog, Image.configure({ uploadDialogSelector: "#upload_dialog", uploadImagesPath: "/editor_images", contentTypes: ["image/png"] })]
43
+ });
44
+ editorElement = editor.view.dom;
45
+
46
+ const csrf = document.createElement("meta");
47
+ csrf.setAttribute("name", "csrf-token");
48
+ csrf.setAttribute("content", "abcdef0123456789");
49
+ document.head.append(csrf);
50
+
51
+ global.fetch = jest.fn(() => Promise.resolve({ ok: true, json: () => Promise.resolve({ url: "/path/to/image.jpg" }) }));
52
+ });
53
+
54
+ afterEach(() => {
55
+ jest.restoreAllMocks();
56
+ });
57
+
58
+ it("allows setting an image with href and target attributes", async () => {
59
+ editorElement.focus();
60
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
61
+ await sleep(0);
62
+
63
+ expect(editor.getHTML()).toMatchHtml(`
64
+ <a href="https://example.com" target="_blank" rel="noopener noreferrer">
65
+ <div class="editor-content-image" data-image="">
66
+ <img src="/path/to/image.jpg" alt="Test image">
67
+ </div>
68
+ </a>
69
+ `);
70
+ });
71
+
72
+ it("allows setting an image with href but no target", async () => {
73
+ editorElement.focus();
74
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com" });
75
+ await sleep(0);
76
+
77
+ expect(editor.getHTML()).toMatchHtml(`
78
+ <a href="https://example.com">
79
+ <div class="editor-content-image" data-image="">
80
+ <img src="/path/to/image.jpg" alt="Test image">
81
+ </div>
82
+ </a>
83
+ `);
84
+ });
85
+
86
+ it("parses existing HTML with linked images", async () => {
87
+ editorElement.focus();
88
+ await updateContent(editorElement,
89
+ '<a href="https://example.com" target="_blank"><div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test image"></div></a>',
90
+ editor
91
+ );
92
+
93
+ expect(editor.getHTML()).toMatchHtml(`
94
+ <a href="https://example.com" target="_blank" rel="noopener noreferrer">
95
+ <div class="editor-content-image" data-image="">
96
+ <img src="/path/to/image.jpg" alt="Test image">
97
+ </div>
98
+ </a>
99
+ `);
100
+ });
101
+
102
+ it("parses existing HTML with linked images without target", async () => {
103
+ editorElement.focus();
104
+ await updateContent(editorElement,
105
+ '<a href="https://example.com"><div class="editor-content-image" data-image=""><img src="/path/to/image.jpg" alt="Test image"></div></a>',
106
+ editor
107
+ );
108
+
109
+ expect(editor.getHTML()).toMatchHtml(`
110
+ <a href="https://example.com">
111
+ <div class="editor-content-image" data-image="">
112
+ <img src="/path/to/image.jpg" alt="Test image">
113
+ </div>
114
+ </a>
115
+ `);
116
+ });
117
+
118
+ it("allows updating image link attributes", async () => {
119
+ editorElement.focus();
120
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
121
+ await sleep(0);
122
+
123
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://docs.example.com" });
124
+ await sleep(0);
125
+
126
+ expect(editor.getHTML()).toMatchHtml(`
127
+ <a href="https://docs.example.com">
128
+ <div class="editor-content-image" data-image="">
129
+ <img src="/path/to/image.jpg" alt="Test image">
130
+ </div>
131
+ </a>
132
+ `);
133
+ });
134
+
135
+ it("allows removing link from image", async () => {
136
+ editorElement.focus();
137
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: "https://example.com", target: "_blank" });
138
+ await sleep(0);
139
+
140
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image", href: null, target: null });
141
+ await sleep(0);
142
+
143
+ expect(editor.getHTML()).toMatchHtml(`
144
+ <div class="editor-content-image" data-image="">
145
+ <img src="/path/to/image.jpg" alt="Test image">
146
+ </div>
147
+ `);
148
+ });
149
+
150
+ it("renders images without links correctly", async () => {
151
+ editorElement.focus();
152
+ editor.commands.setImage({ src: "/path/to/image.jpg", alt: "Test image" });
153
+ await sleep(0);
154
+
155
+ expect(editor.getHTML()).toMatchHtml(`
156
+ <div class="editor-content-image" data-image="">
157
+ <img src="/path/to/image.jpg" alt="Test image">
158
+ </div>
159
+ `);
160
+ });
161
+ });
@@ -64,6 +64,10 @@ describe("Mention", () => {
64
64
  let editor = null;
65
65
  let editorElement = null;
66
66
 
67
+ const normalizeHTML = (html) => {
68
+ return html.replace(/\s*data-mention-suggestion-char="[^"]*"/g, "");
69
+ };
70
+
67
71
  beforeEach(() => {
68
72
  document.body.innerHTML = "";
69
73
 
@@ -108,7 +112,7 @@ describe("Mention", () => {
108
112
  expect(editorElement.innerHTML).toEqual(
109
113
  '<p><span data-suggestion="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
110
114
  );
111
- expect(editor.getHTML()).toEqual(
115
+ expect(normalizeHTML(editor.getHTML())).toEqual(
112
116
  '<p><span data-type="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
113
117
  );
114
118
  });
@@ -122,7 +126,7 @@ describe("Mention", () => {
122
126
  expect(editorElement.innerHTML).toEqual(
123
127
  '<p><span data-suggestion="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
124
128
  );
125
- expect(editor.getHTML()).toEqual(
129
+ expect(normalizeHTML(editor.getHTML())).toEqual(
126
130
  '<p><span data-type="mention" data-id="@johndoe" data-label="@johndoe (John Doe)">@johndoe (John Doe)</span> </p>'
127
131
  );
128
132
  });
@@ -9,6 +9,10 @@ describe("VideoEmbed", () => {
9
9
  let editor = null;
10
10
  let editorElement = null;
11
11
 
12
+ const normalizeHTML = (html) => {
13
+ return html.replace(/<p><br class="ProseMirror-trailingBreak"><\/p>/g, "").replace(/<p><\/p>/g, "");
14
+ };
15
+
12
16
  beforeEach(() => {
13
17
  document.body.innerHTML = "";
14
18
 
@@ -35,7 +39,7 @@ describe("VideoEmbed", () => {
35
39
  </div>
36
40
  </div>
37
41
  `);
38
- expect(editor.getHTML()).toMatchHtml(`
42
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
39
43
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
40
44
  <div>
41
45
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
@@ -52,21 +56,21 @@ describe("VideoEmbed", () => {
52
56
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
53
57
  </div>
54
58
  </div>
55
- `);
59
+ `, editor);
56
60
 
57
61
  editor.commands.setVideo({
58
62
  src: "https://www.youtube.com/watch?v=zhMMW0TENNA",
59
63
  title: "Free Open-Source"
60
64
  });
61
65
 
62
- expect(editorElement.innerHTML).toMatchHtml(`
66
+ expect(normalizeHTML(editorElement.innerHTML)).toMatchHtml(`
63
67
  <div class="editor-content-videoEmbed ProseMirror-selectednode" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA" draggable="true">
64
68
  <div>
65
69
  <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
66
70
  </div>
67
71
  </div>
68
72
  `);
69
- expect(editor.getHTML()).toMatchHtml(`
73
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
70
74
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
71
75
  <div>
72
76
  <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
@@ -83,7 +87,7 @@ describe("VideoEmbed", () => {
83
87
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
84
88
  </div>
85
89
  </div>
86
- `);
90
+ `, editor);
87
91
 
88
92
  editor.commands.videoEmbedDialog();
89
93
  expect(editorElement.classList.contains("dialog-open")).toBe(true);
@@ -94,7 +98,7 @@ describe("VideoEmbed", () => {
94
98
  dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
95
99
  await sleep(50);
96
100
 
97
- expect(editor.getHTML()).toMatchHtml(`
101
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
98
102
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
99
103
  <div>
100
104
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
@@ -113,7 +117,7 @@ describe("VideoEmbed", () => {
113
117
  dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
114
118
  await sleep(50);
115
119
 
116
- expect(editor.getHTML()).toMatchHtml(`
120
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
117
121
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
118
122
  <div>
119
123
  <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Free Open-Source" frameborder="0" allowfullscreen="true"></iframe>
@@ -125,7 +129,7 @@ describe("VideoEmbed", () => {
125
129
  it("allows pasting a YouTube video", async () => {
126
130
  await pasteContent(editorElement, "https://www.youtube.com/watch?v=f6JMgJAQ2tc");
127
131
 
128
- expect(editor.getHTML()).toMatchHtml(`
132
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
129
133
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=f6JMgJAQ2tc">
130
134
  <div>
131
135
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="" frameborder="0" allowfullscreen="true"></iframe>
@@ -137,7 +141,7 @@ describe("VideoEmbed", () => {
137
141
  it("allows pasting a Vimeo video", async () => {
138
142
  await pasteContent(editorElement, "https://vimeo.com/312909656");
139
143
 
140
- expect(editor.getHTML()).toMatchHtml(`
144
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
141
145
  <div class="editor-content-videoEmbed" data-video-embed="https://vimeo.com/312909656">
142
146
  <div>
143
147
  <iframe src="https://player.vimeo.com/video/312909656" title="" frameborder="0" allowfullscreen="true"></iframe>
@@ -154,13 +158,21 @@ describe("VideoEmbed", () => {
154
158
  <iframe src="https://www.youtube-nocookie.com/embed/f6JMgJAQ2tc?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>
155
159
  </div>
156
160
  </div>
157
- `);
161
+ `, editor);
162
+
163
+ // Position calculations do not work with JSDom / Jest.
164
+ editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 0, inside: 0 });
165
+
166
+ // Manually trigger the handleDoubleClick handler directly.
167
+ const mockEvent = new MouseEvent("dblclick", {
168
+ bubbles: true,
169
+ cancelable: true,
170
+ clientX: 10,
171
+ clientY: 10
172
+ });
158
173
 
159
- // Position calculations do not work with JSDom / Jest
160
- editor.view.posAtCoords = jest.fn().mockReturnValue({ pos: 1, inside: -1 });
174
+ editor.view.someProp("handleDoubleClick", (click) => click(editor.view, 0, mockEvent));
161
175
 
162
- editorElement.dispatchEvent(new MouseEvent("mousedown", { clientX: 10, clientY: 10 }));
163
- editorElement.dispatchEvent(new MouseEvent("mousedown", { clientX: 10, clientY: 10 }));
164
176
  await sleep(0);
165
177
 
166
178
  expect(editorElement.classList.contains("dialog-open")).toBe(true);
@@ -172,7 +184,7 @@ describe("VideoEmbed", () => {
172
184
  dialog.querySelector("[data-dialog-actions] button[data-action='save']").click();
173
185
  await sleep(50);
174
186
 
175
- expect(editor.getHTML()).toMatchHtml(`
187
+ expect(normalizeHTML(editor.getHTML())).toMatchHtml(`
176
188
  <div class="editor-content-videoEmbed" data-video-embed="https://www.youtube.com/watch?v=zhMMW0TENNA">
177
189
  <div>
178
190
  <iframe src="https://www.youtube-nocookie.com/embed/zhMMW0TENNA?cc_load_policy=1&amp;modestbranding=1" title="Decidim" frameborder="0" allowfullscreen="true"></iframe>