decidim-decidim_awesome 0.10.2 → 0.11.1

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

Potentially problematic release.


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

Files changed (261) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +24 -0
  3. data/README.md +177 -60
  4. data/app/cells/concerns/decidim/decidim_awesome/global_menu_cell_override.rb +20 -0
  5. data/app/cells/concerns/decidim/decidim_awesome/{proposal_m_cell_override.rb → proposal_l_cell_override.rb} +10 -4
  6. data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb +5 -12
  7. data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb +9 -5
  8. data/app/cells/decidim/decidim_awesome/voting/proposal_metadata_cell.rb +54 -0
  9. data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/modal.erb +18 -0
  10. data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb +37 -32
  11. data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb +9 -4
  12. data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb +2 -2
  13. data/app/commands/concerns/decidim/decidim_awesome/proposals/admin/update_proposal_override.rb +31 -0
  14. data/app/commands/concerns/decidim/decidim_awesome/proposals/create_collaborative_draft_override.rb +27 -0
  15. data/app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb +27 -0
  16. data/app/commands/concerns/decidim/decidim_awesome/proposals/update_collaborative_draft_override.rb +27 -0
  17. data/app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb +26 -0
  18. data/app/commands/decidim/decidim_awesome/admin/create_constraint.rb +1 -1
  19. data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb +4 -3
  20. data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb +1 -1
  21. data/app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb +1 -1
  22. data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb +6 -3
  23. data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb +1 -1
  24. data/app/commands/decidim/decidim_awesome/admin/update_constraint.rb +1 -1
  25. data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb +2 -2
  26. data/app/commands/decidim/decidim_awesome/command.rb +1 -7
  27. data/app/controllers/concerns/decidim/decidim_awesome/admin/maintenance_context.rb +43 -0
  28. data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable_helper.rb +1 -1
  29. data/app/controllers/concerns/decidim/decidim_awesome/content_security_policy.rb +34 -0
  30. data/app/controllers/concerns/decidim/decidim_awesome/limit_pending_amendments.rb +35 -0
  31. data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb +1 -1
  32. data/app/controllers/concerns/decidim/decidim_awesome/proposals/proposal_votes_controller_override.rb +3 -3
  33. data/app/controllers/decidim/decidim_awesome/admin/application_controller.rb +2 -0
  34. data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb +14 -10
  35. data/app/controllers/decidim/decidim_awesome/admin/config_controller.rb +10 -9
  36. data/app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb +23 -20
  37. data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb +6 -10
  38. data/app/controllers/decidim/decidim_awesome/admin/maintenance_controller.rb +76 -0
  39. data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb +6 -10
  40. data/app/controllers/decidim/decidim_awesome/admin/proposal_custom_fields_controller.rb +14 -6
  41. data/app/controllers/decidim/decidim_awesome/admin/scoped_admins_controller.rb +2 -2
  42. data/app/controllers/decidim/decidim_awesome/admin/scoped_styles_controller.rb +2 -2
  43. data/app/controllers/decidim/decidim_awesome/blank_component_controller.rb +8 -3
  44. data/app/controllers/decidim/decidim_awesome/editor_images_controller.rb +3 -3
  45. data/app/controllers/decidim/decidim_awesome/iframe_component/iframe_controller.rb +18 -5
  46. data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_override.rb +21 -0
  47. data/app/forms/{decidim → concerns/decidim}/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb +2 -1
  48. data/app/forms/decidim/decidim_awesome/admin/config_form.rb +28 -14
  49. data/app/forms/decidim/decidim_awesome/admin/custom_redirect_form.rb +2 -2
  50. data/app/forms/decidim/decidim_awesome/admin/intergram_form.rb +4 -0
  51. data/app/forms/decidim/decidim_awesome/admin/menu_form.rb +4 -4
  52. data/app/helpers/concerns/decidim/decidim_awesome/amendments_helper_override.rb +65 -0
  53. data/app/helpers/concerns/decidim/decidim_awesome/breadcrumb_helper_override.rb +23 -0
  54. data/app/helpers/concerns/decidim/decidim_awesome/proposals/application_helper_override.rb +110 -0
  55. data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb +6 -27
  56. data/app/helpers/decidim/decidim_awesome/map_helper.rb +8 -27
  57. data/app/jobs/decidim/decidim_awesome/destroy_private_data_job.rb +22 -0
  58. data/app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb +5 -4
  59. data/app/middleware/decidim/decidim_awesome/current_config.rb +3 -5
  60. data/app/models/concerns/decidim/decidim_awesome/has_proposal_extra_fields.rb +39 -10
  61. data/app/models/decidim/decidim_awesome/awesome_config.rb +1 -1
  62. data/app/models/decidim/decidim_awesome/paper_trail_version.rb +3 -3
  63. data/app/models/decidim/decidim_awesome/proposal_extra_field.rb +35 -1
  64. data/app/models/decidim/decidim_awesome/vote_weight.rb +2 -2
  65. data/app/overrides/decidim/proposals/admin/proposals/show/add_private_body.html.erb.deface +7 -0
  66. data/app/overrides/decidim/proposals/admin/proposals/show/replace_body.html.erb.deface +5 -0
  67. data/app/overrides/decidim/proposals/proposals/_proposal_aside/limit_amendments_modal.html.erb.deface +5 -0
  68. data/app/overrides/decidim/proposals/proposals/_vote_button/replace_vote_button.html.erb.deface +1 -1
  69. data/app/overrides/layouts/decidim/_decidim_javascript/add_awesome_tags.html.erb.deface +6 -0
  70. data/app/overrides/layouts/decidim/_head/add_awesome_tags.html.erb.deface +4 -11
  71. data/app/overrides/layouts/decidim/admin/_header/{replace_scripts.html.erb.deface → add_awesome_tags.html.erb.deface} +4 -4
  72. data/app/packs/entrypoints/decidim_admin_decidim_awesome.js +1 -2
  73. data/app/packs/entrypoints/decidim_admin_decidim_awesome_global.js +4 -0
  74. data/app/packs/entrypoints/decidim_admin_decidim_awesome_global.scss +1 -0
  75. data/app/packs/entrypoints/decidim_decidim_awesome.js +2 -2
  76. data/app/packs/entrypoints/decidim_decidim_awesome_map.scss +1 -1
  77. data/app/packs/entrypoints/decidim_editor.js +14 -0
  78. data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js +96 -69
  79. data/app/packs/src/decidim/decidim_awesome/admin/check_redirections.js +46 -41
  80. data/app/packs/src/decidim/decidim_awesome/admin/codemirror.js +3 -3
  81. data/app/packs/src/decidim/decidim_awesome/admin/constraint_form_events.js +115 -0
  82. data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js +9 -5
  83. data/app/packs/src/decidim/decidim_awesome/admin/form_exit_warn.js +22 -11
  84. data/app/packs/src/decidim/decidim_awesome/admin/proposal_sortings.js +26 -8
  85. data/app/packs/src/decidim/decidim_awesome/admin/tabs_change.js +31 -0
  86. data/app/packs/src/decidim/decidim_awesome/admin/user_picker.js +34 -21
  87. data/app/packs/src/decidim/decidim_awesome/amendments/show_modal_on_limits.js +28 -0
  88. data/app/packs/src/decidim/decidim_awesome/awesome_admin.js +5 -16
  89. data/app/packs/src/decidim/decidim_awesome/awesome_admin_global.js +1 -0
  90. data/app/packs/src/decidim/decidim_awesome/awesome_application.js +1 -15
  91. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js +33 -11
  92. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js +9 -12
  93. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js +28 -0
  94. data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js +3 -4
  95. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js +12 -12
  96. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/meetings_controller.js +11 -7
  97. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js +6 -13
  98. data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js +51 -20
  99. data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js +27 -18
  100. data/app/packs/src/decidim/decidim_awesome/editor/index.js +94 -0
  101. data/app/packs/src/decidim/decidim_awesome/forms/autosave.js +28 -23
  102. data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js +29 -25
  103. data/app/packs/src/decidim/decidim_awesome/forms/rich_text_plugin.js +27 -32
  104. data/app/packs/src/decidim/decidim_awesome/proposals/custom_fields.js +31 -15
  105. data/app/packs/src/decidim/decidim_awesome/proposals/images.js +16 -10
  106. data/app/packs/src/decidim/decidim_awesome/voting/voting_cards.js +47 -38
  107. data/app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss +11 -12
  108. data/app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss +15 -0
  109. data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss +24 -12
  110. data/app/packs/stylesheets/decidim/decidim_awesome/admin/constraints.scss +49 -29
  111. data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss +28 -71
  112. data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_styles.scss +48 -0
  113. data/app/packs/stylesheets/decidim/decidim_awesome/admin/intergram_fixes.scss +11 -0
  114. data/app/packs/stylesheets/decidim/decidim_awesome/admin/user_picker.scss +17 -26
  115. data/app/packs/stylesheets/decidim/decidim_awesome/amendments/modal.scss +5 -0
  116. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin.scss +11 -49
  117. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin_global.scss +19 -0
  118. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_application.scss +4 -19
  119. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss +1 -1
  120. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +41 -35
  121. data/app/packs/stylesheets/decidim/decidim_awesome/forms/autosave.scss +6 -6
  122. data/app/packs/stylesheets/decidim/decidim_awesome/forms/custom_fields.scss +118 -0
  123. data/app/packs/stylesheets/decidim/decidim_awesome/shared/spinner.scss +26 -0
  124. data/app/packs/stylesheets/decidim/decidim_awesome/voting/voting_cards.scss +41 -59
  125. data/app/permissions/decidim/decidim_awesome/admin/permissions.rb +14 -3
  126. data/app/permissions/decidim/decidim_awesome/permissions.rb +3 -4
  127. data/app/presenters/concerns/decidim/decidim_awesome/breadcrumb_root_menu_item_presenter_override.rb +23 -0
  128. data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_item_presenter_override.rb +10 -2
  129. data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_presenter_override.rb +8 -0
  130. data/app/presenters/concerns/decidim/decidim_awesome/proposals/proposal_presenter_override.rb +20 -0
  131. data/app/presenters/decidim/decidim_awesome/admin_log/component_presenter_override.rb +30 -0
  132. data/app/presenters/decidim/decidim_awesome/participatory_space_role_presenter.rb +1 -1
  133. data/app/presenters/decidim/decidim_awesome/private_data_presenter.rb +70 -0
  134. data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb +1 -1
  135. data/app/queries/decidim/decidim_awesome/private_data_finder.rb +19 -0
  136. data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_methods.rb +72 -0
  137. data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_override.rb +38 -0
  138. data/app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb +34 -0
  139. data/app/types/concerns/decidim/decidim_awesome/add_proposal_type_custom_fields.rb +59 -0
  140. data/app/types/concerns/decidim/decidim_awesome/{proposal_type_override.rb → add_proposal_type_vote_weights.rb} +3 -1
  141. data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb +23 -17
  142. data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb +50 -48
  143. data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb +7 -2
  144. data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb +25 -18
  145. data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb +7 -6
  146. data/app/views/decidim/decidim_awesome/admin/config/_form_editors.html.erb +12 -16
  147. data/app/views/decidim/decidim_awesome/admin/config/_form_livechat.html.erb +39 -23
  148. data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_custom_fields.html.erb +35 -17
  149. data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_private_custom_fields.html.erb +1 -0
  150. data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb +68 -80
  151. data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb +16 -12
  152. data/app/views/decidim/decidim_awesome/admin/config/_form_surveys.html.erb +8 -6
  153. data/app/views/decidim/decidim_awesome/admin/config/show.html.erb +22 -12
  154. data/app/views/decidim/decidim_awesome/admin/constraints/_form.html.erb +1 -49
  155. data/app/views/decidim/decidim_awesome/admin/constraints/new.html.erb +14 -9
  156. data/app/views/decidim/decidim_awesome/admin/constraints/show.html.erb +14 -9
  157. data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb +20 -5
  158. data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb +5 -5
  159. data/app/views/decidim/decidim_awesome/admin/custom_redirects/index.html.erb +14 -13
  160. data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb +5 -5
  161. data/app/views/decidim/decidim_awesome/admin/maintenance/_private_data.html.erb +44 -0
  162. data/app/views/decidim/decidim_awesome/admin/maintenance/show.html.erb +44 -0
  163. data/app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb +6 -6
  164. data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb +21 -12
  165. data/app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb +39 -42
  166. data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb +21 -12
  167. data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb +8 -5
  168. data/app/views/decidim/decidim_awesome/admin/proposals/_private_body.html.erb +20 -0
  169. data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb +14 -18
  170. data/app/views/decidim/decidim_awesome/amendments/_modal.html.erb +23 -0
  171. data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb +8 -2
  172. data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb +7 -12
  173. data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb +53 -37
  174. data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb +14 -5
  175. data/app/views/decidim/decidim_awesome/voting/voting_cards/_show_vote_button.html.erb +0 -3
  176. data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb +9 -7
  177. data/app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb +9 -6
  178. data/app/views/layouts/decidim/decidim_awesome/admin/_base.html.erb +12 -0
  179. data/app/views/layouts/decidim/decidim_awesome/admin/application.html.erb +1 -73
  180. data/app/views/layouts/decidim/decidim_awesome/admin/maintenance.html.erb +19 -0
  181. data/config/assets.rb +3 -33
  182. data/config/i18n-tasks.yml +23 -3
  183. data/config/locales/ca.yml +28 -17
  184. data/config/locales/cs.yml +39 -14
  185. data/config/locales/de.yml +25 -15
  186. data/config/locales/en.yml +125 -35
  187. data/config/locales/es.yml +26 -16
  188. data/config/locales/eu.yml +7 -3
  189. data/config/locales/fr.yml +25 -16
  190. data/config/locales/hu.yml +43 -8
  191. data/config/locales/it.yml +8 -15
  192. data/config/locales/ja.yml +26 -15
  193. data/config/locales/lt.yml +0 -4
  194. data/config/locales/nl.yml +9 -14
  195. data/config/locales/pt-BR.yml +9 -14
  196. data/config/locales/ro-RO.yml +0 -3
  197. data/config/locales/sv.yml +9 -9
  198. data/config/rubocop/disabled.yml +11 -0
  199. data/config/rubocop/faker.yml +480 -0
  200. data/config/rubocop/rails.yml +88 -0
  201. data/config/rubocop/rspec.yml +65 -0
  202. data/config/rubocop/ruby.yml +1210 -0
  203. data/db/migrate/20240306175331_rename_editor_images_awesome_config.rb +18 -0
  204. data/db/migrate/20240531224204_add_decidim_awesome_proposal_private_fields.rb +29 -0
  205. data/db/migrate/20240729164227_add_decidim_awesome_proposal_private_fields_date.rb +20 -0
  206. data/db/seeds.rb +3 -3
  207. data/lib/decidim/decidim_awesome/admin_engine.rb +26 -7
  208. data/lib/decidim/decidim_awesome/api/types/localized_custom_fields_type.rb +22 -0
  209. data/lib/decidim/decidim_awesome/api/types/translated_custom_fields_type.rb +51 -0
  210. data/lib/decidim/decidim_awesome/awesome.rb +70 -19
  211. data/lib/decidim/decidim_awesome/awesome_helpers.rb +6 -2
  212. data/lib/decidim/decidim_awesome/checksums.yml +46 -44
  213. data/lib/decidim/decidim_awesome/config.rb +1 -1
  214. data/lib/decidim/decidim_awesome/custom_fields.rb +13 -5
  215. data/lib/decidim/decidim_awesome/engine.rb +165 -56
  216. data/lib/decidim/decidim_awesome/iframe_component/component.rb +1 -2
  217. data/lib/decidim/decidim_awesome/lock.rb +47 -0
  218. data/lib/decidim/decidim_awesome/map_component/component.rb +1 -1
  219. data/lib/decidim/decidim_awesome/menu.rb +165 -0
  220. data/lib/decidim/decidim_awesome/menu_hacker.rb +4 -8
  221. data/lib/decidim/decidim_awesome/system_checker.rb +2 -4
  222. data/lib/decidim/decidim_awesome/test/factories.rb +10 -10
  223. data/lib/decidim/decidim_awesome/test/initializer.rb +7 -12
  224. data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb +2 -2
  225. data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb +2 -2
  226. data/lib/decidim/decidim_awesome/test/shared_examples/{box_label_editor.rb → box_label_editor_examples.rb} +17 -17
  227. data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb +23 -5
  228. data/lib/decidim/decidim_awesome/test/shared_examples/custom_fields_examples.rb +155 -0
  229. data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb +7 -7
  230. data/lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb +42 -58
  231. data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb +9 -8
  232. data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb +32 -24
  233. data/lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb +97 -22
  234. data/lib/decidim/decidim_awesome/version.rb +2 -2
  235. data/lib/decidim/decidim_awesome/voting_manifest.rb +5 -10
  236. data/lib/decidim/decidim_awesome.rb +1 -2
  237. data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake +1 -1
  238. data/lib/tasks/decidim_awesome_upgrade_tasks.rake +4 -0
  239. data/package.json +21 -30
  240. metadata +83 -60
  241. data/app/cells/decidim/decidim_awesome/voting/voting_cards_counter/show.erb +0 -15
  242. data/app/cells/decidim/decidim_awesome/voting/voting_cards_counter/vote_button.erb +0 -15
  243. data/app/cells/decidim/decidim_awesome/voting/voting_cards_counter_cell.rb +0 -21
  244. data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_modal/show.erb +0 -16
  245. data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_modal_cell.rb +0 -20
  246. data/app/cells/decidim/proposals/proposal_m/footer.erb +0 -13
  247. data/app/helpers/decidim/decidim_awesome/amendments_helper_override.rb +0 -48
  248. data/app/helpers/decidim/decidim_awesome/proposals/application_helper_override.rb +0 -78
  249. data/app/overrides/layouts/decidim/_head/add_awesome_legacy_scripts.rb +0 -14
  250. data/app/overrides/layouts/decidim/admin/_header/replace_styles.html.erb.deface +0 -3
  251. data/app/packs/entrypoints/decidim_admin_decidim_awesome_custom_fields.js +0 -2
  252. data/app/packs/entrypoints/decidim_decidim_awesome_admin_form_exit_warn.js +0 -1
  253. data/app/packs/src/decidim/decidim_awesome/admin/constraints.js +0 -55
  254. data/app/packs/src/decidim/decidim_awesome/editors/editor.js +0 -218
  255. data/app/packs/src/decidim/decidim_awesome/editors/tabs_focus.js +0 -22
  256. data/app/packs/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss +0 -19
  257. data/app/packs/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +0 -58
  258. data/app/packs/stylesheets/vendor/select2-foundation-theme.scss +0 -348
  259. data/app/serializers/concerns/decidim/decidim_awesome/proposal_serializer_override.rb +0 -64
  260. data/app/views/decidim/decidim_awesome/admin/config/_modal.html.erb +0 -11
  261. data/app/views/decidim/decidim_awesome/voting/voting_cards/_proposal_m_cell_footer.erb +0 -15
@@ -0,0 +1,30 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ module AdminLog
6
+ module ComponentPresenterOverride
7
+ extend ActiveSupport::Concern
8
+
9
+ included do
10
+ alias_method :decidim_original_action_string, :action_string
11
+ alias_method :decidim_original_i18n_params, :i18n_params
12
+
13
+ def action_string
14
+ return "decidim.decidim_awesome.admin_log.component.#{action}" if action == "destroy_private_data"
15
+
16
+ decidim_original_action_string
17
+ end
18
+
19
+ def i18n_params
20
+ if action == "destroy_private_data"
21
+ decidim_original_i18n_params.merge({ count: action_log.extra["count"] })
22
+ else
23
+ decidim_original_i18n_params
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end
30
+ end
@@ -5,7 +5,7 @@ module Decidim
5
5
  class ParticipatorySpaceRolePresenter < RoleBasePresenter
6
6
  # Finds the destroyed entry if exists
7
7
  def destroy_entry
8
- @destroy_entry ||= PaperTrail::Version.find_by(item_type: item_type, event: "destroy", item_id: item_id)
8
+ @destroy_entry ||= PaperTrail::Version.find_by(item_type:, event: "destroy", item_id:)
9
9
  end
10
10
 
11
11
  # roles are in the destroyed event if the role has been removed
@@ -0,0 +1,70 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ class PrivateDataPresenter < SimpleDelegator
6
+ include Decidim::TranslatableAttributes
7
+ include ActionView::Helpers::DateHelper
8
+ include ActionView::Helpers::TagHelper
9
+
10
+ def name
11
+ @name ||= "#{translated_attribute(participatory_space.title)} / #{translated_attribute(super)}"
12
+ end
13
+
14
+ def path
15
+ @path ||= Decidim::EngineRouter.main_proxy(self).root_path
16
+ end
17
+
18
+ def total
19
+ @total ||= Decidim::Proposals::Proposal.joins(:extra_fields)
20
+ .where(component: self)
21
+ .where.not(extra_fields: { private_body: nil })
22
+ .count.to_s
23
+ end
24
+
25
+ def last_date
26
+ @last_date ||= Decidim::Proposals::Proposal.joins(:extra_fields)
27
+ .where(component: self)
28
+ .where.not(extra_fields: { private_body: nil })
29
+ .order(private_body_updated_at: :desc)
30
+ .first&.extra_fields&.private_body_updated_at
31
+ end
32
+
33
+ def time_ago
34
+ I18n.t("decidim.decidim_awesome.admin.maintenance.private_data.time_ago", time: time_ago_in_words(last_date)) if last_date
35
+ end
36
+
37
+ def destroyable?
38
+ return false unless last_date
39
+
40
+ last_date < DecidimAwesome.private_data_expiration_time.ago
41
+ end
42
+
43
+ def locked?
44
+ Decidim::DecidimAwesome::Lock.new(organization).locked?(__getobj__)
45
+ end
46
+
47
+ def as_json(_options = nil)
48
+ {
49
+ id:,
50
+ name:,
51
+ path:,
52
+ total:,
53
+ last_date:,
54
+ time_ago:,
55
+ locked: locked?,
56
+ done:
57
+ }
58
+ end
59
+
60
+ def done
61
+ return content_tag("span", "", class: "loading-spinner primary") if locked?
62
+
63
+ return if destroyable?
64
+ return if last_date
65
+
66
+ I18n.t("decidim.decidim_awesome.admin.maintenance.private_data.done")
67
+ end
68
+ end
69
+ end
70
+ end
@@ -6,7 +6,7 @@ module Decidim
6
6
  # Finds the destroyed entry if exists
7
7
  def destroy_entry
8
8
  @destroy_entry ||= begin
9
- query = PaperTrail::Version.where(item_type: item_type, event: "update", item_id: item_id)
9
+ query = PaperTrail::Version.where(item_type:, event: "update", item_id:)
10
10
  .where("id > ?", entry.id)
11
11
  if roles.include? "admin"
12
12
  query.where("object_changes LIKE '%\nadmin:\n- true\n- false%'").first
@@ -0,0 +1,19 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ class PrivateDataFinder
6
+ def query
7
+ Component.where(id: proposals.where.not(extra_fields: { private_body: nil }))
8
+ end
9
+
10
+ def proposals
11
+ Decidim::Proposals::Proposal.select(:decidim_component_id).joins(:extra_fields)
12
+ end
13
+
14
+ def for(resources)
15
+ Component.where(id: proposals).where(id: resources)
16
+ end
17
+ end
18
+ end
19
+ end
@@ -0,0 +1,72 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ module Proposals
6
+ # Adds one custom field per column in export if custom fields are activted
7
+ # Adds vote weights
8
+ module ProposalSerializerMethods
9
+ extend ActiveSupport::Concern
10
+
11
+ included do
12
+ include ::Decidim::DecidimAwesome::NeedsAwesomeConfig
13
+
14
+ # Override the NeedsAwesomeConfig's awesome_config_instance,
15
+ # to take context from proposal instead of controller's request.
16
+ def awesome_config_instance
17
+ return @custom_config if @custom_config
18
+
19
+ @custom_config = Config.new(proposal.organization)
20
+ @custom_config.context_from_component(proposal.component)
21
+ @custom_config
22
+ end
23
+
24
+ def serialize_custom_fields
25
+ payload = {}
26
+ custom_fields = CustomFields.new(awesome_proposal_custom_fields)
27
+ if custom_fields.present?
28
+ @proposal.body.each do |locale, body|
29
+ if body.is_a?(Hash)
30
+ body.each do |translation_locale, value|
31
+ fields_entries(custom_fields, value) do |field_key, field_value|
32
+ payload["body/#{field_key}/#{translation_locale}".to_sym] = field_value if payload["body/#{field_key}/#{translation_locale}".to_sym].blank?
33
+ end
34
+ end
35
+ else
36
+ fields_entries(custom_fields, body) do |key, value|
37
+ payload["body/#{key}/#{locale}".to_sym] = value
38
+ end
39
+ end
40
+ end
41
+ end
42
+ payload
43
+ end
44
+
45
+ def serialize_private_custom_fields
46
+ payload = {}
47
+ private_custom_fields = CustomFields.new(awesome_proposal_private_custom_fields)
48
+ if private_custom_fields.present?
49
+ fields_entries(private_custom_fields, proposal.private_body) do |key, value|
50
+ value = value.first if value.is_a? Array
51
+ payload["private_body/#{key}".to_sym] = value
52
+ end
53
+ end
54
+ payload
55
+ end
56
+
57
+ # Iterate on custom fields that has a label and name
58
+ # (will ignore paragraphs and title)
59
+ def fields_entries(custom_fields, body)
60
+ custom_fields.apply_xml(body)
61
+ custom_fields.fields.each do |field|
62
+ next unless field["label"].present? && field.has_key?("name")
63
+
64
+ value = field["userData"].is_a?(Array) ? field["userData"].first : field["userData"]
65
+ yield field["label"].parameterize, value
66
+ end
67
+ end
68
+ end
69
+ end
70
+ end
71
+ end
72
+ end
@@ -0,0 +1,38 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ module Proposals
6
+ # Adds one custom field per column in export if custom fields are activted
7
+ # Adds vote weights
8
+ module ProposalSerializerOverride
9
+ extend ActiveSupport::Concern
10
+
11
+ included do
12
+ include ProposalSerializerMethods
13
+
14
+ alias_method :decidim_original_serialize, :serialize
15
+
16
+ def serialize
17
+ # serialize first the custom fields,
18
+ # as default serialization will strip proposal body's <xml> tags.
19
+ serialization = decidim_original_serialize
20
+ serialization.merge!(proposal_vote_weights)
21
+ serialization.merge!(serialize_custom_fields)
22
+ end
23
+
24
+ protected
25
+
26
+ def proposal_vote_weights
27
+ payload = {}
28
+ if proposal.respond_to?(:vote_weights)
29
+ proposal.update_vote_weights!
30
+ payload[:votes] = proposal.reload.vote_weights
31
+ end
32
+ payload
33
+ end
34
+ end
35
+ end
36
+ end
37
+ end
38
+ end
@@ -0,0 +1,34 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ module Proposals
6
+ ##
7
+ # Custom serializer for Proposals with private data.
8
+ # Used to separate open-data export and admin export.
9
+ class PrivateProposalSerializer < ::Decidim::Proposals::ProposalSerializer
10
+ include ProposalSerializerMethods
11
+
12
+ def serialize
13
+ serialization = super.merge!(serialize_private_custom_fields)
14
+ serialization.merge!(serialize_private_notes)
15
+ end
16
+
17
+ def serialize_private_notes
18
+ payload = {}
19
+ notes = proposal.notes
20
+ return payload unless notes.any?
21
+
22
+ notes.each do |note|
23
+ payload["notes/#{note.id}".to_sym] = {
24
+ created_at: note.created_at,
25
+ note: note.body,
26
+ author: author_name(note.author)
27
+ }
28
+ end
29
+ payload
30
+ end
31
+ end
32
+ end
33
+ end
34
+ end
@@ -0,0 +1,59 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ module AddProposalTypeCustomFields
6
+ extend ActiveSupport::Concern
7
+
8
+ included do
9
+ include ::Decidim::DecidimAwesome::NeedsAwesomeConfig
10
+
11
+ field :body_fields, TranslatedCustomFieldsType, "Custom fields for this proposal", null: true
12
+
13
+ def body_fields
14
+ return if custom_fields.empty?
15
+
16
+ @body_fields ||= object.body.transform_values do |body|
17
+ sanitize_translated_fields(body)
18
+ end
19
+ end
20
+
21
+ # Override the NeedsAwesomeConfig's awesome_config_instance,
22
+ # to take context from proposal instead of controller's request.
23
+ def awesome_config_instance
24
+ return @custom_config if @custom_config
25
+
26
+ @custom_config = Config.new(object.organization)
27
+ @custom_config.context_from_component(object.component)
28
+ @custom_config
29
+ end
30
+
31
+ private
32
+
33
+ def custom_fields
34
+ @custom_fields ||= CustomFields.new(awesome_proposal_custom_fields)
35
+ end
36
+
37
+ def fields_for_xml(body)
38
+ custom_fields.apply_xml(body)
39
+ custom_fields.fields.filter_map do |field|
40
+ next unless field["label"].present? && field.has_key?("name")
41
+
42
+ field["userData"] = field["userData"].first if field["userData"].is_a?(Array)
43
+ field.dup
44
+ end
45
+ end
46
+
47
+ def sanitize_translated_fields(body)
48
+ if body.is_a?(Hash)
49
+ body.transform_values do |value|
50
+ fields_for_xml(value)
51
+ end
52
+ else
53
+ fields_for_xml(body)
54
+ end
55
+ end
56
+ end
57
+ end
58
+ end
59
+ end
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Decidim
4
4
  module DecidimAwesome
5
- module ProposalTypeOverride
5
+ module AddProposalTypeVoteWeights
6
6
  extend ActiveSupport::Concern
7
7
 
8
8
  included do
@@ -10,6 +10,8 @@ module Decidim
10
10
 
11
11
  def vote_weights
12
12
  current_component = object.component
13
+ return unless current_component.current_settings.respond_to?(:votes_hidden?)
14
+
13
15
  object.vote_weights unless current_component.current_settings.votes_hidden?
14
16
  end
15
17
  end
@@ -1,26 +1,32 @@
1
1
  <div class="card">
2
- <div class="card-divider">
3
- <h2 class="card-title"><%= t(".title") %>
4
- <span class="exports dropdown tiny button button--simple button--title" data-toggle="export-dropdown">
5
- <%= t "exports.button", scope: "decidim.decidim_awesome.admin.admin_accountability" %>
6
- </span>
7
- <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
8
- <ul class="vertical menu add-components">
9
- <% %w{CSV JSON Excel}.each do |format| %>
10
- <li class="exports--format--<%= format.downcase %> exports--registrations">
11
- <%= link_to t("decidim.decidim_awesome.admin.admin_accountability.exports.export_as", export_format:
12
- format.upcase), export_admin_accountability_path(export_params.merge(format: format)), method: :post %>
13
- </li>
14
- <% end %>
15
- </ul>
2
+ <div class="bg-gray-6 p-4 rounded-t">
3
+ <h2 class="card-title flex md:flex-row justify-between sm:flex-wrap">
4
+ <%= t(".title") %>
5
+ <div class="flex gap-4">
6
+ <%= link_to t(global? ? ".see_spaces" : ".see_global"), admin_accountability_path(admins: !global?), class: "button button__sm button__transparent-secondary tiny button--title new" %>
7
+ <span class="exports button button__sm button__secondary tiny button--simple button--title" data-toggle="export-dropdown">
8
+ <%= t "exports.button", scope: "decidim.decidim_awesome.admin.admin_accountability" %>
9
+ <%= icon "arrow-down-s-fill" %>
10
+ </span>
11
+ <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
12
+ <ul class="vertical menu add-components">
13
+ <% %w{CSV JSON Excel}.each do |format| %>
14
+ <li class="exports--format--<%= format.downcase %> exports--registrations">
15
+ <%= link_to t("decidim.decidim_awesome.admin.admin_accountability.exports.export_as", export_format:
16
+ format.upcase), export_admin_accountability_path(export_params.merge(format: format)),
17
+ method: :post,
18
+ class: "focus-visible:outline-none" %>
19
+ </li>
20
+ <% end %>
21
+ </ul>
22
+ </div>
16
23
  </div>
17
- <%= link_to t(global? ? ".see_spaces" : ".see_global"), admin_accountability_path(admins: !global?), class: "button tiny button--title new" %>
18
- </h2>
24
+ </h2>
19
25
  </div>
20
26
 
21
27
  <%= render partial: "decidim/decidim_awesome/admin/shared/filters_with_date", locals: { i18n_ctx: "admin_accountability" } %>
22
28
 
23
- <div class="card-section">
29
+ <div class="card-section p-4">
24
30
  <p class="help-text"><%= t(global? ? ".global_description" : ".description") %></p>
25
31
 
26
32
  <% if global_users_missing_date %>
@@ -1,28 +1,31 @@
1
- <div class="card">
2
- <div class="card-divider">
3
- <h2 class="card-title"><%= t ".title" %></h2>
4
- </div>
5
- <div class="card-section">
6
- <p>
7
- <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
8
- <%= check decidim_version_valid? %>
9
- </p>
10
- </div>
11
- <div class="card-section">
12
- <p><%= t(".images_migrated") %>
13
- <% if images_migrated? %>
14
- <%= check true %></p>
15
- <% else %>
16
- <%= check false %></p>
17
- <div class="callout alert">
18
- <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
19
- <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
20
- </div>
21
- <% end %>
22
- </div>
23
- <div class="card-section">
24
- <ul class="vertical menu">
25
- <% overrides.each do |group, props| %>
1
+ <!--
2
+ Force tailwind to compile these classes
3
+ class="fill-success fill-alert"
4
+ -->
5
+
6
+ <div class="card-section decidim-version">
7
+ <p>
8
+ <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
9
+ <%= check decidim_version_valid? %>
10
+ </p>
11
+ </div>
12
+
13
+ <div class="card-section">
14
+ <p><%= t(".images_migrated") %>
15
+ <% if images_migrated? %>
16
+ <%= check true %></p>
17
+ <% else %>
18
+ <%= check false %></p>
19
+ <div class="callout alert">
20
+ <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
21
+ <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
22
+ </div>
23
+ <% end %>
24
+ </div>
25
+
26
+ <div class="card-section">
27
+ <ul class="vertical menu">
28
+ <% overrides.each do |group, props| %>
26
29
  <li>
27
30
  <strong><%= t ".#{group}" %></strong>
28
31
  <ul class="vertical menu">
@@ -36,16 +39,16 @@
36
39
  </ul>
37
40
  <br>
38
41
  </li>
39
- <% end %>
40
- </ul>
41
- <ul class="vertical menu heads">
42
- <li>
43
- <strong><%= t ".head_tags" %></strong>
44
- <ul class="vertical menu">
42
+ <% end %>
43
+ </ul>
44
+ <ul class="vertical menu heads">
45
+ <li>
46
+ <strong><%= t ".head_tags" %></strong>
47
+ <ul class="vertical menu">
45
48
  <% {
46
- CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
47
- JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
48
- }.each do |part, xpath| %>
49
+ CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
50
+ JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
51
+ }.each do |part, xpath| %>
49
52
  <li>
50
53
  <%= part %>
51
54
  <% if head.xpath(xpath).count.positive? %>
@@ -56,16 +59,16 @@
56
59
  <code class="help-text code-block"><%= head_addons(part) %></code>
57
60
  <% end %>
58
61
  </li>
59
- <% end %>
60
- </ul>
61
- </li>
62
- <li>
63
- <strong><%= t ".admin_head_tags" %></strong>
64
- <ul class="vertical menu">
62
+ <% end %>
63
+ </ul>
64
+ </li>
65
+ <li>
66
+ <strong><%= t ".admin_head_tags" %></strong>
67
+ <ul class="vertical menu">
65
68
  <% {
66
- CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
67
- JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
68
- }.each do |part, xpath| %>
69
+ CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
70
+ JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
71
+ }.each do |part, xpath| %>
69
72
  <li>
70
73
  <%= part %>
71
74
  <% if admin_head.xpath(xpath).count.positive? %>
@@ -76,9 +79,8 @@
76
79
  <code class="help-text code-block"><%= admin_addons(part) %></code>
77
80
  <% end %>
78
81
  </li>
79
- <% end %>
80
- </ul>
81
- </li>
82
- </ul>
83
- </div>
82
+ <% end %>
83
+ </ul>
84
+ </li>
85
+ </ul>
84
86
  </div>
@@ -2,6 +2,11 @@
2
2
  <%= t("config.#{var}",
3
3
  scope: "activemodel.attributes",
4
4
  id: "<span class='awesome-auto-edit' data-var='#{var}' data-scope='#{scope}' data-key='#{key}'>#{key}</span>").html_safe %>
5
- <%= icon_link_to "pencil", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "action-icon--edit awesome-auto-edit", data: { "scope" => "#{scope}" } %>
6
- <%= link_to t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), delete_path, method: :delete, class: "float-right delete-box", data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } %>
5
+
6
+ <%= icon_link_to "pencil-line", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "awesome-auto-edit", data: { "scope" => "#{scope}" } %>
7
+
8
+ <%= link_to delete_path, method: :delete, class: "awesome-auto-delete", title: t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } do %>
9
+ <%= icon "delete-bin-line" %>
10
+ <%= t("delete", scope: "decidim.decidim_awesome.admin.config.form_#{var}") %>
11
+ <% end %>
7
12
  <% end %>
@@ -1,27 +1,34 @@
1
- <div class="constraints-editor" data-key="<%= key %>">
2
- <div class="callout" style="display:none" data-closable>
3
- <p></p>
4
- <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
5
- <span aria-hidden="true">&times;</span>
6
- </button>
7
- </div>
8
-
9
- <h5><%= t ".title" %></h5>
1
+ <div class="constraints-editor mb-8 mt-4" data-key="<%= key %>">
2
+ <%= cell "decidim/announcement", "<p></p>".html_safe, hidden: true %>
3
+ <h5 class="mb-2"><%= t ".title" %></h5>
10
4
  <% if constraints.blank? %>
11
5
  <span class="label warning"><%= t ".always" %></span>
12
6
  <% end %>
13
7
 
14
8
  <ul class="constraints-list<%= " inactive" if constraints&.detect{|c| c.settings["participatory_space_manifest"]=="none" } %>">
15
9
  <% constraints&.each do |constraint| %>
16
- <li>
17
- <% constraint.settings.reverse_each do |k, val| %>
18
- <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
19
- <% end %>
20
- <a href="<%= constraint_path(id: constraint.id, key: key) %>" class="edit-condition"><%= t ".edit" %></a>
21
- <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete %>
22
- </li>
23
- <% end %>
10
+ <li>
11
+ <% constraint.settings.reverse_each do |k, val| %>
12
+ <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
13
+ <% end %>
14
+
15
+ <div class="inline-flex items-center gap-1 ml-10">
16
+ <button id="<%= "edit-#{key}-#{constraint.id}" %>" type="button" name="button" class="edit-condition button button__xs button__transparent-secondary" data-dialog-open="<%= "edit-modal-#{key}" %>" data-constraints-url="<%= constraint_path(id: constraint.id, key: key) %>">
17
+ <%= t ".edit" %>
18
+ </button>
19
+
20
+ <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete, class: "button button__xs button__transparent-primary" %>
21
+ </div>
22
+ </li>
23
+ <% end %>
24
24
  </ul>
25
- <a href="<%= new_constraint_path(key: key) %>" class="add-condition" data-open="constraintsModal"><%= t ".add_condition" %></a>
25
+
26
+ <button id="<%= "new-#{key}" %>" type="button" name="button" class="add-condition button button__xs button__secondary" data-dialog-open="<%= "new-modal-#{key}" %>" data-constraints-url="<%= new_constraint_path(key: key) %>">
27
+ <%= icon "add-box-line" %>
28
+ <%= t ".add_condition" %>
29
+ </button>
26
30
 
27
31
  </div>
32
+
33
+ <%= decidim_modal id: "edit-modal-#{key}", data: { constraint: key }, remote: true %>
34
+ <%= decidim_modal id: "new-modal-#{key}", data: { constraint: key }, remote: true %>
@@ -1,21 +1,22 @@
1
- <div class="row column decidim_awesome-form">
1
+ <div class="form__wrapper row column decidim_awesome-form">
2
2
  <% if config_enabled? :scoped_admins %>
3
3
  <p class="help-text"><%= t("help.scoped_admins", scope: "decidim.decidim_awesome.admin.config.form") %></p>
4
4
 
5
5
  <% form.object.scoped_admins&.each do |key, value| %>
6
- <div class="scoped_admins_container" data-key="<%= key %>">
6
+ <div class="card p-4 scoped_admins_container js-box-container" data-key="<%= key %>">
7
7
  <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_admins", key: key, scope: "scoped_admin_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_admin_path(key: key) }) %>
8
8
  <p class="form-error is-visible" id="scoped-admin-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
9
9
 
10
- <%= select_tag "config[scoped_admins][#{key}]", options_from_collection_for_select(users_for(value), :id, :text, proc { true }), { include_blank: false , class: "multiusers-select", multiple: true, data: { url: decidim_admin_decidim_awesome.users_path } } %>
10
+ <%= select_tag "config[scoped_admins][#{key}]", options_for_select(users_for(value), value), { include_blank: false , class: "multiusers-select", multiple: true, data: { url: decidim_admin_decidim_awesome.users_path } } %>
11
11
 
12
12
  <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_admin_#{key}", constraints: constraints_for("scoped_admin_#{key}") }) %>
13
13
  </div>
14
14
  <% end %>
15
15
 
16
- <%= link_to t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_admins"), decidim_admin_decidim_awesome.scoped_admins_path, method: :post %>
16
+ <%= link_to decidim_admin_decidim_awesome.scoped_admins_path, method: :post, class: "button button__sm button__text-secondary mr-auto" do %>
17
+ <%= icon("add-box-line") %>
18
+ <%= t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_admins") %>
19
+ <% end %>
17
20
 
18
21
  <% end %>
19
22
  </div>
20
-
21
- <%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>