decidim-core 0.29.1 → 0.30.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/activity_cell.rb +0 -3
- data/app/cells/decidim/amendable/amend_button_card/show.erb +6 -4
- data/app/cells/decidim/amendable/amend_button_card_cell.rb +8 -0
- data/app/cells/decidim/amendable/amendments/show.erb +1 -1
- data/app/cells/decidim/amendable/promote_button_card/show.erb +2 -0
- data/app/cells/decidim/author/show.erb +5 -4
- data/app/cells/decidim/author_cell.rb +27 -1
- data/app/cells/decidim/card_l/extra_data.erb +1 -0
- data/app/cells/decidim/card_metadata_cell.rb +9 -16
- data/app/cells/decidim/card_s/show.erb +5 -3
- data/app/cells/decidim/comments_button_cell.rb +14 -2
- data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +2 -0
- data/app/cells/decidim/content_blocks/highlighted_elements_with_cell_for_list_cell.rb +1 -1
- data/app/cells/decidim/diff_cell.rb +4 -0
- data/app/cells/decidim/endorsement_block/show.erb +0 -1
- data/app/cells/decidim/endorsement_block_cell.rb +6 -0
- data/app/cells/decidim/endorsement_buttons/button_content.erb +1 -1
- data/app/cells/decidim/endorsement_buttons/select_identity_button.erb +1 -1
- data/app/cells/decidim/endorsement_buttons/show.erb +7 -7
- data/app/cells/decidim/endorsement_buttons/verification_modal.erb +4 -2
- data/app/cells/decidim/endorsers_list/empty.erb +3 -0
- data/app/cells/decidim/endorsers_list/full.erb +17 -5
- data/app/cells/decidim/endorsers_list/show.erb +19 -10
- data/app/cells/decidim/endorsers_list_cell.rb +19 -6
- data/app/cells/decidim/follow_button/show.erb +1 -2
- data/app/cells/decidim/follow_button_cell.rb +5 -0
- data/app/cells/decidim/map/show.erb +3 -0
- data/app/cells/decidim/map/template.erb +14 -0
- data/app/cells/decidim/map_cell.rb +39 -0
- data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb +1 -1
- data/app/cells/decidim/notification_actions/buttons_cell.rb +1 -1
- data/app/cells/decidim/onboarding_action_message/show.erb +15 -0
- data/app/cells/decidim/onboarding_action_message_cell.rb +81 -0
- data/app/cells/decidim/participatory_space_private_user/show.erb +23 -0
- data/app/cells/decidim/participatory_space_private_user_cell.rb +21 -0
- data/app/cells/decidim/progress_bar/show.erb +2 -2
- data/app/cells/decidim/report_button_cell.rb +1 -0
- data/app/cells/decidim/resource_history/show.erb +20 -0
- data/app/cells/decidim/resource_history_cell.rb +66 -0
- data/app/cells/decidim/share_button_cell.rb +0 -4
- data/app/cells/decidim/share_widget/modal.erb +26 -0
- data/app/cells/decidim/share_widget/show.erb +2 -0
- data/app/cells/decidim/share_widget_cell.rb +20 -0
- data/app/cells/decidim/tags/show.erb +7 -4
- data/app/cells/decidim/tags_cell.rb +11 -72
- data/app/cells/decidim/translation_bar/show.erb +2 -2
- data/app/cells/decidim/translation_bar_cell.rb +1 -1
- data/app/commands/decidim/amendable/create_draft.rb +2 -2
- data/app/commands/decidim/create_ephemeral_user.rb +52 -0
- data/app/commands/decidim/create_omniauth_registration.rb +13 -3
- data/app/commands/decidim/create_report.rb +1 -5
- data/app/commands/decidim/create_user_group.rb +6 -2
- data/app/commands/decidim/destroy_account.rb +3 -0
- data/app/commands/decidim/destroy_ephemeral_user.rb +47 -0
- data/app/commands/decidim/update_account.rb +11 -3
- data/app/commands/decidim/update_notifications_settings.rb +1 -0
- data/app/commands/decidim/update_resources_taxonomies.rb +67 -0
- data/app/commands/decidim/update_user_group.rb +7 -1
- data/app/constraints/decidim/current_component.rb +1 -1
- data/app/controllers/concerns/decidim/ajax_permission_handler.rb +21 -0
- data/app/controllers/concerns/decidim/devise_authentication_methods.rb +3 -6
- data/app/controllers/concerns/decidim/devise_controllers.rb +2 -0
- data/app/controllers/concerns/decidim/disable_redirection_to_external_host.rb +1 -1
- data/app/controllers/concerns/decidim/ephemeral_session_checker.rb +87 -0
- data/app/controllers/concerns/decidim/filter_resource.rb +4 -2
- data/app/controllers/concerns/decidim/has_members_page.rb +25 -0
- data/app/controllers/concerns/decidim/headers/browser_feature_permissions.rb +50 -0
- data/app/controllers/concerns/decidim/locale_switcher.rb +2 -2
- data/app/controllers/concerns/decidim/needs_password_change.rb +0 -1
- data/app/controllers/concerns/decidim/needs_permission.rb +2 -1
- data/app/controllers/concerns/decidim/needs_tos_accepted.rb +4 -5
- data/app/controllers/concerns/decidim/onboarding_action_methods.rb +52 -0
- data/app/controllers/decidim/application_controller.rb +10 -0
- data/app/controllers/decidim/authorization_modals_controller.rb +8 -2
- data/app/controllers/decidim/components/base_controller.rb +3 -7
- data/app/controllers/decidim/devise/confirmations_controller.rb +4 -0
- data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +8 -1
- data/app/controllers/decidim/devise/registrations_controller.rb +1 -1
- data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
- data/app/controllers/decidim/doorkeeper/credentials_controller.rb +1 -1
- data/app/controllers/decidim/download_your_data_controller.rb +33 -2
- data/app/controllers/decidim/editor_images_controller.rb +1 -11
- data/app/controllers/decidim/follows_controller.rb +1 -1
- data/app/controllers/decidim/geolocation_controller.rb +19 -0
- data/app/controllers/decidim/homepage_controller.rb +0 -1
- data/app/controllers/decidim/links_controller.rb +1 -1
- data/app/controllers/decidim/open_data_controller.rb +33 -8
- data/app/controllers/decidim/profiles_controller.rb +4 -0
- data/app/controllers/decidim/user_conversations_controller.rb +1 -11
- data/app/events/decidim/soft_delete_resource_event.rb +15 -0
- data/app/forms/decidim/amendable/form.rb +4 -2
- data/app/forms/decidim/ephemeral_user_form.rb +22 -0
- data/app/forms/decidim/notifications_settings_form.rb +1 -0
- data/app/forms/decidim/omniauth_registration_form.rb +14 -1
- data/app/helpers/concerns/decidim/flash_helper_extensions.rb +17 -2
- data/app/helpers/concerns/decidim/user_role_checker.rb +46 -0
- data/app/helpers/decidim/action_authorization_helper.rb +75 -14
- data/app/helpers/decidim/amendments_helper.rb +0 -9
- data/app/helpers/decidim/application_helper.rb +6 -2
- data/app/helpers/decidim/breadcrumb_helper.rb +6 -0
- data/app/helpers/decidim/cache_helper.rb +1 -1
- data/app/helpers/decidim/check_boxes_tree_helper.rb +25 -53
- data/app/helpers/decidim/cta_button_helper.rb +1 -1
- data/app/helpers/decidim/decidim_form_helper.rb +0 -44
- data/app/helpers/decidim/endorsable_helper.rb +0 -10
- data/app/helpers/decidim/layout_helper.rb +6 -0
- data/app/helpers/decidim/map_helper.rb +6 -1
- data/app/helpers/decidim/messaging/conversation_helper.rb +2 -3
- data/app/helpers/decidim/meta_tags_helper.rb +32 -23
- data/app/helpers/decidim/modal_helper.rb +23 -0
- data/app/helpers/decidim/omniauth_helper.rb +5 -5
- data/app/helpers/decidim/onboarding_action_helper.rb +13 -0
- data/app/helpers/decidim/passwords_helper.rb +2 -2
- data/app/helpers/decidim/sanitize_helper.rb +11 -2
- data/app/helpers/decidim/taxonomies_helper.rb +40 -0
- data/app/jobs/decidim/download_your_data_export_job.rb +2 -19
- data/app/jobs/decidim/event_publisher_job.rb +18 -9
- data/app/jobs/decidim/export_job.rb +5 -1
- data/app/jobs/decidim/export_participatory_space_job.rb +4 -1
- data/app/jobs/decidim/open_data_job.rb +4 -4
- data/app/mailers/decidim/export_mailer.rb +7 -12
- data/app/models/decidim/action_log.rb +11 -0
- data/app/models/decidim/attachment.rb +1 -1
- data/app/models/decidim/category.rb +4 -0
- data/app/models/decidim/component.rb +25 -3
- data/app/models/decidim/metric.rb +2 -1
- data/app/models/decidim/moderation.rb +16 -0
- data/app/models/decidim/newsletter.rb +12 -8
- data/app/models/decidim/organization.rb +7 -3
- data/app/models/decidim/participatory_space_private_user.rb +20 -0
- data/app/models/decidim/private_export.rb +24 -0
- data/app/models/decidim/push_notification_message.rb +1 -1
- data/app/models/decidim/scope.rb +4 -0
- data/app/models/decidim/share_token.rb +36 -10
- data/app/models/decidim/taxonomization.rb +23 -0
- data/app/models/decidim/taxonomy.rb +139 -0
- data/app/models/decidim/taxonomy_filter.rb +130 -0
- data/app/models/decidim/taxonomy_filter_item.rb +33 -0
- data/app/models/decidim/user.rb +9 -23
- data/app/models/decidim/user_base_entity.rb +12 -0
- data/app/models/decidim/user_moderation.rb +9 -0
- data/app/models/decidim/user_report.rb +4 -0
- data/app/packs/entrypoints/decidim_core.js +1 -0
- data/app/packs/entrypoints/decidim_geocoding.js +2 -0
- data/app/packs/images/decidim/brands/facebook.svg +10 -0
- data/app/packs/images/decidim/brands/google.svg +7 -1
- data/app/packs/images/decidim/brands/twitter-x.svg +3 -0
- data/app/packs/src/decidim/append_redirect_url_to_modals.js +14 -6
- data/app/packs/src/decidim/check_boxes_tree.js +0 -1
- data/app/packs/src/decidim/clipboard.js +18 -9
- data/app/packs/src/decidim/confirm.js +79 -59
- data/app/packs/src/decidim/decidim_application.js +1 -0
- data/app/packs/src/decidim/direct_uploads/upload_field.js +21 -8
- data/app/packs/src/decidim/form_remote.js +1 -1
- data/app/packs/src/decidim/geocoding/reverse_geocoding.js +60 -0
- data/app/packs/src/decidim/impersonation.js +1 -1
- data/app/packs/src/decidim/index.js +14 -1
- data/app/packs/src/decidim/onboarding_pending_action.js +24 -0
- data/app/packs/src/decidim/remote_tooltips.js +38 -0
- data/app/packs/src/decidim/session_timeouter.js +1 -1
- data/app/packs/src/decidim/sticky_footer.js +29 -0
- data/app/packs/src/decidim/sticky_header.js +6 -31
- data/app/packs/src/decidim/toggle.js +1 -1
- data/app/packs/src/decidim/tooltips.js +42 -22
- data/app/packs/src/decidim/user_registrations.js +13 -0
- data/app/packs/src/decidim/utilities/dom.js +148 -0
- data/app/packs/stylesheets/decidim/_accordion.scss +30 -0
- data/app/packs/stylesheets/decidim/_buttons.scss +19 -0
- data/app/packs/stylesheets/decidim/_dropdown.scss +1 -1
- data/app/packs/stylesheets/decidim/_endorsers_list.scss +26 -20
- data/app/packs/stylesheets/decidim/_forms.scss +2 -2
- data/app/packs/stylesheets/decidim/_header.scss +5 -3
- data/app/packs/stylesheets/decidim/_labels.scss +1 -1
- data/app/packs/stylesheets/decidim/_layout.scss +32 -2
- data/app/packs/stylesheets/decidim/_login.scss +53 -6
- data/app/packs/stylesheets/decidim/_modal.scss +42 -0
- data/app/packs/stylesheets/decidim/_modal_tos_refuse.scss +4 -0
- data/app/packs/stylesheets/decidim/_participatory_spaces.scss +46 -0
- data/app/packs/stylesheets/decidim/_profile.scss +2 -2
- data/app/packs/stylesheets/decidim/_progress-bar.scss +1 -1
- data/app/packs/stylesheets/decidim/_success_image.scss +64 -0
- data/app/packs/stylesheets/decidim/_tribute.scss +36 -0
- data/app/packs/stylesheets/decidim/application.scss +1 -0
- data/app/packs/stylesheets/decidim/geocoding_addons.scss +5 -0
- data/app/packs/stylesheets/decidim/legacy/conference-diploma.scss +2 -1
- data/app/packs/stylesheets/decidim/map.scss +7 -10
- data/app/packs/stylesheets/decidim/resource_history.scss +31 -0
- data/app/permissions/decidim/permissions.rb +8 -2
- data/app/presenters/decidim/admin_log/base_user_presenter.rb +67 -0
- data/app/presenters/decidim/admin_log/component_presenter.rb +32 -3
- data/app/presenters/decidim/admin_log/moderation_presenter.rb +30 -3
- data/app/presenters/decidim/admin_log/share_token_presenter.rb +39 -0
- data/app/presenters/decidim/admin_log/taxonomy_filter_presenter.rb +57 -0
- data/app/presenters/decidim/admin_log/taxonomy_presenter.rb +48 -0
- data/app/presenters/decidim/admin_log/user_group_presenter.rb +6 -6
- data/app/presenters/decidim/admin_log/user_presenter.rb +4 -18
- data/app/presenters/decidim/attachment_presenter.rb +1 -1
- data/app/presenters/decidim/log/value_types/date_presenter.rb +1 -0
- data/app/presenters/decidim/log/value_types/taxonomy_presenter.rb +29 -0
- data/app/presenters/decidim/participatory_space_private_user_presenter.rb +50 -0
- data/app/presenters/decidim/taxonomy_filter_presenter.rb +19 -0
- data/app/presenters/decidim/taxonomy_presenter.rb +14 -0
- data/app/queries/decidim/metrics/blocked_users_metric_manage.rb +2 -2
- data/app/queries/decidim/metrics/users_metric_manage.rb +2 -2
- data/app/queries/decidim/public_activities.rb +1 -12
- data/app/queries/decidim/stats_users_count.rb +2 -2
- data/app/resolvers/decidim/meta_image_url_resolver.rb +128 -0
- data/app/serializers/decidim/exporters/open_data_blocked_user_serializer.rb +25 -0
- data/app/serializers/decidim/exporters/open_data_metric_serializer.rb +22 -0
- data/app/serializers/decidim/exporters/open_data_moderation_serializer.rb +30 -0
- data/app/serializers/decidim/exporters/open_data_taxonomy_serializer.rb +30 -0
- data/app/serializers/decidim/exporters/open_data_user_group_serializer.rb +38 -0
- data/app/serializers/decidim/exporters/open_data_user_serializer.rb +39 -0
- data/app/serializers/decidim/exporters/participatory_space_serializer.rb +104 -0
- data/app/serializers/decidim/exporters/serializer.rb +25 -0
- data/app/serializers/decidim/schema_org_breadcrumb_list_serializer.rb +52 -0
- data/app/services/decidim/action_authorizer.rb +32 -3
- data/app/services/decidim/base_diff_renderer.rb +27 -3
- data/app/services/decidim/download_your_data_exporter.rb +58 -24
- data/app/services/decidim/email_notification_generator.rb +14 -5
- data/app/services/decidim/onboarding_manager.rb +272 -0
- data/app/services/decidim/open_data_exporter.rb +139 -13
- data/app/services/decidim/traceability.rb +13 -0
- data/app/uploaders/decidim/application_uploader.rb +1 -1
- data/app/validators/etiquette_validator.rb +9 -2
- data/app/validators/passthru_validator.rb +1 -1
- data/app/validators/translated_etiquette_validator.rb +32 -0
- data/app/views/decidim/account/_password_fields.html.erb +2 -2
- data/app/views/decidim/application/_accordion_section.html.erb +14 -0
- data/app/views/decidim/application/_collection.html.erb +30 -18
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +5 -1
- data/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb +29 -0
- data/app/views/decidim/devise/registrations/new.html.erb +10 -22
- data/app/views/decidim/devise/sessions/new.html.erb +24 -29
- data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +2 -4
- data/app/views/decidim/devise/shared/_tos_fields.html.erb +16 -0
- data/app/views/decidim/download_your_data/_export.html.erb +15 -0
- data/app/views/decidim/download_your_data/show.html.erb +51 -5
- data/app/views/decidim/endorsements/update_buttons_and_counters.js.erb +16 -19
- data/app/views/decidim/export_mailer/download_your_data_export.html.erb +2 -2
- data/app/views/decidim/export_mailer/export.html.erb +5 -1
- data/app/views/decidim/notifications_settings/show.html.erb +22 -0
- data/app/views/decidim/open_data/_how_to_open_accordion_section.html.erb +15 -0
- data/app/views/decidim/open_data/index.html.erb +108 -0
- data/app/views/decidim/pages/_tabbed.html.erb +2 -2
- data/app/views/decidim/pages/show.html.erb +2 -1
- data/app/views/decidim/participatory_space_private_users/_participatory_space_private_user.html.erb +1 -0
- data/app/views/decidim/shared/_login_modal.html.erb +26 -20
- data/app/views/decidim/shared/_resource_actions.html.erb +21 -0
- data/app/views/decidim/shared/filters/_check_boxes_tree.html.erb +1 -2
- data/app/views/decidim/shared/filters/_collection.html.erb +1 -1
- data/app/views/decidim/shared/filters/_dropdown_label.html.erb +7 -4
- data/app/views/layouts/decidim/_application.html.erb +0 -1
- data/app/views/layouts/decidim/_js_configuration.html.erb +1 -0
- data/app/views/layouts/decidim/_logo.html.erb +1 -1
- data/app/views/layouts/decidim/_logo_mobile.html.erb +1 -1
- data/app/views/layouts/decidim/_meta_tags_config.html.erb +6 -11
- data/app/views/layouts/decidim/_schema_org_breadcrumb_list.html.erb +3 -0
- data/app/views/layouts/decidim/_wrapper.html.erb +15 -9
- data/app/views/layouts/decidim/footer/_main_links.html.erb +1 -1
- data/app/views/layouts/decidim/header/_close_ephemeral_session.html.erb +25 -0
- data/app/views/layouts/decidim/header/_main.html.erb +14 -10
- data/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb +2 -0
- data/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb +1 -1
- data/app/views/layouts/decidim/shared/_layout_item.html.erb +1 -1
- data/config/assets.rb +2 -1
- data/config/locales/ar.yml +38 -54
- data/config/locales/bg.yml +3 -64
- data/config/locales/bn-BD.yml +1 -0
- data/config/locales/bs-BA.yml +98 -0
- data/config/locales/ca.yml +380 -69
- data/config/locales/cs.yml +369 -55
- data/config/locales/de.yml +371 -67
- data/config/locales/el.yml +5 -45
- data/config/locales/en.yml +365 -54
- data/config/locales/eo.yml +0 -2
- data/config/locales/es-MX.yml +366 -58
- data/config/locales/es-PY.yml +366 -58
- data/config/locales/es.yml +375 -64
- data/config/locales/eu.yml +547 -223
- data/config/locales/fi-plain.yml +361 -57
- data/config/locales/fi.yml +400 -93
- data/config/locales/fr-CA.yml +181 -55
- data/config/locales/fr.yml +182 -53
- data/config/locales/ga-IE.yml +4 -16
- data/config/locales/gl.yml +5 -30
- data/config/locales/hu.yml +3 -55
- data/config/locales/id-ID.yml +5 -30
- data/config/locales/is-IS.yml +4 -13
- data/config/locales/it.yml +10 -46
- data/config/locales/ja.yml +230 -69
- data/config/locales/lb.yml +5 -47
- data/config/locales/lt.yml +5 -59
- data/config/locales/lv.yml +5 -36
- data/config/locales/nl.yml +5 -48
- data/config/locales/no.yml +6 -47
- data/config/locales/pl.yml +4 -66
- data/config/locales/pt-BR.yml +12 -52
- data/config/locales/pt.yml +11 -47
- data/config/locales/ro-RO.yml +448 -247
- data/config/locales/ru.yml +4 -16
- data/config/locales/sk.yml +5 -37
- data/config/locales/sv.yml +108 -64
- data/config/locales/tr-TR.yml +5 -45
- data/config/locales/uk.yml +4 -15
- data/config/locales/zh-CN.yml +5 -45
- data/config/locales/zh-TW.yml +5 -50
- data/config/routes.rb +5 -10
- data/db/migrate/20181025082245_add_timestamps_to_components.rb +2 -0
- data/db/migrate/20240628111905_add_visible_to_components.rb +7 -0
- data/db/migrate/20240704115429_create_decidim_taxonomies.rb +23 -0
- data/db/migrate/20240717093514_add_registered_only_to_decidim_share_tokens.rb +7 -0
- data/db/migrate/20240722215500_change_object_changes_on_versions.rb +39 -0
- data/db/migrate/20240806065417_create_decidim_taxonomy_filters.rb +23 -0
- data/db/migrate/20240822161348_add_deleted_at_to_decidim_components.rb +8 -0
- data/db/migrate/20240906162524_add_part_of_to_taxonomies.rb +26 -0
- data/db/migrate/20241001135825_add_role_to_participatory_space_private_users.rb +7 -0
- data/db/migrate/20241001140408_add_published_to_participatory_space_private_users.rb +7 -0
- data/db/migrate/20241022002600_create_private_exports.rb +18 -0
- data/db/migrate/20241028114430_add_component_counter_to_taxonomy_filters.rb +7 -0
- data/db/migrate/20241111104357_add_names_and_space_boolean_to_taxonomy_filters.rb +9 -0
- data/db/migrate/20241127093708_add_taxonomy_to_metrics.rb +7 -0
- data/db/migrate/20241204121445_add_participatory_space_manifests_from_taxonomy_filters.rb +9 -0
- data/decidim-core.gemspec +18 -18
- data/lib/decidim/action_authorization.rb +3 -2
- data/lib/decidim/amendable.rb +1 -1
- data/lib/decidim/api/functions/component_list.rb +1 -1
- data/lib/decidim/api/functions/participatory_space_finder_base.rb +11 -1
- data/lib/decidim/api/input_filters/category_input_filter.rb +5 -3
- data/lib/decidim/api/input_filters/component_input_filter.rb +33 -20
- data/lib/decidim/api/input_filters/user_entity_input_filter.rb +53 -44
- data/lib/decidim/api/input_sorts/component_input_sort.rb +15 -13
- data/lib/decidim/api/input_sorts/user_entity_input_sort.rb +4 -4
- data/lib/decidim/api/interfaces/author_interface.rb +3 -2
- data/lib/decidim/api/interfaces/coauthorable_interface.rb +5 -5
- data/lib/decidim/api/interfaces/endorsable_interface.rb +2 -2
- data/lib/decidim/api/interfaces/participatory_space_interface.rb +5 -10
- data/lib/decidim/api/interfaces/taxonomizable_interface.rb +13 -0
- data/lib/decidim/api/types/amendment_type.rb +5 -7
- data/lib/decidim/api/types/area_api_type.rb +3 -3
- data/lib/decidim/api/types/attachment_type.rb +3 -3
- data/lib/decidim/api/types/category_type.rb +2 -2
- data/lib/decidim/api/types/component_type.rb +7 -0
- data/lib/decidim/api/types/decidim_type.rb +5 -1
- data/lib/decidim/api/types/fingerprint_type.rb +1 -1
- data/lib/decidim/api/types/localized_string_type.rb +1 -1
- data/lib/decidim/api/types/metric_history_type.rb +2 -0
- data/lib/decidim/api/types/metric_type.rb +1 -1
- data/lib/decidim/api/types/organization_type.rb +5 -0
- data/lib/decidim/api/types/participatory_space_link_type.rb +2 -2
- data/lib/decidim/api/types/participatory_space_manifest_type.rb +1 -1
- data/lib/decidim/api/types/quantifiable_translated_field_type.rb +1 -1
- data/lib/decidim/api/types/scope_api_type.rb +2 -3
- data/lib/decidim/api/types/session_type.rb +1 -2
- data/lib/decidim/api/types/taxonomy_type.rb +15 -0
- data/lib/decidim/api/types/trace_version_type.rb +2 -2
- data/lib/decidim/api/types/translated_field_type.rb +3 -5
- data/lib/decidim/api/types/user_group_type.rb +11 -20
- data/lib/decidim/api/types/user_type.rb +9 -18
- data/lib/decidim/asset_router/storage.rb +4 -4
- data/lib/decidim/assets/tailwind/tailwind.config.js.erb +2 -1
- data/lib/decidim/attachment_attributes.rb +1 -1
- data/lib/decidim/attribute_encryptor.rb +1 -1
- data/lib/decidim/attribute_object/nested_validator.rb +1 -1
- data/lib/decidim/attributes/integer_with_units.rb +27 -0
- data/lib/decidim/attributes/rich_text.rb +38 -0
- data/lib/decidim/attributes/time_with_zone.rb +11 -1
- data/lib/decidim/attributes.rb +4 -0
- data/lib/decidim/authorization_form_builder.rb +0 -7
- data/lib/decidim/coauthorable.rb +1 -1
- data/lib/decidim/command.rb +3 -3
- data/lib/decidim/commands/destroy_resource.rb +5 -1
- data/lib/decidim/commands/resource_handler.rb +2 -2
- data/lib/decidim/commands/restore_resource.rb +45 -0
- data/lib/decidim/commands/soft_delete_resource.rb +63 -0
- data/lib/decidim/component_manifest.rb +7 -0
- data/lib/decidim/content_parsers/blob_parser.rb +93 -0
- data/lib/decidim/content_parsers.rb +1 -0
- data/lib/decidim/content_renderers/blob_renderer.rb +90 -0
- data/lib/decidim/content_renderers.rb +1 -0
- data/lib/decidim/core/api.rb +2 -0
- data/lib/decidim/core/engine.rb +50 -8
- data/lib/decidim/core/menu.rb +0 -5
- data/lib/decidim/core/seeds.rb +42 -2
- data/lib/decidim/core/test/factories.rb +133 -2
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +85 -0
- data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +408 -40
- data/lib/decidim/core/test/shared_examples/components_controller_hide_shared_examples.rb +11 -0
- data/lib/decidim/core/test/shared_examples/components_controller_reorder_shared_examples.rb +21 -0
- data/lib/decidim/core/test/shared_examples/download_open_data_shared_context.rb +36 -0
- data/lib/decidim/core/test/shared_examples/download_open_data_shared_examples.rb +45 -0
- data/lib/decidim/core/test/shared_examples/download_your_data_shared_examples.rb +17 -0
- data/lib/decidim/core/test/shared_examples/etiquette_validator_examples.rb +25 -0
- data/lib/decidim/core/test/shared_examples/follows_examples.rb +43 -0
- data/lib/decidim/core/test/shared_examples/has_taxonomies.rb +94 -0
- data/lib/decidim/core/test/shared_examples/manage_share_tokens_examples.rb +237 -0
- data/lib/decidim/core/test/shared_examples/map_examples.rb +2 -0
- data/lib/decidim/core/test/shared_examples/open_data_exporter_examples.rb +102 -0
- data/lib/decidim/core/test/shared_examples/participatory_space_members_page_examples.rb +46 -0
- data/lib/decidim/core/test/shared_examples/participatory_space_search_examples.rb +98 -0
- data/lib/decidim/core/test/shared_examples/permissions.rb +7 -7
- data/lib/decidim/core/test/shared_examples/preview_with_share_token_examples.rb +94 -0
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +9 -5
- data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +75 -69
- data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
- data/lib/decidim/core/test/shared_examples/simple_event.rb +33 -19
- data/lib/decidim/core/test/shared_examples/social_share_examples.rb +25 -0
- data/lib/decidim/core/test/shared_examples/softdeleteable_components_examples.rb +173 -0
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +54 -8
- data/lib/decidim/core/test/shared_examples/taxonomizable_interface_examples.rb +20 -0
- data/lib/decidim/core/test/shared_examples/taxonomizable_resource_examples.rb +37 -0
- data/lib/decidim/core/test/shared_examples/taxonomy_settings.rb +49 -0
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/test.rb +9 -5
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +58 -0
- data/lib/decidim/diffy_extension.rb +18 -0
- data/lib/decidim/download_your_data_serializers/download_your_data_identity_serializer.rb +0 -4
- data/lib/decidim/download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb +3 -1
- data/lib/decidim/download_your_data_serializers/download_your_data_report_serializer.rb +2 -1
- data/lib/decidim/download_your_data_serializers/download_your_data_user_serializer.rb +6 -7
- data/lib/decidim/download_your_data_serializers.rb +19 -0
- data/lib/decidim/exporters/csv.rb +6 -0
- data/lib/decidim/exporters/export_manifest.rb +14 -0
- data/lib/decidim/exporters/pdf.rb +26 -22
- data/lib/decidim/filter_form_builder.rb +12 -15
- data/lib/decidim/form_builder.rb +7 -130
- data/lib/decidim/has_category.rb +5 -1
- data/lib/decidim/has_private_users.rb +4 -0
- data/lib/decidim/has_taxonomy_settings.rb +47 -0
- data/lib/decidim/has_upload_validations.rb +1 -1
- data/lib/decidim/legacy_form_builder.rb +118 -0
- data/lib/decidim/maintenance/import_models/application_record.rb +93 -0
- data/lib/decidim/maintenance/import_models/area.rb +82 -0
- data/lib/decidim/maintenance/import_models/area_type.rb +12 -0
- data/lib/decidim/maintenance/import_models/assembly_type.rb +49 -0
- data/lib/decidim/maintenance/import_models/categorization.rb +14 -0
- data/lib/decidim/maintenance/import_models/category.rb +107 -0
- data/lib/decidim/maintenance/import_models/participatory_process_type.rb +21 -0
- data/lib/decidim/maintenance/import_models/scope.rb +163 -0
- data/lib/decidim/maintenance/import_models.rb +19 -0
- data/lib/decidim/maintenance/taxonomy_importer.rb +132 -0
- data/lib/decidim/maintenance/taxonomy_plan.rb +78 -0
- data/lib/decidim/maintenance.rb +12 -0
- data/lib/decidim/map/autocomplete.rb +53 -8
- data/lib/decidim/map/dynamic_map.rb +1 -1
- data/lib/decidim/map/provider/geocoding/here.rb +9 -3
- data/lib/decidim/map.rb +3 -6
- data/lib/decidim/moderation_tools.rb +14 -3
- data/lib/decidim/newsletter_encryptor.rb +1 -1
- data/lib/decidim/paddable.rb +1 -1
- data/lib/decidim/participable.rb +10 -10
- data/lib/decidim/participatory_space_user.rb +14 -0
- data/lib/decidim/private_download_helper.rb +15 -0
- data/lib/decidim/query_extensions.rb +0 -26
- data/lib/decidim/record_encryptor.rb +51 -46
- data/lib/decidim/resourceable.rb +16 -0
- data/lib/decidim/seeds.rb +18 -20
- data/lib/decidim/settings_manifest.rb +36 -1
- data/lib/decidim/soft_deletable.rb +17 -0
- data/lib/decidim/taxonomizable.rb +72 -0
- data/lib/decidim/translatable_attributes.rb +6 -1
- data/lib/decidim/view_model.rb +0 -1
- data/lib/tasks/decidim_download_your_data_tasks.rake +2 -4
- data/lib/tasks/decidim_procfile.rake +6 -0
- data/lib/tasks/decidim_tasks.rake +1 -0
- data/lib/tasks/decidim_taxonomies.rake +155 -0
- data/lib/tasks/upgrade/{decidim_fix_categorization.rake → clean.rake} +52 -19
- data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake +1 -1
- data/lib/tasks/upgrade/migrations.rake +91 -0
- metadata +217 -103
- data/app/cells/decidim/amendable/amenders_list/show.erb +0 -0
- data/app/cells/decidim/content_blocks/base/content.erb +0 -0
- data/app/cells/decidim/endorsers_list/full_endorsers_list.erb +0 -3
- data/app/cells/decidim/endorsers_list_button/content.erb +0 -1
- data/app/cells/decidim/endorsers_list_button_cell.rb +0 -15
- data/app/cells/decidim/scopes_picker/scope_picker_prompt.erb +0 -3
- data/app/cells/decidim/scopes_picker/scope_picker_values.erb +0 -5
- data/app/cells/decidim/scopes_picker/show.erb +0 -14
- data/app/cells/decidim/scopes_picker_cell.rb +0 -92
- data/app/commands/decidim/update_user_interests.rb +0 -41
- data/app/controllers/decidim/scopes_controller.rb +0 -84
- data/app/controllers/decidim/user_interests_controller.rb +0 -30
- data/app/forms/decidim/user_interest_scope_form.rb +0 -25
- data/app/forms/decidim/user_interests_form.rb +0 -17
- data/app/helpers/decidim/categories_helper.rb +0 -26
- data/app/helpers/decidim/scopes_helper.rb +0 -105
- data/app/packs/images/decidim/vendor/leaflet/layers-2x.png +0 -0
- data/app/packs/images/decidim/vendor/leaflet/layers.png +0 -0
- data/app/packs/images/decidim/vendor/leaflet/marker-icon-2x.png +0 -0
- data/app/packs/images/decidim/vendor/leaflet/marker-icon.png +0 -0
- data/app/packs/images/decidim/vendor/leaflet/marker-shadow.png +0 -0
- data/app/packs/stylesheets/decidim/legacy/MarkerCluster.Default.scss +0 -67
- data/app/packs/stylesheets/decidim/legacy/MarkerCluster.scss +0 -18
- data/app/packs/stylesheets/decidim/legacy/leaflet.scss +0 -705
- data/app/validators/scope_belongs_to_component_validator.rb +0 -16
- data/app/views/decidim/account/_user_groups.html.erb +0 -0
- data/app/views/decidim/scopes/_scopes_picker_input.html.erb +0 -19
- data/app/views/decidim/scopes/picker.html.erb +0 -53
- data/app/views/decidim/shared/_comments.html.erb +0 -0
- data/app/views/decidim/shared/_share_modal.html.erb +0 -26
- data/app/views/decidim/shared/_tags.html.erb +0 -1
- data/app/views/decidim/user_interests/_areas.html.erb +0 -14
- data/app/views/decidim/user_interests/_scopes.html.erb +0 -22
- data/app/views/decidim/user_interests/show.html.erb +0 -22
- data/config/initializers/foundation_rails_helper.rb +0 -4
- data/lib/decidim/core/test/shared_examples/has_category.rb +0 -38
- data/lib/decidim/core/test/shared_examples/has_scope.rb +0 -11
- data/lib/decidim/core/test/shared_examples/manage_component_share_tokens.rb +0 -83
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -49
- data/lib/decidim/core/test/shared_examples/scope_helper_examples.rb +0 -93
- data/lib/decidim/seven_zip_wrapper.rb +0 -29
data/lib/decidim/seeds.rb
CHANGED
@@ -21,7 +21,7 @@ module Decidim
|
|
21
21
|
user = Decidim::User.find_or_initialize_by(email:)
|
22
22
|
user.update!(
|
23
23
|
name: ::Faker::Name.name,
|
24
|
-
nickname: ::Faker::Twitter.unique.screen_name,
|
24
|
+
nickname: "#{::Faker::Twitter.unique.screen_name}-#{rand(10_000)}"[0...20],
|
25
25
|
password: "decidim123456789",
|
26
26
|
organization:,
|
27
27
|
confirmed_at: Time.current,
|
@@ -38,18 +38,6 @@ module Decidim
|
|
38
38
|
user
|
39
39
|
end
|
40
40
|
|
41
|
-
def random_scope(participatory_space:)
|
42
|
-
if participatory_space.scope
|
43
|
-
scopes = participatory_space.scope.descendants
|
44
|
-
global = participatory_space.scope
|
45
|
-
else
|
46
|
-
scopes = participatory_space.organization.scopes
|
47
|
-
global = nil
|
48
|
-
end
|
49
|
-
|
50
|
-
::Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample
|
51
|
-
end
|
52
|
-
|
53
41
|
def seeds_root = File.join(__dir__, "..", "..", "db", "seeds")
|
54
42
|
|
55
43
|
def hero_image = create_blob!(seeds_file: "city.jpeg", filename: "hero_image.jpeg", content_type: "image/jpeg")
|
@@ -97,13 +85,23 @@ module Decidim
|
|
97
85
|
)
|
98
86
|
end
|
99
87
|
|
100
|
-
def
|
101
|
-
Decidim::
|
102
|
-
name: Decidim::Faker::Localized.
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
88
|
+
def create_taxonomy!(name:, parent:)
|
89
|
+
Decidim::Taxonomy.create!(
|
90
|
+
name: Decidim::Faker::Localized.literal(name),
|
91
|
+
organization:,
|
92
|
+
parent:
|
93
|
+
)
|
94
|
+
end
|
95
|
+
|
96
|
+
def create_taxonomy_filter!(root_taxonomy:, taxonomies:, participatory_space_manifests: [])
|
97
|
+
Decidim::TaxonomyFilter.create!(
|
98
|
+
root_taxonomy:,
|
99
|
+
participatory_space_manifests:,
|
100
|
+
filter_items: taxonomies.map do |taxonomy_item|
|
101
|
+
Decidim::TaxonomyFilterItem.new(
|
102
|
+
taxonomy_item:
|
103
|
+
)
|
104
|
+
end
|
107
105
|
)
|
108
106
|
end
|
109
107
|
|
@@ -70,6 +70,8 @@ module Decidim
|
|
70
70
|
validates name, presence: true if attribute.required
|
71
71
|
validates name, inclusion: { in: attribute.build_choices } if attribute.type == :enum
|
72
72
|
end
|
73
|
+
|
74
|
+
SettingsManifest.add_integer_with_units_validation(self, name, attribute) if attribute.type == :integer_with_units
|
73
75
|
end
|
74
76
|
end
|
75
77
|
|
@@ -77,6 +79,20 @@ module Decidim
|
|
77
79
|
@schema
|
78
80
|
end
|
79
81
|
|
82
|
+
def self.add_integer_with_units_validation(schema, name, attribute)
|
83
|
+
schema.class_eval do
|
84
|
+
validate do
|
85
|
+
value = send(name)
|
86
|
+
value = [value["0"].to_i, value["1"].to_s] if value.is_a?(::Hash)
|
87
|
+
|
88
|
+
errors.add(name, :invalid) unless value.is_a?(::Array) &&
|
89
|
+
value.size == 2 &&
|
90
|
+
value[0].is_a?(Integer) &&
|
91
|
+
attribute.build_units.include?(value[1])
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
80
96
|
def required_attributes_for_authorization
|
81
97
|
attributes.select { |_, attribute| attribute.required_for_authorization? }
|
82
98
|
end
|
@@ -91,6 +107,7 @@ module Decidim
|
|
91
107
|
TYPES = {
|
92
108
|
boolean: { klass: Boolean, default: false },
|
93
109
|
integer: { klass: Integer, default: 0 },
|
110
|
+
integer_with_units: { klass: Decidim::Attributes::IntegerWithUnits, default: [5, "minutes"] },
|
94
111
|
string: { klass: String, default: nil },
|
95
112
|
float: { klass: Float, default: nil },
|
96
113
|
text: { klass: String, default: nil },
|
@@ -98,7 +115,8 @@ module Decidim
|
|
98
115
|
enum: { klass: String, default: nil },
|
99
116
|
select: { klass: String, default: nil },
|
100
117
|
scope: { klass: Integer, default: nil },
|
101
|
-
time: { klass: Decidim::Attributes::TimeWithZone, default: nil }
|
118
|
+
time: { klass: Decidim::Attributes::TimeWithZone, default: nil },
|
119
|
+
taxonomy_filters: { klass: Array, default: [] }
|
102
120
|
}.freeze
|
103
121
|
|
104
122
|
attribute :type, Symbol, default: :boolean
|
@@ -111,11 +129,24 @@ module Decidim
|
|
111
129
|
attribute :required_for_authorization, Boolean, default: false
|
112
130
|
attribute :readonly
|
113
131
|
attribute :choices
|
132
|
+
attribute :units
|
114
133
|
attribute :include_blank, Boolean, default: false
|
115
134
|
|
116
135
|
validates :type, inclusion: { in: TYPES.keys }
|
136
|
+
validate :validate_integer_with_units_structure
|
137
|
+
|
138
|
+
def validate_integer_with_units_structure
|
139
|
+
return unless type == :integer_with_units
|
140
|
+
|
141
|
+
errors.add(:default, :invalid) unless default_value.is_a?(::Array) &&
|
142
|
+
default_value.size == 2 &&
|
143
|
+
default_value[0].is_a?(Integer) &&
|
144
|
+
build_units.include?(default_value[1])
|
145
|
+
end
|
117
146
|
|
118
147
|
def type_class
|
148
|
+
return Decidim::Attributes::RichText if type == :text && editor == true
|
149
|
+
|
119
150
|
TYPES[type][:klass]
|
120
151
|
end
|
121
152
|
|
@@ -127,6 +158,10 @@ module Decidim
|
|
127
158
|
choices.try(:call) || choices
|
128
159
|
end
|
129
160
|
|
161
|
+
def build_units
|
162
|
+
units.try(:call) || units
|
163
|
+
end
|
164
|
+
|
130
165
|
def readonly?(context)
|
131
166
|
readonly&.call(context)
|
132
167
|
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/concern"
|
4
|
+
require "paranoia"
|
5
|
+
|
6
|
+
module Decidim
|
7
|
+
# This concern contains the logic related to soft deletion (trashing).
|
8
|
+
module SoftDeletable
|
9
|
+
extend ActiveSupport::Concern
|
10
|
+
|
11
|
+
included do
|
12
|
+
acts_as_paranoid
|
13
|
+
|
14
|
+
scope :deleted_at_desc, -> { order(deleted_at: :desc) }
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,72 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/concern"
|
4
|
+
|
5
|
+
module Decidim
|
6
|
+
# A concern with the components needed when you want a model to have taxonomies.
|
7
|
+
#
|
8
|
+
# The including model needs to implement the following interface:
|
9
|
+
#
|
10
|
+
# @abstract method that gives an associated organization
|
11
|
+
# @method organization
|
12
|
+
# @return [Decidim::Organization]
|
13
|
+
#
|
14
|
+
module Taxonomizable
|
15
|
+
extend ActiveSupport::Concern
|
16
|
+
|
17
|
+
included do
|
18
|
+
has_many :taxonomizations, as: :taxonomizable, class_name: "Decidim::Taxonomization", dependent: :destroy
|
19
|
+
has_many :taxonomies, through: :taxonomizations
|
20
|
+
|
21
|
+
validate :no_root_taxonomies
|
22
|
+
validate :taxonomies_belong_to_organization
|
23
|
+
|
24
|
+
# finds taxonomizables belonging to a specific taxonomy
|
25
|
+
scope :with_taxonomy, ->(taxonomy_id) { includes(:taxonomies).references(:decidim_taxonomies).where("? = ANY(decidim_taxonomies.part_of)", taxonomy_id) }
|
26
|
+
|
27
|
+
# finds taxonomizables belonging to any of the taxonomies specified (or its children)
|
28
|
+
scope :with_taxonomies, lambda { |*taxonomy_ids|
|
29
|
+
conditions = ["? = ANY(part_of)"] * taxonomy_ids.count
|
30
|
+
taxonomies = Decidim::Taxonomy.where(conditions.join(" OR "), *taxonomy_ids.map(&:to_i))
|
31
|
+
includes(:taxonomies).joins(:taxonomies).where(decidim_taxonomies: { id: taxonomies })
|
32
|
+
}
|
33
|
+
|
34
|
+
# finds taxonomizables belonging to all groups of taxonomies specified, each group is an array of taxonomy ids that are ORed together
|
35
|
+
scope :with_any_taxonomies, lambda { |*taxonomy_groups|
|
36
|
+
return with_taxonomies(*taxonomy_groups) unless taxonomy_groups.first.is_a?(Array)
|
37
|
+
|
38
|
+
queries = []
|
39
|
+
taxonomy_groups.each do |root_id, taxonomy_ids|
|
40
|
+
taxonomy_ids = taxonomy_ids.flatten.compact_blank
|
41
|
+
next if taxonomy_ids.empty?
|
42
|
+
|
43
|
+
taxonomy_ids = [root_id] if taxonomy_ids.include?("all")
|
44
|
+
|
45
|
+
queries << with_taxonomies(*taxonomy_ids)
|
46
|
+
end
|
47
|
+
return self if queries.empty?
|
48
|
+
return queries.first if queries.count == 1
|
49
|
+
|
50
|
+
subquery = queries.map(&:arel).reduce do |memo, query|
|
51
|
+
Arel::Nodes::Intersect.new(memo, query)
|
52
|
+
end
|
53
|
+
|
54
|
+
@klass.from(Arel::Nodes::As.new(subquery, Arel.sql(@klass.arel_table.name)))
|
55
|
+
}
|
56
|
+
|
57
|
+
private
|
58
|
+
|
59
|
+
def no_root_taxonomies
|
60
|
+
return unless taxonomies.any?(&:root?)
|
61
|
+
|
62
|
+
errors.add(:taxonomies, :invalid)
|
63
|
+
end
|
64
|
+
|
65
|
+
def taxonomies_belong_to_organization
|
66
|
+
return if taxonomies.all? { |taxonomy| taxonomy.organization == organization }
|
67
|
+
|
68
|
+
errors.add(:taxonomies, :invalid)
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
@@ -34,6 +34,7 @@ module Decidim
|
|
34
34
|
# end
|
35
35
|
#
|
36
36
|
# Returns nothing.
|
37
|
+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
37
38
|
def translatable_attribute(name, type, **)
|
38
39
|
attribute(name, { String => Object }, default: {})
|
39
40
|
|
@@ -41,6 +42,8 @@ module Decidim
|
|
41
42
|
attribute_name = "#{name}_#{locale}".gsub("-", "__")
|
42
43
|
attribute(attribute_name, type, **)
|
43
44
|
|
45
|
+
value_type = attribute_types[attribute_name.to_s]
|
46
|
+
|
44
47
|
define_method attribute_name do
|
45
48
|
field = public_send(name) || {}
|
46
49
|
value =
|
@@ -51,7 +54,6 @@ module Decidim
|
|
51
54
|
# changed and the old value is still stored against the record.
|
52
55
|
field
|
53
56
|
end
|
54
|
-
value_type = self.class.attribute_types[attribute_name.to_s]
|
55
57
|
value_type ? value_type.cast(value) : value
|
56
58
|
end
|
57
59
|
|
@@ -60,12 +62,15 @@ module Decidim
|
|
60
62
|
final = super(value)
|
61
63
|
return unless final # Do not set the `nil` values for the parent hash
|
62
64
|
|
65
|
+
final = value_type.serialize(final) if value_type
|
66
|
+
|
63
67
|
public_send("#{name}=", field.merge(locale => final))
|
64
68
|
end
|
65
69
|
|
66
70
|
yield(attribute_name, locale) if block_given?
|
67
71
|
end
|
68
72
|
end
|
73
|
+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
69
74
|
|
70
75
|
def locales
|
71
76
|
Decidim.available_locales
|
data/lib/decidim/view_model.rb
CHANGED
@@ -8,7 +8,6 @@ module Decidim
|
|
8
8
|
include ActionView::Helpers::TranslationHelper
|
9
9
|
include ::Cell::Translation
|
10
10
|
include Decidim::ResourceHelper
|
11
|
-
include Decidim::ScopesHelper
|
12
11
|
include ActionController::Helpers
|
13
12
|
include Decidim::ActionAuthorization
|
14
13
|
include Decidim::ActionAuthorizationHelper
|
@@ -64,7 +64,7 @@ namespace :decidim do
|
|
64
64
|
input = $stdin.gets.chomp
|
65
65
|
if input.casecmp("y").zero?
|
66
66
|
puts %( Continue...)
|
67
|
-
Decidim::User.where(
|
67
|
+
Decidim::User.where(newsletter_notifications_at: ...Time.zone.parse("2018-05-25 00:00 +02:00")).find_each(&:newsletter_opt_in_notify)
|
68
68
|
else
|
69
69
|
puts %( Execution cancelled...)
|
70
70
|
end
|
@@ -76,9 +76,7 @@ namespace :decidim do
|
|
76
76
|
attachments = ActiveStorage::Attachment.joins(:blob).where(
|
77
77
|
name: "download_your_data_file",
|
78
78
|
record_type: "Decidim::UserBaseEntity"
|
79
|
-
).where(
|
80
|
-
"active_storage_blobs.created_at < ?", Decidim.download_your_data_expiry_time.ago
|
81
|
-
)
|
79
|
+
).where(active_storage_blobs: { created_at: ...Decidim.download_your_data_expiry_time.ago })
|
82
80
|
attachments.each do |attachment|
|
83
81
|
delete_download_your_data_file attachment
|
84
82
|
end
|
@@ -11,6 +11,12 @@ namespace :decidim do
|
|
11
11
|
shakapacker: bin/shakapacker-dev-server
|
12
12
|
RUBY
|
13
13
|
|
14
|
+
if defined?(Sidekiq)
|
15
|
+
actions :append_file, "Procfile.dev", <<~RUBY
|
16
|
+
sidekiq: bundle exec sidekiq -C config/sidekiq.yml
|
17
|
+
RUBY
|
18
|
+
end
|
19
|
+
|
14
20
|
actions :create_file, "bin/dev", %(#!/usr/bin/env sh
|
15
21
|
|
16
22
|
set -e
|
@@ -0,0 +1,155 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "decidim/maintenance"
|
4
|
+
|
5
|
+
namespace :decidim do
|
6
|
+
namespace :taxonomies do
|
7
|
+
desc "Creates a JSON file with the taxonomies structure imported from older models"
|
8
|
+
task :make_plan, [] => :environment do |_task, _args|
|
9
|
+
Decidim::Organization.find_each do |organization|
|
10
|
+
log(true).info "Creating a plan for organization #{organization.id} in #{plan_file_path(organization)}"
|
11
|
+
FileUtils.mkdir_p(Rails.root.join("tmp/taxonomies"))
|
12
|
+
json = planner(organization).to_json do |model|
|
13
|
+
log.info "...Exporting taxonomies for #{model.table_name}"
|
14
|
+
end
|
15
|
+
File.write(plan_file_path(organization), json)
|
16
|
+
log.info "Plan created, you can review or edit if needed before importing."
|
17
|
+
log.info "Import the plan with this command:"
|
18
|
+
log.info "bin/rails decidim:taxonomies:import_plan[#{plan_file_path(organization)}]"
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
desc "Imports taxonomies and filters structure from a JSON file"
|
23
|
+
task :import_plan, [:file] => :environment do |_task, args|
|
24
|
+
file = args[:file].to_s
|
25
|
+
abort "File not found! [#{file}]" unless File.exist?(file)
|
26
|
+
|
27
|
+
data = JSON.parse(File.read(file))
|
28
|
+
organization = Decidim::Organization.find_by(id: data.dig("organization", "id"))
|
29
|
+
abort "Organization not found! [#{data["organization"]}]" unless organization
|
30
|
+
log(true).info "Importing taxonomies and filters for organization #{organization.id}"
|
31
|
+
|
32
|
+
planner(organization).import(data) do |importer, model_name|
|
33
|
+
taxonomies = importer.roots
|
34
|
+
result = importer.result
|
35
|
+
log.info "...Importing #{taxonomies.count} root taxonomies from #{model_name}"
|
36
|
+
taxonomies.each do |name, taxonomy|
|
37
|
+
log.info " - Root taxonomy: #{name}"
|
38
|
+
log.info " 1st level taxonomies: #{taxonomy["taxonomies"].count}"
|
39
|
+
log.info " Filters: #{taxonomy["filters"].count}"
|
40
|
+
taxonomy["filters"].each do |filter|
|
41
|
+
log.info " - Filter name: #{filter["name"]}"
|
42
|
+
log.info " Internal name: #{filter["internal_name"] || "-"}"
|
43
|
+
log.info " Space manifests: #{filter["participatory_space_manifests"]&.join(", ") || "-"}"
|
44
|
+
log.info " Items: #{filter["items"].count}"
|
45
|
+
log.info " Components: #{filter["components"].count}"
|
46
|
+
end
|
47
|
+
end
|
48
|
+
importer.import! do |type, detail|
|
49
|
+
log.info " !#{type}: #{detail}"
|
50
|
+
end
|
51
|
+
log.info " Created taxonomies: #{result[:taxonomies_created].count}"
|
52
|
+
result[:taxonomies_created].each do |name|
|
53
|
+
log.info " - #{name}"
|
54
|
+
end
|
55
|
+
log.info " Created filters: #{result[:filters_created].count}"
|
56
|
+
result[:filters_created].each do |name, items|
|
57
|
+
log.info " - #{name}: #{items.count} items"
|
58
|
+
end
|
59
|
+
log.info " Assigned resources: #{result[:taxonomies_assigned].count}"
|
60
|
+
result[:taxonomies_assigned].each do |name, items|
|
61
|
+
log.info " - #{name}: #{items.count} resources"
|
62
|
+
end
|
63
|
+
log.info " Assigned components: #{result[:components_assigned].count}"
|
64
|
+
result[:components_assigned].each do |name, items|
|
65
|
+
log.info " - #{name}: #{items.count} components"
|
66
|
+
end
|
67
|
+
log.info " Failed resources: #{result[:failed_resources].count}"
|
68
|
+
result[:failed_resources].each do |object_id|
|
69
|
+
log.info " - #{object_id}"
|
70
|
+
end
|
71
|
+
log.info " Failed components: #{result[:failed_components].count}"
|
72
|
+
result[:failed_components].each do |component_id|
|
73
|
+
log.info " - #{component_id}"
|
74
|
+
end
|
75
|
+
Rails.root.join("tmp/taxonomies", "#{organization.host}_result.json").write(JSON.pretty_generate(result))
|
76
|
+
log.info "Result saved in tmp/taxonomies/#{organization.host}_result.json"
|
77
|
+
end
|
78
|
+
log.info "Taxonomies and filters imported successfully."
|
79
|
+
end
|
80
|
+
|
81
|
+
desc "Imports taxonomies and filters structure from all JSON files inside tmp/taxonomies"
|
82
|
+
task :import_all_plans, [] => :environment do |_task, _args|
|
83
|
+
Rails.root.glob("tmp/taxonomies/*_plan.json").each do |file|
|
84
|
+
log.info "Importing plan from #{file}"
|
85
|
+
Rake::Task["decidim:taxonomies:import_plan"].invoke(file)
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
desc "Adds taxonomies to metrics from old categories"
|
90
|
+
task :update_metrics, [:file] => :environment do |_task, args|
|
91
|
+
file = args[:file].to_s
|
92
|
+
abort "File not found! [#{file}]" unless File.exist?(file)
|
93
|
+
|
94
|
+
data = JSON.parse(File.read(file))
|
95
|
+
taxonomies = data["taxonomy_map"]
|
96
|
+
abort "No taxonomies found in the file" unless taxonomies && taxonomies&.any?
|
97
|
+
|
98
|
+
total = taxonomies.count
|
99
|
+
taxonomies.each_with_index do |(id, object_id), index|
|
100
|
+
next unless object_id.include?("ImportModels::Category")
|
101
|
+
|
102
|
+
category_id = object_id.split("/").last
|
103
|
+
percent = ((index + 1) * 100 / total).to_i
|
104
|
+
|
105
|
+
count = Decidim::Metric.where(decidim_category_id: category_id).count
|
106
|
+
log.info "...#{percent}% Updating #{count} metrics for category #{category_id} to taxonomy #{id}"
|
107
|
+
Decidim::Metric.where(decidim_category_id: category_id).update_all(decidim_taxonomy_id: id) # rubocop:disable Rails/SkipsModelValidations
|
108
|
+
end
|
109
|
+
end
|
110
|
+
|
111
|
+
desc "Processes all metrics for result files in tmp/taxonomies"
|
112
|
+
task :update_all_metrics, [] => :environment do |_task, _args|
|
113
|
+
Rails.root.glob("tmp/taxonomies/*_result.json").each do |file|
|
114
|
+
log.info "Processing metrics from #{file}"
|
115
|
+
Rake::Task["decidim:taxonomies:update_metrics"].invoke(file)
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
119
|
+
desc "Reset counters for taxonomies and taxonomy filters"
|
120
|
+
task :reset_counters, [] => :environment do |_task, _args|
|
121
|
+
Decidim::Taxonomy.find_each do |taxonomy|
|
122
|
+
taxonomy.reset_all_counters
|
123
|
+
log.info "Counters reset for taxonomy #{taxonomy.id}:"
|
124
|
+
log.info " Children: #{taxonomy.children_count}"
|
125
|
+
log.info " Taxonomizations: #{taxonomy.taxonomizations_count}"
|
126
|
+
log.info " Filters: #{taxonomy.filters_count}"
|
127
|
+
log.info " Filter items: #{taxonomy.filter_items_count}"
|
128
|
+
end
|
129
|
+
Decidim::TaxonomyFilter.find_each do |filter|
|
130
|
+
filter.reset_all_counters
|
131
|
+
log.info "Counters reset for taxonomy filter #{filter.id}:"
|
132
|
+
log.info " Filter items: #{filter.filter_items_count}"
|
133
|
+
log.info " Components: #{filter.components_count}"
|
134
|
+
end
|
135
|
+
end
|
136
|
+
|
137
|
+
def planner(organization)
|
138
|
+
models = ENV.fetch("IMPORTS", "ParticipatoryProcessType AssemblyType Scope Area Category").split.map do |model_name|
|
139
|
+
"Decidim::Maintenance::ImportModels::#{model_name}".constantize
|
140
|
+
end
|
141
|
+
Decidim::Maintenance::TaxonomyPlan.new(organization, models)
|
142
|
+
end
|
143
|
+
|
144
|
+
def plan_file_path(organization)
|
145
|
+
Rails.root.join("tmp/taxonomies", "#{organization.host}_plan.json")
|
146
|
+
end
|
147
|
+
|
148
|
+
def log(reset = false) # rubocop:disable Style/OptionalBooleanParameter
|
149
|
+
@log = nil if reset
|
150
|
+
@log ||= Logger.new($stdout, formatter: proc { |_severity, _time, _progname, msg|
|
151
|
+
"#{msg}\n"
|
152
|
+
})
|
153
|
+
end
|
154
|
+
end
|
155
|
+
end
|
@@ -8,12 +8,21 @@ namespace :decidim do
|
|
8
8
|
:"decidim:upgrade:clean:searchable_resources",
|
9
9
|
:"decidim:upgrade:clean:notifications",
|
10
10
|
:"decidim:upgrade:clean:follows",
|
11
|
-
:"decidim:upgrade:clean:
|
11
|
+
:"decidim:upgrade:clean:categories",
|
12
|
+
:"decidim:upgrade:clean:action_logs",
|
13
|
+
:"decidim:upgrade:clean:clean_deleted_users",
|
14
|
+
:"decidim:upgrade:clean:fix_blocked_user_notification"
|
12
15
|
]
|
13
16
|
|
17
|
+
desc "Remove data from deleted users"
|
18
|
+
task clean_deleted_users: :environment do
|
19
|
+
logger.info("=== Removing extra data from deleted users")
|
20
|
+
Decidim::User.where.not(deleted_at: nil).update_all(personal_url: "", about: "", notifications_sending_frequency: "none") # rubocop:disable Rails/SkipsModelValidations
|
21
|
+
end
|
22
|
+
|
14
23
|
desc "Removes any action logs belonging to invalid resources"
|
15
24
|
task :action_logs, [] => :environment do
|
16
|
-
|
25
|
+
logger.info("=== Deleting Action logs")
|
17
26
|
invalid = 0
|
18
27
|
Decidim::ActionLog.find_each do |log|
|
19
28
|
log.participatory_space if log.participatory_space_type.present?
|
@@ -33,12 +42,12 @@ namespace :decidim do
|
|
33
42
|
log.delete
|
34
43
|
invalid += 1
|
35
44
|
end
|
36
|
-
|
45
|
+
logger.info("===== Deleted #{invalid} invalid action logs")
|
37
46
|
end
|
38
47
|
|
39
48
|
desc "Removes any follows belonging to invalid resources"
|
40
49
|
task :follows, [] => :environment do
|
41
|
-
|
50
|
+
logger.info("=== Deleting Follows")
|
42
51
|
invalid = 0
|
43
52
|
Decidim::Follow.find_each do |follow|
|
44
53
|
follow.followable
|
@@ -54,12 +63,12 @@ namespace :decidim do
|
|
54
63
|
follow.delete
|
55
64
|
invalid += 1
|
56
65
|
end
|
57
|
-
|
66
|
+
logger.info("===== Deleted #{invalid} invalid follows")
|
58
67
|
end
|
59
68
|
|
60
69
|
desc "Removes any notifications belonging to invalid resources"
|
61
70
|
task :notifications, [] => :environment do
|
62
|
-
|
71
|
+
logger.info("=== Deleting Notification")
|
63
72
|
invalid = 0
|
64
73
|
Decidim::Notification.find_each do |notification|
|
65
74
|
# Check if the resource class still exists
|
@@ -70,13 +79,13 @@ namespace :decidim do
|
|
70
79
|
notification.destroy
|
71
80
|
invalid += 1
|
72
81
|
end
|
73
|
-
|
82
|
+
logger.info("===== Deleted #{invalid} invalid notifications")
|
74
83
|
end
|
75
84
|
|
76
85
|
desc "Removes any resources from search index that do not exist"
|
77
86
|
task :searchable_resources, [] => :environment do
|
78
|
-
|
79
|
-
|
87
|
+
logger.info("=== Deleting Searchable results")
|
88
|
+
logger.info("==== Deleting invalid spaces ")
|
80
89
|
invalid = 0
|
81
90
|
Decidim::SearchableResource.where.not(decidim_participatory_space_type: nil).find_each do |search|
|
82
91
|
search.decidim_participatory_space
|
@@ -84,9 +93,9 @@ namespace :decidim do
|
|
84
93
|
search.destroy!
|
85
94
|
invalid += 1
|
86
95
|
end
|
87
|
-
|
96
|
+
logger.info("===== Deleted #{invalid} invalid spaces")
|
88
97
|
|
89
|
-
|
98
|
+
logger.info("==== Deleting invalid resources from search index ")
|
90
99
|
invalid = 0
|
91
100
|
Decidim::SearchableResource.find_each do |search|
|
92
101
|
next unless search.resource.respond_to?(:component)
|
@@ -98,17 +107,41 @@ namespace :decidim do
|
|
98
107
|
search.destroy!
|
99
108
|
invalid += 1
|
100
109
|
end
|
101
|
-
|
110
|
+
logger.info("===== Deleted #{invalid} invalid resources")
|
102
111
|
end
|
103
|
-
end
|
104
112
|
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
113
|
+
desc "Removes any categorizations belonging to invalid resources"
|
114
|
+
task categories: :environment do
|
115
|
+
logger.info("=== Removing orphan categorizations...")
|
116
|
+
invalid = 0
|
117
|
+
|
118
|
+
Decidim::Categorization.find_each do |categorization|
|
119
|
+
next unless categorization.categorizable.nil?
|
120
|
+
|
121
|
+
invalid += 1
|
122
|
+
categorization.destroy
|
123
|
+
rescue NameError
|
124
|
+
categorization.destroy!
|
125
|
+
invalid += 1
|
126
|
+
end
|
127
|
+
logger.info("===== Deleted #{invalid} invalid resources")
|
128
|
+
end
|
129
|
+
|
130
|
+
desc "Update all blocked users notifications_sending_frequency setting"
|
131
|
+
task fix_blocked_user_notification: :environment do
|
132
|
+
logger.info("=== Updating all blocked users notifications_sending_frequency ...")
|
133
|
+
blocked_users = 0
|
134
|
+
Decidim::User.blocked.where.not(notifications_sending_frequency: :none).find_each do |blocked_user|
|
135
|
+
unless blocked_user.notifications_sending_frequency == "none"
|
136
|
+
blocked_user.update(notifications_sending_frequency: "none")
|
137
|
+
blocked_users += 1
|
138
|
+
end
|
139
|
+
end
|
140
|
+
logger.info("===== Updated #{blocked_users} blocked users")
|
141
|
+
end
|
109
142
|
|
110
|
-
|
111
|
-
|
143
|
+
def logger
|
144
|
+
@logger ||= Logger.new($stdout)
|
112
145
|
end
|
113
146
|
end
|
114
147
|
end
|
@@ -7,7 +7,7 @@ namespace :decidim do
|
|
7
7
|
task :migrate_inline_images_to_active_storage, [:admin_email] => :environment do |_t, args|
|
8
8
|
user = Decidim::User.find_by(email: args[:admin_email])
|
9
9
|
|
10
|
-
raise "Invalid admin. Please, provide the email of an admin with permissions to create editor images" unless user&.admin? && user
|
10
|
+
raise "Invalid admin. Please, provide the email of an admin with permissions to create editor images" unless user&.admin? && user.admin_terms_accepted?
|
11
11
|
|
12
12
|
inline_images_available_attributes.each do |model, attributes|
|
13
13
|
puts "=== Updating model #{model.name} (attributes: #{attributes.join(", ")})..."
|