decidim-core 0.23.1 → 0.24.0.rc2

data/app/cells/decidim/flag_modal/show.erb

@@ -0,0 +1,24 @@
+<div class="reveal flag-modal" id="<%= modal_id %>" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t("decidim.shared.flag_modal.title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_modal.close") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <% if model.reported_by? current_user %>
+    <p><%= t("decidim.shared.flag_modal.already_reported") %></p>
+  <% else %>
+    <p><%= t("decidim.shared.flag_modal.description") %></p>
+    <%= decidim_form_for report_form, url: decidim.report_path(sgid: model.to_sgid.to_s), method: :post, html: { id: nil } do |f| %>
+      <%= f.collection_radio_buttons :reason, [
+        [:spam, t("decidim.shared.flag_modal.spam")],
+        [:offensive, t("decidim.shared.flag_modal.offensive")],
+        [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
+      ], :first, :last do |builder| %>
+        <%= builder.label { builder.radio_button(id: nil) + builder.text } %>
+      <% end %>
+      <%= f.text_area :details, rows: 4, id: nil %>
+      <%= f.submit t("decidim.shared.flag_modal.report") %>
+    <% end %>
+  <% end %>
+</div>

data/app/cells/decidim/flag_modal_cell.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  class FlagModalCell < Decidim::ViewModel
+    include ActionView::Helpers::FormOptionsHelper
+
+    def flag_user
+      render
+    end
+
+    private
+
+    def user_report_form
+      Decidim::ReportForm.from_params(reason: "spam")
+    end
+
+    def modal_id
+      options[:modal_id] || "flagModal"
+    end
+
+    def report_form
+      @report_form ||= Decidim::ReportForm.new(reason: "spam")
+    end
+  end
+end

data/app/cells/decidim/profile/inaccessible.erb

@@ -0,0 +1,9 @@
+<div class="wrapper">
+  <div class="row">
+    <h1 class="heading1 page-title">
+      <div class="text-center">
+        <p><%= t("decidim.profile.inaccessible_message") %></p>
+      </div>
+    </h1>
+  </div>
+</div>

data/app/cells/decidim/profile_cell.rb

@@ -11,7 +11,11 @@ module Decidim
     delegate :current_organization, :current_user, :user_groups_enabled?, to: :controller
 
     def show
-      render :show
+      if profile_holder.blocked? && current_user_logged_in?
+        render :inaccessible
+      else
+        render :show
+      end
     end
 
     def profile_holder
@@ -26,6 +30,10 @@ module Decidim
       context[:active_content]
     end
 
+    def current_user_logged_in?
+      current_user && !current_user.admin?
+    end
+
     def own_profile?
       current_user && current_user == profile_holder
     end

data/app/cells/decidim/profile_sidebar/show.erb

@@ -3,7 +3,16 @@
   <div class="card__content">
     <h1 class="profile--sidebar--title">
       <strong><%= profile_user.name %></strong>
-      <span class="text-small"><%= profile_user.nickname %></span>
+      <br>
+      <span class="text-small">
+        <%= profile_user.nickname %> <br>
+      </span>
+      <% if user_flaggable? %>
+        <span class="user-report_link">
+          <%== cell("decidim/author", profile_user, from:profile_user).flag_user %>
+        </span>
+        &nbsp;
+      <% end %>
       <% if can_contact_user? %>
         <span class="user-contact_link">
           <%= link_to_current_or_new_conversation_with(profile_holder) %>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -7,6 +7,7 @@ module Decidim
     include Decidim::ViewHooksHelper
     include Decidim::ApplicationHelper
     include Decidim::SanitizeHelper
+    include Decidim::CellsHelper
 
     helper_method :profile_user, :logged_in?, :current_user
 

data/app/cells/decidim/reported_content/show.erb

@@ -0,0 +1,5 @@
+<blockquote>
+  <% model.reported_attributes.each do |attribute_name| %>
+    <p><%= render_value(model.attributes.with_indifferent_access[attribute_name]) %></p>
+  <% end %>
+</blockquote>

data/app/cells/decidim/reported_content_cell.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a specific cells for the resource if it was configured
+  # in the component's manifest or a default cell.
+  class ReportedContentCell < Decidim::ViewModel
+    def show
+      if resource_cell?
+        cell(resource_cell, model, options)
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def render_value(value)
+      content = I18n.with_locale(options.fetch(:locale, I18n.locale)) do
+        if value.is_a? Hash
+          translated_attribute(value)
+        else
+          value
+        end
+      end
+      simple_format(content, sanitize: true)
+    end
+
+    def resource_cell?
+      resource_cell.present?
+    end
+
+    def resource_cell
+      @resource_cell ||= resource_reported_content
+    end
+
+    def resource_reported_content
+      resource_manifest&.reported_content_cell.presence
+    end
+
+    def resource_manifest
+      model.try(:resource_manifest) || Decidim.find_resource_manifest(model.class)
+    end
+  end
+end

data/app/cells/decidim/scopes_picker/scope_picker_prompt.erb

@@ -0,0 +1,3 @@
+<div class="picker-prompt">
+  <%= link_to prompt_params[:text], prompt_params[:url], role: "button", aria_label: t("decidim.scopes.scopes_picker_input.select_scope", current: prompt_params[:text]) %>
+</div>

data/app/cells/decidim/scopes_picker/scope_picker_values.erb

@@ -0,0 +1,5 @@
+<div class="picker-values">
+  <%- scopes.each do |scope, params| %>
+    <div><%= link_to params[:text], params[:url], data: { picker_value: scope.id } %></div>
+  <% end %>
+</div>

data/app/cells/decidim/scopes_picker/show.erb

@@ -0,0 +1,14 @@
+<div class="filters__section scope_id_scopes_picker_filter">
+  <fieldset>
+    <legend class="mini-title"><%= legend_title %></legend>
+    <div id="<%= picker_options_id %>" class="data-picker <%= picker_options_class %>" data-picker-name="<%= picker_options_name %>">
+      <% if values_on_top? %>
+        <%= render :scope_picker_values %>
+        <%= render :scope_picker_prompt %>
+      <% else %>
+        <%= render :scope_picker_prompt %>
+        <%= render :scope_picker_values %>
+      <% end %>
+    </div>
+  </fieldset>
+</div>

data/app/cells/decidim/scopes_picker_cell.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to display scopes picker in a form
+  class ScopesPickerCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include ActionView::Helpers::FormOptionsHelper
+    include Decidim::FiltersHelper
+    include Decidim::ScopesHelper
+
+    def form
+      model
+    end
+
+    def checkboxes_on_top?
+      options[:checkboxes_on_top]
+    end
+
+    def multiple?
+      options[:multiple]
+    end
+
+    def values_on_top?
+      !multiple? || checkboxes_on_top?
+    end
+
+    def legend_title
+      options[:legend_title]
+    end
+
+    def label?
+      options[:label]
+    end
+
+    def scope_params(scope)
+      {
+        url: decidim.scopes_picker_path(
+          root: try(:current_participatory_space).try(:scope),
+          current: scope&.id,
+          title: I18n.t("decidim.scopes.prompt"),
+          global_value: "global",
+          max_depth: try(:current_participatory_space).try(:scope_type_max_depth)
+        ),
+        text: scope_name_for_picker(scope, I18n.t("decidim.scopes.prompt"))
+      }
+    end
+
+    def scopes
+      selected_scopes.map { |scope| [scope, scope_params(scope)] }
+    end
+
+    def prompt_params
+      scope_params(nil)
+    end
+
+    def attribute
+      options[:attribute]
+    end
+
+    def picker_options_id
+      if form.options.has_key?(:namespace)
+        "#{form.options[:namespace]}_#{sanitize_for_dom_selector(form.object_name)}"
+      else
+        "#{sanitize_for_dom_selector(form.object_name)}_#{attribute}"
+      end
+    end
+
+    def wrapper_class
+      "#{attribute}_scopes_picker_filter"
+    end
+
+    def picker_options_class
+      "picker-#{multiple? ? "multiple" : "single"}"
+    end
+
+    def picker_options_name
+      "#{form.object_name}[#{attribute}]"
+    end
+
+    def sanitize_for_dom_selector(name)
+      name.to_s.parameterize.underscore
+    end
+
+    def selected_scopes
+      selected = form.object.send(attribute) || []
+      selected = selected.values if selected.is_a?(Hash)
+      selected = [selected] unless selected.is_a?(Array)
+      selected = Decidim::Scope.where(id: selected.map(&:to_i)) unless selected.first.is_a?(Decidim::Scope)
+      selected
+    end
+  end
+end

data/app/cells/decidim/tos_page/announcement.erb

@@ -1,2 +1 @@
-<%= cell("decidim/announcement", announcement_args) %>
-<%= content_tag :div, nil, id: "sticky-top-stop" %>
+<%= cell("decidim/announcement", announcement, announcement_options) %>

data/app/cells/decidim/tos_page/form.erb

@@ -0,0 +1,19 @@
+<div class="columns small-12">
+  <div class="card">
+    <div class="card__content">
+      <div class="card__header">
+        <h5 class="card__title text-center">
+          <%= t("form.legend", scope: "decidim.pages.terms_and_conditions") %>
+        </h5>
+      </div>
+
+      <div class="row column flex-center">
+        <%= cell "decidim/tos_page", :refuse_btn_modal %>
+
+        <%= button_to decidim.accept_tos_path, method: :put, class: "button button--nomargin small" do %>
+          <%= t("form.agreement", scope: "decidim.pages.terms_and_conditions") %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/tos_page_cell.rb

@@ -22,15 +22,17 @@ module Decidim
 
     private
 
-    def announcement_args
-      args = {
-        callout_class: "warning",
-        announcement: {
-          title: t("required_review.title", scope: "decidim.pages.terms_and_conditions"),
-          body: t("required_review.body", scope: "decidim.pages.terms_and_conditions")
-        }
+    def announcement
+      {
+        title: t("required_review.title", scope: "decidim.pages.terms_and_conditions"),
+        body: t("required_review.body", scope: "decidim.pages.terms_and_conditions")
+      }
+    end
+
+    def announcement_options
+      {
+        callout_class: "warning"
       }
-      args
     end
   end
 end

data/app/cells/decidim/translation_bar_cell.rb

@@ -28,7 +28,7 @@ module Decidim
                   elsif query.nil?
                     new_query_params
                   else
-                    query + "&" + new_query_params
+                    "#{query}&#{new_query_params}"
                   end
 
       parsed_url.query = new_query

data/app/cells/decidim/user_conversation/conversation_header.erb

@@ -4,7 +4,7 @@
       <%= icon "chevron-left", role: "img" %>
     <% end %>
   </div>
-  <%= link_to decidim.profile_conversations_path(nickname: user.nickname) do %>
+  <%= link_to profile_path(user.nickname) do %>
     <%= image_tag conversation_avatar, alt: t("decidim.author.avatar") %>
   <% end %>
 

data/app/cells/decidim/user_conversations_cell.rb

@@ -32,7 +32,7 @@ module Decidim
     end
 
     def conversation_interlocutors(conversation)
-      return username_list(conversation.interlocutors(user), true) unless conversation.interlocutors(user).count == 1
+      return username_list(conversation.interlocutors(user), shorten: true) unless conversation.interlocutors(user).count == 1
 
       "#{conversation.interlocutors(user).first.name} <span class=\"muted\">@#{conversation.interlocutors(user).first.nickname}</span>"
     end

data/app/commands/decidim/attachment_methods.rb

@@ -16,6 +16,10 @@ module Decidim
       )
     end
 
+    def delete_attachment(attachment)
+      Attachment.find(attachment.id).delete if attachment.id == proposal.documents.first.id
+    end
+
     def attachment_invalid?
       if attachment.invalid? && attachment.errors.has_key?(:file)
         @form.attachment.errors.add :file, attachment.errors[:file]
@@ -43,5 +47,9 @@ module Decidim
     def process_attachments?
       attachments_allowed? && attachment_present? && attachment_file_uploaded?
     end
+
+    def delete_attachment?
+      @form.attachment&.delete_file.present?
+    end
   end
 end

data/app/commands/decidim/create_report.rb

@@ -25,6 +25,7 @@ module Decidim
 
       transaction do
         find_or_create_moderation!
+        update_reported_content!
         create_report!
         update_report_count!
       end
@@ -47,12 +48,17 @@ module Decidim
       @moderation = Moderation.find_or_create_by!(reportable: @reportable, participatory_space: participatory_space)
     end
 
+    def update_reported_content!
+      @moderation.update!(reported_content: @reportable.reported_searchable_content_text)
+    end
+
     def create_report!
       @report = Report.create!(
         moderation: @moderation,
         user: @current_user,
         reason: form.reason,
-        details: form.details
+        details: form.details,
+        locale: I18n.locale
       )
     end
 
@@ -66,6 +72,8 @@ module Decidim
 
     def send_report_notification_to_moderators
       participatory_space_moderators.each do |moderator|
+        next unless moderator.email_on_moderations
+
         ReportedMailer.report(moderator, @report).deliver_later
       end
     end
@@ -80,6 +88,8 @@ module Decidim
 
     def send_hide_notification_to_moderators
       participatory_space_moderators.each do |moderator|
+        next unless moderator.email_on_moderations
+
         ReportedMailer.hide(moderator, @report).deliver_later
       end
     end

data/app/commands/decidim/create_user_report.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A command with all the business logic when a user creates a report.
+  class CreateUserReport < Rectify::Command
+    # Public: Initializes the command.
+    #
+    # form         - A form object with the params.
+    # reportable   - The resource being reported
+    # current_user - The current user.
+    def initialize(form, reportable, current_user)
+      @form = form
+      @reportable = reportable
+      @current_user = current_user
+    end
+
+    # Executes the command. Broadcasts these events:
+    #
+    # - :ok when everything is valid, together with the report.
+    # - :invalid if the form wasn't valid and we couldn't proceed.
+    #
+    # Returns nothing.
+    def call
+      return broadcast(:invalid) if form.invalid?
+
+      transaction do
+        find_or_create_moderation!
+        create_report!
+        update_report_count!
+        send_notification_to_admins!
+      end
+
+      broadcast(:ok, report)
+    end
+
+    private
+
+    attr_reader :form, :report
+
+    def find_or_create_moderation!
+      @moderation = UserModeration.find_or_create_by!(user: @reportable)
+    end
+
+    def create_report!
+      @report = UserReport.create!(
+        moderation: @moderation,
+        user: @current_user,
+        reason: form.reason,
+        details: form.details
+      )
+    end
+
+    def update_report_count!
+      @moderation.update!(report_count: @moderation.report_count + 1)
+    end
+
+    def send_notification_to_admins!
+      current_organization.admins.each do |admin|
+        Decidim::UserReportJob.perform_later(admin, current_user, form.reason, reportable)
+      end
+    end
+
+    def hideable?
+      false
+    end
+  end
+end