decidim-core 0.26.2 → 0.27.0.rc2
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.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/amendable/announcement_cell.rb +3 -8
- data/app/cells/decidim/announcement_cell.rb +2 -2
- data/app/cells/decidim/author_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/cta/show.erb +1 -1
- data/app/cells/decidim/content_blocks/cta_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/hero/show.erb +2 -2
- data/app/cells/decidim/content_blocks/hero_cell.rb +1 -0
- data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb +5 -5
- data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -3
- data/app/cells/decidim/content_blocks/stats_cell.rb +5 -4
- data/app/cells/decidim/content_blocks/sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero_cell.rb +1 -1
- data/app/cells/decidim/data_consent/category.erb +64 -0
- data/app/cells/decidim/data_consent/dialog.erb +29 -0
- data/app/cells/decidim/data_consent/modal.erb +39 -0
- data/app/cells/decidim/data_consent/show.erb +3 -0
- data/app/cells/decidim/data_consent_cell.rb +21 -0
- data/app/cells/decidim/follow_button_cell.rb +5 -7
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -1
- data/app/cells/decidim/search_results_cell.rb +1 -1
- data/app/cells/decidim/tos_page/refuse_btn_modal.erb +1 -1
- data/app/cells/decidim/upload_modal/files.erb +52 -0
- data/app/cells/decidim/upload_modal/modal.erb +49 -0
- data/app/cells/decidim/upload_modal/show.erb +3 -0
- data/app/cells/decidim/upload_modal_cell.rb +205 -0
- data/app/cells/decidim/user_conversation/reply.erb +1 -1
- data/app/cells/decidim/user_conversations/add_conversation_users.erb +5 -3
- data/app/cells/decidim/version_cell.rb +2 -13
- data/app/cells/decidim/versions_list_cell.rb +2 -13
- data/app/cells/decidim/versions_list_item_cell.rb +2 -13
- data/app/commands/decidim/accept_group_invitation.rb +1 -1
- data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
- data/app/commands/decidim/amendable/accept.rb +1 -1
- data/app/commands/decidim/amendable/create_draft.rb +1 -1
- data/app/commands/decidim/amendable/destroy_draft.rb +1 -1
- data/app/commands/decidim/amendable/promote.rb +1 -1
- data/app/commands/decidim/amendable/publish_draft.rb +1 -1
- data/app/commands/decidim/amendable/reject.rb +1 -1
- data/app/commands/decidim/amendable/update_draft.rb +1 -1
- data/app/commands/decidim/amendable/withdraw.rb +1 -1
- data/app/commands/decidim/attachment_methods.rb +3 -2
- data/app/commands/decidim/create_editor_image.rb +1 -1
- data/app/commands/decidim/create_follow.rb +1 -1
- data/app/commands/decidim/create_omniauth_registration.rb +2 -3
- data/app/commands/decidim/create_registration.rb +1 -2
- data/app/commands/decidim/create_report.rb +1 -1
- data/app/commands/decidim/create_user_group.rb +2 -2
- data/app/commands/decidim/create_user_report.rb +5 -3
- data/app/commands/decidim/delete_follow.rb +1 -1
- data/app/commands/decidim/demote_membership.rb +1 -1
- data/app/commands/decidim/destroy_account.rb +1 -1
- data/app/commands/decidim/endorse_resource.rb +1 -1
- data/app/commands/decidim/gallery_methods.rb +45 -10
- data/app/commands/decidim/invite_user.rb +1 -3
- data/app/commands/decidim/invite_user_again.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +1 -1
- data/app/commands/decidim/join_user_group.rb +1 -1
- data/app/commands/decidim/leave_user_group.rb +8 -2
- data/app/commands/decidim/messaging/reply_to_conversation.rb +2 -2
- data/app/commands/decidim/messaging/start_conversation.rb +2 -2
- data/app/commands/decidim/multiple_attachments_methods.rb +44 -5
- data/app/commands/decidim/promote_membership.rb +1 -1
- data/app/commands/decidim/reject_group_invitation.rb +1 -1
- data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
- data/app/commands/decidim/remove_user_from_group.rb +1 -1
- data/app/commands/decidim/resend_confirmation_instructions.rb +18 -0
- data/app/commands/decidim/search.rb +10 -9
- data/app/commands/decidim/unendorse_resource.rb +1 -1
- data/app/commands/decidim/unsubscribe_settings.rb +1 -1
- data/app/commands/decidim/update_account.rb +5 -3
- data/app/commands/decidim/update_notifications_settings.rb +3 -2
- data/app/commands/decidim/update_password.rb +31 -0
- data/app/commands/decidim/update_user_group.rb +2 -2
- data/app/commands/decidim/update_user_interests.rb +1 -1
- data/app/commands/decidim/validate_upload.rb +15 -0
- data/app/controllers/concerns/decidim/devise_controllers.rb +0 -1
- data/app/controllers/concerns/decidim/filter_resource.rb +23 -24
- data/app/controllers/concerns/decidim/force_authentication.rb +1 -2
- data/app/controllers/concerns/decidim/http_caching_disabler.rb +1 -1
- data/app/controllers/concerns/decidim/needs_password_change.rb +43 -0
- data/app/controllers/concerns/decidim/needs_tos_accepted.rb +3 -3
- data/app/controllers/concerns/decidim/orderable.rb +1 -1
- data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -2
- data/app/controllers/concerns/decidim/resource_versions_concern.rb +4 -0
- data/app/controllers/decidim/account_controller.rb +45 -0
- data/app/controllers/decidim/application_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +2 -0
- data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +7 -1
- data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
- data/app/controllers/decidim/{data_portability_controller.rb → download_your_data_controller.rb} +8 -8
- data/app/controllers/decidim/groups_controller.rb +5 -0
- data/app/controllers/decidim/last_activities_controller.rb +8 -9
- data/app/controllers/decidim/manifests_controller.rb +11 -0
- data/app/controllers/decidim/newsletters_controller.rb +1 -1
- data/app/controllers/decidim/notifications_subscriptions_controller.rb +16 -0
- data/app/controllers/decidim/offline_controller.rb +7 -0
- data/app/controllers/decidim/profiles_controller.rb +1 -1
- data/app/controllers/decidim/searches_controller.rb +4 -3
- data/app/controllers/decidim/short_links_controller.rb +35 -0
- data/app/controllers/decidim/upload_validations_controller.rb +44 -0
- data/app/controllers/decidim/user_activities_controller.rb +32 -16
- data/app/controllers/decidim/user_interests_controller.rb +0 -2
- data/app/controllers/decidim/user_timeline_controller.rb +6 -8
- data/app/events/decidim/change_nickname_event.rb +21 -0
- data/app/events/decidim/resource_endorsed_event.rb +2 -1
- data/app/forms/decidim/account_form.rb +8 -7
- data/app/forms/decidim/form.rb +1 -1
- data/app/forms/decidim/messaging/conversation_form.rb +1 -1
- data/app/forms/decidim/notifications_settings_form.rb +8 -2
- data/app/forms/decidim/password_form.rb +10 -0
- data/app/forms/decidim/registration_form.rb +10 -4
- data/app/forms/decidim/upload_validation_form.rb +54 -0
- data/app/forms/decidim/user_group_form.rb +2 -2
- data/app/forms/decidim/user_interest_scope_form.rb +1 -1
- data/app/forms/decidim/user_interests_form.rb +1 -1
- data/app/forms/translatable_presence_validator.rb +2 -2
- data/app/forms/url_validator.rb +1 -1
- data/app/helpers/decidim/application_helper.rb +2 -2
- data/app/helpers/decidim/attachments_helper.rb +1 -1
- data/app/helpers/decidim/cells_paginate_helper.rb +1 -1
- data/app/helpers/decidim/datalist_select_helper.rb +40 -0
- data/app/helpers/decidim/decidim_form_helper.rb +1 -1
- data/app/helpers/decidim/filters_helper.rb +5 -1
- data/app/helpers/decidim/followable_helper.rb +1 -1
- data/app/helpers/decidim/icon_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +15 -1
- data/app/helpers/decidim/map_helper.rb +12 -8
- data/app/helpers/decidim/meta_tags_helper.rb +0 -2
- data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
- data/app/helpers/decidim/passwords_helper.rb +41 -0
- data/app/helpers/decidim/sanitize_helper.rb +12 -2
- data/app/helpers/decidim/searches_helper.rb +6 -6
- data/app/helpers/decidim/short_link_helper.rb +28 -0
- data/app/helpers/decidim/translations_helper.rb +2 -2
- data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} +5 -5
- data/app/jobs/decidim/email_notifications_digest_generator_job.rb +21 -0
- data/app/jobs/decidim/notification_generator_for_recipient_job.rb +5 -3
- data/app/jobs/decidim/reminder_generator_job.rb +12 -0
- data/app/jobs/decidim/resend_confirmation_instructions_job.rb +11 -0
- data/app/jobs/decidim/user_report_job.rb +2 -2
- data/app/mailers/concerns/decidim/multitenant_asset_host.rb +11 -3
- data/app/mailers/decidim/application_mailer.rb +1 -1
- data/app/mailers/decidim/block_user_mailer.rb +8 -7
- data/app/mailers/decidim/export_mailer.rb +2 -2
- data/app/mailers/decidim/newsletter_mailer.rb +2 -2
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
- data/app/mailers/decidim/notifications_digest_mailer.rb +23 -0
- data/app/mailers/decidim/user_report_mailer.rb +10 -11
- data/app/models/decidim/action_log.rb +95 -11
- data/app/models/decidim/amendment.rb +0 -1
- data/app/models/decidim/area.rb +1 -2
- data/app/models/decidim/area_type.rb +5 -0
- data/app/models/decidim/attachment.rb +6 -0
- data/app/models/decidim/attachment_collection.rb +5 -0
- data/app/models/decidim/category.rb +9 -4
- data/app/models/decidim/coauthorship.rb +0 -2
- data/app/models/decidim/contextual_help_section.rb +5 -1
- data/app/models/decidim/follow.rb +2 -2
- data/app/models/decidim/gamification/badge_score.rb +0 -1
- data/app/models/decidim/identity.rb +2 -2
- data/app/models/decidim/messaging/conversation.rb +4 -4
- data/app/models/decidim/messaging/message.rb +1 -2
- data/app/models/decidim/messaging/participation.rb +0 -2
- data/app/models/decidim/messaging/receipt.rb +0 -2
- data/app/models/decidim/notification.rb +14 -2
- data/app/models/decidim/oauth_application.rb +12 -1
- data/app/models/decidim/organization.rb +7 -7
- data/app/models/decidim/participatory_space_private_user.rb +4 -2
- data/app/models/decidim/permission_action.rb +1 -0
- data/app/models/decidim/reminder.rb +10 -0
- data/app/models/decidim/reminder_delivery.rb +7 -0
- data/app/models/decidim/reminder_record.rb +29 -0
- data/app/models/decidim/report.rb +2 -2
- data/app/models/decidim/scope.rb +3 -4
- data/app/models/decidim/scope_type.rb +5 -0
- data/app/models/decidim/share_token.rb +0 -2
- data/app/models/decidim/short_link.rb +162 -0
- data/app/models/decidim/user.rb +34 -6
- data/app/models/decidim/user_base_entity.rb +2 -1
- data/app/models/decidim/user_group.rb +3 -3
- data/app/models/decidim/user_moderation.rb +0 -2
- data/app/models/decidim/user_report.rb +2 -2
- data/app/packs/entrypoints/decidim_core.js +2 -2
- data/app/packs/entrypoints/decidim_sw.js +1 -0
- data/app/packs/src/decidim/account_form.js +68 -18
- data/app/packs/src/decidim/autocomplete.js +298 -0
- data/app/packs/src/decidim/data_consent/consent_manager.js +136 -0
- data/app/packs/src/decidim/data_consent/consent_manager.test.js +280 -0
- data/app/packs/src/decidim/data_consent/index.js +103 -0
- data/app/packs/src/decidim/datalist_select.js +36 -0
- data/app/packs/src/decidim/direct_uploads/upload_field.js +117 -0
- data/app/packs/src/decidim/direct_uploads/upload_modal.js +264 -0
- data/app/packs/src/decidim/direct_uploads/upload_utility.js +49 -0
- data/app/packs/src/decidim/direct_uploads/uploader.js +89 -0
- data/app/packs/src/decidim/external_domain_warning.js +1 -1
- data/app/packs/src/decidim/external_link.js +14 -3
- data/app/packs/src/decidim/external_link.test.js +64 -0
- data/app/packs/src/decidim/geocoding.js +10 -35
- data/app/packs/src/decidim/identity_selector_dialog.js +1 -1
- data/app/packs/src/decidim/impersonation.js +3 -3
- data/app/packs/src/decidim/input_character_counter.js +215 -22
- data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
- data/app/packs/src/decidim/map/factory.js +3 -1
- data/app/packs/src/decidim/map/icon.js +2 -1
- data/app/packs/src/decidim/map/legacy.js +2 -2
- data/app/packs/src/decidim/map/svg-icon.js +248 -0
- data/app/packs/src/decidim/map.js +2 -2
- data/app/packs/src/decidim/security/selfxss_warning.js +5 -1
- data/app/packs/src/decidim/session_timeouter.js +15 -15
- data/app/packs/src/decidim/sw/a2hs.js +37 -0
- data/app/packs/src/decidim/sw/index.js +3 -0
- data/app/packs/src/decidim/sw/loader.js +18 -0
- data/app/packs/src/decidim/sw/push-permissions.js +87 -0
- data/app/packs/src/decidim/sw/sw.js +80 -0
- data/app/packs/src/decidim/vizzs/areachart.js +33 -28
- data/app/packs/src/decidim/vizzs/{metrics.js → index.js} +0 -0
- data/app/packs/src/decidim/vizzs/linechart.js +23 -18
- data/app/packs/src/decidim/vizzs/rowchart.js +15 -11
- data/app/packs/stylesheets/decidim/email.scss +66 -0
- data/app/packs/stylesheets/decidim/layouts/_user.scss +8 -0
- data/app/packs/stylesheets/decidim/modules/_autocomplete.scss +99 -0
- data/app/packs/stylesheets/decidim/modules/_cards.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_comments.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_data-consent.scss +115 -0
- data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
- data/app/packs/stylesheets/decidim/modules/_forms.scss +5 -0
- data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss +29 -2
- data/app/packs/stylesheets/decidim/modules/_modules.scss +3 -1
- data/app/packs/stylesheets/decidim/modules/_reveal.scss +15 -0
- data/app/packs/stylesheets/decidim/modules/_upload_modal.scss +143 -0
- data/app/packs/stylesheets/decidim/utils/_fontface.scss +3 -0
- data/app/permissions/decidim/permissions.rb +6 -6
- data/app/presenters/decidim/admin_log/area_type_presenter.rb +34 -0
- data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb +35 -0
- data/app/presenters/decidim/admin_log/attachment_presenter.rb +27 -0
- data/app/presenters/decidim/admin_log/category_presenter.rb +36 -0
- data/app/presenters/decidim/admin_log/component_presenter.rb +35 -3
- data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb +33 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +9 -4
- data/app/presenters/decidim/admin_log/scope_type_presenter.rb +34 -0
- data/app/presenters/decidim/home_stats_presenter.rb +4 -2
- data/app/presenters/decidim/log/base_presenter.rb +1 -1
- data/app/presenters/decidim/menu_item_presenter.rb +1 -1
- data/app/presenters/decidim/metric_charts_presenter.rb +7 -1
- data/app/presenters/decidim/nil_presenter.rb +3 -1
- data/app/presenters/decidim/notification_to_mailer_presenter.rb +39 -0
- data/app/presenters/decidim/notifications_digest_presenter.rb +42 -0
- data/app/presenters/decidim/official_author_presenter.rb +4 -0
- data/app/presenters/decidim/organization_presenter.rb +22 -0
- data/app/presenters/decidim/push_notification_presenter.rb +25 -0
- data/app/presenters/decidim/stats_presenter.rb +1 -1
- data/app/presenters/decidim/user_presenter.rb +4 -1
- data/app/presenters/decidim/validation_errors_presenter.rb +1 -1
- data/app/queries/decidim/messaging/user_conversations.rb +1 -1
- data/app/queries/decidim/metric_manage.rb +1 -1
- data/app/queries/decidim/own_activities.rb +11 -0
- data/app/queries/decidim/participatory_processes_with_user_role.rb +1 -1
- data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb} +35 -77
- data/app/queries/decidim/public_components.rb +1 -1
- data/app/queries/decidim/similar_emendations.rb +1 -1
- data/app/queries/decidim/stats_users_count.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_users.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/invited_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/manageable_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/scrubbers/decidim/admin_input_scrubber.rb +25 -0
- data/app/scrubbers/decidim/user_input_scrubber.rb +3 -5
- data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb} +6 -6
- data/app/services/decidim/email_notification_generator.rb +2 -2
- data/app/services/decidim/engine_resolver.rb +66 -0
- data/app/services/decidim/events_manager.rb +1 -1
- data/app/services/decidim/iframe_disabler.rb +30 -0
- data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
- data/app/services/decidim/notifications_digest_sending_decider.rb +22 -0
- data/app/services/decidim/notifications_subscriptions_persistor.rb +37 -0
- data/app/services/decidim/open_data_exporter.rb +1 -1
- data/app/services/decidim/resource_search.rb +17 -164
- data/app/services/decidim/send_push_notification.rb +61 -0
- data/app/services/decidim/traceability.rb +1 -1
- data/app/uploaders/decidim/application_uploader.rb +2 -12
- data/app/uploaders/decidim/cw/attachment_uploader.rb +1 -1
- data/app/uploaders/decidim/cw/{data_portability_uploader.rb → download_your_data_uploader.rb} +3 -3
- data/app/uploaders/decidim/cw/image_uploader.rb +2 -2
- data/app/uploaders/decidim/organization_favicon_uploader.rb +3 -2
- data/app/validators/passthru_validator.rb +29 -21
- data/app/validators/password_validator.rb +25 -4
- data/app/validators/uploader_image_dimensions_validator.rb +1 -1
- data/app/views/decidim/account/_account_notification.js.erb +20 -0
- data/app/views/decidim/account/_password_fields.html.erb +2 -2
- data/app/views/decidim/account/cancel_email_change.js.erb +6 -0
- data/app/views/decidim/account/resend_confirmation_instructions.erb +1 -0
- data/app/views/decidim/account/show.html.erb +19 -6
- data/app/views/decidim/application/{_attachments.html.erb → _attachments.erb} +2 -2
- data/app/views/decidim/application/_collection.html.erb +1 -1
- data/app/views/decidim/application/{_document.html.erb → _document.erb} +0 -0
- data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
- data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
- data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
- data/app/views/decidim/devise/invitations/edit.html.erb +3 -4
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +3 -3
- data/app/views/decidim/devise/passwords/edit.html.erb +7 -5
- data/app/views/decidim/devise/passwords/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/new.html.erb +5 -5
- data/app/views/decidim/devise/sessions/new.html.erb +2 -2
- data/app/views/decidim/{data_portability → download_your_data}/export.html.erb +0 -0
- data/app/views/decidim/{data_portability → download_your_data}/show.html.erb +2 -2
- data/app/views/decidim/export_mailer/download_your_data_export.html.erb +7 -0
- data/app/views/decidim/last_activities/index.html.erb +1 -1
- data/app/views/decidim/manifests/show.json.erb +31 -0
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +5 -3
- data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_start.html.erb +1 -3
- data/app/views/decidim/messaging/conversations/create.js.erb +1 -0
- data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb +11 -0
- data/app/views/decidim/notifications_digest_mailer/digest_mail.erb +27 -0
- data/app/views/decidim/notifications_settings/show.html.erb +67 -44
- data/app/views/decidim/offline/show.html.erb +9 -0
- data/app/views/decidim/pages/_standalone.html.erb +1 -1
- data/app/views/decidim/pages/_tabbed.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
- data/app/views/decidim/reported_mailer/report.html.erb +1 -1
- data/app/views/decidim/scopes/picker.html.erb +1 -1
- data/app/views/decidim/searches/_filters.html.erb +2 -2
- data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +3 -3
- data/app/views/decidim/user_interests/show.html.erb +11 -13
- data/app/views/decidim/user_report_mailer/notify.html.erb +10 -3
- data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -1
- data/app/views/layouts/decidim/_application.html.erb +6 -3
- data/app/views/layouts/decidim/_data_consent_warning.html.erb +8 -0
- data/app/views/layouts/decidim/_decidim_javascript.html.erb +12 -0
- data/app/views/layouts/decidim/_head.html.erb +4 -2
- data/app/views/layouts/decidim/_js_configuration.html.erb +5 -1
- data/app/views/layouts/decidim/_main_footer.html.erb +1 -0
- data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
- data/app/views/layouts/decidim/widget.html.erb +2 -2
- data/config/assets.rb +1 -0
- data/config/locales/ar.yml +48 -45
- data/config/locales/bg.yml +15 -39
- data/config/locales/ca.yml +191 -45
- data/config/locales/cs.yml +192 -44
- data/config/locales/de.yml +227 -44
- data/config/locales/el.yml +15 -39
- data/config/locales/en.yml +187 -41
- data/config/locales/eo.yml +4 -6
- data/config/locales/es-MX.yml +190 -44
- data/config/locales/es-PY.yml +190 -44
- data/config/locales/es.yml +190 -44
- data/config/locales/eu.yml +16 -46
- data/config/locales/fi-plain.yml +188 -42
- data/config/locales/fi.yml +188 -42
- data/config/locales/fr-CA.yml +189 -43
- data/config/locales/fr.yml +196 -50
- data/config/locales/ga-IE.yml +5 -9
- data/config/locales/gl.yml +47 -39
- data/config/locales/hu.yml +312 -41
- data/config/locales/id-ID.yml +15 -38
- data/config/locales/is-IS.yml +6 -15
- data/config/locales/it.yml +23 -48
- data/config/locales/ja.yml +189 -44
- data/config/locales/lb.yml +16 -41
- data/config/locales/lt.yml +1950 -0
- data/config/locales/lv.yml +15 -37
- data/config/locales/nl.yml +41 -43
- data/config/locales/no.yml +25 -45
- data/config/locales/pl.yml +113 -41
- data/config/locales/pt-BR.yml +17 -41
- data/config/locales/pt.yml +16 -41
- data/config/locales/ro-RO.yml +20 -45
- data/config/locales/ru.yml +15 -27
- data/config/locales/sk.yml +15 -39
- data/config/locales/sl.yml +1 -0
- data/config/locales/sr-CS.yml +1 -0
- data/config/locales/sv.yml +73 -43
- data/config/locales/tr-TR.yml +15 -38
- data/config/locales/uk.yml +15 -26
- data/config/locales/zh-CN.yml +17 -39
- data/config/routes.rb +37 -4
- data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
- data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +1 -0
- data/db/migrate/20190412131728_fix_user_names.rb +4 -4
- data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb +22 -0
- data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb +14 -0
- data/db/migrate/20211208155453_create_decidim_reminders.rb +11 -0
- data/db/migrate/20211209121025_create_decidim_reminder_records.rb +11 -0
- data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb +10 -0
- data/db/migrate/20220118121921_change_required_description_categories.rb +7 -0
- data/db/migrate/20220127113419_add_notification_settings_to_users.rb +7 -0
- data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb +7 -0
- data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb +7 -0
- data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb +7 -0
- data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb +15 -0
- data/db/migrate/20220518094535_add_previous_passwords_to_users.rb +20 -0
- data/db/migrate/20220524195530_create_decidim_short_links.rb +23 -0
- data/db/seeds.rb +17 -18
- data/lib/decidim/acts_as_tree.rb +47 -0
- data/lib/decidim/api/input_sorts/component_input_sort.rb +2 -1
- data/lib/decidim/api/interfaces/authorable_interface.rb +6 -5
- data/lib/decidim/asset_router.rb +80 -0
- data/lib/decidim/attachment_attributes.rb +8 -8
- data/lib/decidim/attribute_object/form.rb +174 -0
- data/lib/decidim/attribute_object/model.rb +148 -0
- data/lib/decidim/attribute_object/nested_validator.rb +22 -0
- data/lib/decidim/attribute_object/type_map.rb +14 -0
- data/lib/decidim/attribute_object/type_resolver.rb +91 -0
- data/lib/decidim/attribute_object.rb +26 -0
- data/lib/decidim/attributes/array.rb +62 -0
- data/lib/decidim/attributes/blob.rb +20 -0
- data/lib/decidim/attributes/clean_string.rb +12 -6
- data/lib/decidim/attributes/hash.rb +36 -0
- data/lib/decidim/attributes/integer.rb +17 -0
- data/lib/decidim/attributes/localized_date.rb +9 -7
- data/lib/decidim/attributes/model.rb +32 -0
- data/lib/decidim/attributes/object.rb +28 -0
- data/lib/decidim/attributes/symbol.rb +23 -0
- data/lib/decidim/attributes/time_with_zone.rb +9 -7
- data/lib/decidim/attributes.rb +29 -0
- data/lib/decidim/authorable.rb +21 -6
- data/lib/decidim/authorization_form_builder.rb +9 -11
- data/lib/decidim/carrier_wave_migrator_service.rb +15 -15
- data/lib/decidim/coauthorable.rb +22 -4
- data/lib/decidim/command.rb +44 -0
- data/lib/decidim/common_passwords.rb +1 -1
- data/lib/decidim/component_manifest.rb +5 -5
- data/lib/decidim/component_validator.rb +2 -2
- data/lib/decidim/content_block_manifest.rb +1 -1
- data/lib/decidim/content_parsers/hashtag_parser.rb +2 -2
- data/lib/decidim/content_parsers/resource_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_group_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_parser.rb +4 -4
- data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
- data/lib/decidim/content_renderers/link_renderer.rb +2 -2
- data/lib/decidim/content_renderers/user_group_renderer.rb +1 -1
- data/lib/decidim/content_renderers/user_renderer.rb +1 -1
- data/lib/decidim/controller_helpers.rb +41 -0
- data/lib/decidim/core/engine.rb +30 -19
- data/lib/decidim/core/test/factories.rb +48 -8
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +16 -4
- data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +15 -2
- data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +203 -0
- data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
- data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +60 -0
- data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +120 -40
- data/lib/decidim/core/test/shared_examples/resourceable.rb +0 -6
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +40 -0
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/test.rb +2 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +149 -16
- data/lib/decidim/dependency_resolver.rb +272 -0
- data/lib/decidim/{data_portability.rb → download_your_data.rb} +3 -3
- data/lib/decidim/{data_portability_serializers/data_portability_conversation_serializer.rb → download_your_data_serializers/download_your_data_conversation_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_follow_serializer.rb → download_your_data_serializers/download_your_data_follow_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_identity_serializer.rb → download_your_data_serializers/download_your_data_identity_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_notification_serializer.rb → download_your_data_serializers/download_your_data_notification_serializer.rb} +2 -2
- 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
- data/lib/decidim/{data_portability_serializers/data_portability_report_serializer.rb → download_your_data_serializers/download_your_data_report_serializer.rb} +2 -2
- 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
- data/lib/decidim/{data_portability_serializers/data_portability_user_serializer.rb → download_your_data_serializers/download_your_data_user_serializer.rb} +3 -3
- data/lib/decidim/download_your_data_serializers.rb +23 -0
- data/lib/decidim/engine_router.rb +7 -1
- data/lib/decidim/env.rb +56 -0
- data/lib/decidim/event_recorder.rb +25 -0
- data/lib/decidim/events/base_event.rb +10 -14
- data/lib/decidim/events/simple_event.rb +13 -4
- data/lib/decidim/exporters/export_data.rb +1 -1
- data/lib/decidim/exporters/export_manifest.rb +2 -1
- data/lib/decidim/file_validator_humanizer.rb +24 -1
- data/lib/decidim/filterable_resource.rb +55 -0
- data/lib/decidim/fingerprint_calculator.rb +2 -4
- data/lib/decidim/form_builder.rb +158 -130
- data/lib/decidim/gamification/badge.rb +2 -3
- data/lib/decidim/gamification/badge_scorer.rb +1 -0
- data/lib/decidim/has_area.rb +27 -0
- data/lib/decidim/has_attachments.rb +2 -2
- data/lib/decidim/has_category.rb +36 -0
- data/lib/decidim/has_resource_permission.rb +0 -2
- data/lib/decidim/importers/import_manifest.rb +3 -21
- data/lib/decidim/jsonb_attributes.rb +6 -4
- data/lib/decidim/manifest_messages.rb +23 -0
- data/lib/decidim/map/autocomplete.rb +6 -4
- data/lib/decidim/map/frontend.rb +2 -2
- data/lib/decidim/map/provider/dynamic_map/here.rb +46 -1
- data/lib/decidim/map/provider/geocoding/here.rb +5 -5
- data/lib/decidim/map/provider/here.rb +3 -0
- data/lib/decidim/map/provider/osm.rb +3 -0
- data/lib/decidim/map.rb +4 -4
- data/lib/decidim/menu.rb +1 -1
- data/lib/decidim/metric_manifest.rb +2 -2
- data/lib/decidim/nicknamizable.rb +1 -1
- data/lib/decidim/notification_setting_manifest.rb +19 -0
- data/lib/decidim/organization_settings.rb +8 -7
- data/lib/decidim/participatory_space_context_manifest.rb +2 -2
- data/lib/decidim/participatory_space_manifest.rb +2 -2
- data/lib/decidim/processes_file_locally.rb +31 -0
- data/lib/decidim/query.rb +84 -0
- data/lib/decidim/record_encryptor.rb +29 -8
- data/lib/decidim/reminder_manifest.rb +75 -0
- data/lib/decidim/reminder_registry.rb +67 -0
- data/lib/decidim/resource_manifest.rb +1 -1
- data/lib/decidim/resourceable.rb +11 -0
- data/lib/decidim/scopable.rb +15 -0
- data/lib/decidim/settings_manifest.rb +4 -4
- data/lib/decidim/spring.rb +16 -0
- data/lib/decidim/translatable_attributes.rb +20 -9
- data/lib/decidim/url_option_resolver.rb +50 -0
- data/lib/decidim/view_hooks.rb +1 -1
- data/lib/decidim/view_model.rb +5 -1
- data/lib/decidim/webpacker/thread_safe_compiler.rb +30 -0
- data/lib/decidim/webpacker/webpack/custom.js +15 -3
- data/lib/decidim/webpacker/webpacker.yml +1 -1
- data/lib/decidim/webpacker.rb +2 -0
- data/lib/devise/models/decidim_validatable.rb +1 -1
- data/lib/tasks/decidim_active_storage_migration_tasks.rake +1 -3
- data/lib/tasks/{decidim_data_portability_tasks.rake → decidim_download_your_data_tasks.rake} +9 -9
- data/lib/tasks/decidim_mailers_tasks.rake +23 -0
- data/lib/tasks/decidim_metrics_tasks.rake +1 -1
- data/lib/tasks/decidim_pwa_tasks.rake +18 -0
- data/lib/tasks/decidim_reminders_tasks.rake +17 -0
- data/lib/tasks/decidim_tasks.rake +6 -1
- data/lib/tasks/decidim_webpacker_tasks.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +51 -0
- metadata +190 -85
- data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
- data/app/helpers/decidim/cookies_helper.rb +0 -11
- data/app/packs/src/decidim/vizzs/renders.js +0 -9
- data/app/packs/src/decidim/vizzs.js +0 -1
- data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss +0 -26
- data/app/services/decidim/home_activity_search.rb +0 -80
- data/app/services/decidim/participatory_space_search.rb +0 -54
- data/app/views/decidim/cookie_policy/accept.js.erb +0 -3
- data/app/views/decidim/devise/registrations/edit.html.erb +0 -41
- data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
- data/app/views/layouts/decidim/_cookie_warning.html.erb +0 -8
- data/lib/decidim/data_portability_serializers.rb +0 -23
- data/lib/decidim/middleware/rails_cookies.rb +0 -23
@@ -0,0 +1,280 @@
|
|
1
|
+
/* global global, jest */
|
2
|
+
|
3
|
+
import Cookies from "js-cookie";
|
4
|
+
import ConsentManager from "./consent_manager";
|
5
|
+
|
6
|
+
// Mock js-cookie so that we can store the return values from the "set" method
|
7
|
+
// in order to inspect their flags.
|
8
|
+
jest.mock("js-cookie", () => {
|
9
|
+
const originalModule = jest.requireActual("js-cookie");
|
10
|
+
|
11
|
+
return {
|
12
|
+
// ...originalModule,
|
13
|
+
cookieStorage: {},
|
14
|
+
get: originalModule.get,
|
15
|
+
set: function (name, value, options) {
|
16
|
+
this.cookieStorage[name] = originalModule.set(name, value, options);
|
17
|
+
}
|
18
|
+
};
|
19
|
+
});
|
20
|
+
|
21
|
+
Reflect.deleteProperty(global.window, "location");
|
22
|
+
global.window = Object.create(window);
|
23
|
+
global.window.location = {
|
24
|
+
protocol: "https:",
|
25
|
+
hostname: "decidim.dev"
|
26
|
+
};
|
27
|
+
|
28
|
+
describe("ConsentManager", () => {
|
29
|
+
const dialogContent = `
|
30
|
+
<div id="dc-dialog-wrapper" class="flex-center" role="region">
|
31
|
+
<div class="dc-dialog padding-vertical-1">
|
32
|
+
<div class="row expanded">
|
33
|
+
<div class="columns medium-12 large-8">
|
34
|
+
<div class="dc-content">
|
35
|
+
<div class="h5">Information about the cookies used on the website</div>
|
36
|
+
<div>
|
37
|
+
We use cookies on our website to improve the performance and content of the site. The cookies enable us to provide a more individual user experience and social media channels.
|
38
|
+
</div>
|
39
|
+
</div>
|
40
|
+
</div>
|
41
|
+
<div class="columns medium-12 large-4">
|
42
|
+
<div class="dc-button-wrapper flex-center">
|
43
|
+
<button id="dc-dialog-accept" class="button">
|
44
|
+
Accept all
|
45
|
+
</button>
|
46
|
+
<button id="dc-dialog-reject" class="button hollow">
|
47
|
+
Accept only essential
|
48
|
+
</button>
|
49
|
+
<button id="dc-dialog-settings" class="button clear" data-open="dc-modal" aria-controls="dc-modal" aria-haspopup="dialog" tabindex="0">
|
50
|
+
Settings
|
51
|
+
</button>
|
52
|
+
</div>
|
53
|
+
</div>
|
54
|
+
</div>
|
55
|
+
</div>
|
56
|
+
</div>
|
57
|
+
`;
|
58
|
+
const modalContent = `
|
59
|
+
<div class="reveal dc-modal" id="dc-modal" role="dialog" data-close-on-click="false" data-close-on-esc="false" aria-modal="true" aria-hidden="true">
|
60
|
+
<div class="reveal__header">
|
61
|
+
<h3 class="reveal__title">Cookie settings</h3>
|
62
|
+
<p>
|
63
|
+
We use cookies to ensure the basic functionalities of the website and to enhance your online experience. You can choose for each category to opt-in/out whenever you want.
|
64
|
+
</p>
|
65
|
+
</div>
|
66
|
+
|
67
|
+
<div class="dc-categories">
|
68
|
+
<div class="category-wrapper margin-vertical-1" data-id="essential">
|
69
|
+
<div class="category-row flex-center">
|
70
|
+
<button class="dc-title padding-left-3">
|
71
|
+
<span class="h5 dc-category-title">
|
72
|
+
<strong>Essential</strong>
|
73
|
+
</span>
|
74
|
+
</button>
|
75
|
+
<div class="dc-switch">
|
76
|
+
<input class="switch-input" checked="checked" id="dc-essential" type="checkbox" name="essential" disabled="">
|
77
|
+
<label class="switch-paddle" for="dc-essential">
|
78
|
+
<span class="show-for-sr">Toggle Essential</span>
|
79
|
+
</label>
|
80
|
+
</div>
|
81
|
+
</div>
|
82
|
+
<div class="dc-description hide">
|
83
|
+
<div class="description-text">
|
84
|
+
<p>These cookies are essential for the proper functioning of my website. Without these cookies, the website would not work properly.</p>
|
85
|
+
</div>
|
86
|
+
<div class="dataconsent-details-wrapper">
|
87
|
+
<div class="row detail-titles">
|
88
|
+
<div class="columns small-2">Type</div>
|
89
|
+
<div class="columns small-2">Name</div>
|
90
|
+
<div class="columns small-2">Service</div>
|
91
|
+
<div class="columns small-6">Description</div>
|
92
|
+
</div>
|
93
|
+
<div class="row dataconsent-detail-row">
|
94
|
+
<div class="columns small-2">Cookie</div>
|
95
|
+
<div class="columns small-2">_session_id</div>
|
96
|
+
<div class="columns small-2">This website</div>
|
97
|
+
<div class="columns small-6">
|
98
|
+
Allows websites to remember user within a website when they move between web pages.
|
99
|
+
</div>
|
100
|
+
</div>
|
101
|
+
<div class="row dataconsent-detail-row">
|
102
|
+
<div class="columns small-2">Cookie</div>
|
103
|
+
<div class="columns small-2">decidim-consent</div>
|
104
|
+
<div class="columns small-2">This website</div>
|
105
|
+
<div class="columns small-6">
|
106
|
+
Stores information about the cookies allowed by the user on this website.
|
107
|
+
</div>
|
108
|
+
</div>
|
109
|
+
</div>
|
110
|
+
</div>
|
111
|
+
</div>
|
112
|
+
<div class="category-wrapper margin-vertical-1" data-id="preferences">
|
113
|
+
<div class="category-row flex-center">
|
114
|
+
<button class="dc-title padding-left-3">
|
115
|
+
<span class="h5 dc-category-title">
|
116
|
+
<strong>Preferences</strong>
|
117
|
+
</span>
|
118
|
+
</button>
|
119
|
+
<div class="dc-switch">
|
120
|
+
<input class="switch-input" id="dc-preferences" type="checkbox" name="preferences">
|
121
|
+
<label class="switch-paddle" for="dc-preferences">
|
122
|
+
<span class="show-for-sr">Toggle Preferences</span>
|
123
|
+
</label>
|
124
|
+
</div>
|
125
|
+
</div>
|
126
|
+
<div class="dc-description hide">
|
127
|
+
<div class="description-text">
|
128
|
+
<p>These cookies allow the website to remember the choices you have made in the past</p>
|
129
|
+
</div>
|
130
|
+
</div>
|
131
|
+
</div>
|
132
|
+
<div class="category-wrapper margin-vertical-1" data-id="analytics">
|
133
|
+
<div class="category-row flex-center">
|
134
|
+
<button class="dc-title padding-left-3">
|
135
|
+
<span class="h5 dc-category-title">
|
136
|
+
<strong>Analytics and statistics</strong>
|
137
|
+
</span>
|
138
|
+
</button>
|
139
|
+
<div class="dc-switch">
|
140
|
+
<input class="switch-input" id="dc-analytics" type="checkbox" name="analytics">
|
141
|
+
<label class="switch-paddle" for="dc-analytics">
|
142
|
+
<span class="show-for-sr">Toggle Analytics and statistics</span>
|
143
|
+
</label>
|
144
|
+
</div>
|
145
|
+
</div>
|
146
|
+
<div class="dc-description hide">
|
147
|
+
<div class="description-text">
|
148
|
+
<p>Analytics cookies are cookies that track how users navigate and interact with a website. The information collected is used to help the website owner improve the website.</p>
|
149
|
+
</div>
|
150
|
+
</div>
|
151
|
+
</div>
|
152
|
+
<div class="category-wrapper margin-vertical-1" data-id="marketing">
|
153
|
+
<div class="category-row flex-center">
|
154
|
+
<button class="dc-title padding-left-3">
|
155
|
+
<span class="h5 dc-category-title">
|
156
|
+
<strong>Marketing</strong>
|
157
|
+
</span>
|
158
|
+
</button>
|
159
|
+
<div class="dc-switch">
|
160
|
+
<input class="switch-input" id="dc-marketing" type="checkbox" name="marketing">
|
161
|
+
<label class="switch-paddle" for="dc-marketing">
|
162
|
+
<span class="show-for-sr">Toggle Marketing</span>
|
163
|
+
</label>
|
164
|
+
</div>
|
165
|
+
</div>
|
166
|
+
<div class="dc-description hide">
|
167
|
+
<div class="description-text">
|
168
|
+
<p>These cookies collect information about how you use the website, which pages you visited and which links you clicked on.</p>
|
169
|
+
</div>
|
170
|
+
</div>
|
171
|
+
</div>
|
172
|
+
</div>
|
173
|
+
<div class="dc-buttons-wrapper flex-center">
|
174
|
+
<div class="dc-buttons-left">
|
175
|
+
<button id="dc-modal-accept" class="button" data-close="">Accept all</button>
|
176
|
+
<button id="dc-modal-reject" class="button hollow" data-close="">Accept only essential</button>
|
177
|
+
</div>
|
178
|
+
<div class="dc-buttons-right">
|
179
|
+
<button id="dc-modal-save" class="button clear" data-close="">Save settings</button>
|
180
|
+
</div>
|
181
|
+
</div>
|
182
|
+
</div>
|
183
|
+
`;
|
184
|
+
const cookieWarningContent = `
|
185
|
+
<div class="dataconsent-warning flex-center padding-1 hide">
|
186
|
+
<p>You need to enable all cookies in order to see this content.</p>
|
187
|
+
<a href="#" class="button margin-vertical-2" data-open="dc-modal">
|
188
|
+
Change cookie settings
|
189
|
+
</a>
|
190
|
+
</div>
|
191
|
+
`;
|
192
|
+
|
193
|
+
const getCookie = (name) => {
|
194
|
+
for (const [key, value] of Object.entries(Cookies.cookieStorage)) {
|
195
|
+
if (key === name) {
|
196
|
+
const cookie = {};
|
197
|
+
value.split(";").forEach((cookieString) => {
|
198
|
+
const kv = cookieString.trim().split("=");
|
199
|
+
const val = kv[1] || true;
|
200
|
+
|
201
|
+
if (kv[0] === key) {
|
202
|
+
cookie.value = val;
|
203
|
+
} else {
|
204
|
+
cookie[kv[0]] = val;
|
205
|
+
}
|
206
|
+
});
|
207
|
+
|
208
|
+
return cookie;
|
209
|
+
}
|
210
|
+
}
|
211
|
+
|
212
|
+
return null;
|
213
|
+
};
|
214
|
+
|
215
|
+
let manager = null;
|
216
|
+
const originalLocation = window.location;
|
217
|
+
|
218
|
+
beforeEach(() => {
|
219
|
+
Cookies.cookieStorage = {};
|
220
|
+
|
221
|
+
document.body.innerHTML = dialogContent + modalContent + cookieWarningContent;
|
222
|
+
|
223
|
+
const modal = document.querySelector("#dc-modal");
|
224
|
+
const categories = [...modal.querySelectorAll(".category-wrapper")].map((el) => el.dataset.id);
|
225
|
+
manager = new ConsentManager({
|
226
|
+
modal: modal,
|
227
|
+
categories: categories,
|
228
|
+
cookieName: "decidim-consent",
|
229
|
+
warningElement: document.querySelector(".dataconsent-warning")
|
230
|
+
});
|
231
|
+
});
|
232
|
+
|
233
|
+
afterEach(() => {
|
234
|
+
window.location = originalLocation;
|
235
|
+
});
|
236
|
+
|
237
|
+
describe("updateState", () => {
|
238
|
+
let cookie = null;
|
239
|
+
|
240
|
+
describe("when the current URL is secure", () => {
|
241
|
+
beforeEach(() => {
|
242
|
+
manager.updateState({ foo: "bar" });
|
243
|
+
cookie = getCookie("decidim-consent");
|
244
|
+
});
|
245
|
+
|
246
|
+
it("sets the cookie with the correct value", () => {
|
247
|
+
expect(cookie.value).toEqual("{%22foo%22:%22bar%22}");
|
248
|
+
});
|
249
|
+
|
250
|
+
it("sets the cookie with the correct expiry", () => {
|
251
|
+
const expiry = Date.parse(cookie.expires);
|
252
|
+
const oneYearFromNow = Date.now() + 3600 * 24 * 1000 * 365;
|
253
|
+
|
254
|
+
// Expect it to be within a second of the expected expiry time because
|
255
|
+
// it would be pretty hard to try to guess the exact same millisecond.
|
256
|
+
expect(oneYearFromNow - 1000).toBeLessThan(expiry);
|
257
|
+
expect(oneYearFromNow + 1000).toBeGreaterThan(expiry);
|
258
|
+
});
|
259
|
+
|
260
|
+
it("sets the cookie with the correct flags", () => {
|
261
|
+
expect(cookie.domain).toEqual("decidim.dev");
|
262
|
+
expect(cookie.sameSite).toEqual("Lax");
|
263
|
+
expect(cookie.secure).toBe(true);
|
264
|
+
});
|
265
|
+
});
|
266
|
+
|
267
|
+
describe("when the current URL is insecure", () => {
|
268
|
+
beforeEach(() => {
|
269
|
+
Reflect.defineProperty(window.location, "protocol", { value: "http:" })
|
270
|
+
|
271
|
+
manager.updateState({ foo: "bar" });
|
272
|
+
cookie = getCookie("decidim-consent");
|
273
|
+
});
|
274
|
+
|
275
|
+
it("does not set the secure flag", () => {
|
276
|
+
expect(cookie.secure).toBeUndefined();
|
277
|
+
});
|
278
|
+
});
|
279
|
+
});
|
280
|
+
});
|
@@ -0,0 +1,103 @@
|
|
1
|
+
import ConsentManager from "src/decidim/data_consent/consent_manager";
|
2
|
+
|
3
|
+
const initDialog = (manager) => {
|
4
|
+
if (Object.keys(manager.state).length > 0) {
|
5
|
+
return;
|
6
|
+
}
|
7
|
+
const dialogWrapper = document.querySelector("#dc-dialog-wrapper");
|
8
|
+
dialogWrapper.classList.remove("hide");
|
9
|
+
|
10
|
+
const acceptAllButton = dialogWrapper.querySelector("#dc-dialog-accept");
|
11
|
+
const rejectAllButton = dialogWrapper.querySelector("#dc-dialog-reject");
|
12
|
+
const settingsButton = dialogWrapper.querySelector("#dc-dialog-settings");
|
13
|
+
|
14
|
+
acceptAllButton.addEventListener("click", () => {
|
15
|
+
manager.acceptAll();
|
16
|
+
dialogWrapper.style.display = "none";
|
17
|
+
});
|
18
|
+
|
19
|
+
rejectAllButton.addEventListener("click", () => {
|
20
|
+
manager.rejectAll();
|
21
|
+
dialogWrapper.style.display = "none";
|
22
|
+
});
|
23
|
+
|
24
|
+
settingsButton.addEventListener("click", () => {
|
25
|
+
dialogWrapper.style.display = "none";
|
26
|
+
});
|
27
|
+
}
|
28
|
+
|
29
|
+
const initModal = (manager) => {
|
30
|
+
const categoryElements = manager.modal.querySelectorAll(".category-wrapper");
|
31
|
+
|
32
|
+
categoryElements.forEach((categoryEl) => {
|
33
|
+
const categoryButton = categoryEl.querySelector(".dc-title");
|
34
|
+
const categoryDescription = categoryEl.querySelector(".dc-description");
|
35
|
+
categoryButton.addEventListener("click", () => {
|
36
|
+
const hidden = categoryDescription.classList.contains("hide");
|
37
|
+
if (hidden) {
|
38
|
+
categoryButton.classList.add("open");
|
39
|
+
categoryDescription.classList.remove("hide");
|
40
|
+
} else {
|
41
|
+
categoryButton.classList.remove("open");
|
42
|
+
categoryDescription.classList.add("hide");
|
43
|
+
}
|
44
|
+
})
|
45
|
+
})
|
46
|
+
|
47
|
+
const acceptAllButton = manager.modal.querySelector("#dc-modal-accept");
|
48
|
+
const rejectAllButton = manager.modal.querySelector("#dc-modal-reject");
|
49
|
+
const saveSettingsButton = manager.modal.querySelector("#dc-modal-save");
|
50
|
+
|
51
|
+
acceptAllButton.addEventListener("click", () => {
|
52
|
+
manager.acceptAll();
|
53
|
+
})
|
54
|
+
|
55
|
+
rejectAllButton.addEventListener("click", () => {
|
56
|
+
manager.rejectAll();
|
57
|
+
})
|
58
|
+
|
59
|
+
saveSettingsButton.addEventListener("click", () => {
|
60
|
+
let newState = {};
|
61
|
+
manager.categories.forEach((category) => {
|
62
|
+
const accepted = manager.modal.querySelector(`input[name='${category}']`).checked;
|
63
|
+
if (accepted) {
|
64
|
+
newState[category] = true;
|
65
|
+
}
|
66
|
+
})
|
67
|
+
manager.saveSettings(newState);
|
68
|
+
})
|
69
|
+
}
|
70
|
+
|
71
|
+
const initDisabledIframes = (manager) => {
|
72
|
+
const disabledIframes = document.querySelectorAll(".disabled-iframe")
|
73
|
+
if (manager.allAccepted()) {
|
74
|
+
disabledIframes.forEach((elem) => {
|
75
|
+
const iframe = document.createElement("iframe")
|
76
|
+
iframe.setAttribute("src", elem.getAttribute("src"));
|
77
|
+
iframe.className = elem.classList.toString();
|
78
|
+
iframe.setAttribute("allowfullscreen", elem.getAttribute("allowfullscreen"));
|
79
|
+
iframe.setAttribute("frameborder", elem.getAttribute("frameborder"));
|
80
|
+
elem.parentElement.appendChild(iframe);
|
81
|
+
elem.remove();
|
82
|
+
})
|
83
|
+
}
|
84
|
+
}
|
85
|
+
|
86
|
+
document.addEventListener("DOMContentLoaded", () => {
|
87
|
+
const modal = document.querySelector("#dc-modal");
|
88
|
+
if (!modal) {
|
89
|
+
return;
|
90
|
+
}
|
91
|
+
|
92
|
+
const categories = [...modal.querySelectorAll(".category-wrapper")].map((el) => el.dataset.id)
|
93
|
+
const manager = new ConsentManager({
|
94
|
+
modal: modal,
|
95
|
+
categories: categories,
|
96
|
+
cookieName: window.Decidim.config.get("consent_cookie_name"),
|
97
|
+
warningElement: document.querySelector(".dataconsent-warning")
|
98
|
+
});
|
99
|
+
|
100
|
+
initDisabledIframes(manager);
|
101
|
+
initModal(manager, categories);
|
102
|
+
initDialog(manager);
|
103
|
+
});
|
@@ -0,0 +1,36 @@
|
|
1
|
+
/**
|
2
|
+
// Function adds feature to datalist that you can have different id and label.
|
3
|
+
// Used with datalist_select_helper.rb#datalist_select
|
4
|
+
* @param {HTMLElement} target - dataselect wrapper
|
5
|
+
* @param {Function} callback - the function to be executed after a successful selection.
|
6
|
+
* @returns {Void} - Returns nothing.
|
7
|
+
*/
|
8
|
+
|
9
|
+
export const datalistSelect = (target, callback) => {
|
10
|
+
if (!target) {
|
11
|
+
return;
|
12
|
+
}
|
13
|
+
|
14
|
+
const input = target.querySelector("input[type='hidden'");
|
15
|
+
const textInput = target.querySelector("input[type='text']");
|
16
|
+
const items = target.querySelector("datalist").children;
|
17
|
+
|
18
|
+
const selectValue = (selected) => {
|
19
|
+
for (let idx = 0; idx < items.length; idx += 1) {
|
20
|
+
if (items[idx].innerHTML === selected) {
|
21
|
+
const id = items[idx].dataset.value;
|
22
|
+
input.value = id;
|
23
|
+
if (callback) {
|
24
|
+
return callback(id);
|
25
|
+
}
|
26
|
+
return true;
|
27
|
+
}
|
28
|
+
}
|
29
|
+
return false;
|
30
|
+
}
|
31
|
+
|
32
|
+
textInput.addEventListener("input", () => {
|
33
|
+
const selected = textInput.value;
|
34
|
+
selectValue(selected);
|
35
|
+
})
|
36
|
+
}
|
@@ -0,0 +1,117 @@
|
|
1
|
+
import UploadModal from "src/decidim/direct_uploads/upload_modal";
|
2
|
+
import { truncateFilename, createHiddenInput } from "src/decidim/direct_uploads/upload_utility";
|
3
|
+
|
4
|
+
const loadAttachments = (modal) => {
|
5
|
+
Array.from(modal.activeAttachments.children).forEach((child) => {
|
6
|
+
modal.createUploadItem(child.dataset.filename, child.dataset.title, "validated");
|
7
|
+
})
|
8
|
+
}
|
9
|
+
|
10
|
+
const addInputEventListener = (modal) => {
|
11
|
+
modal.input.addEventListener("change", (event) => {
|
12
|
+
event.preventDefault();
|
13
|
+
const files = event.target.files;
|
14
|
+
Array.from(files).forEach((file) => modal.uploadFile(file));
|
15
|
+
})
|
16
|
+
}
|
17
|
+
|
18
|
+
const addButtonEventListener = (modal) => {
|
19
|
+
modal.button.addEventListener("click", (event) => {
|
20
|
+
event.preventDefault();
|
21
|
+
Array.from(modal.trashCan.children).forEach((item) => {
|
22
|
+
modal.uploadItems.append(item);
|
23
|
+
})
|
24
|
+
if (modal.uploadItems.children.length === 0) {
|
25
|
+
modal.modalTitle.innerHTML = modal.modalTitle.dataset.addlabel;
|
26
|
+
} else {
|
27
|
+
modal.modalTitle.innerHTML = modal.modalTitle.dataset.editlabel;
|
28
|
+
}
|
29
|
+
modal.updateDropZone();
|
30
|
+
})
|
31
|
+
}
|
32
|
+
|
33
|
+
const addDropZoneEventListeners = (modal) => {
|
34
|
+
modal.dropZone.addEventListener("dragenter", (event) => {
|
35
|
+
event.preventDefault();
|
36
|
+
})
|
37
|
+
|
38
|
+
modal.dropZone.addEventListener("dragover", (event) => {
|
39
|
+
event.preventDefault();
|
40
|
+
modal.dropZone.classList.add("is-dragover");
|
41
|
+
})
|
42
|
+
|
43
|
+
modal.dropZone.addEventListener("dragleave", () => {
|
44
|
+
modal.dropZone.classList.remove("is-dragover");
|
45
|
+
})
|
46
|
+
|
47
|
+
modal.dropZone.addEventListener("drop", (event) => {
|
48
|
+
event.preventDefault();
|
49
|
+
const files = event.dataTransfer.files;
|
50
|
+
Array.from(files).forEach((file) => modal.uploadFile(file));
|
51
|
+
})
|
52
|
+
}
|
53
|
+
|
54
|
+
const addSaveButtonEventListener = (modal) => {
|
55
|
+
modal.saveButton.addEventListener("click", (event) => {
|
56
|
+
event.preventDefault();
|
57
|
+
const validatedItems = modal.uploadItems.querySelectorAll(".upload-item[data-state='validated']")
|
58
|
+
const validatedItemsCount = validatedItems.length;
|
59
|
+
validatedItems.forEach((item) => {
|
60
|
+
let details = item.querySelector(".attachment-details");
|
61
|
+
if (details) {
|
62
|
+
modal.activeAttachments.appendChild(details);
|
63
|
+
} else {
|
64
|
+
details = modal.activeAttachments.querySelector(`.attachment-details[data-filename='${item.dataset.filename}'`);
|
65
|
+
}
|
66
|
+
const span = details.querySelector("span");
|
67
|
+
span.classList.add("filename");
|
68
|
+
if (modal.options.titled) {
|
69
|
+
const title = item.querySelector("input[type='text']").value;
|
70
|
+
details.dataset.title = title;
|
71
|
+
let hiddenTitle = details.querySelector(".hidden-title")
|
72
|
+
if (hiddenTitle) {
|
73
|
+
hiddenTitle.value = title;
|
74
|
+
} else {
|
75
|
+
const attachmentId = details.querySelector(`[name='${modal.options.resourceName}[${modal.name}][]'`).value
|
76
|
+
const ordinalNumber = modal.getOrdinalNumber()
|
77
|
+
const hiddenTitleField = createHiddenInput("hidden-title", `${modal.options.resourceName}[${modal.options.addAttribute}][${ordinalNumber}][title]`, title)
|
78
|
+
const hiddenIdField = createHiddenInput("hidden-id", `${modal.options.resourceName}[${modal.options.addAttribute}][${ordinalNumber}][id]`, attachmentId)
|
79
|
+
details.appendChild(hiddenTitleField);
|
80
|
+
details.appendChild(hiddenIdField);
|
81
|
+
}
|
82
|
+
span.innerHTML = `${title} (${truncateFilename(item.dataset.filename)})`;
|
83
|
+
} else {
|
84
|
+
span.innerHTML = truncateFilename(item.dataset.filename, 19);
|
85
|
+
}
|
86
|
+
span.style.display = "block";
|
87
|
+
});
|
88
|
+
|
89
|
+
if (!modal.options.titled && modal.trashCan.children.length > 0) {
|
90
|
+
modal.activeAttachments.innerHTML = `<input name='${modal.options.resourceName}[remove_${modal.name}]' type="hidden" value="true">`;
|
91
|
+
}
|
92
|
+
|
93
|
+
if (validatedItemsCount > 0) {
|
94
|
+
// Foundation helper does some magic with error fields, so these must be triggered using jQuery.
|
95
|
+
const $el = $(modal.uploadContainer.querySelector("input[type='checkbox']"));
|
96
|
+
if ($el) {
|
97
|
+
$el.prop("checked", true);
|
98
|
+
$el.trigger("change");
|
99
|
+
}
|
100
|
+
}
|
101
|
+
modal.cleanTrashCan();
|
102
|
+
modal.updateAddAttachmentsButton();
|
103
|
+
});
|
104
|
+
}
|
105
|
+
|
106
|
+
document.addEventListener("DOMContentLoaded", () => {
|
107
|
+
const attachmentButtons = document.querySelectorAll("button.add-file");
|
108
|
+
|
109
|
+
attachmentButtons.forEach((attachmentButton) => {
|
110
|
+
const modal = new UploadModal(attachmentButton);
|
111
|
+
loadAttachments(modal);
|
112
|
+
addInputEventListener(modal);
|
113
|
+
addButtonEventListener(modal);
|
114
|
+
addDropZoneEventListeners(modal);
|
115
|
+
addSaveButtonEventListener(modal);
|
116
|
+
})
|
117
|
+
})
|