decidim-core 0.26.4 → 0.27.0.rc1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of decidim-core might be problematic. Click here for more details.

Files changed (569) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/cells/decidim/amendable/announcement_cell.rb +4 -9
  4. data/app/cells/decidim/announcement_cell.rb +1 -1
  5. data/app/cells/decidim/author_cell.rb +1 -1
  6. data/app/cells/decidim/card_m_cell.rb +1 -1
  7. data/app/cells/decidim/content_blocks/cta/show.erb +1 -1
  8. data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
  9. data/app/cells/decidim/content_blocks/hero/show.erb +1 -1
  10. data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb +4 -4
  11. data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +1 -1
  12. data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
  13. data/app/cells/decidim/content_blocks/last_activity/show.erb +1 -1
  14. data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -3
  15. data/app/cells/decidim/content_blocks/stats_cell.rb +4 -5
  16. data/app/cells/decidim/content_blocks/sub_hero/show.erb +1 -1
  17. data/app/cells/decidim/data_consent/category.erb +64 -0
  18. data/app/cells/decidim/data_consent/dialog.erb +29 -0
  19. data/app/cells/decidim/data_consent/modal.erb +39 -0
  20. data/app/cells/decidim/data_consent/show.erb +3 -0
  21. data/app/cells/decidim/data_consent_cell.rb +21 -0
  22. data/app/cells/decidim/follow_button_cell.rb +5 -7
  23. data/app/cells/decidim/profile_sidebar_cell.rb +1 -1
  24. data/app/cells/decidim/search_results_cell.rb +1 -1
  25. data/app/cells/decidim/tos_page/refuse_btn_modal.erb +1 -1
  26. data/app/cells/decidim/upload_modal/files.erb +52 -0
  27. data/app/cells/decidim/upload_modal/modal.erb +49 -0
  28. data/app/cells/decidim/upload_modal/show.erb +3 -0
  29. data/app/cells/decidim/upload_modal_cell.rb +205 -0
  30. data/app/cells/decidim/user_conversation/reply.erb +1 -1
  31. data/app/cells/decidim/user_conversations/add_conversation_users.erb +5 -3
  32. data/app/cells/decidim/version_cell.rb +2 -13
  33. data/app/cells/decidim/versions_list_cell.rb +2 -13
  34. data/app/cells/decidim/versions_list_item_cell.rb +2 -13
  35. data/app/commands/decidim/accept_group_invitation.rb +1 -1
  36. data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
  37. data/app/commands/decidim/amendable/accept.rb +1 -1
  38. data/app/commands/decidim/amendable/create_draft.rb +1 -1
  39. data/app/commands/decidim/amendable/destroy_draft.rb +1 -1
  40. data/app/commands/decidim/amendable/promote.rb +1 -1
  41. data/app/commands/decidim/amendable/publish_draft.rb +1 -1
  42. data/app/commands/decidim/amendable/reject.rb +1 -1
  43. data/app/commands/decidim/amendable/update_draft.rb +1 -1
  44. data/app/commands/decidim/amendable/withdraw.rb +1 -1
  45. data/app/commands/decidim/attachment_methods.rb +3 -2
  46. data/app/commands/decidim/create_editor_image.rb +1 -1
  47. data/app/commands/decidim/create_follow.rb +1 -1
  48. data/app/commands/decidim/create_omniauth_registration.rb +2 -3
  49. data/app/commands/decidim/create_registration.rb +1 -2
  50. data/app/commands/decidim/create_report.rb +1 -1
  51. data/app/commands/decidim/create_user_group.rb +2 -2
  52. data/app/commands/decidim/create_user_report.rb +5 -3
  53. data/app/commands/decidim/delete_follow.rb +1 -1
  54. data/app/commands/decidim/demote_membership.rb +1 -1
  55. data/app/commands/decidim/destroy_account.rb +1 -1
  56. data/app/commands/decidim/endorse_resource.rb +1 -1
  57. data/app/commands/decidim/gallery_methods.rb +45 -10
  58. data/app/commands/decidim/invite_user.rb +1 -3
  59. data/app/commands/decidim/invite_user_again.rb +1 -1
  60. data/app/commands/decidim/invite_user_to_group.rb +1 -1
  61. data/app/commands/decidim/join_user_group.rb +1 -1
  62. data/app/commands/decidim/leave_user_group.rb +8 -2
  63. data/app/commands/decidim/messaging/reply_to_conversation.rb +2 -2
  64. data/app/commands/decidim/messaging/start_conversation.rb +2 -2
  65. data/app/commands/decidim/multiple_attachments_methods.rb +44 -5
  66. data/app/commands/decidim/promote_membership.rb +1 -1
  67. data/app/commands/decidim/reject_group_invitation.rb +1 -1
  68. data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
  69. data/app/commands/decidim/remove_user_from_group.rb +1 -1
  70. data/app/commands/decidim/resend_confirmation_instructions.rb +18 -0
  71. data/app/commands/decidim/search.rb +10 -9
  72. data/app/commands/decidim/unendorse_resource.rb +1 -1
  73. data/app/commands/decidim/unsubscribe_settings.rb +1 -1
  74. data/app/commands/decidim/update_account.rb +2 -2
  75. data/app/commands/decidim/update_notifications_settings.rb +3 -2
  76. data/app/commands/decidim/update_password.rb +31 -0
  77. data/app/commands/decidim/update_user_group.rb +2 -2
  78. data/app/commands/decidim/update_user_interests.rb +1 -1
  79. data/app/commands/decidim/validate_upload.rb +15 -0
  80. data/app/controllers/concerns/decidim/devise_controllers.rb +0 -1
  81. data/app/controllers/concerns/decidim/filter_resource.rb +23 -24
  82. data/app/controllers/concerns/decidim/force_authentication.rb +1 -2
  83. data/app/controllers/concerns/decidim/http_caching_disabler.rb +1 -1
  84. data/app/controllers/concerns/decidim/needs_password_change.rb +43 -0
  85. data/app/controllers/concerns/decidim/needs_tos_accepted.rb +3 -3
  86. data/app/controllers/concerns/decidim/orderable.rb +1 -1
  87. data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -2
  88. data/app/controllers/concerns/decidim/resource_versions_concern.rb +0 -4
  89. data/app/controllers/decidim/account_controller.rb +45 -0
  90. data/app/controllers/decidim/application_controller.rb +1 -1
  91. data/app/controllers/decidim/devise/invitations_controller.rb +4 -9
  92. data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
  93. data/app/controllers/decidim/devise/registrations_controller.rb +3 -5
  94. data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
  95. data/app/controllers/decidim/{data_portability_controller.rb → download_your_data_controller.rb} +8 -8
  96. data/app/controllers/decidim/groups_controller.rb +5 -0
  97. data/app/controllers/decidim/last_activities_controller.rb +7 -9
  98. data/app/controllers/decidim/manifests_controller.rb +11 -0
  99. data/app/controllers/decidim/newsletters_controller.rb +1 -1
  100. data/app/controllers/decidim/notifications_subscriptions_controller.rb +16 -0
  101. data/app/controllers/decidim/offline_controller.rb +7 -0
  102. data/app/controllers/decidim/profiles_controller.rb +1 -1
  103. data/app/controllers/decidim/searches_controller.rb +4 -3
  104. data/app/controllers/decidim/short_links_controller.rb +35 -0
  105. data/app/controllers/decidim/upload_validations_controller.rb +44 -0
  106. data/app/controllers/decidim/user_activities_controller.rb +32 -16
  107. data/app/controllers/decidim/user_interests_controller.rb +0 -2
  108. data/app/controllers/decidim/user_timeline_controller.rb +6 -8
  109. data/app/events/decidim/change_nickname_event.rb +21 -0
  110. data/app/events/decidim/resource_endorsed_event.rb +1 -2
  111. data/app/forms/decidim/account_form.rb +3 -3
  112. data/app/forms/decidim/amendable/form.rb +1 -2
  113. data/app/forms/decidim/form.rb +1 -1
  114. data/app/forms/decidim/messaging/conversation_form.rb +1 -1
  115. data/app/forms/decidim/notifications_settings_form.rb +8 -2
  116. data/app/forms/decidim/password_form.rb +10 -0
  117. data/app/forms/decidim/registration_form.rb +2 -2
  118. data/app/forms/decidim/upload_validation_form.rb +54 -0
  119. data/app/forms/decidim/user_group_form.rb +1 -1
  120. data/app/forms/decidim/user_interest_scope_form.rb +1 -1
  121. data/app/forms/decidim/user_interests_form.rb +1 -1
  122. data/app/forms/translatable_presence_validator.rb +2 -2
  123. data/app/forms/url_validator.rb +1 -1
  124. data/app/helpers/decidim/application_helper.rb +2 -2
  125. data/app/helpers/decidim/attachments_helper.rb +1 -1
  126. data/app/helpers/decidim/cells_paginate_helper.rb +1 -1
  127. data/app/helpers/decidim/datalist_select_helper.rb +40 -0
  128. data/app/helpers/decidim/decidim_form_helper.rb +1 -1
  129. data/app/helpers/decidim/filters_helper.rb +1 -5
  130. data/app/helpers/decidim/followable_helper.rb +1 -1
  131. data/app/helpers/decidim/icon_helper.rb +1 -1
  132. data/app/helpers/decidim/layout_helper.rb +15 -1
  133. data/app/helpers/decidim/map_helper.rb +12 -8
  134. data/app/helpers/decidim/meta_tags_helper.rb +0 -2
  135. data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
  136. data/app/helpers/decidim/passwords_helper.rb +41 -0
  137. data/app/helpers/decidim/sanitize_helper.rb +1 -0
  138. data/app/helpers/decidim/searches_helper.rb +6 -6
  139. data/app/helpers/decidim/short_link_helper.rb +28 -0
  140. data/app/helpers/decidim/translations_helper.rb +2 -2
  141. data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} +5 -5
  142. data/app/jobs/decidim/email_notifications_digest_generator_job.rb +21 -0
  143. data/app/jobs/decidim/notification_generator_for_recipient_job.rb +5 -3
  144. data/app/jobs/decidim/reminder_generator_job.rb +12 -0
  145. data/app/jobs/decidim/resend_confirmation_instructions_job.rb +11 -0
  146. data/app/jobs/decidim/user_report_job.rb +2 -2
  147. data/app/mailers/concerns/decidim/multitenant_asset_host.rb +11 -3
  148. data/app/mailers/decidim/application_mailer.rb +1 -1
  149. data/app/mailers/decidim/block_user_mailer.rb +8 -7
  150. data/app/mailers/decidim/export_mailer.rb +2 -2
  151. data/app/mailers/decidim/newsletter_mailer.rb +2 -2
  152. data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
  153. data/app/mailers/decidim/notification_mailer.rb +0 -1
  154. data/app/mailers/decidim/notifications_digest_mailer.rb +23 -0
  155. data/app/mailers/decidim/user_report_mailer.rb +10 -11
  156. data/app/models/decidim/action_log.rb +95 -11
  157. data/app/models/decidim/amendment.rb +0 -1
  158. data/app/models/decidim/area.rb +1 -2
  159. data/app/models/decidim/area_type.rb +5 -0
  160. data/app/models/decidim/attachment.rb +6 -0
  161. data/app/models/decidim/attachment_collection.rb +5 -0
  162. data/app/models/decidim/category.rb +9 -4
  163. data/app/models/decidim/coauthorship.rb +0 -2
  164. data/app/models/decidim/contextual_help_section.rb +5 -1
  165. data/app/models/decidim/follow.rb +2 -2
  166. data/app/models/decidim/gamification/badge_score.rb +0 -1
  167. data/app/models/decidim/identity.rb +2 -2
  168. data/app/models/decidim/messaging/conversation.rb +4 -4
  169. data/app/models/decidim/messaging/message.rb +1 -2
  170. data/app/models/decidim/messaging/participation.rb +0 -2
  171. data/app/models/decidim/messaging/receipt.rb +0 -2
  172. data/app/models/decidim/notification.rb +5 -2
  173. data/app/models/decidim/oauth_application.rb +12 -1
  174. data/app/models/decidim/organization.rb +7 -7
  175. data/app/models/decidim/participatory_space_private_user.rb +4 -2
  176. data/app/models/decidim/permission_action.rb +1 -0
  177. data/app/models/decidim/reminder.rb +10 -0
  178. data/app/models/decidim/reminder_delivery.rb +7 -0
  179. data/app/models/decidim/reminder_record.rb +29 -0
  180. data/app/models/decidim/report.rb +2 -2
  181. data/app/models/decidim/scope.rb +3 -4
  182. data/app/models/decidim/scope_type.rb +5 -0
  183. data/app/models/decidim/share_token.rb +0 -2
  184. data/app/models/decidim/short_link.rb +162 -0
  185. data/app/models/decidim/user.rb +34 -6
  186. data/app/models/decidim/user_base_entity.rb +1 -2
  187. data/app/models/decidim/user_group.rb +3 -3
  188. data/app/models/decidim/user_moderation.rb +0 -2
  189. data/app/models/decidim/user_report.rb +2 -2
  190. data/app/packs/entrypoints/decidim_core.js +2 -2
  191. data/app/packs/entrypoints/decidim_sw.js +1 -0
  192. data/app/packs/images/decidim/gamification/badges/decidim_gamification_badges_invitations.svg +1 -0
  193. data/app/packs/src/decidim/autocomplete.js +298 -0
  194. data/app/packs/src/decidim/cookie_consent/consent_manager.js +133 -0
  195. data/app/packs/src/decidim/cookie_consent/cookie_consent.js +103 -0
  196. data/app/packs/src/decidim/datalist_select.js +36 -0
  197. data/app/packs/src/decidim/direct_uploads/upload_field.js +117 -0
  198. data/app/packs/src/decidim/direct_uploads/upload_modal.js +264 -0
  199. data/app/packs/src/decidim/direct_uploads/upload_utility.js +49 -0
  200. data/app/packs/src/decidim/direct_uploads/uploader.js +89 -0
  201. data/app/packs/src/decidim/editor/linebreak_module.js +8 -0
  202. data/app/packs/src/decidim/editor.js +2 -9
  203. data/app/packs/src/decidim/external_domain_warning.js +1 -1
  204. data/app/packs/src/decidim/external_link.js +14 -3
  205. data/app/packs/src/decidim/external_link.test.js +64 -0
  206. data/app/packs/src/decidim/geocoding.js +10 -35
  207. data/app/packs/src/decidim/identity_selector_dialog.js +1 -1
  208. data/app/packs/src/decidim/impersonation.js +3 -3
  209. data/app/packs/src/decidim/input_character_counter.js +177 -7
  210. data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
  211. data/app/packs/src/decidim/map/icon.js +2 -1
  212. data/app/packs/src/decidim/map/svg-icon.js +248 -0
  213. data/app/packs/src/decidim/security/selfxss_warning.js +5 -1
  214. data/app/packs/src/decidim/session_timeouter.js +15 -15
  215. data/app/packs/src/decidim/sw/a2hs.js +28 -0
  216. data/app/packs/src/decidim/sw/index.js +3 -0
  217. data/app/packs/src/decidim/sw/loader.js +18 -0
  218. data/app/packs/src/decidim/sw/push-permissions.js +87 -0
  219. data/app/packs/src/decidim/sw/sw.js +80 -0
  220. data/app/packs/src/decidim/vizzs/areachart.js +33 -28
  221. data/app/packs/src/decidim/vizzs/linechart.js +23 -18
  222. data/app/packs/src/decidim/vizzs/rowchart.js +15 -11
  223. data/app/packs/stylesheets/decidim/email.scss +66 -0
  224. data/app/packs/stylesheets/decidim/layouts/_user.scss +8 -0
  225. data/app/packs/stylesheets/decidim/modules/_autocomplete.scss +99 -0
  226. data/app/packs/stylesheets/decidim/modules/_cards.scss +0 -2
  227. data/app/packs/stylesheets/decidim/modules/_comments.scss +0 -2
  228. data/app/packs/stylesheets/decidim/modules/_cookie-consent.scss +115 -0
  229. data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
  230. data/app/packs/stylesheets/decidim/modules/_forms.scss +0 -5
  231. data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss +29 -2
  232. data/app/packs/stylesheets/decidim/modules/_modules.scss +3 -1
  233. data/app/packs/stylesheets/decidim/modules/_reveal.scss +15 -0
  234. data/app/packs/stylesheets/decidim/modules/_upload_modal.scss +143 -0
  235. data/app/packs/stylesheets/decidim/utils/_fontface.scss +3 -0
  236. data/app/permissions/decidim/permissions.rb +4 -8
  237. data/app/presenters/decidim/admin_log/area_type_presenter.rb +34 -0
  238. data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb +35 -0
  239. data/app/presenters/decidim/admin_log/attachment_presenter.rb +27 -0
  240. data/app/presenters/decidim/admin_log/category_presenter.rb +36 -0
  241. data/app/presenters/decidim/admin_log/component_presenter.rb +35 -3
  242. data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb +33 -0
  243. data/app/presenters/decidim/admin_log/organization_presenter.rb +9 -4
  244. data/app/presenters/decidim/admin_log/scope_type_presenter.rb +34 -0
  245. data/app/presenters/decidim/home_stats_presenter.rb +8 -13
  246. data/app/presenters/decidim/log/base_presenter.rb +1 -1
  247. data/app/presenters/decidim/menu_item_presenter.rb +1 -1
  248. data/app/presenters/decidim/metric_charts_presenter.rb +7 -1
  249. data/app/presenters/decidim/nil_presenter.rb +3 -1
  250. data/app/presenters/decidim/notification_to_mailer_presenter.rb +39 -0
  251. data/app/presenters/decidim/notifications_digest_presenter.rb +42 -0
  252. data/app/presenters/decidim/official_author_presenter.rb +4 -0
  253. data/app/presenters/decidim/organization_presenter.rb +22 -0
  254. data/app/presenters/decidim/push_notification_presenter.rb +24 -0
  255. data/app/presenters/decidim/stats_presenter.rb +9 -8
  256. data/app/presenters/decidim/user_presenter.rb +4 -12
  257. data/app/presenters/decidim/validation_errors_presenter.rb +1 -1
  258. data/app/queries/decidim/messaging/user_conversations.rb +1 -1
  259. data/app/queries/decidim/metric_manage.rb +1 -1
  260. data/app/queries/decidim/own_activities.rb +11 -0
  261. data/app/queries/decidim/participatory_processes_with_user_role.rb +1 -1
  262. data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb} +35 -78
  263. data/app/queries/decidim/public_components.rb +1 -1
  264. data/app/queries/decidim/similar_emendations.rb +1 -1
  265. data/app/queries/decidim/stats_users_count.rb +1 -1
  266. data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
  267. data/app/queries/decidim/user_groups/accepted_user_groups.rb +1 -1
  268. data/app/queries/decidim/user_groups/accepted_users.rb +1 -1
  269. data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
  270. data/app/queries/decidim/user_groups/invited_memberships.rb +1 -1
  271. data/app/queries/decidim/user_groups/manageable_user_groups.rb +1 -1
  272. data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
  273. data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb} +6 -6
  274. data/app/services/decidim/email_notification_generator.rb +2 -2
  275. data/app/services/decidim/engine_resolver.rb +66 -0
  276. data/app/services/decidim/events_manager.rb +1 -1
  277. data/app/services/decidim/iframe_disabler.rb +31 -0
  278. data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
  279. data/app/services/decidim/notifications_digest_sending_decider.rb +18 -0
  280. data/app/services/decidim/notifications_subscriptions_persistor.rb +37 -0
  281. data/app/services/decidim/open_data_exporter.rb +1 -1
  282. data/app/services/decidim/resource_search.rb +17 -164
  283. data/app/services/decidim/send_push_notification.rb +59 -0
  284. data/app/services/decidim/traceability.rb +1 -1
  285. data/app/uploaders/decidim/application_uploader.rb +2 -12
  286. data/app/uploaders/decidim/cw/attachment_uploader.rb +1 -1
  287. data/app/uploaders/decidim/cw/{data_portability_uploader.rb → download_your_data_uploader.rb} +3 -3
  288. data/app/uploaders/decidim/cw/image_uploader.rb +2 -2
  289. data/app/uploaders/decidim/organization_favicon_uploader.rb +3 -2
  290. data/app/validators/etiquette_validator.rb +3 -7
  291. data/app/validators/passthru_validator.rb +29 -21
  292. data/app/validators/password_validator.rb +25 -4
  293. data/app/validators/uploader_image_dimensions_validator.rb +1 -1
  294. data/app/views/decidim/account/_account_notification.js.erb +20 -0
  295. data/app/views/decidim/account/_password_fields.html.erb +2 -2
  296. data/app/views/decidim/account/cancel_email_change.js.erb +6 -0
  297. data/app/views/decidim/account/resend_confirmation_instructions.erb +1 -0
  298. data/app/views/decidim/account/show.html.erb +19 -6
  299. data/app/views/decidim/application/{_attachments.html.erb → _attachments.erb} +2 -2
  300. data/app/views/decidim/application/_collection.html.erb +1 -1
  301. data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
  302. data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
  303. data/app/views/decidim/devise/invitations/edit.html.erb +3 -4
  304. data/app/views/decidim/devise/omniauth_registrations/new.html.erb +3 -3
  305. data/app/views/decidim/devise/passwords/edit.html.erb +7 -5
  306. data/app/views/decidim/devise/passwords/new.html.erb +1 -1
  307. data/app/views/decidim/devise/registrations/edit.html.erb +41 -0
  308. data/app/views/decidim/devise/registrations/new.html.erb +5 -5
  309. data/app/views/decidim/devise/sessions/new.html.erb +2 -2
  310. data/app/views/decidim/{data_portability → download_your_data}/show.html.erb +2 -2
  311. data/app/views/decidim/export_mailer/download_your_data_export.html.erb +7 -0
  312. data/app/views/decidim/last_activities/index.html.erb +1 -1
  313. data/app/views/decidim/manifests/show.json.erb +31 -0
  314. data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +5 -3
  315. data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
  316. data/app/views/decidim/messaging/conversations/_start.html.erb +1 -3
  317. data/app/views/decidim/messaging/conversations/create.js.erb +1 -0
  318. data/app/views/decidim/notification_mailer/event_received.html.erb +1 -1
  319. data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb +11 -0
  320. data/app/views/decidim/notifications_digest_mailer/digest_mail.erb +27 -0
  321. data/app/views/decidim/notifications_settings/show.html.erb +79 -52
  322. data/app/views/decidim/offline/show.html.erb +9 -0
  323. data/app/views/decidim/pages/_standalone.html.erb +1 -1
  324. data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
  325. data/app/views/decidim/reported_mailer/report.html.erb +1 -1
  326. data/app/views/decidim/scopes/picker.html.erb +1 -1
  327. data/app/views/decidim/searches/_filters.html.erb +2 -2
  328. data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +3 -3
  329. data/app/views/decidim/user_interests/show.html.erb +13 -11
  330. data/app/views/decidim/user_report_mailer/notify.html.erb +10 -3
  331. data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -1
  332. data/app/views/layouts/decidim/_application.html.erb +6 -3
  333. data/app/views/layouts/decidim/_cookie_warning.html.erb +8 -8
  334. data/app/views/layouts/decidim/_decidim_javascript.html.erb +12 -0
  335. data/app/views/layouts/decidim/_head.html.erb +4 -2
  336. data/app/views/layouts/decidim/_js_configuration.html.erb +5 -1
  337. data/app/views/layouts/decidim/_main_footer.html.erb +1 -0
  338. data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
  339. data/app/views/layouts/decidim/widget.html.erb +2 -2
  340. data/config/assets.rb +1 -0
  341. data/config/locales/am-ET.yml +1 -0
  342. data/config/locales/ar.yml +72 -36
  343. data/config/locales/bg.yml +38 -31
  344. data/config/locales/ca.yml +211 -40
  345. data/config/locales/cs.yml +218 -45
  346. data/config/locales/da.yml +1 -0
  347. data/config/locales/de.yml +49 -99
  348. data/config/locales/el.yml +37 -30
  349. data/config/locales/en.yml +205 -34
  350. data/config/locales/eo.yml +4 -6
  351. data/config/locales/es-MX.yml +208 -37
  352. data/config/locales/es-PY.yml +208 -37
  353. data/config/locales/es.yml +213 -42
  354. data/config/locales/et.yml +1 -0
  355. data/config/locales/eu.yml +41 -41
  356. data/config/locales/fi-plain.yml +206 -35
  357. data/config/locales/fi.yml +206 -35
  358. data/config/locales/fr-CA.yml +194 -37
  359. data/config/locales/fr.yml +201 -44
  360. data/config/locales/ga-IE.yml +10 -8
  361. data/config/locales/gl.yml +71 -30
  362. data/config/locales/hr.yml +1 -0
  363. data/config/locales/hu.yml +86 -206
  364. data/config/locales/id-ID.yml +39 -29
  365. data/config/locales/is-IS.yml +7 -17
  366. data/config/locales/it.yml +47 -41
  367. data/config/locales/ja.yml +197 -38
  368. data/config/locales/ko.yml +1 -0
  369. data/config/locales/lb.yml +38 -32
  370. data/config/locales/lt.yml +1 -1780
  371. data/config/locales/lv.yml +37 -28
  372. data/config/locales/mt.yml +1 -0
  373. data/config/locales/nl.yml +50 -36
  374. data/config/locales/no.yml +47 -36
  375. data/config/locales/om-ET.yml +1 -0
  376. data/config/locales/pl.yml +89 -35
  377. data/config/locales/pt-BR.yml +42 -35
  378. data/config/locales/pt.yml +39 -33
  379. data/config/locales/ro-RO.yml +42 -36
  380. data/config/locales/ru.yml +19 -26
  381. data/config/locales/si-LK.yml +1 -0
  382. data/config/locales/sk.yml +40 -30
  383. data/config/locales/sl.yml +1 -0
  384. data/config/locales/so-SO.yml +1 -0
  385. data/config/locales/sr-CS.yml +1 -0
  386. data/config/locales/sv.yml +90 -34
  387. data/config/locales/sw-KE.yml +1 -0
  388. data/config/locales/ti-ER.yml +1 -0
  389. data/config/locales/tr-TR.yml +39 -31
  390. data/config/locales/uk.yml +17 -27
  391. data/config/locales/val-ES.yml +1 -0
  392. data/config/locales/vi.yml +1 -0
  393. data/config/locales/zh-CN.yml +39 -30
  394. data/config/locales/zh-TW.yml +1 -0
  395. data/config/routes.rb +19 -22
  396. data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
  397. data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +1 -0
  398. data/db/migrate/20190412131728_fix_user_names.rb +4 -4
  399. data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb +22 -0
  400. data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb +14 -0
  401. data/db/migrate/20211208155453_create_decidim_reminders.rb +11 -0
  402. data/db/migrate/20211209121025_create_decidim_reminder_records.rb +11 -0
  403. data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb +10 -0
  404. data/db/migrate/20220118121921_change_required_description_categories.rb +7 -0
  405. data/db/migrate/20220127113419_add_notification_settings_to_users.rb +7 -0
  406. data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb +7 -0
  407. data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb +7 -0
  408. data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb +7 -0
  409. data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb +15 -0
  410. data/db/migrate/20220518094535_add_previous_passwords_to_users.rb +20 -0
  411. data/db/migrate/20220524195530_create_decidim_short_links.rb +23 -0
  412. data/db/seeds.rb +17 -18
  413. data/lib/decidim/acts_as_tree.rb +47 -0
  414. data/lib/decidim/api/input_sorts/component_input_sort.rb +2 -1
  415. data/lib/decidim/api/interfaces/authorable_interface.rb +6 -5
  416. data/lib/decidim/asset_router.rb +80 -0
  417. data/lib/decidim/attachment_attributes.rb +8 -8
  418. data/lib/decidim/attribute_object/form.rb +174 -0
  419. data/lib/decidim/attribute_object/model.rb +148 -0
  420. data/lib/decidim/attribute_object/nested_validator.rb +22 -0
  421. data/lib/decidim/attribute_object/type_map.rb +14 -0
  422. data/lib/decidim/attribute_object/type_resolver.rb +91 -0
  423. data/lib/decidim/attribute_object.rb +26 -0
  424. data/lib/decidim/attributes/array.rb +62 -0
  425. data/lib/decidim/attributes/blob.rb +20 -0
  426. data/lib/decidim/attributes/clean_string.rb +12 -6
  427. data/lib/decidim/attributes/hash.rb +36 -0
  428. data/lib/decidim/attributes/integer.rb +17 -0
  429. data/lib/decidim/attributes/localized_date.rb +8 -14
  430. data/lib/decidim/attributes/model.rb +24 -0
  431. data/lib/decidim/attributes/object.rb +28 -0
  432. data/lib/decidim/attributes/symbol.rb +23 -0
  433. data/lib/decidim/attributes/time_with_zone.rb +7 -17
  434. data/lib/decidim/attributes.rb +29 -0
  435. data/lib/decidim/authorable.rb +21 -6
  436. data/lib/decidim/authorization_form_builder.rb +9 -11
  437. data/lib/decidim/carrier_wave_migrator_service.rb +15 -15
  438. data/lib/decidim/coauthorable.rb +22 -4
  439. data/lib/decidim/command.rb +44 -0
  440. data/lib/decidim/common_passwords.rb +1 -1
  441. data/lib/decidim/component_manifest.rb +5 -5
  442. data/lib/decidim/component_validator.rb +2 -2
  443. data/lib/decidim/content_block_manifest.rb +1 -1
  444. data/lib/decidim/content_parsers/hashtag_parser.rb +2 -2
  445. data/lib/decidim/content_parsers/resource_parser.rb +1 -1
  446. data/lib/decidim/content_parsers/user_group_parser.rb +1 -1
  447. data/lib/decidim/content_parsers/user_parser.rb +4 -4
  448. data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
  449. data/lib/decidim/content_renderers/link_renderer.rb +2 -2
  450. data/lib/decidim/content_renderers/user_group_renderer.rb +1 -1
  451. data/lib/decidim/content_renderers/user_renderer.rb +1 -1
  452. data/lib/decidim/controller_helpers.rb +41 -0
  453. data/lib/decidim/core/engine.rb +35 -19
  454. data/lib/decidim/core/test/factories.rb +48 -8
  455. data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +16 -4
  456. data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +1 -1
  457. data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +15 -2
  458. data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
  459. data/lib/decidim/core/test/shared_examples/comments_examples.rb +203 -0
  460. data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
  461. data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
  462. data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -2
  463. data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
  464. data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +120 -40
  465. data/lib/decidim/core/test/shared_examples/resourceable.rb +0 -6
  466. data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
  467. data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
  468. data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +3 -3
  469. data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
  470. data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
  471. data/lib/decidim/core/test.rb +0 -3
  472. data/lib/decidim/core/version.rb +1 -1
  473. data/lib/decidim/core.rb +108 -14
  474. data/lib/decidim/{data_portability.rb → download_your_data.rb} +3 -3
  475. data/lib/decidim/{data_portability_serializers/data_portability_conversation_serializer.rb → download_your_data_serializers/download_your_data_conversation_serializer.rb} +2 -2
  476. data/lib/decidim/{data_portability_serializers/data_portability_follow_serializer.rb → download_your_data_serializers/download_your_data_follow_serializer.rb} +2 -2
  477. data/lib/decidim/{data_portability_serializers/data_portability_identity_serializer.rb → download_your_data_serializers/download_your_data_identity_serializer.rb} +2 -2
  478. data/lib/decidim/{data_portability_serializers/data_portability_notification_serializer.rb → download_your_data_serializers/download_your_data_notification_serializer.rb} +2 -2
  479. data/lib/decidim/{data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb → download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb} +2 -2
  480. data/lib/decidim/{data_portability_serializers/data_portability_report_serializer.rb → download_your_data_serializers/download_your_data_report_serializer.rb} +2 -2
  481. data/lib/decidim/{data_portability_serializers/data_portability_user_group_serializer.rb → download_your_data_serializers/download_your_data_user_group_serializer.rb} +2 -2
  482. data/lib/decidim/{data_portability_serializers/data_portability_user_serializer.rb → download_your_data_serializers/download_your_data_user_serializer.rb} +3 -3
  483. data/lib/decidim/download_your_data_serializers.rb +23 -0
  484. data/lib/decidim/engine_router.rb +7 -1
  485. data/lib/decidim/env.rb +56 -0
  486. data/lib/decidim/event_recorder.rb +25 -0
  487. data/lib/decidim/events/base_event.rb +10 -14
  488. data/lib/decidim/events/simple_event.rb +6 -5
  489. data/lib/decidim/exporters/export_data.rb +1 -1
  490. data/lib/decidim/exporters/export_manifest.rb +2 -1
  491. data/lib/decidim/file_validator_humanizer.rb +24 -1
  492. data/lib/decidim/filterable_resource.rb +55 -0
  493. data/lib/decidim/fingerprint_calculator.rb +2 -4
  494. data/lib/decidim/form_builder.rb +159 -138
  495. data/lib/decidim/gamification/badge.rb +2 -3
  496. data/lib/decidim/gamification/badge_scorer.rb +1 -0
  497. data/lib/decidim/has_area.rb +27 -0
  498. data/lib/decidim/has_attachments.rb +2 -2
  499. data/lib/decidim/has_category.rb +36 -0
  500. data/lib/decidim/has_resource_permission.rb +2 -0
  501. data/lib/decidim/importers/import_manifest.rb +3 -21
  502. data/lib/decidim/jsonb_attributes.rb +6 -4
  503. data/lib/decidim/manifest_messages.rb +23 -0
  504. data/lib/decidim/map/autocomplete.rb +6 -4
  505. data/lib/decidim/map/frontend.rb +2 -2
  506. data/lib/decidim/map/provider/dynamic_map/here.rb +1 -46
  507. data/lib/decidim/map/provider/geocoding/here.rb +5 -5
  508. data/lib/decidim/map/provider/here.rb +3 -0
  509. data/lib/decidim/map/provider/osm.rb +3 -0
  510. data/lib/decidim/map.rb +4 -4
  511. data/lib/decidim/menu.rb +1 -1
  512. data/lib/decidim/metric_manifest.rb +2 -2
  513. data/lib/decidim/nicknamizable.rb +1 -1
  514. data/lib/decidim/notification_setting_manifest.rb +19 -0
  515. data/lib/decidim/organization_settings.rb +8 -7
  516. data/lib/decidim/participatory_space_context_manifest.rb +2 -2
  517. data/lib/decidim/participatory_space_manifest.rb +2 -2
  518. data/lib/decidim/processes_file_locally.rb +31 -0
  519. data/lib/decidim/query.rb +84 -0
  520. data/lib/decidim/record_encryptor.rb +29 -8
  521. data/lib/decidim/reminder_manifest.rb +75 -0
  522. data/lib/decidim/reminder_registry.rb +67 -0
  523. data/lib/decidim/resource_manifest.rb +1 -1
  524. data/lib/decidim/resourceable.rb +15 -5
  525. data/lib/decidim/scopable.rb +15 -0
  526. data/lib/decidim/settings_manifest.rb +4 -4
  527. data/lib/decidim/spring.rb +16 -0
  528. data/lib/decidim/translatable_attributes.rb +13 -16
  529. data/lib/decidim/url_option_resolver.rb +50 -0
  530. data/lib/decidim/view_hooks.rb +1 -1
  531. data/lib/decidim/view_model.rb +5 -1
  532. data/lib/decidim/webpacker/thread_safe_compiler.rb +30 -0
  533. data/lib/decidim/webpacker/webpack/custom.js +15 -3
  534. data/lib/decidim/webpacker/webpacker.yml +1 -1
  535. data/lib/decidim/webpacker.rb +2 -0
  536. data/lib/devise/models/decidim_validatable.rb +1 -1
  537. data/lib/tasks/decidim_active_storage_migration_tasks.rake +1 -3
  538. data/lib/tasks/{decidim_data_portability_tasks.rake → decidim_download_your_data_tasks.rake} +9 -9
  539. data/lib/tasks/decidim_mailers_tasks.rake +23 -0
  540. data/lib/tasks/decidim_metrics_tasks.rake +1 -1
  541. data/lib/tasks/decidim_pwa_tasks.rake +18 -0
  542. data/lib/tasks/decidim_reminders_tasks.rake +17 -0
  543. data/lib/tasks/decidim_tasks.rake +6 -1
  544. data/lib/tasks/decidim_webpacker_tasks.rake +1 -1
  545. data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +51 -0
  546. metadata +186 -91
  547. data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
  548. data/app/helpers/decidim/cookies_helper.rb +0 -11
  549. data/app/packs/src/decidim/editor/clipboard_override.js +0 -143
  550. data/app/packs/src/decidim/editor/clipboard_utilities.js +0 -119
  551. data/app/packs/src/decidim/vizzs/renders.js +0 -9
  552. data/app/packs/src/decidim/vizzs.js +0 -1
  553. data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss +0 -26
  554. data/app/services/decidim/home_activity_search.rb +0 -80
  555. data/app/services/decidim/participatory_space_search.rb +0 -54
  556. data/app/views/decidim/cookie_policy/accept.js.erb +0 -3
  557. data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
  558. data/config/locales/gn-PY.yml +0 -1
  559. data/config/locales/lo-LA.yml +0 -1
  560. data/config/locales/oc-FR.yml +0 -1
  561. data/lib/decidim/core/test/shared_examples/mcell_examples.rb +0 -17
  562. data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +0 -60
  563. data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +0 -40
  564. data/lib/decidim/data_portability_serializers.rb +0 -23
  565. data/lib/decidim/middleware/rails_cookies.rb +0 -23
  566. /data/app/packs/src/decidim/vizzs/{metrics.js → index.js} +0 -0
  567. /data/app/views/decidim/application/{_document.html.erb → _document.erb} +0 -0
  568. /data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
  569. /data/app/views/decidim/{data_portability → download_your_data}/export.html.erb +0 -0
@@ -23,29 +23,47 @@ module Decidim
23
23
  scope :from_author, ->(author) { from_all_author_identities(author).where("decidim_coauthorships.decidim_user_group_id": nil) }
24
24
  # retrieves models from the given UserGroup.
25
25
  scope :from_user_group, ->(user_group) { joins(:coauthorships).where("decidim_coauthorships.decidim_user_group_id": user_group.id) }
26
- scope :official_origin, lambda {
26
+ scope :with_official_origin, lambda {
27
27
  where.not(coauthorships_count: 0)
28
28
  .joins(:coauthorships)
29
29
  .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
30
30
  }
31
- scope :citizens_origin, lambda {
31
+ scope :with_participants_origin, lambda {
32
32
  where.not(coauthorships_count: 0)
33
33
  .joins(:coauthorships)
34
34
  .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
35
35
  .where(decidim_coauthorships: { decidim_user_group_id: nil })
36
36
  }
37
- scope :user_group_origin, lambda {
37
+ scope :with_user_group_origin, lambda {
38
38
  where.not(coauthorships_count: 0)
39
39
  .joins(:coauthorships)
40
40
  .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
41
41
  .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
42
42
  }
43
- scope :meeting_origin, lambda {
43
+ scope :with_meeting_origin, lambda {
44
44
  where.not(coauthorships_count: 0)
45
45
  .joins(:coauthorships)
46
46
  .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
47
47
  }
48
48
 
49
+ scope :with_any_origin, lambda { |*origin_keys|
50
+ search_values = origin_keys.compact.compact_blank
51
+
52
+ conditions = [:official, :participants, :user_group, :meeting].map do |key|
53
+ search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
54
+ end.compact
55
+ return self unless conditions.any?
56
+
57
+ scoped_query = where(id: conditions.shift)
58
+ conditions.each do |condition|
59
+ scoped_query = scoped_query.or(where(id: condition))
60
+ end
61
+
62
+ scoped_query
63
+ }
64
+
65
+ scope :coauthored_by, ->(author) { where.not(coauthorships_count: 0).from_all_author_identities(author) }
66
+
49
67
  validates :coauthorships, presence: true
50
68
 
51
69
  # Overwrite default reload method to unset the instance variables so reloading works as expected.
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Copyright (c) 2016 Andy Pike - The MIT license
4
+ #
5
+ # This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/command.rb
6
+ # We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
7
+ # Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
8
+ module Decidim
9
+ class Command
10
+ include ::Wisper::Publisher
11
+
12
+ def self.call(*args, **kwargs, &block)
13
+ event_recorder = Decidim::EventRecorder.new
14
+
15
+ command = new(*args, **kwargs)
16
+ command.subscribe(event_recorder)
17
+ command.evaluate(&block) if block_given?
18
+ command.call
19
+
20
+ event_recorder.events
21
+ end
22
+
23
+ def evaluate(&block)
24
+ @caller = eval("self", block.binding, __FILE__, __LINE__)
25
+ instance_eval(&block)
26
+ end
27
+
28
+ def transaction(&block)
29
+ ActiveRecord::Base.transaction(&block) if block_given?
30
+ end
31
+
32
+ def method_missing(method_name, ...)
33
+ if @caller.respond_to?(method_name, true)
34
+ @caller.send(method_name, ...)
35
+ else
36
+ super
37
+ end
38
+ end
39
+
40
+ def respond_to_missing?(method_name, include_private = false)
41
+ @caller.respond_to?(method_name, include_private)
42
+ end
43
+ end
44
+ end
@@ -30,7 +30,7 @@ module Decidim
30
30
  @common_password_list ||= begin
31
31
  list = []
32
32
  URLS.each do |url|
33
- URI.open(url) do |data|
33
+ URI.parse(url).open do |data|
34
34
  data.read.split.each do |line|
35
35
  list << line if line.length >= min_length
36
36
  end
@@ -12,18 +12,18 @@ module Decidim
12
12
  # `Decidim.register_component`.
13
13
  class ComponentManifest
14
14
  include ActiveModel::Model
15
- include Virtus.model
15
+ include Decidim::AttributeObject::Model
16
16
 
17
- attribute :admin_engine, Rails::Engine
18
- attribute :engine, Rails::Engine
17
+ attribute :admin_engine, Rails::Engine, **{}
18
+ attribute :engine, Rails::Engine, **{}
19
19
 
20
20
  attribute :name, Symbol
21
- attribute :hooks, Hash[Symbol => Array[Proc]], default: {}
21
+ attribute(:hooks, { Symbol => Array[Proc] }, default: {})
22
22
 
23
23
  attribute :query_type, String, default: "Decidim::Core::ComponentType"
24
24
 
25
25
  # An array with the name of the classes that will be exported with
26
- # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
26
+ # the download your data feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
27
27
  attribute :data_portable_entities, Array, default: []
28
28
 
29
29
  # An array with the name of the classes to know the participants
@@ -13,10 +13,10 @@ class ComponentValidator < ActiveModel::EachValidator
13
13
  # over all the validators.
14
14
  def validate_each(record, attribute, component)
15
15
  unless component
16
- record.errors[attribute] << :blank
16
+ record.errors.add(attribute, :blank)
17
17
  return
18
18
  end
19
19
 
20
- record.errors[attribute] << :invalid if component.manifest_name.to_s != options[:manifest].to_s
20
+ record.errors.add(attribute, :invalid) if component.manifest_name.to_s != options[:manifest].to_s
21
21
  end
22
22
  end
@@ -20,7 +20,7 @@ module Decidim
20
20
  # be unique per scope.
21
21
  class ContentBlockManifest
22
22
  include ActiveModel::Model
23
- include Virtus.model
23
+ include Decidim::AttributeObject::Model
24
24
 
25
25
  attribute :name, Symbol
26
26
  attribute :public_name_key, String
@@ -18,14 +18,14 @@ module Decidim
18
18
 
19
19
  # Matches a hashtag if it starts with a letter or number
20
20
  # and only contains letters, numbers or underscores.
21
- HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
21
+ HASHTAG_REGEX = /\s\K\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i
22
22
 
23
23
  # Replaces hashtags name with new or existing hashtags models global ids.
24
24
  #
25
25
  # @return [String] the content with the hashtags replaced by global ids
26
26
  def rewrite
27
27
  content.gsub(HASHTAG_REGEX) do |match|
28
- "#{hashtag(match[1..-1]).to_global_id}/#{(extra_hashtags? ? "_" : "")}#{match[1..-1]}"
28
+ "#{hashtag(match[1..-1]).to_global_id}/#{extra_hashtags? ? "_" : ""}#{match[1..-1]}"
29
29
  end
30
30
  end
31
31
 
@@ -11,7 +11,7 @@ module Decidim
11
11
  URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
12
12
  URL_REGEX_END_CHAR = '[\d]'
13
13
  # Matches a mentioned resource ID (~(d)+ expression)
14
- ID_REGEX = /~(\d+)/.freeze
14
+ ID_REGEX = /~(\d+)/
15
15
 
16
16
  # Replaces found mentions matching an existing
17
17
  # Resource with a global id for that Resource. Other mentions found that doesn't
@@ -16,7 +16,7 @@ module Decidim
16
16
  Metadata = Struct.new(:groups)
17
17
 
18
18
  # Matches a nickname if contains letters, numbers or underscores.
19
- MENTION_REGEX = /\B@(\w*)\b/.freeze
19
+ MENTION_REGEX = /\B@(\w*)\b/
20
20
 
21
21
  # Replaces found mentions matching a nickname of an existing
22
22
  # group in the current organization with a global id. Other
@@ -16,7 +16,7 @@ module Decidim
16
16
  Metadata = Struct.new(:users)
17
17
 
18
18
  # Matches a nickname if contains letters, numbers or underscores.
19
- MENTION_REGEX = /\B@(\w*)\b/.freeze
19
+ MENTION_REGEX = /\B@(\w*)\b/
20
20
 
21
21
  # Replaces found mentions matching a nickname of an existing
22
22
  # user in the current organization with a global id. Other
@@ -26,7 +26,7 @@ module Decidim
26
26
  # @return [String] the content with the valid mentions replaced by a global id
27
27
  def rewrite
28
28
  content.gsub(MENTION_REGEX) do |match|
29
- users[match[1..-1]]&.to_global_id&.to_s || match
29
+ users[match[1..-1].downcase]&.to_global_id&.to_s || match
30
30
  end
31
31
  end
32
32
 
@@ -43,11 +43,11 @@ module Decidim
43
43
  end
44
44
 
45
45
  def existing_users
46
- @existing_users ||= Decidim::User.where(organization: current_organization, nickname: content_nicknames)
46
+ @existing_users ||= Decidim::User.where("decidim_organization_id = ? AND LOWER(nickname) IN (?)", current_organization.id, content_nicknames)
47
47
  end
48
48
 
49
49
  def content_nicknames
50
- @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq
50
+ @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq.map!(&:downcase)
51
51
  end
52
52
 
53
53
  def current_organization
@@ -10,7 +10,7 @@ module Decidim
10
10
  # @see BaseRenderer Examples of how to use a content renderer
11
11
  class HashtagRenderer < BaseRenderer
12
12
  # Matches a global id representing a Decidim::Hashtag
13
- GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
13
+ GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}
14
14
 
15
15
  # Replaces found Global IDs matching an existing hashtag with
16
16
  # a link to their detail page. The Global IDs representing an
@@ -45,12 +45,12 @@ module Decidim
45
45
 
46
46
  private
47
47
 
48
- AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix.freeze
48
+ AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix
49
49
 
50
50
  # # regexps for determining context, used high-volume
51
51
  AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, %r{</a>}i].freeze
52
52
 
53
- PUNCTUATION_RE = %r{[^\p{Word}/=&]$}.freeze
53
+ PUNCTUATION_RE = %r{[^\p{Word}/=&]$}
54
54
 
55
55
  BRACKETS = { "]" => "[", ")" => "(", "}" => "{" }.freeze
56
56
 
@@ -10,7 +10,7 @@ module Decidim
10
10
  # @see BaseRenderer Examples of how to use a content renderer
11
11
  class UserGroupRenderer < BaseRenderer
12
12
  # Matches a global id representing a Decidim::UserGroup
13
- GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}.freeze
13
+ GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}
14
14
 
15
15
  # Replaces found Global IDs matching an existing user with
16
16
  # a link to their profile. The Global IDs representing an
@@ -10,7 +10,7 @@ module Decidim
10
10
  # @see BaseRenderer Examples of how to use a content renderer
11
11
  class UserRenderer < BaseRenderer
12
12
  # Matches a global id representing a Decidim::User
13
- GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}.freeze
13
+ GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}
14
14
 
15
15
  # Replaces found Global IDs matching an existing user with
16
16
  # a link to their profile. The Global IDs representing an
@@ -0,0 +1,41 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Copyright (c) 2016 Andy Pike - The MIT license
4
+ #
5
+ # This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/controller_helpers.rb
6
+ # We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
7
+ # Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
8
+ module Decidim
9
+ module ControllerHelpers
10
+ def self.included(base_class)
11
+ base_class.helper_method(:presenter)
12
+ end
13
+
14
+ def present(presenter, options = {})
15
+ presenter_type = options.fetch(:for, :template)
16
+
17
+ presenter.attach_controller(self)
18
+ rectify_presenters[presenter_type] = presenter
19
+ end
20
+
21
+ def presenter(presenter_type = :template)
22
+ rectify_presenters[presenter_type]
23
+ end
24
+
25
+ def expose(presentation_data)
26
+ presentation_data.each do |attribute, value|
27
+ if presenter.respond_to?("#{attribute}=")
28
+ presenter.public_send("#{attribute}=", value)
29
+ else
30
+ instance_variable_set("@#{attribute}", value)
31
+ end
32
+ end
33
+ end
34
+
35
+ private
36
+
37
+ def rectify_presenters
38
+ @rectify_presenters ||= {}
39
+ end
40
+ end
41
+ end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require "rails"
3
+ require "decidim/rails"
4
4
  require "active_support/all"
5
5
  require "action_view/railtie"
6
6
 
@@ -13,7 +13,6 @@ require "devise-i18n"
13
13
  require "devise_invitable"
14
14
  require "foundation_rails_helper"
15
15
  require "active_link_to"
16
- require "rectify"
17
16
  require "carrierwave"
18
17
  require "rails-i18n"
19
18
  require "date_validator"
@@ -39,7 +38,7 @@ require "mime-types"
39
38
  require "diffy"
40
39
  require "social-share-button"
41
40
  require "ransack"
42
- require "searchlight"
41
+ require "wisper"
43
42
  require "webpacker"
44
43
 
45
44
  # Needed for the assets:precompile task, for configuring webpacker instance
@@ -49,9 +48,6 @@ require "decidim/api"
49
48
  require "decidim/middleware/strip_x_forwarded_host"
50
49
  require "decidim/middleware/current_organization"
51
50
 
52
- # Backport cookie handling extensions for Rails 6.0
53
- require "decidim/middleware/rails_cookies"
54
-
55
51
  module Decidim
56
52
  module Core
57
53
  # Decidim's core Rails Engine.
@@ -67,6 +63,10 @@ module Decidim
67
63
  end
68
64
  end
69
65
 
66
+ initializer "decidim.action_mailer" do |app|
67
+ app.config.action_mailer.deliver_later_queue_name = :mailers
68
+ end
69
+
70
70
  initializer "decidim.middleware" do |app|
71
71
  app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::CurrentOrganization
72
72
  app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::StripXForwardedHost
@@ -92,6 +92,17 @@ module Decidim
92
92
  Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
93
93
  end
94
94
 
95
+ initializer "decidim.ransack" do
96
+ Ransack.configure do |config|
97
+ # Avoid turning parameter values such as user_id[]=1&user_id[]=2 into
98
+ # { user_id: [true, "2"] }. This option allows us to handle the type
99
+ # convertions manually instead for each case.
100
+ # See: https://github.com/activerecord-hackery/ransack/issues/593
101
+ # See: https://github.com/activerecord-hackery/ransack/pull/742
102
+ config.sanitize_custom_scope_booleans = false
103
+ end
104
+ end
105
+
95
106
  initializer "decidim.i18n_exceptions" do
96
107
  ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
97
108
  end
@@ -122,16 +133,15 @@ module Decidim
122
133
  next if Decidim.maps.present?
123
134
  next if Decidim.geocoder.blank?
124
135
 
125
- legacy_api_key ||= begin
126
- if Decidim.geocoder[:here_api_key].present?
127
- Decidim.geocoder.fetch(:here_api_key)
128
- elsif Decidim.geocoder[:here_app_id].present?
129
- [
130
- Decidim.geocoder.fetch(:here_app_id),
131
- Decidim.geocoder.fetch(:here_app_code)
132
- ]
133
- end
134
- end
136
+ legacy_api_key ||= if Decidim.geocoder[:here_api_key].present?
137
+ Decidim.geocoder.fetch(:here_api_key)
138
+ elsif Decidim.geocoder[:here_app_id].present?
139
+ [
140
+ Decidim.geocoder.fetch(:here_app_id),
141
+ Decidim.geocoder.fetch(:here_app_code)
142
+ ]
143
+ end
144
+
135
145
  next unless legacy_api_key
136
146
 
137
147
  ActiveSupport::Deprecation.warn(
@@ -167,6 +177,7 @@ module Decidim
167
177
 
168
178
  Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
169
179
  processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
180
+
170
181
  processes = processes.where("created_at >= ?", start_at) if start_at.present?
171
182
  processes = processes.where("created_at <= ?", end_at) if end_at.present?
172
183
  processes.count
@@ -221,9 +232,9 @@ module Decidim
221
232
  decidim.user_interests_path,
222
233
  position: 1.4
223
234
 
224
- menu.add_item :data_portability,
235
+ menu.add_item :download_your_data,
225
236
  t("my_data", scope: "layouts.decidim.user_profile"),
226
- decidim.data_portability_path,
237
+ decidim.download_your_data_path,
227
238
  position: 1.5
228
239
 
229
240
  menu.add_item :delete_account,
@@ -254,7 +265,7 @@ module Decidim
254
265
  Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/views") # for partials
255
266
  end
256
267
 
257
- initializer "doorkeeper", before: "doorkeeper.params.filter" do
268
+ initializer "doorkeeper" do
258
269
  Doorkeeper.configure do
259
270
  orm :active_record
260
271
 
@@ -531,6 +542,11 @@ module Decidim
531
542
  end
532
543
 
533
544
  initializer "decidim.core.add_badges" do
545
+ Decidim::Gamification.register_badge(:invitations) do |badge|
546
+ badge.levels = [1, 5, 10, 30, 50]
547
+ badge.reset = ->(user) { Decidim::User.where(invited_by: user.id).count }
548
+ end
549
+
534
550
  Decidim::Gamification.register_badge(:followers) do |badge|
535
551
  badge.levels = [1, 15, 30, 60, 100]
536
552
  badge.reset = ->(user) { user.followers.count }
@@ -17,8 +17,8 @@ FactoryBot.define do
17
17
  "#{Faker::Lorem.sentence(word_count: 3)} #{n}".delete("'")
18
18
  end
19
19
 
20
- sequence(:name) do |n|
21
- "#{Faker::Name.name} #{n}".delete("'")
20
+ sequence(:name) do |_|
21
+ Faker::Name.name.delete("'")
22
22
  end
23
23
 
24
24
  sequence(:nickname) do |n|
@@ -125,8 +125,6 @@ FactoryBot.define do
125
125
 
126
126
  factory :user, class: "Decidim::User" do
127
127
  email { generate(:email) }
128
- password { "decidim123456" }
129
- password_confirmation { password }
130
128
  name { generate(:name) }
131
129
  nickname { generate(:nickname) }
132
130
  organization
@@ -137,8 +135,10 @@ FactoryBot.define do
137
135
  about { "<script>alert(\"ABOUT\");</script>#{Faker::Lorem.paragraph(sentence_count: 2)}" }
138
136
  confirmation_sent_at { Time.current }
139
137
  accepted_tos_version { organization.tos_version }
140
- email_on_notification { true }
138
+ notifications_sending_frequency { "real_time" }
141
139
  email_on_moderations { true }
140
+ password_updated_at { Time.current }
141
+ previous_passwords { [] }
142
142
  extended_data { {} }
143
143
 
144
144
  trait :confirmed do
@@ -148,7 +148,7 @@ FactoryBot.define do
148
148
  trait :blocked do
149
149
  blocked { true }
150
150
  blocked_at { Time.current }
151
- extended_data { { "user_name": generate(:name) } }
151
+ extended_data { { user_name: generate(:name) } }
152
152
  name { "Blocked user" }
153
153
  end
154
154
 
@@ -183,6 +183,14 @@ FactoryBot.define do
183
183
  officialized_at { Time.current }
184
184
  officialized_as { generate_localized_title }
185
185
  end
186
+
187
+ after(:build) do |user, evaluator|
188
+ # We have specs that call e.g. `create(:user, admin: true)` where we need
189
+ # to do this to ensure the user creation does not fail due to the short
190
+ # password.
191
+ user.password ||= evaluator.password || "decidim123456789"
192
+ user.password_confirmation ||= evaluator.password_confirmation || user.password
193
+ end
186
194
  end
187
195
 
188
196
  factory :participatory_space_private_user, class: "Decidim::ParticipatorySpacePrivateUser" do
@@ -714,8 +722,8 @@ FactoryBot.define do
714
722
 
715
723
  factory :user_report, class: "Decidim::UserReport" do
716
724
  reason { "spam" }
717
- moderation { build(:user_moderation) }
718
- user { build(:user, organization: moderation.organization) }
725
+ moderation { create(:user_moderation, user: user) }
726
+ user { build(:user) }
719
727
  end
720
728
 
721
729
  factory :user_moderation, class: "Decidim::UserModeration" do
@@ -756,4 +764,36 @@ FactoryBot.define do
756
764
  author { create(:user, :admin, :confirmed, organization: organization) }
757
765
  file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
758
766
  end
767
+
768
+ factory :reminder, class: "Decidim::Reminder" do
769
+ user { build(:user) }
770
+ component { build(:dummy_component, organization: user.organization) }
771
+ end
772
+
773
+ factory :reminder_record, class: "Decidim::ReminderRecord" do
774
+ reminder { create(:reminder) }
775
+ remindable { build(:dummy_resource) }
776
+ end
777
+
778
+ factory :reminder_delivery, class: "Decidim::ReminderDelivery" do
779
+ reminder { create(:reminder) }
780
+ end
781
+
782
+ factory :short_link, class: "Decidim::ShortLink" do
783
+ target { create(:component, manifest_name: "dummy") }
784
+ route_name { nil }
785
+ params { {} }
786
+
787
+ before(:create) do |object|
788
+ object.organization ||= object.target if object.target.is_a?(Decidim::Organization)
789
+ object.organization ||= object.target.try(:organization) || create(:organization)
790
+ object.identifier ||= Decidim::ShortLink.unique_identifier_within(object.organization)
791
+ object.mounted_engine_name ||=
792
+ if object.target.respond_to?(:participatory_space)
793
+ "decidim_#{object.target.participatory_space.underscored_name}_dummy"
794
+ else
795
+ "decidim"
796
+ end
797
+ end
798
+ end
759
799
  end
@@ -4,8 +4,14 @@ shared_examples "admin creates resource gallery" do
4
4
  context "when uploading images" do
5
5
  let(:uploaded_photos) do
6
6
  [
7
- Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
8
- Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
7
+ {
8
+ title: "Picture of the city",
9
+ file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
10
+ },
11
+ {
12
+ title: "Picture of another city",
13
+ file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
14
+ }
9
15
  ]
10
16
  end
11
17
  let(:photos) { [] }
@@ -33,8 +39,14 @@ shared_examples "admin manages resource gallery" do
33
39
  context "when managing images" do
34
40
  let(:uploaded_photos) do
35
41
  [
36
- Decidim::Dev.test_file("city.jpeg", "image/jpeg"),
37
- Decidim::Dev.test_file("city2.jpeg", "image/jpeg")
42
+ {
43
+ title: "Picture of the city",
44
+ file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city.jpeg", "image/jpeg"), filename: "city.jpeg").signed_id
45
+ },
46
+ {
47
+ title: "Picture of another city",
48
+ file: ActiveStorage::Blob.create_and_upload!(io: Decidim::Dev.test_file("city2.jpeg", "image/jpeg"), filename: "city2.jpeg").signed_id
49
+ }
38
50
  ]
39
51
  end
40
52
  let(:photos) { [] }
@@ -21,7 +21,7 @@ shared_examples "an amendment form" do
21
21
 
22
22
  it "only adds errors to this field" do
23
23
  subject.valid?
24
- expect(subject.errors.keys).to eq [:title]
24
+ expect(subject.errors.attribute_names).to eq [:title]
25
25
  end
26
26
  end
27
27
 
@@ -25,7 +25,7 @@ shared_examples_for "authorable interface" do
25
25
  model.update(author: author, user_group: nil)
26
26
  end
27
27
 
28
- it "includes the user's ID" do
28
+ it "includes the user's name" do
29
29
  expect(response["author"]["name"]).to eq(author.name)
30
30
  end
31
31
  end
@@ -38,9 +38,22 @@ shared_examples_for "authorable interface" do
38
38
  model.update(user_group: user_group, author: nil)
39
39
  end
40
40
 
41
- it "includes the user's ID" do
41
+ it "includes the user group's name" do
42
42
  expect(response["author"]["name"]).to eq(user_group.name)
43
43
  end
44
44
  end
45
+
46
+ describe "with an organization" do
47
+ let(:organization) { model.participatory_space.organization }
48
+ let(:query) { "{ author { name } }" }
49
+
50
+ before do
51
+ model.update(author: organization, user_group: nil)
52
+ end
53
+
54
+ it "does not return a main author" do
55
+ expect(response["author"]).to eq(nil)
56
+ end
57
+ end
45
58
  end
46
59
  end
@@ -65,7 +65,7 @@ shared_examples_for "coauthorable interface" do
65
65
  expect(response["authors"]).to include("name" => coauthor.name)
66
66
  end
67
67
 
68
- it "do not return a main author" do
68
+ it "does not return a main author" do
69
69
  expect(response["author"]).to eq(nil)
70
70
  end
71
71
  end
@@ -82,7 +82,7 @@ shared_examples_for "coauthorable interface" do
82
82
  expect(response["authors"]).to include("name" => coauthor.name)
83
83
  end
84
84
 
85
- it "do not return a main author" do
85
+ it "does not return a main author" do
86
86
  expect(response["author"]).to eq(nil)
87
87
  end
88
88
  end