decidim-decidim_awesome 0.8.0 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +363 -0
- data/README.md +375 -100
- data/Rakefile +2 -1
- data/app/cells/concerns/decidim/decidim_awesome/global_menu_cell_override.rb +20 -0
- data/app/cells/concerns/decidim/decidim_awesome/proposal_l_cell_override.rb +26 -0
- data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb +5 -12
- data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb +7 -7
- data/app/cells/decidim/decidim_awesome/voting/proposal_metadata_cell.rb +69 -0
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_base_cell.rb +40 -0
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/modal.erb +18 -0
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb +40 -0
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/vote_block_for.erb +16 -0
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb +90 -0
- data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb +2 -2
- data/app/commands/concerns/decidim/decidim_awesome/proposals/admin/update_proposal_override.rb +31 -0
- data/app/commands/concerns/decidim/decidim_awesome/proposals/create_collaborative_draft_override.rb +27 -0
- data/app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb +27 -0
- data/app/commands/concerns/decidim/decidim_awesome/proposals/update_collaborative_draft_override.rb +27 -0
- data/app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb +26 -0
- data/app/commands/concerns/decidim/decidim_awesome/system/create_organization_override.rb +29 -0
- data/app/commands/concerns/decidim/decidim_awesome/system/update_organization_override.rb +35 -0
- data/app/commands/concerns/decidim/decidim_awesome/update_account_override.rb +30 -0
- data/app/commands/decidim/decidim_awesome/admin/create_constraint.rb +3 -3
- data/app/commands/decidim/decidim_awesome/admin/create_custom_redirect.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/create_menu_hack.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb +5 -4
- data/app/commands/decidim/decidim_awesome/admin/create_scoped_admin.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb +4 -3
- data/app/commands/decidim/decidim_awesome/admin/destroy_constraint.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb +2 -2
- data/app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb +2 -2
- data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb +7 -4
- data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_admin.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb +7 -5
- data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb +2 -2
- data/app/commands/decidim/decidim_awesome/admin/update_config.rb +2 -3
- data/app/commands/decidim/decidim_awesome/admin/update_constraint.rb +3 -3
- data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb +3 -3
- data/app/commands/decidim/decidim_awesome/admin/update_menu_hack.rb +1 -1
- data/app/commands/decidim/decidim_awesome/command.rb +8 -0
- data/app/commands/decidim/decidim_awesome/create_editor_image.rb +2 -2
- data/app/controllers/concerns/decidim/decidim_awesome/admin/maintenance_context.rb +43 -0
- data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable.rb +67 -0
- data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable_helper.rb +38 -0
- data/app/controllers/concerns/decidim/decidim_awesome/check_login_authorizations.rb +60 -0
- data/app/controllers/concerns/decidim/decidim_awesome/content_security_policy.rb +34 -0
- data/app/controllers/concerns/decidim/decidim_awesome/limit_pending_amendments.rb +35 -0
- data/app/controllers/concerns/decidim/decidim_awesome/needs_awesome_config.rb +0 -2
- data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb +3 -3
- data/app/controllers/concerns/decidim/decidim_awesome/proposals/memoize_extra_fields.rb +23 -0
- data/app/controllers/concerns/decidim/decidim_awesome/proposals/orderable_override.rb +94 -0
- data/app/controllers/concerns/decidim/decidim_awesome/proposals/proposal_votes_controller_override.rb +64 -0
- data/app/controllers/concerns/decidim/decidim_awesome/use_user_time_zone.rb +32 -0
- data/app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb +72 -0
- data/app/controllers/decidim/decidim_awesome/admin/admin_authorizations_controller.rb +122 -0
- data/app/controllers/decidim/decidim_awesome/admin/application_controller.rb +2 -0
- data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb +21 -17
- data/app/controllers/decidim/decidim_awesome/admin/config_controller.rb +17 -8
- data/app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb +27 -20
- data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb +6 -8
- data/app/controllers/decidim/decidim_awesome/admin/maintenance_controller.rb +76 -0
- data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb +6 -8
- data/app/controllers/decidim/decidim_awesome/admin/proposal_custom_fields_controller.rb +14 -6
- data/app/controllers/decidim/decidim_awesome/admin/scoped_admins_controller.rb +2 -2
- data/app/controllers/decidim/decidim_awesome/admin/scoped_styles_controller.rb +14 -6
- data/app/controllers/decidim/decidim_awesome/blank_component_controller.rb +8 -3
- data/app/controllers/decidim/decidim_awesome/editor_images_controller.rb +3 -5
- data/app/controllers/decidim/decidim_awesome/iframe_component/iframe_controller.rb +18 -5
- data/app/controllers/decidim/decidim_awesome/required_authorizations_controller.rb +58 -0
- data/app/forms/concerns/decidim/decidim_awesome/account_form_override.rb +25 -0
- data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_customizations.rb +57 -0
- data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_override.rb +21 -0
- data/app/forms/concerns/decidim/decidim_awesome/system/organization_form_override.rb +34 -0
- data/app/forms/decidim/decidim_awesome/admin/config_form.rb +88 -20
- data/app/forms/decidim/decidim_awesome/admin/custom_redirect_form.rb +3 -3
- data/app/forms/decidim/decidim_awesome/admin/intergram_form.rb +4 -0
- data/app/forms/decidim/decidim_awesome/admin/menu_form.rb +5 -5
- data/app/helpers/concerns/decidim/decidim_awesome/amendments_helper_override.rb +65 -0
- data/app/helpers/concerns/decidim/decidim_awesome/breadcrumb_helper_override.rb +23 -0
- data/app/helpers/concerns/decidim/decidim_awesome/proposals/application_helper_override.rb +110 -0
- data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb +12 -29
- data/app/helpers/decidim/decidim_awesome/admin/system_checker_helpers.rb +4 -0
- data/app/helpers/decidim/decidim_awesome/map_helper.rb +38 -52
- data/app/jobs/decidim/decidim_awesome/destroy_private_data_job.rb +22 -0
- data/app/jobs/decidim/decidim_awesome/export_admin_actions_job.rb +28 -0
- data/app/models/concerns/decidim/decidim_awesome/has_proposal_extra_fields.rb +80 -0
- data/app/models/concerns/decidim/decidim_awesome/has_vote_weight.rb +30 -0
- data/app/models/decidim/decidim_awesome/awesome_config.rb +1 -2
- data/app/models/decidim/decidim_awesome/config_constraint.rb +0 -2
- data/app/models/decidim/decidim_awesome/editor_image.rb +0 -3
- data/app/models/decidim/decidim_awesome/paper_trail_version.rb +117 -0
- data/app/models/decidim/decidim_awesome/proposal_extra_field.rb +45 -0
- data/app/models/decidim/decidim_awesome/vote_weight.rb +30 -0
- data/app/overrides/decidim/account/show/add_timezone_select.html.erb.deface +3 -0
- data/app/overrides/decidim/admin/officializations/index/add_modal.html.erb.deface +3 -0
- data/app/overrides/decidim/admin/officializations/index/add_td.html.erb.deface +5 -0
- data/app/overrides/decidim/admin/officializations/index/add_th.html.erb.deface +5 -0
- data/app/overrides/decidim/proposals/admin/proposals/_form/replace_editor.html.erb.deface +3 -0
- data/app/overrides/decidim/proposals/admin/proposals/show/add_private_body.html.erb.deface +7 -0
- data/app/overrides/decidim/proposals/admin/proposals/show/replace_body.html.erb.deface +5 -0
- data/app/overrides/decidim/proposals/proposals/_proposal_aside/limit_amendments_modal.html.erb.deface +5 -0
- data/app/overrides/decidim/proposals/proposals/_vote_button/replace_vote_button.html.erb.deface +7 -0
- data/app/overrides/decidim/proposals/proposals/_votes_count/replace_counter.html.erb.deface +10 -0
- data/app/overrides/decidim/system/organizations/_advanced_settings/add_awesome_config.html.erb.deface +9 -0
- data/app/{views/layouts/decidim/_head.html.erb → overrides/layouts/decidim/_decidim_javascript/add_awesome_tags.html.erb.deface} +2 -1
- data/app/overrides/layouts/decidim/_head/add_awesome_tags.html.erb.deface +7 -0
- data/app/overrides/layouts/decidim/admin/_header/add_awesome_custom_styles.html.erb.deface +3 -0
- data/app/overrides/layouts/decidim/admin/_header/add_awesome_tags.html.erb.deface +10 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome.js +2 -2
- data/app/packs/entrypoints/decidim_admin_decidim_awesome_global.js +4 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome_global.scss +1 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome_search_form.scss +1 -0
- data/app/packs/entrypoints/decidim_decidim_awesome.js +2 -2
- data/app/packs/entrypoints/decidim_decidim_awesome_map.scss +1 -1
- data/app/packs/entrypoints/decidim_editor.js +14 -0
- data/app/packs/images/decidim/decidim_awesome/handcard.svg +14 -0
- data/app/packs/images/decidim/decidim_awesome/handcheck.svg +17 -0
- data/app/packs/images/decidim/decidim_awesome/pokecode-logo.png +0 -0
- data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js +96 -69
- data/app/packs/src/decidim/decidim_awesome/admin/check_redirections.js +46 -41
- data/app/packs/src/decidim/decidim_awesome/admin/codemirror.js +3 -3
- data/app/packs/src/decidim/decidim_awesome/admin/constraint_form_events.js +115 -0
- data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js +19 -14
- data/app/packs/src/decidim/decidim_awesome/admin/form_exit_warn.js +23 -11
- data/app/packs/src/decidim/decidim_awesome/admin/proposal_sortings.js +26 -0
- data/app/packs/src/decidim/decidim_awesome/admin/tabs_change.js +31 -0
- data/app/packs/src/decidim/decidim_awesome/admin/user_picker.js +34 -20
- data/app/packs/src/decidim/decidim_awesome/admin/verification_selects.js +21 -0
- data/app/packs/src/decidim/decidim_awesome/admin/verifications.js +43 -0
- data/app/packs/src/decidim/decidim_awesome/amendments/show_modal_on_limits.js +28 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_admin.js +7 -16
- data/app/packs/src/decidim/decidim_awesome/awesome_admin_global.js +2 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_application.js +2 -15
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js +48 -23
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js +9 -12
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js +28 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js +15 -15
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js +70 -37
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/meetings_controller.js +11 -7
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js +9 -16
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js +75 -45
- data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js +28 -18
- data/app/packs/src/decidim/decidim_awesome/editor/index.js +94 -0
- data/app/packs/src/decidim/decidim_awesome/forms/autosave.js +29 -28
- data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js +55 -42
- data/app/packs/src/decidim/decidim_awesome/forms/rich_text_plugin.js +30 -32
- data/app/packs/src/decidim/decidim_awesome/proposals/custom_fields.js +32 -16
- data/app/packs/src/decidim/decidim_awesome/proposals/images.js +16 -10
- data/app/packs/src/decidim/decidim_awesome/voting/voting_cards.js +72 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/admin_accountability.scss +67 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss +11 -12
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss +15 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss +24 -12
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/constraints.scss +49 -29
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss +28 -71
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_styles.scss +48 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/intergram_fixes.scss +11 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/user_picker.scss +17 -26
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/verifications.scss +99 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/amendments/modal.scss +5 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin.scss +14 -49
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin_global.scss +20 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_application.scss +4 -18
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss +1 -1
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +41 -35
- data/app/packs/stylesheets/decidim/decidim_awesome/forms/autosave.scss +6 -6
- data/app/packs/stylesheets/decidim/decidim_awesome/forms/custom_fields.scss +118 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/shared/spinner.scss +26 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/voting/voting_cards.scss +205 -0
- data/app/permissions/decidim/decidim_awesome/admin/permissions.rb +57 -1
- data/app/permissions/decidim/decidim_awesome/permissions.rb +11 -6
- data/app/presenters/concerns/decidim/decidim_awesome/breadcrumb_root_menu_item_presenter_override.rb +23 -0
- data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_item_presenter_override.rb +10 -2
- data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_presenter_override.rb +8 -0
- data/app/presenters/concerns/decidim/decidim_awesome/proposals/proposal_presenter_override.rb +20 -0
- data/app/presenters/decidim/decidim_awesome/admin_log/component_presenter_override.rb +28 -0
- data/app/presenters/decidim/decidim_awesome/admin_log/user_presenter_override.rb +46 -0
- data/app/presenters/decidim/decidim_awesome/paper_trail_base_presenter.rb +28 -0
- data/app/presenters/decidim/decidim_awesome/participatory_space_role_presenter.rb +45 -0
- data/app/presenters/decidim/decidim_awesome/private_data_presenter.rb +70 -0
- data/app/presenters/decidim/decidim_awesome/role_base_presenter.rb +102 -0
- data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb +50 -0
- data/app/queries/decidim/decidim_awesome/private_data_finder.rb +19 -0
- data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_methods.rb +72 -0
- data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_override.rb +38 -0
- data/app/serializers/decidim/decidim_awesome/paper_trail_version_serializer.rb +37 -0
- data/app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb +34 -0
- data/app/types/concerns/decidim/decidim_awesome/add_proposal_type_custom_fields.rb +59 -0
- data/app/types/concerns/decidim/decidim_awesome/add_proposal_type_vote_weights.rb +20 -0
- data/app/uploaders/decidim/decidim_awesome/image_uploader.rb +12 -0
- data/app/validators/concerns/decidim/decidim_awesome/etiquette_validator_override.rb +41 -0
- data/app/views/decidim/decidim_awesome/account/_timezone_select.html.erb +3 -0
- data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb +71 -0
- data/app/views/decidim/decidim_awesome/admin/admin_authorizations/authorization.html.erb +20 -0
- data/app/views/decidim/decidim_awesome/admin/admin_authorizations/callout.html.erb +3 -0
- data/app/views/decidim/decidim_awesome/admin/admin_authorizations/conflict.html.erb +5 -0
- data/app/views/decidim/decidim_awesome/admin/admin_authorizations/edit.html.erb +41 -0
- data/app/views/decidim/decidim_awesome/admin/checks/_assets_tester.html.erb +2 -0
- data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb +51 -48
- data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb +7 -2
- data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb +25 -18
- data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb +7 -6
- data/app/views/decidim/decidim_awesome/admin/config/_form_editors.html.erb +12 -16
- data/app/views/decidim/decidim_awesome/admin/config/_form_livechat.html.erb +39 -23
- data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_custom_fields.html.erb +35 -17
- data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_private_custom_fields.html.erb +1 -0
- data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb +92 -6
- data/app/views/decidim/decidim_awesome/admin/config/_form_scoped_admin_styles.html.erb +1 -0
- data/app/views/decidim/decidim_awesome/admin/config/_form_scoped_styles.html.erb +48 -0
- data/app/views/decidim/decidim_awesome/admin/config/_form_surveys.html.erb +16 -6
- data/app/views/decidim/decidim_awesome/admin/config/_form_verifications.html.erb +15 -0
- data/app/views/decidim/decidim_awesome/admin/config/show.html.erb +22 -12
- data/app/views/decidim/decidim_awesome/admin/constraints/_form.html.erb +1 -49
- data/app/views/decidim/decidim_awesome/admin/constraints/new.html.erb +14 -9
- data/app/views/decidim/decidim_awesome/admin/constraints/no_permissions.html.erb +6 -0
- data/app/views/decidim/decidim_awesome/admin/constraints/show.html.erb +14 -9
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb +20 -5
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb +5 -5
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/index.html.erb +14 -13
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb +5 -5
- data/app/views/decidim/decidim_awesome/admin/maintenance/_private_data.html.erb +44 -0
- data/app/views/decidim/decidim_awesome/admin/maintenance/show.html.erb +44 -0
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb +6 -6
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb +21 -12
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb +39 -42
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb +21 -12
- data/app/views/decidim/decidim_awesome/admin/officializations/_participants_td.html.erb +25 -0
- data/app/views/decidim/decidim_awesome/admin/officializations/_participants_th.html.erb +1 -0
- data/app/views/decidim/decidim_awesome/admin/officializations/_verification_modal.html.erb +9 -0
- data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb +8 -5
- data/app/views/decidim/decidim_awesome/admin/proposals/_private_body.html.erb +20 -0
- data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb +61 -0
- data/app/views/decidim/decidim_awesome/amendments/_modal.html.erb +23 -0
- data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb +8 -2
- data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb +7 -12
- data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb +53 -37
- data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb +14 -5
- data/app/views/decidim/decidim_awesome/required_authorizations/index.html.erb +66 -0
- data/app/views/decidim/decidim_awesome/system/organizations/_admin_allowed_authorizations.html.erb +5 -0
- data/app/views/decidim/decidim_awesome/voting/voting_cards/_show_vote_button.html.erb +3 -0
- data/app/views/decidim/decidim_awesome/voting/voting_cards/_show_votes_count.html.erb +1 -0
- data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb +11 -8
- data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb +1 -1
- data/app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb +9 -6
- data/app/views/layouts/decidim/decidim_awesome/admin/_base.html.erb +12 -0
- data/app/views/layouts/decidim/decidim_awesome/admin/_custom_styles.html.erb +3 -0
- data/app/views/layouts/decidim/decidim_awesome/admin/admin_authorizations.html.erb +7 -0
- data/app/views/layouts/decidim/decidim_awesome/admin/application.html.erb +3 -0
- data/app/views/layouts/decidim/decidim_awesome/admin/maintenance.html.erb +19 -0
- data/config/assets.rb +5 -34
- data/config/i18n-tasks.yml +30 -0
- data/config/locales/ca.yml +335 -26
- data/config/locales/cs.yml +331 -22
- data/config/locales/de.yml +642 -0
- data/config/locales/en.yml +403 -33
- data/config/locales/es.yml +333 -24
- data/config/locales/eu.yml +623 -20
- data/config/locales/fr.yml +282 -23
- data/config/locales/hu.yml +268 -0
- data/config/locales/it.yml +155 -24
- data/config/locales/ja.yml +334 -25
- data/config/locales/lt.yml +94 -0
- data/config/locales/nl.yml +20 -19
- data/config/locales/pt-BR.yml +31 -24
- data/config/locales/ro-RO.yml +152 -0
- data/config/locales/sv.yml +28 -12
- data/config/rubocop/disabled.yml +11 -0
- data/config/rubocop/faker.yml +480 -0
- data/config/rubocop/rails.yml +88 -0
- data/config/rubocop/rspec.yml +65 -0
- data/config/rubocop/ruby.yml +1210 -0
- data/db/migrate/20231006113837_create_decidim_awesome_vote_weights.rb +13 -0
- data/db/migrate/20231006113841_create_decidim_awesome_proposal_extra_fields.rb +14 -0
- data/db/migrate/20240306175331_rename_editor_images_awesome_config.rb +18 -0
- data/db/migrate/20240531224204_add_decidim_awesome_proposal_private_fields.rb +29 -0
- data/db/migrate/20240729164227_add_decidim_awesome_proposal_private_fields_date.rb +20 -0
- data/db/seeds.rb +4 -4
- data/lib/decidim/decidim_awesome/admin_engine.rb +41 -6
- data/lib/decidim/decidim_awesome/api/types/localized_custom_fields_type.rb +22 -0
- data/lib/decidim/decidim_awesome/api/types/translated_custom_fields_type.rb +51 -0
- data/lib/decidim/decidim_awesome/authorizator.rb +34 -0
- data/lib/decidim/decidim_awesome/awesome.rb +236 -29
- data/lib/decidim/decidim_awesome/awesome_helpers.rb +57 -17
- data/lib/decidim/decidim_awesome/checksums.yml +95 -20
- data/lib/decidim/decidim_awesome/config.rb +25 -17
- data/lib/decidim/decidim_awesome/context_analyzers/request_analyzer.rb +3 -3
- data/lib/decidim/decidim_awesome/custom_fields.rb +13 -5
- data/lib/decidim/decidim_awesome/engine.rb +250 -19
- data/lib/decidim/decidim_awesome/iframe_component/component.rb +4 -4
- data/lib/decidim/decidim_awesome/lock.rb +47 -0
- data/lib/decidim/decidim_awesome/map_component/component.rb +2 -2
- data/lib/decidim/decidim_awesome/menu.rb +201 -0
- data/lib/decidim/decidim_awesome/menu_hacker.rb +7 -5
- data/{app/middleware/decidim/decidim_awesome → lib/decidim/decidim_awesome/middleware}/current_config.rb +5 -3
- data/lib/decidim/decidim_awesome/request_memoizer.rb +16 -0
- data/lib/decidim/decidim_awesome/system_checker.rb +6 -2
- data/lib/decidim/decidim_awesome/test/factories.rb +31 -9
- data/lib/decidim/decidim_awesome/test/initializer.rb +22 -6
- data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb +2 -2
- data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb +2 -2
- data/lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb +61 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/{box_label_editor.rb → box_label_editor_examples.rb} +22 -22
- data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb +24 -6
- data/lib/decidim/decidim_awesome/test/shared_examples/custom_fields_examples.rb +155 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb +7 -7
- data/lib/decidim/decidim_awesome/test/shared_examples/custom_styles_examples.rb +156 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb +42 -58
- data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb +9 -8
- data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb +40 -29
- data/lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb +129 -38
- data/lib/decidim/decidim_awesome/version.rb +2 -2
- data/lib/decidim/decidim_awesome/voting_manifest.rb +55 -0
- data/lib/decidim/decidim_awesome.rb +1 -3
- data/lib/tasks/decidim_awesome_upgrade_tasks.rake +9 -0
- data/lib/tasks/decidim_awesome_webpacker_tasks.rake +2 -0
- data/package.json +54 -0
- metadata +192 -86
- data/app/forms/decidim/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb +0 -38
- data/app/helpers/decidim/decidim_awesome/amendments_helper_override.rb +0 -48
- data/app/helpers/decidim/decidim_awesome/proposals/application_helper_override.rb +0 -78
- data/app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb +0 -106
- data/app/packs/entrypoints/decidim_admin_decidim_awesome_custom_fields.js +0 -2
- data/app/packs/entrypoints/decidim_decidim_awesome_admin_form_exit_warn.js +0 -1
- data/app/packs/images/decidim/decidim_awesome/platoniq-logo.png +0 -0
- data/app/packs/src/decidim/decidim_awesome/admin/constraints.js +0 -55
- data/app/packs/src/decidim/decidim_awesome/editors/editor.js +0 -190
- data/app/packs/src/decidim/decidim_awesome/editors/tabs_focus.js +0 -22
- data/app/packs/src/vendor/image-resize.min.js +0 -1
- data/app/packs/src/vendor/image-upload.min.js +0 -6
- data/app/packs/src/vendor/leaflet.featuregroup.subgroup.js +0 -184
- data/app/packs/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss +0 -19
- data/app/packs/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +0 -58
- data/app/packs/stylesheets/vendor/select2-foundation-theme.scss +0 -348
- data/app/uploaders/decidim/cw/decidim_awesome/image_uploader.rb +0 -26
- data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb +0 -26
- data/app/views/decidim/decidim_awesome/admin/config/_modal.html.erb +0 -11
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +0 -101
- data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +0 -83
- data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +0 -1
- data/app/views/layouts/decidim/admin/_header.html.erb +0 -5
- data/app/views/layouts/decidim/admin/decidim_awesome.html.erb +0 -75
- data/app/views/v0.25/decidim/proposals/collaborative_drafts/_show.html.erb +0 -128
- data/app/views/v0.25/layouts/decidim/_head.html.erb +0 -41
- data/app/views/v0.25/layouts/decidim/admin/_header.html.erb +0 -11
- data/app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb +0 -128
- data/app/views/v0.26/layouts/decidim/_head.html.erb +0 -45
- data/app/views/v0.26/layouts/decidim/admin/_header.html.erb +0 -11
- data/lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb +0 -39
- data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake +0 -37
- /data/app/models/{decidim → concerns/decidim}/decidim_awesome/user_override.rb +0 -0
@@ -0,0 +1,21 @@
|
|
1
|
+
/* eslint-disable no-new */
|
2
|
+
|
3
|
+
import TomSelect from "tom-select/dist/cjs/tom-select.popular";
|
4
|
+
|
5
|
+
document.addEventListener("DOMContentLoaded", () => {
|
6
|
+
const selectContainer = document.getElementById("config_force_authorization_after_login");
|
7
|
+
|
8
|
+
if (!selectContainer) {
|
9
|
+
return;
|
10
|
+
}
|
11
|
+
|
12
|
+
new TomSelect(selectContainer, {
|
13
|
+
plugins: ["remove_button", "dropdown_input"],
|
14
|
+
create: false,
|
15
|
+
render: {
|
16
|
+
option: function (data, escape) {
|
17
|
+
return `<div>${escape(data.text)}</div>`;
|
18
|
+
}
|
19
|
+
}
|
20
|
+
});
|
21
|
+
});
|
@@ -0,0 +1,43 @@
|
|
1
|
+
document.addEventListener("DOMContentLoaded", () => {
|
2
|
+
const dialog = document.getElementById("awesome-verification-modal");
|
3
|
+
if (!dialog) {
|
4
|
+
return;
|
5
|
+
}
|
6
|
+
const container = dialog.querySelector("[data-dialog-container]");
|
7
|
+
|
8
|
+
dialog.addEventListener("open.dialog", async (el) => {
|
9
|
+
const modal = window.Decidim.currentDialogs[el.target.id];
|
10
|
+
const button = modal.openingTrigger;
|
11
|
+
const url = button.dataset.verificationUrl;
|
12
|
+
container.innerHTML = '<br><br><span class="loading-spinner"></span>';
|
13
|
+
// console.log("open.dialog", el, "container", container, "button", button, "url", url);
|
14
|
+
fetch(url).then((res) => res.text()).then((html) => {
|
15
|
+
container.innerHTML = html;
|
16
|
+
});
|
17
|
+
});
|
18
|
+
|
19
|
+
|
20
|
+
document.body.addEventListener("ajax:complete", (responseText) => {
|
21
|
+
const response = JSON.parse(responseText.detail[0].response)
|
22
|
+
const button = document.querySelector(`[data-verification-handler="${response.handler}"][data-verification-user-id="${response.userId}"]`);
|
23
|
+
// console.log("ajax:complete", responseText, "response", response, "button", button);
|
24
|
+
container.innerHTML = response.message;
|
25
|
+
|
26
|
+
if (response.granted) {
|
27
|
+
button.classList.add("granted");
|
28
|
+
} else {
|
29
|
+
button.classList.remove("granted");
|
30
|
+
const forceVerificationCheck = container.querySelector("#force_verification_check");
|
31
|
+
const forceVerification = container.querySelector("#force_verification");
|
32
|
+
|
33
|
+
if (forceVerificationCheck) {
|
34
|
+
forceVerificationCheck.addEventListener("change", function() {
|
35
|
+
forceVerification.disabled = !forceVerification.disabled;
|
36
|
+
if (forceVerificationCheck.checked) {
|
37
|
+
forceVerification.focus()
|
38
|
+
}
|
39
|
+
});
|
40
|
+
}
|
41
|
+
}
|
42
|
+
});
|
43
|
+
});
|
@@ -0,0 +1,28 @@
|
|
1
|
+
document.addEventListener("DOMContentLoaded", () => {
|
2
|
+
const modalId = "LimitAmendmentsModal";
|
3
|
+
const modalEl = document.getElementById(modalId);
|
4
|
+
const amendButton = document.getElementById("amend-button");
|
5
|
+
const limitAmendments = modalEl && JSON.parse(modalEl.dataset.limitAmendments);
|
6
|
+
|
7
|
+
if (!amendButton || !limitAmendments || document.querySelector('a[href^="/users/sign_in"]')) {
|
8
|
+
return;
|
9
|
+
}
|
10
|
+
|
11
|
+
modalEl.querySelectorAll("a").forEach((aEl) => {
|
12
|
+
aEl.addEventListener("click", () => {
|
13
|
+
window.Decidim.currentDialogs[modalId].close();
|
14
|
+
});
|
15
|
+
});
|
16
|
+
|
17
|
+
/**
|
18
|
+
* Determines if the modal should be displayed based on its current state and data attributes.
|
19
|
+
*/
|
20
|
+
amendButton.addEventListener("click", (event) => {
|
21
|
+
const modal = window.Decidim.currentDialogs[modalId];
|
22
|
+
if (modal) {
|
23
|
+
event.preventDefault();
|
24
|
+
event.stopPropagation();
|
25
|
+
modal.open();
|
26
|
+
}
|
27
|
+
});
|
28
|
+
});
|
@@ -1,23 +1,14 @@
|
|
1
|
-
// Webpack seems to "forgget" about certain libraries already being loaded
|
2
|
-
// if javascript_pack_tag is called two times, let's include the whole Decidim admin here instead
|
3
|
-
import "entrypoints/decidim_admin"
|
4
1
|
// Custom scripts for awesome
|
5
|
-
import "src/decidim/decidim_awesome/admin/
|
2
|
+
import "src/decidim/decidim_awesome/admin/constraint_form_events"
|
6
3
|
import "src/decidim/decidim_awesome/admin/auto_edit"
|
7
4
|
import "src/decidim/decidim_awesome/admin/user_picker"
|
8
|
-
import "src/decidim/decidim_awesome/
|
5
|
+
import "src/decidim/decidim_awesome/admin/proposal_sortings"
|
9
6
|
import "src/decidim/decidim_awesome/admin/codemirror"
|
10
7
|
import "src/decidim/decidim_awesome/admin/check_redirections"
|
8
|
+
import "src/decidim/decidim_awesome/admin/form_exit_warn"
|
11
9
|
|
12
|
-
import
|
10
|
+
import "src/decidim/decidim_awesome/proposals/custom_fields"
|
11
|
+
import "src/decidim/decidim_awesome/admin/custom_fields_builder"
|
12
|
+
import "src/decidim/decidim_awesome/admin/verification_selects"
|
13
13
|
|
14
|
-
|
15
|
-
$(".editor-container").each((_idx, container) => {
|
16
|
-
destroyQuillEditor(container);
|
17
|
-
if (window.DecidimAwesome.use_markdown_editor) {
|
18
|
-
createMarkdownEditor(container);
|
19
|
-
} else {
|
20
|
-
createQuillEditor(container);
|
21
|
-
}
|
22
|
-
});
|
23
|
-
});
|
14
|
+
window.DecidimAwesome = window.DecidimAwesome || {};
|
@@ -1,17 +1,4 @@
|
|
1
1
|
import "src/decidim/decidim_awesome/proposals/images"
|
2
2
|
import "src/decidim/decidim_awesome/forms/autosave"
|
3
|
-
import
|
4
|
-
|
5
|
-
$(() => {
|
6
|
-
// rebuild editors
|
7
|
-
if (window.DecidimAwesome.allow_images_in_full_editor || window.DecidimAwesome.allow_images_in_small_editor || window.DecidimAwesome.use_markdown_editor) {
|
8
|
-
$(".editor-container").each((_idx, container) => {
|
9
|
-
destroyQuillEditor(container);
|
10
|
-
if (window.DecidimAwesome.use_markdown_editor) {
|
11
|
-
createMarkdownEditor(container);
|
12
|
-
} else {
|
13
|
-
createQuillEditor(container);
|
14
|
-
}
|
15
|
-
});
|
16
|
-
}
|
17
|
-
});
|
3
|
+
import "src/decidim/decidim_awesome/voting/voting_cards"
|
4
|
+
import "src/decidim/decidim_awesome/amendments/show_modal_on_limits"
|
@@ -8,6 +8,7 @@ export default class Fetcher {
|
|
8
8
|
};
|
9
9
|
this.onFinished = () => {};
|
10
10
|
this.onNode = () => {};
|
11
|
+
this.onCollection = () => {};
|
11
12
|
this.hashtags = [];
|
12
13
|
|
13
14
|
this.collection = this.controller.component.type;
|
@@ -29,7 +30,7 @@ export default class Fetcher {
|
|
29
30
|
api.fetchAll((result) => {
|
30
31
|
if (result) {
|
31
32
|
const collection = result.component[this.collection];
|
32
|
-
// console.log("collection",collection)
|
33
|
+
// console.log("collection", collection)
|
33
34
|
|
34
35
|
collection.edges.forEach((element) => {
|
35
36
|
let node = element.node;
|
@@ -43,6 +44,8 @@ export default class Fetcher {
|
|
43
44
|
}
|
44
45
|
});
|
45
46
|
|
47
|
+
this.onCollection(collection);
|
48
|
+
|
46
49
|
if (collection.pageInfo.hasNextPage) {
|
47
50
|
this.fetch(collection.pageInfo.endCursor);
|
48
51
|
} else {
|
@@ -53,24 +56,25 @@ export default class Fetcher {
|
|
53
56
|
}
|
54
57
|
|
55
58
|
decorateNode(node) {
|
56
|
-
const body = this.findTranslation(node.body.translations)
|
59
|
+
const body = this.findTranslation(node.body.translations)
|
57
60
|
const title = this.findTranslation(node.title.translations);
|
58
61
|
node.hashtags = this.collectHashtags(title);
|
59
62
|
node.hashtags = node.hashtags.concat(this.collectHashtags(body));
|
60
63
|
// hashtags in the title look ugly, lets replace the gid:... structure with the tag #name
|
61
64
|
node.title.translation = this.replaceHashtags(title, node.hashtags);
|
62
|
-
node.body.translation = this.appendHtmlHashtags(this.truncate(this.removeHashtags(body))
|
63
|
-
node.
|
65
|
+
node.body.translation = this.appendHtmlHashtags(this.truncate(this.removeHashtags(body)), node.hashtags);
|
66
|
+
// console.log("decorateNode", node.title.translation, "BODY", body, "translation", node.body.translation, node.hashtags)
|
67
|
+
node.link = `${this.controller.component.url}/${node.id}`;
|
64
68
|
}
|
65
69
|
|
66
70
|
findTranslation(translations) {
|
67
|
-
let
|
68
|
-
|
71
|
+
let lang = document.querySelector("html").getAttribute("lang"),
|
72
|
+
text = "";
|
69
73
|
|
70
|
-
translations.forEach((
|
71
|
-
if (
|
72
|
-
if (!text ||
|
73
|
-
text =
|
74
|
+
translations.forEach((txt) => {
|
75
|
+
if (txt.text) {
|
76
|
+
if (!text || txt.locale === lang) {
|
77
|
+
text = txt.text
|
74
78
|
}
|
75
79
|
}
|
76
80
|
});
|
@@ -80,14 +84,12 @@ export default class Fetcher {
|
|
80
84
|
collectHashtags(text) {
|
81
85
|
let tags = [];
|
82
86
|
if (text) {
|
83
|
-
const gids = text.match(/gid:\/\/[^\s
|
87
|
+
const gids = text.match(/gid:\/\/[^\s<&,;]+/g)
|
84
88
|
if (gids) {
|
85
|
-
tags = gids.filter((gid) => gid.indexOf("/Decidim::Hashtag/")
|
89
|
+
tags = gids.filter((gid) => gid.indexOf("/Decidim::Hashtag/") !== -1).map((gid) => {
|
86
90
|
const parts = gid.split("/");
|
87
|
-
const fromSelector = parts[5].charAt(0)
|
88
|
-
const tag = fromSelector
|
89
|
-
? parts[5].substr(1)
|
90
|
-
: parts[5];
|
91
|
+
const fromSelector = parts[5].charAt(0) === "_";
|
92
|
+
const tag = fromSelector ? parts[5].substr(1) : parts[5]; // eslint-disable-line no-ternary, multiline-ternary
|
91
93
|
const name = `#${tag}`;
|
92
94
|
const html = `<a href="/search?term=${name}">${name}</a>`;
|
93
95
|
const hashtag = {
|
@@ -107,7 +109,8 @@ export default class Fetcher {
|
|
107
109
|
return tags;
|
108
110
|
}
|
109
111
|
|
110
|
-
replaceHashtags(
|
112
|
+
replaceHashtags(txt, hashtags) {
|
113
|
+
let text = txt;
|
111
114
|
hashtags.forEach((tag) => {
|
112
115
|
text = text.replace(tag.gid, tag.name)
|
113
116
|
});
|
@@ -115,17 +118,39 @@ export default class Fetcher {
|
|
115
118
|
}
|
116
119
|
|
117
120
|
removeHashtags(text) {
|
118
|
-
return text.replace(/gid:\/\/[^\s
|
121
|
+
return text.replace(/gid:\/\/[^\s<&,;]+/g, "");
|
119
122
|
}
|
120
123
|
|
121
|
-
appendHtmlHashtags(
|
122
|
-
tags.
|
123
|
-
|
124
|
-
|
125
|
-
|
124
|
+
appendHtmlHashtags(txt, tags) {
|
125
|
+
let string = tags.reduce((accumulator, tag) => (accumulator
|
126
|
+
? `${accumulator} ${tag.html}`
|
127
|
+
: tag.html), "");
|
128
|
+
if (string) {
|
129
|
+
return `${txt}<p>${string}</p>`;
|
130
|
+
}
|
131
|
+
return txt;
|
132
|
+
|
126
133
|
}
|
127
134
|
|
128
135
|
truncate(html) {
|
129
136
|
return $.truncate(html, this.config);
|
130
137
|
}
|
138
|
+
|
139
|
+
formatDateRange(startDate, endDate) {
|
140
|
+
// Check if either startDate or endDate is blank
|
141
|
+
if (!startDate || !endDate) {
|
142
|
+
return "";
|
143
|
+
}
|
144
|
+
|
145
|
+
// Convert startDate and endDate to JavaScript Date objects
|
146
|
+
const start = new Date(startDate);
|
147
|
+
const end = new Date(endDate);
|
148
|
+
|
149
|
+
const date = Intl.DateTimeFormat(window.DecidimAwesome.currentLocale, { // eslint-disable-line new-cap
|
150
|
+
year: "numeric",
|
151
|
+
month: "short",
|
152
|
+
day: "numeric"
|
153
|
+
});
|
154
|
+
return date.formatRange(start, end);
|
155
|
+
}
|
131
156
|
}
|
@@ -29,23 +29,13 @@ export default class MeetingsFetcher extends Fetcher {
|
|
29
29
|
}
|
30
30
|
}
|
31
31
|
startTime
|
32
|
-
|
33
|
-
translations {
|
34
|
-
text
|
35
|
-
locale
|
36
|
-
}
|
37
|
-
}
|
32
|
+
endTime
|
38
33
|
address
|
39
|
-
locationHints {
|
40
|
-
translations {
|
41
|
-
text
|
42
|
-
locale
|
43
|
-
}
|
44
|
-
}
|
45
34
|
coordinates {
|
46
35
|
latitude
|
47
36
|
longitude
|
48
37
|
}
|
38
|
+
typeOfMeeting
|
49
39
|
category {
|
50
40
|
id
|
51
41
|
}
|
@@ -56,4 +46,11 @@ export default class MeetingsFetcher extends Fetcher {
|
|
56
46
|
}
|
57
47
|
}`;
|
58
48
|
}
|
49
|
+
|
50
|
+
decorateNode(node) {
|
51
|
+
super.decorateNode(node);
|
52
|
+
node.icon = window.AwesomeMapMeetingTypes[node.typeOfMeeting];
|
53
|
+
node.meetingType = window.AwesomeMapMeetingTexts[node.typeOfMeeting];
|
54
|
+
node.dateRange = this.formatDateRange(node.startTime, node.endTime);
|
55
|
+
}
|
59
56
|
}
|
@@ -23,12 +23,18 @@ export default class ProposalsFetcher extends Fetcher {
|
|
23
23
|
locale
|
24
24
|
}
|
25
25
|
}
|
26
|
+
author {
|
27
|
+
id
|
28
|
+
name
|
29
|
+
}
|
26
30
|
body {
|
27
31
|
translations {
|
28
32
|
text
|
29
33
|
locale
|
30
34
|
}
|
31
35
|
}
|
36
|
+
totalCommentsCount
|
37
|
+
endorsementsCount
|
32
38
|
address
|
33
39
|
coordinates {
|
34
40
|
latitude
|
@@ -49,4 +55,26 @@ export default class ProposalsFetcher extends Fetcher {
|
|
49
55
|
}
|
50
56
|
}`;
|
51
57
|
}
|
58
|
+
|
59
|
+
decorateNode(node) {
|
60
|
+
super.decorateNode(node);
|
61
|
+
node.authorName = node.author && node.author.name || window.DecidimAwesome.texts.officialAuthor;
|
62
|
+
node.humanState = window.AwesomeMapProposalTexts[node.state];
|
63
|
+
switch (node.state) {
|
64
|
+
case "accepted":
|
65
|
+
node.stateClass = "success";
|
66
|
+
break;
|
67
|
+
case "rejected":
|
68
|
+
case "withdrawn":
|
69
|
+
node.stateClass = "alert";
|
70
|
+
break;
|
71
|
+
case "evaluating":
|
72
|
+
node.stateClass = "warning";
|
73
|
+
break;
|
74
|
+
default:
|
75
|
+
node.stateClass = "muted";
|
76
|
+
}
|
77
|
+
|
78
|
+
node.isAmendment = () => (Boolean(this.controller.amendments[node.id]));
|
79
|
+
}
|
52
80
|
}
|
@@ -1,8 +1,10 @@
|
|
1
1
|
import * as L from "leaflet";
|
2
|
-
|
3
|
-
import "
|
4
|
-
|
5
|
-
import "leaflet.
|
2
|
+
// comes with Decidim
|
3
|
+
import "leaflet-tilelayer-here"
|
4
|
+
// Comes with Decidim
|
5
|
+
import "leaflet.markercluster";
|
6
|
+
// included in this package.json
|
7
|
+
import "leaflet.featuregroup.subgroup"
|
6
8
|
import "src/vendor/jquery.truncate"
|
7
9
|
import "jsrender"
|
8
10
|
|
@@ -40,7 +42,6 @@ export default class AwesomeMap {
|
|
40
42
|
this.cluster = new L.MarkerClusterGroup();
|
41
43
|
this.map.addLayer(this.cluster);
|
42
44
|
this.controls = new ControlsUI(this);
|
43
|
-
this.allMarkers = [];
|
44
45
|
this.onFinished = () => {};
|
45
46
|
this.controllers = {};
|
46
47
|
this.loading = [];
|
@@ -61,8 +62,8 @@ export default class AwesomeMap {
|
|
61
62
|
this.loading.pop();
|
62
63
|
this.autoResize();
|
63
64
|
|
64
|
-
if (this.loading.length
|
65
|
-
this.controls
|
65
|
+
if (this.loading.length === 0) {
|
66
|
+
this.controls.loading.style.display = "none";
|
66
67
|
// call trigger as all loads are finished
|
67
68
|
this.onFinished();
|
68
69
|
}
|
@@ -91,13 +92,11 @@ export default class AwesomeMap {
|
|
91
92
|
};
|
92
93
|
|
93
94
|
if (category) {
|
94
|
-
let id = category.id
|
95
|
-
|
96
|
-
: parseInt(category, 10);
|
97
|
-
let cat = this.categories.find((c) => c.id == id);
|
95
|
+
let id = category.id ? parseInt(category.id, 10) : parseInt(category, 10); // eslint-disable-line no-ternary, multiline-ternary
|
96
|
+
let cat = this.categories.find((ct) => ct.id === id);
|
98
97
|
if (cat) {
|
99
98
|
cat.children = () => {
|
100
|
-
return this.categories.filter((
|
99
|
+
return this.categories.filter((ct) => ct.parent === cat.id);
|
101
100
|
}
|
102
101
|
return cat;
|
103
102
|
}
|
@@ -106,12 +105,12 @@ export default class AwesomeMap {
|
|
106
105
|
}
|
107
106
|
|
108
107
|
_getController(component) {
|
109
|
-
let controller;
|
108
|
+
let controller = null;
|
110
109
|
|
111
|
-
if (component.type
|
110
|
+
if (component.type === "proposals") {
|
112
111
|
controller = new ProposalsController(this, component);
|
113
112
|
}
|
114
|
-
if (component.type
|
113
|
+
if (component.type === "meetings" && this.config.menu.meetings) {
|
115
114
|
controller = new MeetingsController(this, component);
|
116
115
|
}
|
117
116
|
|
@@ -126,5 +125,6 @@ export default class AwesomeMap {
|
|
126
125
|
this.controllers[component.type] = controller;
|
127
126
|
return this.controllers[component.type]
|
128
127
|
}
|
128
|
+
return null;
|
129
129
|
}
|
130
130
|
}
|
@@ -10,28 +10,57 @@ export default class Controller {
|
|
10
10
|
group: new L.FeatureGroup.SubGroup(this.awesomeMap.cluster)
|
11
11
|
};
|
12
12
|
this.onFinished = () => {};
|
13
|
-
this.
|
14
|
-
|
13
|
+
this.allNodes = [];
|
15
14
|
}
|
16
15
|
|
17
16
|
getLabel() {
|
18
|
-
let text = this.
|
19
|
-
|
20
|
-
|
17
|
+
let text = this.component.name;
|
18
|
+
if (!text || this.awesomeMap.config.menu.mergeComponents) {
|
19
|
+
text = window.DecidimAwesome.texts[this.component.type];
|
20
|
+
}
|
21
21
|
return `<span class="awesome_map-component" id="awesome_map-component_${this.component.id}" title="0" data-layer="${this.component.type}">${text}</span>`
|
22
22
|
}
|
23
23
|
|
24
24
|
setFetcher(Fetcher) {
|
25
|
+
let checkProposalState = function (node, map) {
|
26
|
+
const showConfig = map.config.show;
|
27
|
+
return showConfig[node.state || "notAnswered"];
|
28
|
+
}
|
29
|
+
|
25
30
|
this.fetcher = new Fetcher(this);
|
26
31
|
this.fetcher.onFinished = () => {
|
27
32
|
// console.log(`all ${this.component.type} loaded`, this)
|
28
33
|
this._onFinished();
|
29
34
|
};
|
35
|
+
this.fetcher.onCollection = (collection) => {
|
36
|
+
if (collection && collection.edges) {
|
37
|
+
// Add markers to the main cluster group
|
38
|
+
let collectionEdges = [];
|
39
|
+
if (this.fetcher.collection === "meetings") {
|
40
|
+
collectionEdges = collection.edges.filter((item) => item.node.coordinates && item.node.coordinates.latitude && item.node.coordinates.longitude);
|
41
|
+
} else {
|
42
|
+
collectionEdges = collection.edges.filter((item) => item.node.coordinates && item.node.coordinates.latitude && item.node.coordinates.longitude && checkProposalState(item.node, this.awesomeMap));
|
43
|
+
}
|
44
|
+
|
45
|
+
try {
|
46
|
+
this.awesomeMap.cluster.addLayers(collectionEdges.map((item) => item.node.marker));
|
47
|
+
} catch (evt) {
|
48
|
+
console.error("Failed marker collection assignation", collectionEdges, "error", evt);
|
49
|
+
}
|
50
|
+
// subgroups don't have th addLayers utility
|
51
|
+
collectionEdges.forEach((item) => {
|
52
|
+
this.awesomeMap.layers[this.component.type].group.addLayer(item.node.marker);
|
53
|
+
this.addMarkerCategory(item.node.marker, item.node.category);
|
54
|
+
this.addMarkerHashtags(item.node.marker, item.node.hashtags);
|
55
|
+
});
|
56
|
+
}
|
57
|
+
};
|
30
58
|
}
|
31
59
|
|
32
60
|
addControls() {
|
33
61
|
this.awesomeMap.controls.main.addOverlay(this.controls.group, this.controls.label);
|
34
|
-
this.
|
62
|
+
this.controls.group.addTo(this.awesomeMap.map);
|
63
|
+
this.awesomeMap.layers[this.component.type] = this.controls;
|
35
64
|
}
|
36
65
|
|
37
66
|
loadNodes() {
|
@@ -40,16 +69,20 @@ export default class Controller {
|
|
40
69
|
|
41
70
|
addMarker(marker, node) {
|
42
71
|
|
43
|
-
/*
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
72
|
+
/*
|
73
|
+
theorically, this should be enough to create popups on markers but it looks that
|
74
|
+
there is some bug in leaflet that sometimes prevents this to work
|
75
|
+
*/
|
76
|
+
/*
|
77
|
+
let dom = document.createElement("div");
|
78
|
+
// console.log("addMarker", marker, "dom", dom)
|
79
|
+
dom.innerHTML = $.templates(`#${this.templateId}`).render(node);
|
80
|
+
marker.bindPopup(dom, {
|
48
81
|
maxwidth: 640,
|
49
82
|
minWidth: 500,
|
50
83
|
keepInView: true,
|
51
84
|
className: "map-info"
|
52
|
-
});
|
85
|
+
}); //*/
|
53
86
|
|
54
87
|
marker.on("click", () => {
|
55
88
|
let dom = document.createElement("div");
|
@@ -62,51 +95,51 @@ export default class Controller {
|
|
62
95
|
className: "map-info"
|
63
96
|
|
64
97
|
}).setLatLng(marker.getLatLng()).setContent(dom);
|
65
|
-
this.awesomeMap.map.
|
98
|
+
this.awesomeMap.map.addLayer(pop);
|
99
|
+
// console.log("marker click", node, "pop", pop, "marker", marker, "dom", dom, "templateId", this.templateId)
|
66
100
|
});
|
67
|
-
|
68
|
-
this.
|
69
|
-
|
70
|
-
this.allMarkers.push({
|
71
|
-
marker: marker,
|
72
|
-
component: this.component,
|
73
|
-
node: node
|
74
|
-
});
|
75
|
-
|
76
|
-
this.addMarkerCategory(marker, node.category);
|
77
|
-
this.addMarkerHashtags(marker, node.hashtags);
|
101
|
+
node.marker = marker;
|
102
|
+
node.component = this.component;
|
103
|
+
this.allNodes.push(node);
|
78
104
|
}
|
79
105
|
|
80
106
|
addMarkerCategory(marker, category) {
|
81
107
|
// Add to category layer
|
82
108
|
const cat = this.awesomeMap.getCategory(category);
|
83
109
|
if (this.awesomeMap.layers[cat.id]) {
|
84
|
-
|
85
|
-
|
86
|
-
|
110
|
+
try {
|
111
|
+
this.awesomeMap.layers[cat.id].group.addLayer(marker);
|
112
|
+
this.awesomeMap.controls.showCategory(cat);
|
113
|
+
} catch (evt) {
|
114
|
+
console.error("Failed category marker assignation. category:", category, "marker:", marker, evt.message);
|
115
|
+
}
|
116
|
+
}
|
87
117
|
}
|
88
118
|
|
89
119
|
addMarkerHashtags(marker, hashtags) {
|
90
120
|
// Add hashtag layer
|
91
121
|
if (this.awesomeMap.config.menu.hashtags) {
|
92
|
-
|
122
|
+
try {
|
123
|
+
this.awesomeMap.controls.addHashtagsControls(hashtags, marker);
|
124
|
+
} catch (evt) {
|
125
|
+
console.error("Failed hashtags marker assignation. hashtags:", hashtags, "marker:", marker, evt.message);
|
126
|
+
}
|
93
127
|
}
|
94
128
|
}
|
95
129
|
|
96
130
|
// Override if needed (call this.onFinished() at the end!)
|
97
131
|
_onFinished() {
|
98
|
-
this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.
|
132
|
+
this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.allNodes.length);
|
99
133
|
this.onFinished();
|
100
134
|
}
|
101
135
|
|
102
|
-
createIcon(
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
fillOpacity: 0.9
|
136
|
+
createIcon(color) {
|
137
|
+
const size = 36;
|
138
|
+
return L.divIcon({
|
139
|
+
html: `
|
140
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="${size}px" height="${size}px" class="text-secondary" style="color: ${color}"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M18.364 17.364L12 23.728l-6.364-6.364a9 9 0 1 1 12.728 0zM12 15a4 4 0 1 0 0-8 4 4 0 0 0 0 8zm0-2a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/></svg>`,
|
141
|
+
iconAnchor: [0.5 * size, size],
|
142
|
+
popupAnchor: [0, -0.5 * size]
|
110
143
|
});
|
111
144
|
}
|
112
145
|
}
|
@@ -2,12 +2,6 @@ import * as L from "leaflet";
|
|
2
2
|
import Controller from "src/decidim/decidim_awesome/awesome_map/controllers/controller";
|
3
3
|
import MeetingsFetcher from "src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher";
|
4
4
|
|
5
|
-
const MeetingIcon = L.DivIcon.SVGIcon.DecidimIcon.extend({
|
6
|
-
_createPathDescription: function() {
|
7
|
-
return "M 15.991543,4 C 7.3956015,4 2.9250351,10.5 3.000951,16.999999 3.1063486,26.460968 12.747693,30.000004 15.991543,43 19.242091,30.000004 29,26.255134 29,16.999999 29,10.5 23.951131,4 15.996007,4 m -0.153508,2.6000001 a 2.1720294,2.1076698 0 0 1 2.330514,2.1124998 2.177008,2.1125006 0 0 1 -4.354016,0 2.1720294,2.1076698 0 0 1 2.023502,-2.1124998 m -2.651707,4.8056679 h 5.610202 l 3.935584,7.569899 -1.926038,0.934266 -2.009546,-3.859265 v 14.557403 h -2.484243 v -9.126003 h -0.642162 v 9.126003 H 13.190347 V 16.050568 l -2.009545,3.859265 -1.926036,-0.934266 3.935581,-7.569899";
|
8
|
-
}
|
9
|
-
});
|
10
|
-
|
11
5
|
export default class MeetingsController extends Controller {
|
12
6
|
constructor(awesomeMap, component) {
|
13
7
|
super(awesomeMap, component)
|
@@ -19,7 +13,7 @@ export default class MeetingsController extends Controller {
|
|
19
13
|
// for each meeting, create a marker with an associated popup
|
20
14
|
this.fetcher.onNode = (meeting) => {
|
21
15
|
let marker = new L.Marker([meeting.coordinates.latitude, meeting.coordinates.longitude], {
|
22
|
-
icon: this.createIcon(
|
16
|
+
icon: this.createIcon(this.awesomeMap.getCategory(meeting.category).color),
|
23
17
|
title: meeting.title.translation
|
24
18
|
});
|
25
19
|
// console.log("new meeting", meeting, marker)
|
@@ -28,4 +22,14 @@ export default class MeetingsController extends Controller {
|
|
28
22
|
|
29
23
|
this.fetcher.fetch();
|
30
24
|
}
|
25
|
+
|
26
|
+
createIcon(color) {
|
27
|
+
const size = 36;
|
28
|
+
return L.divIcon({
|
29
|
+
html: `
|
30
|
+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" width="${size}px" height="${size}px" class="text-primary" style="color: ${color}"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M 15.991543,4 C 7.3956015,4 2.9250351,10.5 3.000951,16.999999 3.1063486,26.460968 12.747693,30.000004 15.991543,43 19.242091,30.000004 29,26.255134 29,16.999999 29,10.5 23.951131,4 15.996007,4 m -0.153508,2.6000001 a 2.1720294,2.1076698 0 0 1 2.330514,2.1124998 2.177008,2.1125006 0 0 1 -4.354016,0 2.1720294,2.1076698 0 0 1 2.023502,-2.1124998 m -2.651707,4.8056679 h 5.610202 l 3.935584,7.569899 -1.926038,0.934266 -2.009546,-3.859265 v 14.557403 h -2.484243 v -9.126003 h -0.642162 v 9.126003 H 13.190347 V 16.050568 l -2.009545,3.859265 -1.926036,-0.934266 3.935581,-7.569899"/></svg>`,
|
31
|
+
iconAnchor: [0.5 * size, size],
|
32
|
+
popupAnchor: [0, -0.5 * size]
|
33
|
+
});
|
34
|
+
}
|
31
35
|
}
|