decidim-reporting_proposals 0.5.1 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (142) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/lint.yml +3 -3
  3. data/.github/workflows/test_integration.yml +19 -5
  4. data/.github/workflows/test_unit.yml +19 -5
  5. data/.gitignore +2 -0
  6. data/.rubocop.yml +1 -3
  7. data/.rubocop_ruby.yml +1 -2
  8. data/.ruby-version +1 -1
  9. data/.simplecov +14 -9
  10. data/Gemfile +6 -5
  11. data/Gemfile.lock +382 -400
  12. data/README.md +14 -9
  13. data/Rakefile +0 -2
  14. data/app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb +23 -0
  15. data/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb +22 -19
  16. data/app/commands/concerns/decidim/{proposals → reporting_proposals}/admin/answer_proposal_override.rb +2 -2
  17. data/app/commands/concerns/decidim/{proposals → reporting_proposals}/admin/assign_proposals_to_valuator_override.rb +1 -1
  18. data/app/commands/concerns/decidim/reporting_proposals/admin/update_category_override.rb +1 -1
  19. data/app/commands/concerns/decidim/reporting_proposals/admin/update_proposal_answer_template_override.rb +26 -0
  20. data/app/commands/concerns/decidim/{proposals → reporting_proposals}/publish_proposal_override.rb +2 -2
  21. data/app/commands/decidim/reporting_proposals/create_reporting_proposal.rb +1 -1
  22. data/app/commands/decidim/reporting_proposals/update_reporting_proposal.rb +38 -0
  23. data/app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb +31 -0
  24. data/app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answers_controller_override.rb +1 -1
  25. data/app/controllers/concerns/decidim/reporting_proposals/admin/proposals_controller_override.rb +3 -1
  26. data/app/controllers/concerns/decidim/reporting_proposals/admin/valuation_assignments_controller_override.rb +57 -0
  27. data/app/controllers/concerns/decidim/reporting_proposals/needs_proposal_extra_validations_snippets.rb +0 -1
  28. data/app/controllers/concerns/decidim/reporting_proposals/proposals_controller_override.rb +39 -0
  29. data/app/controllers/decidim/reporting_proposals/admin/proposals_controller.rb +4 -4
  30. data/app/controllers/decidim/reporting_proposals/geolocation_controller.rb +1 -1
  31. data/app/events/concerns/decidim/{proposals → reporting_proposals}/publish_proposal_event_override.rb +1 -1
  32. data/app/forms/concerns/decidim/reporting_proposals/form_builder_override.rb +9 -16
  33. data/app/forms/concerns/decidim/reporting_proposals/map_builder_override.rb +6 -5
  34. data/app/forms/decidim/reporting_proposals/admin/proposal_photo_form.rb +1 -5
  35. data/app/forms/decidim/reporting_proposals/proposal_form.rb +2 -0
  36. data/app/helpers/concerns/decidim/reporting_proposals/proposal_wizard_helper_override.rb +7 -30
  37. data/app/helpers/concerns/decidim/reporting_proposals/resource_helper_override.rb +1 -1
  38. data/app/mailers/concerns/decidim/reporting_proposals/admin/hidden_resource_mailer.rb +30 -0
  39. data/app/mailers/concerns/decidim/{proposals → reporting_proposals}/admin/notification_answer_proposal_mailer.rb +1 -1
  40. data/app/mailers/concerns/decidim/{proposals → reporting_proposals}/admin/proposals_valuator_mailer.rb +2 -2
  41. data/app/mailers/concerns/decidim/{proposals → reporting_proposals}/notification_publish_proposal_mailer.rb +1 -1
  42. data/app/mailers/concerns/decidim/reporting_proposals/reported_mailer_override.rb +18 -0
  43. data/app/overrides/decidim/proposals/admin/proposals/show/add_address.html.erb.deface +1 -1
  44. data/app/overrides/decidim/proposals/admin/proposals/show/add_photo_management.html.erb.deface +1 -1
  45. data/app/overrides/decidim/proposals/admin/proposals/show/add_send_email_btn.html.erb.deface +1 -1
  46. data/app/overrides/decidim/proposals/admin/proposals/show/add_valuators_form.html.erb.deface +16 -10
  47. data/app/overrides/decidim/proposals/proposals/_wizard_header/add_description.html.erb.deface +5 -0
  48. data/app/overrides/decidim/proposals/proposals/_wizard_header/replace_title.html.erb.deface +5 -6
  49. data/app/overrides/decidim/proposals/proposals/compare/add_css.html.erb.deface +5 -0
  50. data/app/overrides/decidim/proposals/proposals/compare/add_distance_badge.html.erb.deface +10 -0
  51. data/app/overrides/decidim/proposals/proposals/edit/add_css.html.erb.deface +1 -1
  52. data/app/overrides/decidim/proposals/proposals/edit/replace_javascript.html.erb.deface +2 -2
  53. data/app/overrides/decidim/proposals/proposals/edit_draft/replace_javascript.html.erb.deface +3 -3
  54. data/app/overrides/decidim/proposals/proposals/edit_draft/replace_partial_edit_form_fields.html.erb.deface +6 -1
  55. data/app/overrides/decidim/proposals/proposals/new/add_css.html.erb.deface +2 -2
  56. data/app/overrides/decidim/proposals/proposals/new/remove_body.html.erb.deface +1 -0
  57. data/app/overrides/decidim/proposals/proposals/new/remove_title.html.erb.deface +1 -1
  58. data/app/overrides/decidim/proposals/proposals/new/replace_javascript.html.erb.deface +2 -2
  59. data/app/overrides/decidim/proposals/proposals/preview/add_css.html.erb.deface +5 -0
  60. data/app/overrides/decidim/proposals/proposals/show/add_additional_button.html.erb.deface +1 -1
  61. data/app/packs/entrypoints/decidim_reporting_proposals.js +1 -0
  62. data/app/packs/src/decidim/reporting_proposals/proposal_extra_validations.js +12 -13
  63. data/app/packs/src/decidim/reporting_proposals/proposals/add_proposal.js +45 -41
  64. data/app/packs/src/decidim/reporting_proposals/reverse_geocoding.js +0 -2
  65. data/app/packs/src/decidim/reporting_proposals/user_camera_inputs.js +7 -7
  66. data/app/packs/stylesheets/decidim/reporting_proposals/geocoding_addons.scss +9 -26
  67. data/app/packs/stylesheets/decidim/reporting_proposals/list_component_admin.scss +6 -6
  68. data/app/packs/stylesheets/decidim/reporting_proposals/manage_component_admin.scss +44 -30
  69. data/app/packs/stylesheets/decidim/reporting_proposals/proposals/add_proposal.scss +9 -4
  70. data/app/packs/stylesheets/decidim/reporting_proposals/user_camera_inputs.scss +21 -13
  71. data/app/permissions/concerns/decidim/reporting_proposals/admin/permissions_override.rb +73 -0
  72. data/app/permissions/decidim/templates/admin/permissions.rb +51 -0
  73. data/app/presenters/concerns/decidim/reporting_proposals/resource_locator_presenter_override.rb +40 -0
  74. data/app/resources/concerns/decidim/reporting_proposals/resource_manifest_override.rb +16 -0
  75. data/app/serializers/decidim/reporting_proposals/proposal_serializer_override.rb +4 -4
  76. data/app/views/decidim/proposals/admin/proposal_notes/_editing_note.html.erb +3 -3
  77. data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes_body.html.erb +1 -1
  78. data/app/views/decidim/proposals/admin/proposals/_address.html.erb +11 -10
  79. data/app/views/decidim/proposals/admin/proposals/_send_email_button.html.erb +6 -4
  80. data/app/views/decidim/proposals/proposals/_additional_button.html.erb +1 -1
  81. data/app/views/decidim/proposals/proposals/index.js.erb +0 -2
  82. data/app/views/decidim/reporting_proposals/admin/proposals/_photo_form.html.erb +2 -3
  83. data/app/views/decidim/reporting_proposals/admin/proposals/_photo_gallery.html.erb +3 -4
  84. data/app/views/decidim/reporting_proposals/admin/proposals/_photos.html.erb +15 -11
  85. data/app/views/decidim/reporting_proposals/admin/proposals/_proposal_td_hide.html.erb +7 -11
  86. data/app/views/decidim/reporting_proposals/admin/proposals/_proposal_td_title.html.erb +2 -2
  87. data/app/views/decidim/reporting_proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb +17 -0
  88. data/app/views/decidim/reporting_proposals/proposals/_additional_button_for_show.html.erb +5 -2
  89. data/app/views/decidim/reporting_proposals/proposals/_camera_button.html.erb +26 -0
  90. data/app/views/decidim/reporting_proposals/proposals/_new_proposal_fields.html.erb +7 -5
  91. data/app/views/decidim/reporting_proposals/proposals/_reporting_proposal_fields.html.erb +61 -86
  92. data/app/views/decidim/reporting_proposals/proposals/_user_group.html.erb +1 -1
  93. data/bin/dev +5 -0
  94. data/bin/{webpack-dev-server → shakapacker} +1 -1
  95. data/bin/shakapacker-dev-server +6 -0
  96. data/config/assets.rb +1 -3
  97. data/config/locales/ca.yml +0 -2
  98. data/config/locales/en.yml +22 -48
  99. data/decidim-reporting_proposals.gemspec +1 -2
  100. data/lib/decidim/reporting_proposals/admin_engine.rb +4 -0
  101. data/lib/decidim/reporting_proposals/component.rb +26 -26
  102. data/lib/decidim/reporting_proposals/engine.rb +18 -12
  103. data/lib/decidim/reporting_proposals/test/factories.rb +2 -12
  104. data/lib/decidim/reporting_proposals/version.rb +3 -4
  105. data/lib/tasks/reporting_proposals_upgrade.rake +5 -0
  106. data/package-lock.json +4072 -5101
  107. data/package.json +12 -7
  108. metadata +73 -105
  109. data/app/commands/concerns/decidim/admin/hide_resource_override.rb +0 -34
  110. data/app/commands/concerns/decidim/templates/admin/copy_questionnaire_template_override.rb +0 -32
  111. data/app/commands/concerns/decidim/templates/admin/create_questionnaire_template_override.rb +0 -32
  112. data/app/commands/decidim/templates/admin/copy_proposal_answer_template.rb +0 -35
  113. data/app/commands/decidim/templates/admin/create_proposal_answer_template.rb +0 -48
  114. data/app/commands/decidim/templates/admin/update_proposal_answer_template.rb +0 -52
  115. data/app/controllers/concerns/decidim/proposals/admin/valuation_assignments_controller_override.rb +0 -35
  116. data/app/controllers/concerns/decidim/templates/admin/application_controller_override.rb +0 -20
  117. data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb +0 -183
  118. data/app/forms/decidim/templates/admin/proposal_answer_template_form.rb +0 -21
  119. data/app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb +0 -28
  120. data/app/mailers/concerns/decidim/reported_mailer_override.rb +0 -16
  121. data/app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface +0 -5
  122. data/app/overrides/decidim/proposals/proposals/_edit_form_fields/replace_add_photos.html.erb.deface +0 -37
  123. data/app/overrides/decidim/proposals/proposals/_proposal_similar/add_distance_badge.html.erb.deface +0 -5
  124. data/app/overrides/decidim/proposals/proposals/edit_draft/add_css.html.erb.deface +0 -5
  125. data/app/overrides/decidim/proposals/proposals/edit_draft/add_user_group.html.erb.deface +0 -3
  126. data/app/packs/entrypoints/decidim_reporting_proposals_js_validations.js +0 -1
  127. data/app/packs/entrypoints/decidim_templates_admin.js +0 -1
  128. data/app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js +0 -27
  129. data/app/permissions/decidim/templates/admin/extra_permissions.rb +0 -37
  130. data/app/presenters/concerns/decidim/resource_locator_presenter_override.rb +0 -38
  131. data/app/resources/concerns/decidim/resource_manifest_override.rb +0 -14
  132. data/app/views/decidim/proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb +0 -17
  133. data/app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb +0 -34
  134. data/app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb +0 -16
  135. data/app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb +0 -3
  136. data/app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb +0 -52
  137. data/app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb +0 -6
  138. data/db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb +0 -8
  139. data/db/migrate/20230404104741_migrate_templatable.rb +0 -13
  140. /data/app/views/decidim/{admin → reporting_proposals/admin}/hidden_resource_mailer/notify_mail.html.erb +0 -0
  141. /data/app/views/decidim/{proposals → reporting_proposals}/admin/notification_answer_proposal_mailer/notify_proposal_author.html.erb +0 -0
  142. /data/app/views/decidim/{proposals → reporting_proposals}/notification_publish_proposal_mailer/notify_proposal_author.html.erb +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1c31fb493fe1dcdc1729de5b5fa4c8d794936b909945669882edec96f5394806
4
- data.tar.gz: 5d7e54593eec73a4fa6216758466b121e8f3442128be1ceaca0d8922aa8eee33
3
+ metadata.gz: 94e79ff5cfbd82e86ba6b4cf9bd6f89d5918b65e164f036250f1c3ed5cf1f690
4
+ data.tar.gz: d071738d997c74fa2ba298770a92e532641ce7073881b11c16585d0fbbb8a5dc
5
5
  SHA512:
6
- metadata.gz: e3771d1642893bf230a5b19187294ea43f44b2b61da1745326b3d6be7b49668c4c8370d77d157204d09750ceba3ab4f613c4a766d66667596f4e5ebcf80e39b9
7
- data.tar.gz: 80f730ab582dad444cb25541ea7253802b2f17f010b7b5fbf655d0683695930a52cdd4ac58e0a0afb65ca7208d10ffbf85438bf169a9796828ef29dddaadeca0
6
+ metadata.gz: c9d1542f7254004d9bfb389d53a1e124d9dfe0f8b99176558541b9e987707715fa2d2e2b22b1e07722e7b6decfcf0558879be0410a4e68949ec7a1924c1214ad
7
+ data.tar.gz: c3201643675fe008bc13ba86c94f1f9c7f5d44dbb177413cb921fb6cc28796f33cf0dc8ce2a8c930ace9075966b8898e0db92a9431dbc14c5a2a848d9af5ded0
@@ -8,8 +8,8 @@ on:
8
8
 
9
9
  env:
10
10
  CI: "true"
11
- RUBY_VERSION: 3.0.5
12
- NODE_VERSION: 16.9.1
11
+ RUBY_VERSION: 3.1.1
12
+ NODE_VERSION: 18.17.1
13
13
 
14
14
  jobs:
15
15
  lint-report:
@@ -17,7 +17,7 @@ jobs:
17
17
  runs-on: ubuntu-latest
18
18
 
19
19
  steps:
20
- - uses: actions/checkout@v2
20
+ - uses: actions/checkout@v4
21
21
  with:
22
22
  fetch-depth: 1
23
23
 
@@ -8,9 +8,9 @@ on:
8
8
 
9
9
  env:
10
10
  CI: "true"
11
- CODECOV: "true"
12
- RUBY_VERSION: 3.0.5
13
- NODE_VERSION: 16.9.1
11
+ SIMPLECOV: "true"
12
+ RUBY_VERSION: 3.1.1
13
+ NODE_VERSION: 18.17.1
14
14
  RAILS_ENV: test
15
15
  DATABASE_USERNAME: postgres
16
16
  DATABASE_PASSWORD: postgres
@@ -34,7 +34,7 @@ jobs:
34
34
 
35
35
  steps:
36
36
 
37
- - uses: actions/checkout@v3
37
+ - uses: actions/checkout@v4
38
38
  with:
39
39
  fetch-depth: 1
40
40
 
@@ -68,7 +68,7 @@ jobs:
68
68
 
69
69
  test:
70
70
  name: Integration Tests
71
- runs-on: ubuntu-20.04
71
+ runs-on: ubuntu-latest
72
72
  needs: build
73
73
  strategy:
74
74
  matrix:
@@ -98,6 +98,20 @@ jobs:
98
98
  with:
99
99
  fetch-depth: 1
100
100
 
101
+ - uses: nanasess/setup-chromedriver@v2
102
+ with:
103
+ chromedriver-version: 119.0.6045.105
104
+
105
+ - name: List Chrome
106
+ run: apt list --installed | grep chrome
107
+
108
+ - name: Remove Chrome
109
+ run: sudo apt remove google-chrome-stable
110
+
111
+ - uses: browser-actions/setup-chrome@v1
112
+ with:
113
+ chrome-version: 119.0.6045.105
114
+
101
115
  - uses: ruby/setup-ruby@v1
102
116
  with:
103
117
  ruby-version: ${{ env.RUBY_VERSION }}
@@ -8,9 +8,9 @@ on:
8
8
 
9
9
  env:
10
10
  CI: "true"
11
- CODECOV: "true"
12
- RUBY_VERSION: 3.0.5
13
- NODE_VERSION: 16.9.1
11
+ SIMPLECOV: "true"
12
+ RUBY_VERSION: 3.1.1
13
+ NODE_VERSION: 18.17.1
14
14
 
15
15
  jobs:
16
16
  test-unit:
@@ -34,10 +34,24 @@ jobs:
34
34
  DATABASE_HOST: localhost
35
35
 
36
36
  steps:
37
- - uses: actions/checkout@v2
37
+ - uses: actions/checkout@v4
38
38
  with:
39
39
  fetch-depth: 1
40
40
 
41
+ - uses: nanasess/setup-chromedriver@v2
42
+ with:
43
+ chromedriver-version: 119.0.6045.105
44
+
45
+ - name: List Chrome
46
+ run: apt list --installed | grep chrome
47
+
48
+ - name: Remove Chrome
49
+ run: sudo apt remove google-chrome-stable
50
+
51
+ - uses: browser-actions/setup-chrome@v1
52
+ with:
53
+ chrome-version: 119.0.6045.105
54
+
41
55
  - uses: ruby/setup-ruby@v1
42
56
  with:
43
57
  ruby-version: ${{ env.RUBY_VERSION }}
@@ -52,4 +66,4 @@ jobs:
52
66
  - name: Upload coverage reports to Codecov
53
67
  uses: codecov/codecov-action@v3
54
68
  with:
55
- token: ${{ secrets.CODECOV_TOKEN }}
69
+ token: ${{ secrets.CODECOV_TOKEN }}
data/.gitignore CHANGED
@@ -25,3 +25,5 @@ development_app
25
25
  *.gem
26
26
  node_modules/
27
27
  npm_debug.log
28
+ tailwind.config.js
29
+ .rubocop-http*
data/.rubocop.yml CHANGED
@@ -1,4 +1,2 @@
1
1
  inherit_from:
2
- - .rubocop_ruby.yml
3
- - .rubocop_rails.yml
4
- - .rubocop-disabled.yml
2
+ - https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml
data/.rubocop_ruby.yml CHANGED
@@ -70,7 +70,7 @@ AllCops:
70
70
  # If a value is specified for TargetRubyVersion then it is used.
71
71
  # Else if .ruby-version exists and it contains an MRI version it is used.
72
72
  # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
73
- TargetRubyVersion: 3.0
73
+ TargetRubyVersion: 3.1
74
74
 
75
75
  # RSpec:
76
76
  # Patterns:
@@ -1765,4 +1765,3 @@ Faker/DeprecatedArguments:
1765
1765
  questions:
1766
1766
  - number
1767
1767
  - supplemental
1768
-
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 3.0.5
1
+ 3.1.1
data/.simplecov CHANGED
@@ -1,13 +1,18 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- SimpleCov.start do
4
- root ENV.fetch("ENGINE_ROOT", nil)
3
+ if ENV["SIMPLECOV"]
4
+ SimpleCov.start do
5
+ # We ignore some of the files because they are never tested
6
+ add_filter "/config/"
7
+ add_filter "/db/"
8
+ add_filter "lib/decidim/reporting_proposals/version.rb"
9
+ add_filter "/spec"
10
+ end
5
11
 
6
- add_filter "lib/decidim/reporting_proposals/version.rb"
7
- add_filter "lib/decidim/reporting_proposals/component.rb"
8
- add_filter "/spec"
9
- end
10
-
11
- SimpleCov.command_name ENV.fetch("COMMAND_NAME", nil) || File.basename(Dir.pwd)
12
+ SimpleCov.merge_timeout 1800
12
13
 
13
- SimpleCov.merge_timeout 1800
14
+ if ENV["CI"]
15
+ require "simplecov-cobertura"
16
+ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
17
+ end
18
+ end
data/Gemfile CHANGED
@@ -16,7 +16,8 @@ gem "decidim", DECIDIM_VERSION
16
16
  gem "decidim-reporting_proposals", path: "."
17
17
 
18
18
  gem "bootsnap", "~> 1.7"
19
- gem "faker", "~> 2.14"
19
+ gem "faker", "~> 3.2"
20
+ gem "puma", ">= 6.3.1"
20
21
  gem "rspec", "~> 3.0"
21
22
 
22
23
  group :development, :test do
@@ -28,11 +29,11 @@ group :development, :test do
28
29
  end
29
30
 
30
31
  group :development do
31
- gem "letter_opener_web", "~> 2.0"
32
+ gem "letter_opener_web"
32
33
  gem "listen", "~> 3.1"
33
- gem "rubocop-faker"
34
- gem "spring"
35
- gem "spring-watcher-listen"
34
+ gem "rubocop-faker", "~> 1.1"
35
+ gem "spring", "~> 2.0"
36
+ gem "spring-watcher-listen", "~> 2.0"
36
37
  gem "web-console"
37
38
  end
38
39