decidim-reporting_proposals 0.5.1 → 0.6.0

data/app/views/decidim/reporting_proposals/proposals/_additional_button_for_show.html.erb

@@ -1,6 +1,9 @@
 <% if current_component.settings.try(:additional_buttons_for_show_proposal_show) &&
   current_component.settings.additional_button_for_show_proposal_text.present? &&
   current_component.settings.additional_button_for_show_proposal_link.present? %>
-  <%= link_to translated_attribute(component_settings.additional_button_for_show_proposal_text),
-              component_settings.additional_button_for_show_proposal_link, class: "title-action__action button small ml-s" %>
+
+  <section class="layout-aside__section">
+    <%= link_to translated_attribute(component_settings.additional_button_for_show_proposal_text),
+              component_settings.additional_button_for_show_proposal_link, class: "button button__sm button__transparent-secondary w-full" %>
+  </section>
 <% end %>

data/app/views/decidim/reporting_proposals/proposals/_camera_button.html.erb

@@ -0,0 +1,26 @@
+<% if component_settings.attachments_allowed? %>
+  <div class="gallery__container photos_container">
+    <% if @form.respond_to?(:photos) && @form.photos.any? %>
+      <% @form.photos.each do |photo| %>
+        <div class="callout gallery__item" id="attachment_<%= photo.id %>" data-closable>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
+          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_image", scope: "decidim.reporting_proposals.proposals.edit") %>"
+                  title="<%= t("delete_image", scope: "decidim.reporting_proposals.proposals.edit") %>"
+                  type="button"
+                  data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+    <div class="field">
+      <%= form.file_field :add_photos, multiple: false, label: t("image", scope: "decidim.reporting_proposals.proposals.form") %>
+
+      <div class="has_no_image">
+        <%= form.check_box :has_no_image %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/reporting_proposals/proposals/_new_proposal_fields.html.erb

@@ -1,7 +1,9 @@
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags" %>
-</div>
+<div class="form__wrapper">
+  <div class="field hashtags__container">
+    <%= form.text_field :title, class: "js-hashtags" %>
+  </div>
 
-<div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
+  <div class="field hashtags__container">
+    <%= text_editor_for_proposal_body(form) %>
+  </div>
 </div>

data/app/views/decidim/reporting_proposals/proposals/_reporting_proposal_fields.html.erb

@@ -1,101 +1,76 @@
-<% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
-  </div>
-<% end %>
-
-<% if component_settings.attachments_allowed? %>
-  <fieldset class="gallery__container photos_container">
-  <% if @form.photos.any? %>
-    <% @form.photos.each do |photo| %>
-      <div class="callout gallery__item" id="attachment_<%= photo.id %>" data-closable>
-        <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
-        <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-        <button class="close-button"
-                aria-label="<%= t("delete_image", scope: "decidim.reporting_proposals.proposals.edit") %>"
-                title="<%= t("delete_image", scope: "decidim.reporting_proposals.proposals.edit") %>"
-                type="button"
-                data-close>
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-    <% end %>
+<div class="form__wrapper">
+  <% if @form.categories&.any? %>
+    <div class="field hashtags__container">
+      <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
+    </div>
   <% end %>
-    <div class="field row column">
-      <%= form.file_field :add_photos, multiple: false, label: t("image", scope: "decidim.reporting_proposals.proposals.form") %>
 
-      <div class="has_no_image">
-        <%= form.check_box :has_no_image %>
+  <%= render "decidim/reporting_proposals/proposals/camera_button", form: form %>
+
+  <% if @form.geocoding_enabled? %>
+    <div id="address_input">
+      <div class="address-fill">
+        <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address"), required: true %>
+      </div>
+      <div class="has_no_address">
+        <%= form.check_box :has_no_address %>
+        <%= form.hidden_field :has_address, value: "1" %>
+      </div>
+      <div id="address_map" class="proposal__container">
+        <p class="help-text">
+          <%= t("instructions", scope: "decidim.proposals.proposals.dynamic_map_instructions") %> <%= t("description", scope: "decidim.proposals.proposals.dynamic_map_instructions") %>
+        </p>
+        <%= dynamic_map_for proposal_preview_data_for_map(@form.to_h) %>
       </div>
     </div>
-  </fieldset>
-
-<% end %>
+  <% end %>
 
-<% if @form.geocoding_enabled? %>
-  <div class="field" id="address_input">
-    <div class="address-fill">
-      <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
-    </div>
-    <div class="has_no_address">
-      <%= form.check_box :has_no_address %>
-      <%= form.hidden_field :has_address, value: "1" %>
-    </div>
-    <div class="map address-fill" id="address_map">
-      <%= render partial: "dynamic_map_instructions" %>
-      <%= dynamic_map_for proposal_preview_data_for_map(@form.to_h) %>
-    </div>
+  <div class="field hashtags__container">
+    <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
   </div>
-<% end %>
-
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
-</div>
 
-<div class="field hashtags__container">
   <%= text_editor_for_proposal_body(form) %>
-</div>
 
-<% if @form.component_automatic_hashtags.any? %>
-  <div class="field">
-    <%= form.label :automatic_hashtags %>
-    <div class="checkboxes hashtags">
-      <% @form.component_automatic_hashtags.each do |hashtag| %>
-        <label>
-          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-        </label>
-      <% end %>
+  <% if @form.component_automatic_hashtags.any? %>
+    <div class="field">
+      <%= form.label :automatic_hashtags %>
+      <div class="checkboxes hashtags">
+        <% @form.component_automatic_hashtags.each do |hashtag| %>
+          <label>
+            <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+          </label>
+        <% end %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
 
-<% if @form.component_suggested_hashtags.any? %>
-  <div class="field">
-    <%= form.label :suggested_hashtags, nil, for: nil %>
-    <div class="checkboxes hashtags">
-      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
-        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-      end %>
+  <% if @form.component_suggested_hashtags.any? %>
+    <div class="field">
+      <%= form.label :suggested_hashtags, nil, for: nil %>
+      <div class="checkboxes hashtags">
+        <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
+          option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+        end %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
 
-<% if current_component.has_subscopes? %>
-  <div class="field">
-    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-  </div>
-<% end %>
+  <% if current_component.has_subscopes? %>
+    <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+  <% end %>
 
-<% if component_settings.attachments_allowed? && !component_settings.only_photo_attachments? %>
-    <fieldset class="attachments_container gallery__container documents_container">
-    <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <div class="row column">
-      <%= form.attachment :documents,
-        multiple: true,
-        label: t("decidim.proposals.proposals.edit.add_documents"),
-        button_label: t("decidim.proposals.proposals.edit.add_documents"),
-        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
-        help_i18n_scope: "decidim.forms.file_help.file" %>
+  <% if component_settings.attachments_allowed? && !component_settings.only_photo_attachments? %>
+    <div class="attachments_container gallery__container documents_container">
+      <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
+      <div>
+        <%= form.attachment :documents,
+                            multiple: true,
+                            label: t("decidim.proposals.proposals.edit.add_documents"),
+                            button_label: t("decidim.proposals.proposals.edit.add_documents"),
+                            button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+                            button_class: "button button__lg button__transparent-secondary w-full",
+                            help_i18n_scope: "decidim.forms.file_help.file" %>
+      </div>
     </div>
-  </fieldset>
-<% end %>
+  <% end %>
+</div>

data/app/views/decidim/reporting_proposals/proposals/_user_group.html.erb

@@ -1,5 +1,5 @@
 <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
+  <div class="field hashtags__container">
     <%= user_group_select_field(form, :user_group_id) %>
   </div>
 <% end %>

data/bin/dev

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd development_app
+
+./bin/dev

data/bin/{webpack-dev-server → shakapacker}

@@ -3,4 +3,4 @@
 
 Dir.chdir("development_app")
 
-load "bin/webpack-dev-server"
+load "bin/shakapacker"

data/bin/shakapacker-dev-server

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+Dir.chdir("development_app")
+
+load "bin/shakapacker-dev-server"

data/config/assets.rb

@@ -8,7 +8,5 @@ Decidim::Webpacker.register_entrypoints(
   decidim_reporting_proposals_manage_component_admin: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_manage_component_admin.js",
   decidim_reporting_proposals_list_component_admin: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_list_component_admin.js",
   decidim_reporting_proposals_geocoding: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_geocoding.js",
-  decidim_reporting_proposals_camera: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_camera.js",
-  decidim_reporting_proposals_js_validations: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_js_validations.js",
-  decidim_templates_admin: "#{base_path}/app/packs/entrypoints/decidim_templates_admin.js"
+  decidim_reporting_proposals_camera: "#{base_path}/app/packs/entrypoints/decidim_reporting_proposals_camera.js"
 )

data/config/locales/ca.yml

@@ -7,8 +7,6 @@ ca:
       proposal:
         has_no_address: No té adreça
         has_no_image: Sense imatge
-      template:
-        scope_for_availability: Limita la disponibilitat al component
   decidim:
     admin:
       hidden_resource_mailer:

data/config/locales/en.yml

@@ -7,10 +7,11 @@ en:
       proposal:
         has_no_address: Has no address
         has_no_image: Has no image
-      template:
-        scope_for_availability: Restrict availability to the component
   decidim:
     admin:
+      actions:
+        manage: Manage
+        new: New
       hidden_resource_mailer:
         notify_mail:
           body_1: An administrator removed your proposal because it has been reported.
@@ -19,10 +20,6 @@ en:
           hello: Hello,
           reason: 'Reason: %{reason}'
           subject: Your proposal has been hidden
-      templates:
-        fetch:
-          error: Couldn't find this template, maybe has been deleted?
-        missing_resource: "(missing resource)"
     application:
       geocoding:
         unconfigured: Geocoding is not configured!
@@ -56,10 +53,10 @@ en:
         name: Reporting proposals
         settings:
           global:
-            additional_button_for_show_proposal_link: Additional action button after
-              the "back to list" link when visiting a particular proposal (link)
-            additional_button_for_show_proposal_text: Additional action button after
-              the "back to list" link when visiting a particular proposal (text)
+            additional_button_for_show_proposal_link: Additional sidebar action button
+              when visiting a particular proposal (link)
+            additional_button_for_show_proposal_text: Additional sidebar action button
+              when visiting a particular proposal (text)
             additional_button_link: Additional action button next to new proposal
               (link)
             additional_button_text: Additional action button next to new proposal
@@ -231,16 +228,8 @@ en:
             geolocated_at: Geolocated at
           send_email_button:
             send_mail: Send an email to user
-        proposals_valuator_mailer:
-          notify_proposals_valuator:
-            admin_panel: admin panel
-            email_body: You've been assigned as a valuator for the proposals listed
-              below. This means you've been trusted to give them feedback and a proper
-              response in the next coming days.
-            gratitude: Thanks for your help!
-            greeting: Hi %{name}
-            public_side: public side
-            subject: New proposals assigned to you for evaluation
+          show:
+            report: Report
     reported_mailer:
       report:
         admin_resource: Admin this resource
@@ -405,9 +394,10 @@ en:
             success: Proposal note successfully updated.
         proposals:
           photo_form:
-            action: Add image
+            action: Save images
             add_images: Add images
-            gallery_legend: Add images
+            edit_images: Edit images
+            gallery_legend: Add an image gallery (Optional)
             title: Photos
             upload_msg: No files selected
           photo_gallery:
@@ -420,6 +410,16 @@ en:
             remove_assignment: remove assignment
             remove_assignment_confirmation: remove assignment confirmation
             valuators: Valuators
+        proposals_valuator_mailer:
+          notify_proposals_valuator:
+            admin_panel: admin panel
+            email_body: You've been assigned as a valuator for the proposals listed
+              below. This means you've been trusted to give them feedback and a proper
+              response in the next coming days.
+            gratitude: Thanks for your help!
+            greeting: Hi %{name}
+            public_side: public side
+            subject: New proposals assigned to you for evaluation
         resolution_time: Resolution time
         time_elapsed:
           datetime:
@@ -487,29 +487,3 @@ en:
           delete_image: Delete image
         form:
           image: Image/photo
-    templates:
-      admin:
-        proposal_answer_templates:
-          form:
-            answer_template: Answer template
-            hint: "<strong>Hint:</strong> You can use these variables anywhere on
-              the answer template that will be replaced when using the template"
-            hint1: "<strong>%{organization}</strong> will be replaced by the organization's
-              name"
-            hint2: "<strong>%{name}</strong> will be replaced by the author's name"
-            hint3: "<strong>%{admin}</strong> will be replaced by the admin's name
-              (the one answering the proposal)"
-            save: Save
-            scope_for_availability_help: Note that only participatory spaces having
-              components of the type "proposals" will be listed.
-            template_title: Template information
-          index:
-            confirm_delete: Are you sure you want to delete this template?
-            global_scope: Global (available everywhere)
-            internal_state: Internal State
-            scope_for_availability: Scope
-            title: Proposal answers
-          template_chooser:
-            select_template: Select a template answer
-      template_types:
-        proposal_answer_templates: Proposal answers

data/decidim-reporting_proposals.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description = "A module for Decidim that facilitates the creation of proposals related to geolocated issues in a city"
   spec.license = "AGPL-3.0"
   spec.homepage = "https://github.com/openpoke/decidim-module-reporting_proposals"
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "decidim-core", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "decidim-participatory_processes", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "decidim-proposals", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
-  spec.add_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "deface", ">= 1.9"
 
   spec.add_development_dependency "decidim-accountability", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION

data/lib/decidim/reporting_proposals/admin_engine.rb

@@ -38,6 +38,10 @@ module Decidim
         end
       end
 
+      initializer "decidim_reporting_proposals.register_icons" do
+        Decidim.icons.register(name: "camera-line", icon: "camera-line", category: "system", description: "", engine: :decidim_reporting_proposals)
+      end
+
       def load_seed
         nil
       end

data/lib/decidim/reporting_proposals/component.rb

@@ -139,7 +139,7 @@ Decidim.register_component(:reporting_proposals) do |component|
                    .where(component: component_instance)
                    .includes(:scope, :category, :component)
 
-      if space.user_roles(:valuator).where(user: user).any?
+      if space.user_roles(:valuator).where(user:).any?
         collection.with_valuation_assigned_to(user, space)
       else
         collection
@@ -168,7 +168,7 @@ Decidim.register_component(:reporting_proposals) do |component|
     imports.form_class_name = "Decidim::Proposals::Admin::ProposalsFileImportForm"
 
     imports.messages do |msg|
-      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.proposals", count: count) }
+      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.proposals", count:) }
       msg.set(:title) { I18n.t("decidim.proposals.admin.imports.title.proposals") }
       msg.set(:label) { I18n.t("decidim.proposals.admin.imports.label.proposals") }
       msg.set(:help) { I18n.t("decidim.proposals.admin.imports.help.proposals") }
@@ -179,7 +179,7 @@ Decidim.register_component(:reporting_proposals) do |component|
 
   component.imports :answers do |imports|
     imports.messages do |msg|
-      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.answers", count: count) }
+      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.answers", count:) }
       msg.set(:title) { I18n.t("decidim.proposals.admin.imports.title.answers") }
       msg.set(:label) { I18n.t("decidim.proposals.admin.imports.label.answers") }
       msg.set(:help) { I18n.t("decidim.proposals.admin.imports.help.answers") }
@@ -213,12 +213,12 @@ Decidim.register_component(:reporting_proposals) do |component|
       name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :reporting_proposals).i18n_name,
       manifest_name: :reporting_proposals,
       published_at: Time.current,
-      participatory_space: participatory_space,
+      participatory_space:,
       settings: {
         vote_limit: 0,
         collaborative_drafts_enabled: true
       },
-      step_settings: step_settings
+      step_settings:
     }
 
     component = Decidim.traceability.perform_action!(
@@ -248,19 +248,19 @@ Decidim.register_component(:reporting_proposals) do |component|
                                           elsif n.positive?
                                             ["accepted", Decidim::Faker::Localized.sentence(word_count: 10), nil]
                                           else
-                                            [nil, nil, nil]
+                                            ["not_answered", nil, nil]
                                           end
 
       params = {
-        component: component,
+        component:,
         category: participatory_space.categories.sample,
         scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
         title: { en: Faker::Lorem.sentence(word_count: 2) },
         body: { en: Faker::Lorem.paragraphs(number: 2).join("\n") },
-        state: state,
-        answer: answer,
+        state:,
+        answer:,
         answered_at: state.present? ? Time.current : nil,
-        state_published_at: state_published_at,
+        state_published_at:,
         published_at: Time.current
       }
 
@@ -279,7 +279,7 @@ Decidim.register_component(:reporting_proposals) do |component|
       if n.positive?
         Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
           user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
+          proposal.add_coauthor(author, user_group:)
         end
       end
 
@@ -287,11 +287,11 @@ Decidim.register_component(:reporting_proposals) do |component|
         email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
 
-        author = Decidim::User.find_or_initialize_by(email: email)
+        author = Decidim::User.find_or_initialize_by(email:)
         author.update!(
           password: "decidim123456",
           password_confirmation: "decidim123456",
-          name: name,
+          name:,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
           tos_agreement: "1",
@@ -318,7 +318,7 @@ Decidim.register_component(:reporting_proposals) do |component|
         )
 
         params = {
-          component: component,
+          component:,
           category: participatory_space.categories.sample,
           scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
           title: { en: "#{proposal.title["en"]} #{Faker::Lorem.sentence(word_count: 1)}" },
@@ -344,7 +344,7 @@ Decidim.register_component(:reporting_proposals) do |component|
         Decidim::Amendment.create!(
           amender: author,
           amendable: proposal,
-          emendation: emendation,
+          emendation:,
           state: "evaluating"
         )
       end
@@ -353,11 +353,11 @@ Decidim.register_component(:reporting_proposals) do |component|
         email = "vote-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-#{m}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} #{m}"
 
-        author = Decidim::User.find_or_initialize_by(email: email)
+        author = Decidim::User.find_or_initialize_by(email:)
         author.update!(
           password: "decidim123456",
           password_confirmation: "decidim123456",
-          name: name,
+          name:,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
           tos_agreement: "1",
@@ -366,8 +366,8 @@ Decidim.register_component(:reporting_proposals) do |component|
           about: Faker::Lorem.paragraph(sentence_count: 2)
         )
 
-        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.published_state? && proposal.rejected?
-        Decidim::Proposals::ProposalVote.create!(proposal: emendation, author: author) if emendation
+        Decidim::Proposals::ProposalVote.create!(proposal:, author:) unless proposal.published_state? && proposal.rejected?
+        Decidim::Proposals::ProposalVote.create!(proposal: emendation, author:) if emendation
       end
 
       unless proposal.published_state? && proposal.rejected?
@@ -375,11 +375,11 @@ Decidim.register_component(:reporting_proposals) do |component|
           email = "endorsement-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-endr#{index}@example.org"
           name = "#{Faker::Name.name} #{participatory_space.id} #{n} endr#{index}"
 
-          author = Decidim::User.find_or_initialize_by(email: email)
+          author = Decidim::User.find_or_initialize_by(email:)
           author.update!(
             password: "decidim123456",
             password_confirmation: "decidim123456",
-            name: name,
+            name:,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,
             tos_agreement: "1",
@@ -405,7 +405,7 @@ Decidim.register_component(:reporting_proposals) do |component|
               user_group: group
             )
           end
-          Decidim::Endorsement.create!(resource: proposal, author: author, user_group: author.user_groups.first)
+          Decidim::Endorsement.create!(resource: proposal, author:, user_group: author.user_groups.first)
         end
       end
 
@@ -413,7 +413,7 @@ Decidim.register_component(:reporting_proposals) do |component|
         author_admin = Decidim::User.where(organization: component.organization, admin: true).all.sample
 
         Decidim::Proposals::ProposalNote.create!(
-          proposal: proposal,
+          proposal:,
           author: author_admin,
           body: Faker::Lorem.paragraphs(number: 2).join("\n")
         )
@@ -435,12 +435,12 @@ Decidim.register_component(:reporting_proposals) do |component|
 
       draft = Decidim.traceability.perform_action!("create", Decidim::Proposals::CollaborativeDraft, author) do
         draft = Decidim::Proposals::CollaborativeDraft.new(
-          component: component,
+          component:,
           category: participatory_space.categories.sample,
           scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
           title: Faker::Lorem.sentence(word_count: 2),
           body: Faker::Lorem.paragraphs(number: 2).join("\n"),
-          state: state,
+          state:,
           published_at: Time.current
         )
         draft.coauthorships.build(author: participatory_space.organization)
@@ -471,7 +471,7 @@ Decidim.register_component(:reporting_proposals) do |component|
     Decidim.traceability.update!(
       Decidim::Proposals::CollaborativeDraft.all.sample,
       Decidim::User.where(organization: component.organization).all.sample,
-      component: component,
+      component:,
       category: participatory_space.categories.sample,
       scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
       title: Faker::Lorem.sentence(word_count: 2),