decidim-core 0.26.3 → 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 (556) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/cells/decidim/amendable/announcement_cell.rb +3 -8
  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/content_blocks/cta/show.erb +1 -1
  7. data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
  8. data/app/cells/decidim/content_blocks/hero/show.erb +1 -1
  9. data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb +4 -4
  10. data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +1 -1
  11. data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
  12. data/app/cells/decidim/content_blocks/last_activity/show.erb +1 -1
  13. data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -3
  14. data/app/cells/decidim/content_blocks/stats_cell.rb +4 -5
  15. data/app/cells/decidim/content_blocks/sub_hero/show.erb +1 -1
  16. data/app/cells/decidim/data_consent/category.erb +64 -0
  17. data/app/cells/decidim/data_consent/dialog.erb +29 -0
  18. data/app/cells/decidim/data_consent/modal.erb +39 -0
  19. data/app/cells/decidim/data_consent/show.erb +3 -0
  20. data/app/cells/decidim/data_consent_cell.rb +21 -0
  21. data/app/cells/decidim/follow_button_cell.rb +5 -7
  22. data/app/cells/decidim/profile_sidebar_cell.rb +1 -1
  23. data/app/cells/decidim/search_results_cell.rb +1 -1
  24. data/app/cells/decidim/tos_page/refuse_btn_modal.erb +1 -1
  25. data/app/cells/decidim/upload_modal/files.erb +52 -0
  26. data/app/cells/decidim/upload_modal/modal.erb +49 -0
  27. data/app/cells/decidim/upload_modal/show.erb +3 -0
  28. data/app/cells/decidim/upload_modal_cell.rb +205 -0
  29. data/app/cells/decidim/user_conversation/reply.erb +1 -1
  30. data/app/cells/decidim/user_conversations/add_conversation_users.erb +5 -3
  31. data/app/cells/decidim/version_cell.rb +2 -13
  32. data/app/cells/decidim/versions_list_cell.rb +2 -13
  33. data/app/cells/decidim/versions_list_item_cell.rb +2 -13
  34. data/app/commands/decidim/accept_group_invitation.rb +1 -1
  35. data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
  36. data/app/commands/decidim/amendable/accept.rb +1 -1
  37. data/app/commands/decidim/amendable/create_draft.rb +1 -1
  38. data/app/commands/decidim/amendable/destroy_draft.rb +1 -1
  39. data/app/commands/decidim/amendable/promote.rb +1 -1
  40. data/app/commands/decidim/amendable/publish_draft.rb +1 -1
  41. data/app/commands/decidim/amendable/reject.rb +1 -1
  42. data/app/commands/decidim/amendable/update_draft.rb +1 -1
  43. data/app/commands/decidim/amendable/withdraw.rb +1 -1
  44. data/app/commands/decidim/attachment_methods.rb +3 -2
  45. data/app/commands/decidim/create_editor_image.rb +1 -1
  46. data/app/commands/decidim/create_follow.rb +1 -1
  47. data/app/commands/decidim/create_omniauth_registration.rb +2 -3
  48. data/app/commands/decidim/create_registration.rb +1 -2
  49. data/app/commands/decidim/create_report.rb +1 -1
  50. data/app/commands/decidim/create_user_group.rb +2 -2
  51. data/app/commands/decidim/create_user_report.rb +5 -3
  52. data/app/commands/decidim/delete_follow.rb +1 -1
  53. data/app/commands/decidim/demote_membership.rb +1 -1
  54. data/app/commands/decidim/destroy_account.rb +1 -1
  55. data/app/commands/decidim/endorse_resource.rb +1 -1
  56. data/app/commands/decidim/gallery_methods.rb +45 -10
  57. data/app/commands/decidim/invite_user.rb +1 -3
  58. data/app/commands/decidim/invite_user_again.rb +1 -1
  59. data/app/commands/decidim/invite_user_to_group.rb +1 -1
  60. data/app/commands/decidim/join_user_group.rb +1 -1
  61. data/app/commands/decidim/leave_user_group.rb +8 -2
  62. data/app/commands/decidim/messaging/reply_to_conversation.rb +2 -2
  63. data/app/commands/decidim/messaging/start_conversation.rb +2 -2
  64. data/app/commands/decidim/multiple_attachments_methods.rb +44 -5
  65. data/app/commands/decidim/promote_membership.rb +1 -1
  66. data/app/commands/decidim/reject_group_invitation.rb +1 -1
  67. data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
  68. data/app/commands/decidim/remove_user_from_group.rb +1 -1
  69. data/app/commands/decidim/resend_confirmation_instructions.rb +18 -0
  70. data/app/commands/decidim/search.rb +10 -9
  71. data/app/commands/decidim/unendorse_resource.rb +1 -1
  72. data/app/commands/decidim/unsubscribe_settings.rb +1 -1
  73. data/app/commands/decidim/update_account.rb +2 -2
  74. data/app/commands/decidim/update_notifications_settings.rb +3 -2
  75. data/app/commands/decidim/update_password.rb +31 -0
  76. data/app/commands/decidim/update_user_group.rb +2 -2
  77. data/app/commands/decidim/update_user_interests.rb +1 -1
  78. data/app/commands/decidim/validate_upload.rb +15 -0
  79. data/app/controllers/concerns/decidim/devise_controllers.rb +0 -1
  80. data/app/controllers/concerns/decidim/filter_resource.rb +23 -24
  81. data/app/controllers/concerns/decidim/force_authentication.rb +1 -2
  82. data/app/controllers/concerns/decidim/http_caching_disabler.rb +1 -1
  83. data/app/controllers/concerns/decidim/needs_password_change.rb +43 -0
  84. data/app/controllers/concerns/decidim/needs_tos_accepted.rb +3 -3
  85. data/app/controllers/concerns/decidim/orderable.rb +1 -1
  86. data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -2
  87. data/app/controllers/concerns/decidim/resource_versions_concern.rb +0 -4
  88. data/app/controllers/decidim/account_controller.rb +45 -0
  89. data/app/controllers/decidim/application_controller.rb +1 -1
  90. data/app/controllers/decidim/devise/invitations_controller.rb +2 -0
  91. data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
  92. data/app/controllers/decidim/devise/registrations_controller.rb +3 -1
  93. data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
  94. data/app/controllers/decidim/{data_portability_controller.rb → download_your_data_controller.rb} +8 -8
  95. data/app/controllers/decidim/groups_controller.rb +5 -0
  96. data/app/controllers/decidim/last_activities_controller.rb +7 -9
  97. data/app/controllers/decidim/manifests_controller.rb +11 -0
  98. data/app/controllers/decidim/newsletters_controller.rb +1 -1
  99. data/app/controllers/decidim/notifications_subscriptions_controller.rb +16 -0
  100. data/app/controllers/decidim/offline_controller.rb +7 -0
  101. data/app/controllers/decidim/profiles_controller.rb +1 -1
  102. data/app/controllers/decidim/searches_controller.rb +4 -3
  103. data/app/controllers/decidim/short_links_controller.rb +35 -0
  104. data/app/controllers/decidim/upload_validations_controller.rb +44 -0
  105. data/app/controllers/decidim/user_activities_controller.rb +32 -16
  106. data/app/controllers/decidim/user_interests_controller.rb +0 -2
  107. data/app/controllers/decidim/user_timeline_controller.rb +6 -8
  108. data/app/events/decidim/change_nickname_event.rb +21 -0
  109. data/app/events/decidim/resource_endorsed_event.rb +1 -2
  110. data/app/forms/decidim/account_form.rb +2 -2
  111. data/app/forms/decidim/form.rb +1 -1
  112. data/app/forms/decidim/messaging/conversation_form.rb +1 -1
  113. data/app/forms/decidim/notifications_settings_form.rb +8 -2
  114. data/app/forms/decidim/password_form.rb +10 -0
  115. data/app/forms/decidim/registration_form.rb +2 -2
  116. data/app/forms/decidim/upload_validation_form.rb +54 -0
  117. data/app/forms/decidim/user_group_form.rb +1 -1
  118. data/app/forms/decidim/user_interest_scope_form.rb +1 -1
  119. data/app/forms/decidim/user_interests_form.rb +1 -1
  120. data/app/forms/translatable_presence_validator.rb +2 -2
  121. data/app/forms/url_validator.rb +1 -1
  122. data/app/helpers/decidim/application_helper.rb +2 -2
  123. data/app/helpers/decidim/attachments_helper.rb +1 -1
  124. data/app/helpers/decidim/cells_paginate_helper.rb +1 -1
  125. data/app/helpers/decidim/datalist_select_helper.rb +40 -0
  126. data/app/helpers/decidim/decidim_form_helper.rb +1 -1
  127. data/app/helpers/decidim/filters_helper.rb +1 -5
  128. data/app/helpers/decidim/followable_helper.rb +1 -1
  129. data/app/helpers/decidim/icon_helper.rb +1 -1
  130. data/app/helpers/decidim/layout_helper.rb +15 -1
  131. data/app/helpers/decidim/map_helper.rb +12 -8
  132. data/app/helpers/decidim/meta_tags_helper.rb +0 -2
  133. data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
  134. data/app/helpers/decidim/passwords_helper.rb +41 -0
  135. data/app/helpers/decidim/sanitize_helper.rb +1 -0
  136. data/app/helpers/decidim/searches_helper.rb +6 -6
  137. data/app/helpers/decidim/short_link_helper.rb +28 -0
  138. data/app/helpers/decidim/translations_helper.rb +2 -2
  139. data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} +5 -5
  140. data/app/jobs/decidim/email_notifications_digest_generator_job.rb +21 -0
  141. data/app/jobs/decidim/notification_generator_for_recipient_job.rb +5 -3
  142. data/app/jobs/decidim/reminder_generator_job.rb +12 -0
  143. data/app/jobs/decidim/resend_confirmation_instructions_job.rb +11 -0
  144. data/app/jobs/decidim/user_report_job.rb +2 -2
  145. data/app/mailers/concerns/decidim/multitenant_asset_host.rb +11 -3
  146. data/app/mailers/decidim/application_mailer.rb +1 -1
  147. data/app/mailers/decidim/block_user_mailer.rb +8 -7
  148. data/app/mailers/decidim/export_mailer.rb +2 -2
  149. data/app/mailers/decidim/newsletter_mailer.rb +2 -2
  150. data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
  151. data/app/mailers/decidim/notifications_digest_mailer.rb +23 -0
  152. data/app/mailers/decidim/user_report_mailer.rb +10 -11
  153. data/app/models/decidim/action_log.rb +95 -11
  154. data/app/models/decidim/amendment.rb +0 -1
  155. data/app/models/decidim/area.rb +1 -2
  156. data/app/models/decidim/area_type.rb +5 -0
  157. data/app/models/decidim/attachment.rb +6 -0
  158. data/app/models/decidim/attachment_collection.rb +5 -0
  159. data/app/models/decidim/category.rb +9 -4
  160. data/app/models/decidim/coauthorship.rb +0 -2
  161. data/app/models/decidim/contextual_help_section.rb +5 -1
  162. data/app/models/decidim/follow.rb +2 -2
  163. data/app/models/decidim/gamification/badge_score.rb +0 -1
  164. data/app/models/decidim/identity.rb +2 -2
  165. data/app/models/decidim/messaging/conversation.rb +4 -4
  166. data/app/models/decidim/messaging/message.rb +1 -2
  167. data/app/models/decidim/messaging/participation.rb +0 -2
  168. data/app/models/decidim/messaging/receipt.rb +0 -2
  169. data/app/models/decidim/notification.rb +5 -2
  170. data/app/models/decidim/oauth_application.rb +12 -1
  171. data/app/models/decidim/organization.rb +7 -7
  172. data/app/models/decidim/participatory_space_private_user.rb +4 -2
  173. data/app/models/decidim/permission_action.rb +1 -0
  174. data/app/models/decidim/reminder.rb +10 -0
  175. data/app/models/decidim/reminder_delivery.rb +7 -0
  176. data/app/models/decidim/reminder_record.rb +29 -0
  177. data/app/models/decidim/report.rb +2 -2
  178. data/app/models/decidim/scope.rb +3 -4
  179. data/app/models/decidim/scope_type.rb +5 -0
  180. data/app/models/decidim/share_token.rb +0 -2
  181. data/app/models/decidim/short_link.rb +162 -0
  182. data/app/models/decidim/user.rb +34 -6
  183. data/app/models/decidim/user_base_entity.rb +1 -2
  184. data/app/models/decidim/user_group.rb +3 -3
  185. data/app/models/decidim/user_moderation.rb +0 -2
  186. data/app/models/decidim/user_report.rb +2 -2
  187. data/app/packs/entrypoints/decidim_core.js +2 -2
  188. data/app/packs/entrypoints/decidim_sw.js +1 -0
  189. data/app/packs/src/decidim/autocomplete.js +298 -0
  190. data/app/packs/src/decidim/cookie_consent/consent_manager.js +133 -0
  191. data/app/packs/src/decidim/cookie_consent/cookie_consent.js +103 -0
  192. data/app/packs/src/decidim/datalist_select.js +36 -0
  193. data/app/packs/src/decidim/direct_uploads/upload_field.js +117 -0
  194. data/app/packs/src/decidim/direct_uploads/upload_modal.js +264 -0
  195. data/app/packs/src/decidim/direct_uploads/upload_utility.js +49 -0
  196. data/app/packs/src/decidim/direct_uploads/uploader.js +89 -0
  197. data/app/packs/src/decidim/external_domain_warning.js +1 -1
  198. data/app/packs/src/decidim/external_link.js +14 -3
  199. data/app/packs/src/decidim/external_link.test.js +64 -0
  200. data/app/packs/src/decidim/geocoding.js +10 -35
  201. data/app/packs/src/decidim/identity_selector_dialog.js +1 -1
  202. data/app/packs/src/decidim/impersonation.js +3 -3
  203. data/app/packs/src/decidim/input_character_counter.js +177 -7
  204. data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
  205. data/app/packs/src/decidim/map/icon.js +2 -1
  206. data/app/packs/src/decidim/map/svg-icon.js +248 -0
  207. data/app/packs/src/decidim/security/selfxss_warning.js +5 -1
  208. data/app/packs/src/decidim/session_timeouter.js +15 -15
  209. data/app/packs/src/decidim/sw/a2hs.js +28 -0
  210. data/app/packs/src/decidim/sw/index.js +3 -0
  211. data/app/packs/src/decidim/sw/loader.js +18 -0
  212. data/app/packs/src/decidim/sw/push-permissions.js +87 -0
  213. data/app/packs/src/decidim/sw/sw.js +80 -0
  214. data/app/packs/src/decidim/vizzs/areachart.js +33 -28
  215. data/app/packs/src/decidim/vizzs/{metrics.js → index.js} +0 -0
  216. data/app/packs/src/decidim/vizzs/linechart.js +23 -18
  217. data/app/packs/src/decidim/vizzs/rowchart.js +15 -11
  218. data/app/packs/stylesheets/decidim/email.scss +66 -0
  219. data/app/packs/stylesheets/decidim/layouts/_user.scss +8 -0
  220. data/app/packs/stylesheets/decidim/modules/_autocomplete.scss +99 -0
  221. data/app/packs/stylesheets/decidim/modules/_cards.scss +0 -2
  222. data/app/packs/stylesheets/decidim/modules/_comments.scss +0 -2
  223. data/app/packs/stylesheets/decidim/modules/_cookie-consent.scss +115 -0
  224. data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
  225. data/app/packs/stylesheets/decidim/modules/_forms.scss +0 -5
  226. data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss +29 -2
  227. data/app/packs/stylesheets/decidim/modules/_modules.scss +3 -1
  228. data/app/packs/stylesheets/decidim/modules/_reveal.scss +15 -0
  229. data/app/packs/stylesheets/decidim/modules/_upload_modal.scss +143 -0
  230. data/app/packs/stylesheets/decidim/utils/_fontface.scss +3 -0
  231. data/app/permissions/decidim/permissions.rb +4 -8
  232. data/app/presenters/decidim/admin_log/area_type_presenter.rb +34 -0
  233. data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb +35 -0
  234. data/app/presenters/decidim/admin_log/attachment_presenter.rb +27 -0
  235. data/app/presenters/decidim/admin_log/category_presenter.rb +36 -0
  236. data/app/presenters/decidim/admin_log/component_presenter.rb +35 -3
  237. data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb +33 -0
  238. data/app/presenters/decidim/admin_log/organization_presenter.rb +9 -4
  239. data/app/presenters/decidim/admin_log/scope_type_presenter.rb +34 -0
  240. data/app/presenters/decidim/home_stats_presenter.rb +4 -2
  241. data/app/presenters/decidim/log/base_presenter.rb +1 -1
  242. data/app/presenters/decidim/menu_item_presenter.rb +1 -1
  243. data/app/presenters/decidim/metric_charts_presenter.rb +7 -1
  244. data/app/presenters/decidim/nil_presenter.rb +3 -1
  245. data/app/presenters/decidim/notification_to_mailer_presenter.rb +39 -0
  246. data/app/presenters/decidim/notifications_digest_presenter.rb +42 -0
  247. data/app/presenters/decidim/official_author_presenter.rb +4 -0
  248. data/app/presenters/decidim/organization_presenter.rb +22 -0
  249. data/app/presenters/decidim/push_notification_presenter.rb +24 -0
  250. data/app/presenters/decidim/stats_presenter.rb +1 -1
  251. data/app/presenters/decidim/user_presenter.rb +1 -4
  252. data/app/presenters/decidim/validation_errors_presenter.rb +1 -1
  253. data/app/queries/decidim/messaging/user_conversations.rb +1 -1
  254. data/app/queries/decidim/metric_manage.rb +1 -1
  255. data/app/queries/decidim/own_activities.rb +11 -0
  256. data/app/queries/decidim/participatory_processes_with_user_role.rb +1 -1
  257. data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb} +35 -77
  258. data/app/queries/decidim/public_components.rb +1 -1
  259. data/app/queries/decidim/similar_emendations.rb +1 -1
  260. data/app/queries/decidim/stats_users_count.rb +1 -1
  261. data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
  262. data/app/queries/decidim/user_groups/accepted_user_groups.rb +1 -1
  263. data/app/queries/decidim/user_groups/accepted_users.rb +1 -1
  264. data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
  265. data/app/queries/decidim/user_groups/invited_memberships.rb +1 -1
  266. data/app/queries/decidim/user_groups/manageable_user_groups.rb +1 -1
  267. data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
  268. data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb} +6 -6
  269. data/app/services/decidim/email_notification_generator.rb +2 -2
  270. data/app/services/decidim/engine_resolver.rb +66 -0
  271. data/app/services/decidim/events_manager.rb +1 -1
  272. data/app/services/decidim/iframe_disabler.rb +31 -0
  273. data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
  274. data/app/services/decidim/notifications_digest_sending_decider.rb +18 -0
  275. data/app/services/decidim/notifications_subscriptions_persistor.rb +37 -0
  276. data/app/services/decidim/open_data_exporter.rb +1 -1
  277. data/app/services/decidim/resource_search.rb +17 -164
  278. data/app/services/decidim/send_push_notification.rb +59 -0
  279. data/app/services/decidim/traceability.rb +1 -1
  280. data/app/uploaders/decidim/application_uploader.rb +2 -12
  281. data/app/uploaders/decidim/cw/attachment_uploader.rb +1 -1
  282. data/app/uploaders/decidim/cw/{data_portability_uploader.rb → download_your_data_uploader.rb} +3 -3
  283. data/app/uploaders/decidim/cw/image_uploader.rb +2 -2
  284. data/app/uploaders/decidim/organization_favicon_uploader.rb +3 -2
  285. data/app/validators/passthru_validator.rb +29 -21
  286. data/app/validators/password_validator.rb +25 -4
  287. data/app/validators/uploader_image_dimensions_validator.rb +1 -1
  288. data/app/views/decidim/account/_account_notification.js.erb +20 -0
  289. data/app/views/decidim/account/_password_fields.html.erb +2 -2
  290. data/app/views/decidim/account/cancel_email_change.js.erb +6 -0
  291. data/app/views/decidim/account/resend_confirmation_instructions.erb +1 -0
  292. data/app/views/decidim/account/show.html.erb +19 -6
  293. data/app/views/decidim/application/{_attachments.html.erb → _attachments.erb} +2 -2
  294. data/app/views/decidim/application/_collection.html.erb +1 -1
  295. data/app/views/decidim/application/{_document.html.erb → _document.erb} +0 -0
  296. data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
  297. data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
  298. data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
  299. data/app/views/decidim/devise/invitations/edit.html.erb +3 -4
  300. data/app/views/decidim/devise/omniauth_registrations/new.html.erb +3 -3
  301. data/app/views/decidim/devise/passwords/edit.html.erb +7 -5
  302. data/app/views/decidim/devise/passwords/new.html.erb +1 -1
  303. data/app/views/decidim/devise/registrations/edit.html.erb +5 -5
  304. data/app/views/decidim/devise/registrations/new.html.erb +5 -5
  305. data/app/views/decidim/devise/sessions/new.html.erb +2 -2
  306. data/app/views/decidim/{data_portability → download_your_data}/export.html.erb +0 -0
  307. data/app/views/decidim/{data_portability → download_your_data}/show.html.erb +2 -2
  308. data/app/views/decidim/export_mailer/download_your_data_export.html.erb +7 -0
  309. data/app/views/decidim/last_activities/index.html.erb +1 -1
  310. data/app/views/decidim/manifests/show.json.erb +31 -0
  311. data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +5 -3
  312. data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
  313. data/app/views/decidim/messaging/conversations/_start.html.erb +1 -3
  314. data/app/views/decidim/messaging/conversations/create.js.erb +1 -0
  315. data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb +11 -0
  316. data/app/views/decidim/notifications_digest_mailer/digest_mail.erb +27 -0
  317. data/app/views/decidim/notifications_settings/show.html.erb +79 -52
  318. data/app/views/decidim/offline/show.html.erb +9 -0
  319. data/app/views/decidim/pages/_standalone.html.erb +1 -1
  320. data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
  321. data/app/views/decidim/reported_mailer/report.html.erb +1 -1
  322. data/app/views/decidim/scopes/picker.html.erb +1 -1
  323. data/app/views/decidim/searches/_filters.html.erb +2 -2
  324. data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +3 -3
  325. data/app/views/decidim/user_interests/show.html.erb +13 -11
  326. data/app/views/decidim/user_report_mailer/notify.html.erb +10 -3
  327. data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -1
  328. data/app/views/layouts/decidim/_application.html.erb +6 -3
  329. data/app/views/layouts/decidim/_cookie_warning.html.erb +8 -8
  330. data/app/views/layouts/decidim/_decidim_javascript.html.erb +12 -0
  331. data/app/views/layouts/decidim/_head.html.erb +4 -2
  332. data/app/views/layouts/decidim/_js_configuration.html.erb +5 -1
  333. data/app/views/layouts/decidim/_main_footer.html.erb +1 -0
  334. data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
  335. data/app/views/layouts/decidim/widget.html.erb +2 -2
  336. data/config/assets.rb +1 -0
  337. data/config/locales/am-ET.yml +1 -0
  338. data/config/locales/ar.yml +50 -36
  339. data/config/locales/bg.yml +16 -31
  340. data/config/locales/ca.yml +190 -39
  341. data/config/locales/cs.yml +195 -42
  342. data/config/locales/da.yml +1 -0
  343. data/config/locales/de.yml +27 -99
  344. data/config/locales/el.yml +15 -30
  345. data/config/locales/en.yml +183 -32
  346. data/config/locales/eo.yml +4 -6
  347. data/config/locales/es-MX.yml +186 -35
  348. data/config/locales/es-PY.yml +186 -35
  349. data/config/locales/es.yml +188 -37
  350. data/config/locales/et.yml +1 -0
  351. data/config/locales/eu.yml +19 -40
  352. data/config/locales/fi-plain.yml +184 -33
  353. data/config/locales/fi.yml +184 -33
  354. data/config/locales/fr-CA.yml +172 -35
  355. data/config/locales/fr.yml +180 -43
  356. data/config/locales/ga-IE.yml +6 -8
  357. data/config/locales/gl.yml +49 -30
  358. data/config/locales/hr.yml +1 -0
  359. data/config/locales/hu.yml +64 -206
  360. data/config/locales/id-ID.yml +17 -29
  361. data/config/locales/is-IS.yml +7 -17
  362. data/config/locales/it.yml +25 -41
  363. data/config/locales/ja.yml +175 -36
  364. data/config/locales/ko.yml +1 -0
  365. data/config/locales/lb.yml +17 -33
  366. data/config/locales/lt.yml +1 -1802
  367. data/config/locales/lv.yml +15 -28
  368. data/config/locales/mt.yml +1 -0
  369. data/config/locales/nl.yml +28 -36
  370. data/config/locales/no.yml +25 -36
  371. data/config/locales/om-ET.yml +1 -0
  372. data/config/locales/pl.yml +67 -35
  373. data/config/locales/pt-BR.yml +20 -35
  374. data/config/locales/pt.yml +17 -33
  375. data/config/locales/ro-RO.yml +20 -36
  376. data/config/locales/ru.yml +17 -28
  377. data/config/locales/si-LK.yml +1 -0
  378. data/config/locales/sk.yml +18 -30
  379. data/config/locales/sl.yml +1 -0
  380. data/config/locales/so-SO.yml +1 -0
  381. data/config/locales/sr-CS.yml +1 -0
  382. data/config/locales/sv.yml +68 -34
  383. data/config/locales/sw-KE.yml +1 -0
  384. data/config/locales/ti-ER.yml +1 -0
  385. data/config/locales/tr-TR.yml +17 -31
  386. data/config/locales/uk.yml +17 -27
  387. data/config/locales/val-ES.yml +1 -0
  388. data/config/locales/vi.yml +1 -0
  389. data/config/locales/zh-CN.yml +17 -30
  390. data/config/locales/zh-TW.yml +1 -0
  391. data/config/routes.rb +17 -2
  392. data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
  393. data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +1 -0
  394. data/db/migrate/20190412131728_fix_user_names.rb +4 -4
  395. data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb +22 -0
  396. data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb +14 -0
  397. data/db/migrate/20211208155453_create_decidim_reminders.rb +11 -0
  398. data/db/migrate/20211209121025_create_decidim_reminder_records.rb +11 -0
  399. data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb +10 -0
  400. data/db/migrate/20220118121921_change_required_description_categories.rb +7 -0
  401. data/db/migrate/20220127113419_add_notification_settings_to_users.rb +7 -0
  402. data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb +7 -0
  403. data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb +7 -0
  404. data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb +7 -0
  405. data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb +15 -0
  406. data/db/migrate/20220518094535_add_previous_passwords_to_users.rb +20 -0
  407. data/db/migrate/20220524195530_create_decidim_short_links.rb +23 -0
  408. data/db/seeds.rb +17 -18
  409. data/lib/decidim/acts_as_tree.rb +47 -0
  410. data/lib/decidim/api/input_sorts/component_input_sort.rb +2 -1
  411. data/lib/decidim/api/interfaces/authorable_interface.rb +6 -5
  412. data/lib/decidim/asset_router.rb +80 -0
  413. data/lib/decidim/attachment_attributes.rb +8 -8
  414. data/lib/decidim/attribute_object/form.rb +174 -0
  415. data/lib/decidim/attribute_object/model.rb +148 -0
  416. data/lib/decidim/attribute_object/nested_validator.rb +22 -0
  417. data/lib/decidim/attribute_object/type_map.rb +14 -0
  418. data/lib/decidim/attribute_object/type_resolver.rb +91 -0
  419. data/lib/decidim/attribute_object.rb +26 -0
  420. data/lib/decidim/attributes/array.rb +62 -0
  421. data/lib/decidim/attributes/blob.rb +20 -0
  422. data/lib/decidim/attributes/clean_string.rb +12 -6
  423. data/lib/decidim/attributes/hash.rb +36 -0
  424. data/lib/decidim/attributes/integer.rb +17 -0
  425. data/lib/decidim/attributes/localized_date.rb +9 -7
  426. data/lib/decidim/attributes/model.rb +24 -0
  427. data/lib/decidim/attributes/object.rb +28 -0
  428. data/lib/decidim/attributes/symbol.rb +23 -0
  429. data/lib/decidim/attributes/time_with_zone.rb +9 -7
  430. data/lib/decidim/attributes.rb +29 -0
  431. data/lib/decidim/authorable.rb +21 -6
  432. data/lib/decidim/authorization_form_builder.rb +9 -11
  433. data/lib/decidim/carrier_wave_migrator_service.rb +15 -15
  434. data/lib/decidim/coauthorable.rb +22 -4
  435. data/lib/decidim/command.rb +44 -0
  436. data/lib/decidim/common_passwords.rb +1 -1
  437. data/lib/decidim/component_manifest.rb +5 -5
  438. data/lib/decidim/component_validator.rb +2 -2
  439. data/lib/decidim/content_block_manifest.rb +1 -1
  440. data/lib/decidim/content_parsers/hashtag_parser.rb +2 -2
  441. data/lib/decidim/content_parsers/resource_parser.rb +1 -1
  442. data/lib/decidim/content_parsers/user_group_parser.rb +1 -1
  443. data/lib/decidim/content_parsers/user_parser.rb +4 -4
  444. data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
  445. data/lib/decidim/content_renderers/link_renderer.rb +2 -2
  446. data/lib/decidim/content_renderers/user_group_renderer.rb +1 -1
  447. data/lib/decidim/content_renderers/user_renderer.rb +1 -1
  448. data/lib/decidim/controller_helpers.rb +41 -0
  449. data/lib/decidim/core/engine.rb +30 -19
  450. data/lib/decidim/core/test/factories.rb +48 -8
  451. data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +16 -4
  452. data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +1 -1
  453. data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +15 -2
  454. data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
  455. data/lib/decidim/core/test/shared_examples/comments_examples.rb +203 -0
  456. data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
  457. data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
  458. data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -2
  459. data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
  460. data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +120 -40
  461. data/lib/decidim/core/test/shared_examples/resourceable.rb +0 -6
  462. data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
  463. data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
  464. data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +3 -3
  465. data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
  466. data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
  467. data/lib/decidim/core/test.rb +0 -2
  468. data/lib/decidim/core/version.rb +1 -1
  469. data/lib/decidim/core.rb +108 -14
  470. data/lib/decidim/{data_portability.rb → download_your_data.rb} +3 -3
  471. data/lib/decidim/{data_portability_serializers/data_portability_conversation_serializer.rb → download_your_data_serializers/download_your_data_conversation_serializer.rb} +2 -2
  472. data/lib/decidim/{data_portability_serializers/data_portability_follow_serializer.rb → download_your_data_serializers/download_your_data_follow_serializer.rb} +2 -2
  473. data/lib/decidim/{data_portability_serializers/data_portability_identity_serializer.rb → download_your_data_serializers/download_your_data_identity_serializer.rb} +2 -2
  474. data/lib/decidim/{data_portability_serializers/data_portability_notification_serializer.rb → download_your_data_serializers/download_your_data_notification_serializer.rb} +2 -2
  475. 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
  476. data/lib/decidim/{data_portability_serializers/data_portability_report_serializer.rb → download_your_data_serializers/download_your_data_report_serializer.rb} +2 -2
  477. 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
  478. data/lib/decidim/{data_portability_serializers/data_portability_user_serializer.rb → download_your_data_serializers/download_your_data_user_serializer.rb} +3 -3
  479. data/lib/decidim/download_your_data_serializers.rb +23 -0
  480. data/lib/decidim/engine_router.rb +7 -1
  481. data/lib/decidim/env.rb +56 -0
  482. data/lib/decidim/event_recorder.rb +25 -0
  483. data/lib/decidim/events/base_event.rb +10 -14
  484. data/lib/decidim/events/simple_event.rb +6 -5
  485. data/lib/decidim/exporters/export_data.rb +1 -1
  486. data/lib/decidim/exporters/export_manifest.rb +2 -1
  487. data/lib/decidim/file_validator_humanizer.rb +24 -1
  488. data/lib/decidim/filterable_resource.rb +55 -0
  489. data/lib/decidim/fingerprint_calculator.rb +2 -4
  490. data/lib/decidim/form_builder.rb +158 -130
  491. data/lib/decidim/gamification/badge.rb +2 -3
  492. data/lib/decidim/gamification/badge_scorer.rb +1 -0
  493. data/lib/decidim/has_area.rb +27 -0
  494. data/lib/decidim/has_attachments.rb +2 -2
  495. data/lib/decidim/has_category.rb +36 -0
  496. data/lib/decidim/has_resource_permission.rb +2 -0
  497. data/lib/decidim/importers/import_manifest.rb +3 -21
  498. data/lib/decidim/jsonb_attributes.rb +6 -4
  499. data/lib/decidim/manifest_messages.rb +23 -0
  500. data/lib/decidim/map/autocomplete.rb +6 -4
  501. data/lib/decidim/map/frontend.rb +2 -2
  502. data/lib/decidim/map/provider/dynamic_map/here.rb +1 -46
  503. data/lib/decidim/map/provider/geocoding/here.rb +5 -5
  504. data/lib/decidim/map/provider/here.rb +3 -0
  505. data/lib/decidim/map/provider/osm.rb +3 -0
  506. data/lib/decidim/map.rb +4 -4
  507. data/lib/decidim/menu.rb +1 -1
  508. data/lib/decidim/metric_manifest.rb +2 -2
  509. data/lib/decidim/nicknamizable.rb +1 -1
  510. data/lib/decidim/notification_setting_manifest.rb +19 -0
  511. data/lib/decidim/organization_settings.rb +8 -7
  512. data/lib/decidim/participatory_space_context_manifest.rb +2 -2
  513. data/lib/decidim/participatory_space_manifest.rb +2 -2
  514. data/lib/decidim/processes_file_locally.rb +31 -0
  515. data/lib/decidim/query.rb +84 -0
  516. data/lib/decidim/record_encryptor.rb +29 -8
  517. data/lib/decidim/reminder_manifest.rb +75 -0
  518. data/lib/decidim/reminder_registry.rb +67 -0
  519. data/lib/decidim/resource_manifest.rb +1 -1
  520. data/lib/decidim/resourceable.rb +11 -0
  521. data/lib/decidim/scopable.rb +15 -0
  522. data/lib/decidim/settings_manifest.rb +4 -4
  523. data/lib/decidim/spring.rb +16 -0
  524. data/lib/decidim/translatable_attributes.rb +13 -16
  525. data/lib/decidim/url_option_resolver.rb +50 -0
  526. data/lib/decidim/view_hooks.rb +1 -1
  527. data/lib/decidim/view_model.rb +5 -1
  528. data/lib/decidim/webpacker/thread_safe_compiler.rb +30 -0
  529. data/lib/decidim/webpacker/webpack/custom.js +15 -3
  530. data/lib/decidim/webpacker/webpacker.yml +1 -1
  531. data/lib/decidim/webpacker.rb +2 -0
  532. data/lib/devise/models/decidim_validatable.rb +1 -1
  533. data/lib/tasks/decidim_active_storage_migration_tasks.rake +1 -3
  534. data/lib/tasks/{decidim_data_portability_tasks.rake → decidim_download_your_data_tasks.rake} +9 -9
  535. data/lib/tasks/decidim_mailers_tasks.rake +23 -0
  536. data/lib/tasks/decidim_metrics_tasks.rake +1 -1
  537. data/lib/tasks/decidim_pwa_tasks.rake +18 -0
  538. data/lib/tasks/decidim_reminders_tasks.rake +17 -0
  539. data/lib/tasks/decidim_tasks.rake +6 -1
  540. data/lib/tasks/decidim_webpacker_tasks.rake +1 -1
  541. data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +51 -0
  542. metadata +184 -86
  543. data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
  544. data/app/helpers/decidim/cookies_helper.rb +0 -11
  545. data/app/packs/src/decidim/vizzs/renders.js +0 -9
  546. data/app/packs/src/decidim/vizzs.js +0 -1
  547. data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss +0 -26
  548. data/app/services/decidim/home_activity_search.rb +0 -80
  549. data/app/services/decidim/participatory_space_search.rb +0 -54
  550. data/app/views/decidim/cookie_policy/accept.js.erb +0 -3
  551. data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
  552. data/config/locales/oc-FR.yml +0 -1
  553. data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +0 -60
  554. data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +0 -40
  555. data/lib/decidim/data_portability_serializers.rb +0 -23
  556. data/lib/decidim/middleware/rails_cookies.rb +0 -23
@@ -2,16 +2,22 @@
2
2
 
3
3
  module Decidim
4
4
  module Attributes
5
- # Custom Virtus value to "standardize" the newline characters within strings
6
- # that are sent through user entered forms. This strips out the carriage
7
- # return characters from the strings in order to avoid validation mismatches
8
- # with the string lengths between the frontend and the backend.
5
+ # Custom attributes value to "standardize" the newline characters within
6
+ # strings that are sent through user entered forms. This strips out the
7
+ # carriage return characters from the strings in order to avoid validation
8
+ # mismatches with the string lengths between the frontend and the backend.
9
9
  #
10
10
  # This type should be used with forms that have:
11
11
  # - A user input defined with the <textarea> element
12
12
  # - The input element having the `maxlength` attribute defined for it
13
13
  # - The backend having a maximum length validation for the input
14
- class CleanString < Virtus::Attribute
14
+ class CleanString < ActiveModel::Type::Value
15
+ def type # :nodoc:
16
+ :"decidim/attributes/clean_string"
17
+ end
18
+
19
+ private
20
+
15
21
  # When using Windows or copying texts from existing documents, the text
16
22
  # can contain the carriage return characters (\r) that the front-end
17
23
  # character counter does not consider as actual characters. This happens
@@ -27,7 +33,7 @@ module Decidim
27
33
  # are included in the data that gets sent to the server. In order to fix
28
34
  # this mismatch, remove the carriage return characters from the text
29
35
  # using this attribute type.
30
- def coerce(value)
36
+ def cast_value(value)
31
37
  return value unless value.is_a?(String)
32
38
 
33
39
  value.gsub(/\r/, "")
@@ -0,0 +1,36 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Attributes
5
+ # Custom attributes value to represent a Hash.
6
+ class Hash < Decidim::Attributes::Array
7
+ attr_reader :key_type
8
+
9
+ def initialize(key_type: ::Symbol, value_type: ::Object, default: {})
10
+ @key_type = key_type
11
+ @value_type = value_type
12
+ @default = default
13
+ end
14
+
15
+ def type # :nodoc:
16
+ :hash
17
+ end
18
+
19
+ private
20
+
21
+ def cast_value(value)
22
+ value ||= default.dup
23
+ value = value.to_h if !value.is_a?(::Hash) && value.respond_to?(:to_h)
24
+
25
+ # This preserves backwards compatibility for non-hash values e.g. with
26
+ # the admin hero content block which expects the images container object
27
+ # as the default value when building the admin form.
28
+ return value unless value.is_a?(::Hash)
29
+
30
+ value.to_h do |k, v|
31
+ [primitive_value(k, key_type), primitive_value(v, value_type)]
32
+ end
33
+ end
34
+ end
35
+ end
36
+ end
@@ -0,0 +1,17 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Attributes
5
+ # Custom attributes value to represent an Integer that is customized from
6
+ # the parent class to also convert records to their ID representations.
7
+ class Integer < ActiveModel::Type::Integer
8
+ private
9
+
10
+ def cast_value(value)
11
+ return cast_value(value.id) if value.respond_to?(:id)
12
+
13
+ super
14
+ end
15
+ end
16
+ end
17
+ end
@@ -2,20 +2,22 @@
2
2
 
3
3
  module Decidim
4
4
  module Attributes
5
- # Custom Virtus value to parse a String representing a Date using
5
+ # Custom attributes value to parse a String representing a Date using
6
6
  # the app localization format.
7
- class LocalizedDate < Virtus::Attribute
8
- def coerce(value)
7
+ class LocalizedDate < ActiveModel::Type::Date
8
+ def type
9
+ :"decidim/attributes/localized_date"
10
+ end
11
+
12
+ private
13
+
14
+ def cast_value(value)
9
15
  return value unless value.is_a?(String)
10
16
 
11
17
  Date.strptime(value, I18n.t("date.formats.decidim_short"))
12
18
  rescue ArgumentError
13
19
  nil
14
20
  end
15
-
16
- def type
17
- Axiom::Types::Date
18
- end
19
21
  end
20
22
  end
21
23
  end
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Attributes
5
+ # Custom attributes value to represent a Model.
6
+ class Model < Decidim::Attributes::Object
7
+ def type # :nodoc:
8
+ :model
9
+ end
10
+
11
+ private
12
+
13
+ def cast_value(value)
14
+ return value if value.is_a?(primitive)
15
+ return value if value.is_a?(Decidim::AttributeObject::Model)
16
+ return primitive.new(value) if value.is_a?(::Hash)
17
+ return primitive.new(value.to_h) if value.respond_to?(:to_h)
18
+ return primitive.new(value.attributes) if value.respond_to?(:attributes)
19
+
20
+ value
21
+ end
22
+ end
23
+ end
24
+ end
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Attributes
5
+ # Custom attributes value to represent an Object.
6
+ class Object < ActiveModel::Type::Value
7
+ attr_reader :primitive
8
+
9
+ def initialize(primitive: ::Object)
10
+ @primitive = primitive
11
+ end
12
+
13
+ def type # :nodoc:
14
+ :object
15
+ end
16
+
17
+ # The nested validator should be only added for those attributes that
18
+ # inherit from the AttributeObject::Model type. Otherwise this would be
19
+ # also added e.g. for ActiveRecord objects which would cause unexpected
20
+ # validation errors.
21
+ def validate_nested?
22
+ return false unless primitive.is_a?(Class)
23
+
24
+ (primitive < Decidim::AttributeObject::Model) == true
25
+ end
26
+ end
27
+ end
28
+ end
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Attributes
5
+ # Custom attributes value to represent a Symbol.
6
+ class Symbol < ActiveModel::Type::Value
7
+ def type # :nodoc:
8
+ :symbol
9
+ end
10
+
11
+ private
12
+
13
+ def cast_value(value)
14
+ return value if value.is_a?(::Symbol)
15
+
16
+ value = value.to_s if !value.respond_to?(:to_sym) && value.respond_to?(:to_s)
17
+ return unless value.respond_to?(:to_sym)
18
+
19
+ value.to_sym
20
+ end
21
+ end
22
+ end
23
+ end
@@ -2,20 +2,22 @@
2
2
 
3
3
  module Decidim
4
4
  module Attributes
5
- # Custom Virtus value to parse a String representing a Time using
5
+ # Custom attributes value to parse a String representing a Time using
6
6
  # the app TimeZone.
7
- class TimeWithZone < Virtus::Attribute
8
- def coerce(value)
7
+ class TimeWithZone < ActiveModel::Type::Time
8
+ def type
9
+ :"decidim/attributes/time_with_zone"
10
+ end
11
+
12
+ private
13
+
14
+ def cast_value(value)
9
15
  return value unless value.is_a?(String)
10
16
 
11
17
  Time.zone.strptime(value, I18n.t("time.formats.decidim_short"))
12
18
  rescue ArgumentError
13
19
  nil
14
20
  end
15
-
16
- def type
17
- Axiom::Types::Time
18
- end
19
21
  end
20
22
  end
21
23
  end
@@ -5,5 +5,34 @@ module Decidim
5
5
  autoload :TimeWithZone, "decidim/attributes/time_with_zone"
6
6
  autoload :LocalizedDate, "decidim/attributes/localized_date"
7
7
  autoload :CleanString, "decidim/attributes/clean_string"
8
+ autoload :Blob, "decidim/attributes/blob"
9
+ autoload :Array, "decidim/attributes/array"
10
+ autoload :Hash, "decidim/attributes/hash"
11
+ autoload :Object, "decidim/attributes/object"
12
+ autoload :Model, "decidim/attributes/model"
13
+ autoload :Symbol, "decidim/attributes/symbol"
14
+ autoload :Integer, "decidim/attributes/integer"
15
+
16
+ # Base types
17
+ ActiveModel::Type.register(:array, Decidim::Attributes::Array)
18
+ ActiveModel::Type.register(:hash, Decidim::Attributes::Hash)
19
+ ActiveModel::Type.register(:object, Decidim::Attributes::Object)
20
+ ActiveModel::Type.register(:model, Decidim::Attributes::Model)
21
+ ActiveModel::Type.register(:symbol, Decidim::Attributes::Symbol)
22
+
23
+ # Synonyms
24
+ ActiveModel::Type.register(:date_time, ActiveModel::Type::DateTime) # Synonym for :datetime
25
+
26
+ # Extra types
27
+ ActiveModel::Type.register(:"decidim/attributes/time_with_zone", Decidim::Attributes::TimeWithZone)
28
+ ActiveModel::Type.register(:"decidim/attributes/localized_date", Decidim::Attributes::LocalizedDate)
29
+ ActiveModel::Type.register(:"decidim/attributes/clean_string", Decidim::Attributes::CleanString)
30
+ ActiveModel::Type.register(:"decidim/attributes/blob", Decidim::Attributes::Blob)
31
+
32
+ # Overrides
33
+ # The overrides deletion can be omitted after upgrade to Rails 7.0 (delete this after upgrade)
34
+ ActiveModel::Type.registry.send(:registrations).delete_if { |r| r.send(:name) == :integer }
35
+
36
+ ActiveModel::Type.register(:integer, Decidim::Attributes::Integer)
8
37
  end
9
38
  end
@@ -12,21 +12,36 @@ module Decidim
12
12
  belongs_to :author, polymorphic: true, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type"
13
13
  belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
14
14
 
15
- scope :official_origin, lambda {
15
+ scope :with_official_origin, lambda {
16
16
  where(decidim_author_type: "Decidim::Organization")
17
17
  }
18
18
 
19
- scope :user_group_origin, lambda {
19
+ scope :with_user_group_origin, lambda {
20
20
  where(decidim_author_type: "Decidim::UserBaseEntity")
21
21
  .where.not(decidim_user_group_id: nil)
22
22
  }
23
23
 
24
- scope :citizens_origin, lambda {
24
+ scope :with_participants_origin, lambda {
25
25
  where(decidim_author_type: "Decidim::UserBaseEntity")
26
26
  .where(decidim_user_group_id: nil)
27
27
  }
28
28
 
29
- validates :author, presence: true
29
+ scope :with_any_origin, lambda { |*origin_keys|
30
+ search_values = origin_keys.compact.compact_blank
31
+
32
+ conditions = [:official, :participants, :user_group].map do |key|
33
+ search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
34
+ end.compact
35
+ return self unless conditions.any?
36
+
37
+ scoped_query = where(id: conditions.shift)
38
+ conditions.each do |condition|
39
+ scoped_query = scoped_query.or(where(id: condition))
40
+ end
41
+
42
+ scoped_query
43
+ }
44
+
30
45
  validate :verified_user_group, :user_group_membership
31
46
  validate :author_belongs_to_organization
32
47
 
@@ -35,7 +50,7 @@ module Decidim
35
50
  #
36
51
  # user - the user to check for authorship
37
52
  def authored_by?(other_author)
38
- other_author == author || other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group)
53
+ other_author == author || (other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group))
39
54
  end
40
55
 
41
56
  # Returns the normalized author, whether it's a user group or a user. Ideally this should be
@@ -70,7 +85,7 @@ module Decidim
70
85
  def author_belongs_to_organization
71
86
  return if !author || !organization
72
87
 
73
- errors.add(:author, :invalid) unless author == organization || author.respond_to?(:organization) && author.organization == organization
88
+ errors.add(:author, :invalid) unless author == organization || (author.respond_to?(:organization) && author.organization == organization)
74
89
  end
75
90
  end
76
91
  end
@@ -39,8 +39,8 @@ module Decidim
39
39
  return hidden_field(name) if name.to_s == "handler_name"
40
40
  return scopes_selector if name.to_s == "scope_id"
41
41
 
42
- case type.name
43
- when "Date", "Time"
42
+ case type
43
+ when :date, :datetime, :time, :"decidim/attributes/localized_date"
44
44
  date_field name
45
45
  else
46
46
  text_field name
@@ -54,24 +54,22 @@ module Decidim
54
54
  end
55
55
 
56
56
  def find_input_type(name)
57
- found_attribute = object.class.attribute_set.detect do |attribute|
58
- attribute.name.to_s == name
59
- end
57
+ value_type = object.class.attribute_types[name]
60
58
 
61
- raise "Could not find attribute #{name} in #{object.class.name}" unless found_attribute
59
+ raise "Could not find attribute #{name} in #{object.class.name}" unless value_type
62
60
 
63
- found_attribute.type.primitive
61
+ value_type.type
64
62
  end
65
63
 
66
64
  def public_attributes
67
- form_attributes.inject({}) do |all, attribute|
68
- all.update(attribute.name => attribute.type.primitive)
65
+ form_attributes.inject({}) do |all, (name, value_type)|
66
+ all.update(name => value_type.type)
69
67
  end
70
68
  end
71
69
 
72
70
  def form_attributes
73
- object.class.attribute_set.select do |attribute|
74
- object.form_attributes.include?(attribute.name)
71
+ object.class.attribute_types.select do |key, _|
72
+ object.form_attributes.include?(key) || object.form_attributes.include?(key.to_sym)
75
73
  end
76
74
  end
77
75
  end
@@ -85,16 +85,16 @@ module Decidim
85
85
  as_checksum = destination.blob.checksum
86
86
 
87
87
  logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
88
- " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
89
- " from CW attribute #{image_config[:name]} to AS" \
90
- " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
88
+ " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
89
+ " from CW attribute #{image_config[:name]} to AS" \
90
+ " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
91
91
  else
92
92
  logger.info "[SKIP] Pending migration of Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
93
- " from CW attribute #{image_config[:name]} to AS" \
93
+ " from CW attribute #{image_config[:name]} to AS" \
94
94
  end
95
95
  rescue StandardError
96
96
  logger.info "[ERROR] Exception checking Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
97
- " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
97
+ " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
98
98
  end
99
99
  end
100
100
  end
@@ -108,8 +108,8 @@ module Decidim
108
108
 
109
109
  if destination.attached?
110
110
  logger.info "[SKIP] Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
111
- " from CW attribute #{image_config[:name]} to AS" \
112
- " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
111
+ " from CW attribute #{image_config[:name]} to AS" \
112
+ " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
113
113
  next
114
114
  end
115
115
 
@@ -132,9 +132,9 @@ module Decidim
132
132
  as_checksum = destination.blob.checksum
133
133
 
134
134
  logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
135
- " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
136
- " from CW attribute #{image_config[:name]} to AS" \
137
- " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
135
+ " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
136
+ " from CW attribute #{image_config[:name]} to AS" \
137
+ " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
138
138
 
139
139
  routes_mappings << { instance: "Decidim::ContentBlock##{block.id}",
140
140
  attachment_origin_attribute: image_config[:name],
@@ -142,7 +142,7 @@ module Decidim
142
142
  destination_path: Rails.application.routes.url_helpers.rails_blob_url(destination.blob, only_path: true) }
143
143
  rescue StandardError
144
144
  logger.info "[ERROR] Exception migrating Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
145
- " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
145
+ " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
146
146
  end
147
147
  end
148
148
  end
@@ -177,7 +177,7 @@ module Decidim
177
177
  as_checksum = copy.send(as_attribute).blob.checksum
178
178
 
179
179
  logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
180
- " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
180
+ " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
181
181
 
182
182
  routes_mappings << {
183
183
  instance: "#{klass}##{item.id}",
@@ -208,8 +208,8 @@ module Decidim
208
208
  as_checksum = copy.send(as_attribute).blob.checksum
209
209
 
210
210
  logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
211
- " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
212
- " to AS #{as_attribute} attribute"
211
+ " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
212
+ " to AS #{as_attribute} attribute"
213
213
  else
214
214
  logger.info "[SKIP] Pending migration of #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
215
215
  end
@@ -286,7 +286,7 @@ module Decidim
286
286
 
287
287
  def self.cw_file(attachment)
288
288
  if attachment.file.is_a?(CarrierWave::Storage::Fog::File)
289
- URI.open(URI.parse(attachment.url))
289
+ URI.parse(attachment.url).open
290
290
  else
291
291
  File.open(attachment.file.file)
292
292
  end
@@ -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