decidim-debates 0.22.0 → 0.23.0

data/app/presenters/decidim/debates/admin_log/debate_presenter.rb

@@ -15,14 +15,18 @@ module Decidim
       class DebatePresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Debates::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
-            description: :i18n,
+            description: "Decidim::Debates::AdminLog::ValueTypes::DebateTitleDescriptionPresenter",
             end_date: :date,
             information_updates: :i18n,
             instructions: :i18n,
             start_date: :date,
-            title: :i18n
+            title: "Decidim::Debates::AdminLog::ValueTypes::DebateTitleDescriptionPresenter"
           }
         end
 

data/app/presenters/decidim/debates/admin_log/value_types/debate_title_description_presenter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module AdminLog
+      module ValueTypes
+        # This class presents the given value as a Decidim::Debates::DebateTitleBody. Check
+        # the `DefaultPresenter` for more info on how value presenters work.
+        class DebateTitleDescriptionPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          def present
+            return unless value
+
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.translated_attribute(value))
+            renderer.render(links: false).html_safe
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/debates/debate_presenter.rb

@@ -6,8 +6,11 @@ module Decidim
     # Decorator for debates
     #
     class DebatePresenter < SimpleDelegator
+      include Decidim::TranslationsHelper
+      include Decidim::ResourceHelper
       include Decidim::SanitizeHelper
       include Decidim::TranslatableAttributes
+      include ActionView::Helpers::DateHelper
 
       def debate
         __getobj__
@@ -23,15 +26,67 @@ module Decidim
                     end
       end
 
-      def title
-        content = translated_attribute(debate.title)
-        decidim_html_escape(content)
+      def title(links: false, all_locales: false)
+        return unless debate
+
+        handle_locales(debate.title, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
+          renderer.render(links: links).html_safe
+        end
+      end
+
+      def description(strip_tags: false, links: false, all_locales: false)
+        return unless debate
+
+        handle_locales(debate.description, all_locales) do |content|
+          content = strip_tags(content) if strip_tags
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          content = renderer.render(links: links).html_safe
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
+          content
+        end
+      end
+
+      def handle_locales(content, all_locales, &block)
+        if all_locales
+          content.each_with_object({}) do |(key, value), parsed_content|
+            parsed_content[key] = if key == "machine_translations"
+                                    handle_locales(value, all_locales, &block)
+                                  else
+                                    block.call(value)
+                                  end
+          end
+        else
+          yield(translated_attribute(content))
+        end
+      end
+
+      def last_comment_at
+        return unless debate.last_comment_at
+
+        time_ago_in_words(debate.last_comment_at)
+      end
+
+      def last_comment_by
+        debate.last_comment_by&.presenter
+      end
+
+      def participants_count
+        comments_authors.count do |author|
+          author.is_a?(Decidim::User)
+        end
+      end
+
+      def groups_count
+        comments_authors.count do |author|
+          author.is_a?(Decidim::UserGroup)
+        end
       end
 
-      def description(strip_tags: false)
-        content = translated_attribute(debate.description)
-        content = strip_tags(content) if strip_tags
-        content
+      private
+
+      def comments_authors
+        @comments_authors ||= debate.comments.includes(:author, :user_group).map(&:normalized_author).uniq
       end
     end
   end

data/app/presenters/decidim/debates/log/resource_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          Decidim::Debates::DebatePresenter.new(resource).title
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/debates/official_author_presenter.rb

@@ -5,38 +5,10 @@ module Decidim
     #
     # A dummy presenter to abstract out the author of an official debate.
     #
-    class OfficialAuthorPresenter
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
       def name
         I18n.t("decidim.debates.models.debate.fields.official_debate")
       end
-
-      def nickname
-        ""
-      end
-
-      def badge
-        ""
-      end
-
-      def profile_path
-        ""
-      end
-
-      def avatar_url
-        ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
-      end
-
-      def deleted?
-        false
-      end
-
-      def can_be_contacted?
-        false
-      end
-
-      def has_tooltip?
-        false
-      end
     end
   end
 end

data/app/services/decidim/debates/debate_search.rb

@@ -6,41 +6,31 @@ module Decidim
     # `current_component` param with a `Decidim::Component` in order to
     # find the debates.
     class DebateSearch < ResourceSearch
+      text_search_fields :title, :description
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the debates from.
       # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
+      # per_page    - The number of debates to return per page.
       def initialize(options = {})
         super(Debate.not_hidden, options)
       end
 
-      # Handle the search_text filter. We have to cast the JSONB columns
-      # into a `text` type so that we can search.
-      def search_search_text
-        query
-          .where("decidim_debates_debates.title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("decidim_debates_debates.description::text ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the origin filter
-      def search_origin
-        if origin == "official"
-          query.where(author: component.organization)
-        elsif origin == "citizens"
-          query.where.not(decidim_author_type: "Decidim::Organization")
+      # Handle the activity filter
+      def search_activity
+        case activity
+        when "commented"
+          query.commented_by(user)
+        when "my_debates"
+          query.authored_by(user)
         else # Assume 'all'
           query
         end
       end
 
-      def search_order_start_time
-        if order_start_time == "asc"
-          query.order("start_time ASC")
-        elsif order_start_time == "desc"
-          query.order("start_time DESC")
-        else
-          query.order("start_time ASC")
-        end
+      # Handle the state filter
+      def search_state
+        apply_scopes(%w(open closed), state)
       end
     end
   end

data/app/services/decidim/debates/diff_renderer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    class DiffRenderer < BaseDiffRenderer
+      private
+
+      # Lists which attributes will be diffable and how they should be rendered.
+      def attribute_types
+        {
+          title: :i18n,
+          description: :i18n,
+          information_updates: :i18n,
+          instructions: :i18n,
+          start_time: :string,
+          end_time: :string,
+          conclusions: :i18n,
+          closed_at: :string
+        }
+      end
+
+      def debate
+        @debate ||= Debate.find_by(id: version.item_id)
+      end
+    end
+  end
+end

data/app/views/decidim/debates/admin/debate_closes/edit.html.erb

@@ -0,0 +1,17 @@
+<%= decidim_form_for(@form, url: debate_debate_close_path(debate, @form), html: { class: "form edit_close_debate" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t(".title") %></h2>
+    </div>
+
+    <div class="card-section">
+      <div class="row column">
+        <%= f.translated :editor, :conclusions, autofocus: true, rows: 15 %>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".close") %>
+  </div>
+<% end %>

data/app/views/decidim/debates/admin/debates/_form.html.erb

@@ -4,12 +4,12 @@
   </div>
 
   <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+     <div class="row column hashtags__container">
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
+     <div class="row column hashtags__container">
+      <%= form.translated :editor, :description, hashtaggable: true %>
     </div>
 
     <div class="row column">

data/app/views/decidim/debates/admin/debates/index.html.erb

@@ -15,6 +15,7 @@
             <th><%= t("models.debate.fields.title", scope: "decidim.debates") %></th>
             <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
             <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
+            <%= th_resource_scope_label %>
             <th class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
           </tr>
         </thead>
@@ -22,7 +23,7 @@
           <% debates.each do |debate| %>
             <tr data-id="<%= debate.id %>">
               <td>
-                <%= link_to translated_attribute(debate.title), resource_locator(debate).path, target: :blank %><br>
+                <%= link_to present(debate).title, resource_locator(debate).path, target: :blank %><br>
               </td>
               <td>
                 <% if debate.start_time %>
@@ -34,11 +35,16 @@
                   <%= l debate.end_time, format: :long %>
                 <% end %>
               </td>
+              <%= td_resource_scope_for(debate.scope) %>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :debate, debate: debate %>
                   <%= icon_link_to "pencil", edit_debate_path(debate), t("actions.edit", scope: "decidim.debates"), class: "action-icon--edit" %>
                 <% end %>
 
+                <% if allowed_to? :close, :debate, debate: debate %>
+                  <%= icon_link_to "lock-locked", edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), t("actions.close", scope: "decidim.debates"), class: "action-icon--close" %>
+                <% end %>
+
                 <% if allowed_to? :delete, :debate, debate: debate %>
                   <%= icon_link_to "circle-x", debate_path(debate), t("actions.destroy", scope: "decidim.debates"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.debates") } %>
                 <% end %>

data/app/views/decidim/debates/debates/_close_debate_modal.html.erb

@@ -0,0 +1,13 @@
+<div class="reveal close-debate-modal" id="closeDebateModal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t("decidim.debates.debates.show.close_debate") %></h3>
+    <button class="close-button" data-close aria-label="<%= t(".close") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <p><%= t(".description") %></p>
+  <%= decidim_form_for form, url: close_debate_path(debate), method: :post do |f| %>
+    <%= f.text_area :conclusions, rows: 10 %>
+    <%= f.submit t(".send") %>
+  <% end %>
+</div>

data/app/views/decidim/debates/debates/_debates.html.erb

@@ -1,4 +1,11 @@
+<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
+  <div class="column">
+    <%= order_selector available_orders, i18n_scope: "decidim.debates.debates.orders" %>
+  </div>
+</div>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render paginated_debates %>
 </div>
+
 <%= decidim_paginate paginated_debates %>

data/app/views/decidim/debates/debates/_filters.html.erb

@@ -14,19 +14,21 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :origin, [["all", t(".all")], ["official", t(".official")], ["citizens", t(".citizens")]], :first, :last, { legend_title: t(".origin") }, "aria-controls": "debates" %>
+  <%= form.check_boxes_tree :state, filter_debates_state_values, legend_title: t(".state"), "aria-controls": "debates" %>
 
-  <% if current_component.categories.any? %>
-    <%= form.categories_select :category_id,
-                               current_component.categories,
-                               {
-                                 legend_title: t(".category"),
-                                 disable_parents: false,
-                                 label: "",
-                                 include_blank: t(".category_prompt"),
-                                 aria_label: t(".category")
-                               },
-                               "aria-label": t(".category"),
-                               "aria-controls": "debates" %>
+  <% if current_participatory_space.has_subscopes? %>
+    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "debates" %>
   <% end %>
+
+  <% if current_participatory_space.categories.any? %>
+    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "debates" %>
+  <% end %>
+
+  <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "debates" %>
+
+  <% if current_user %>
+    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "debates" %>
+  <% end %>
+
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

data/app/views/decidim/debates/debates/_form.html.erb

@@ -0,0 +1,19 @@
+<div class="field">
+  <%= form.text_field :title %>
+</div>
+
+<div class="field">
+  <%= text_editor_for_debate_description(form) %>
+</div>
+
+<% if current_participatory_space.categories&.any? %>
+  <div class="field">
+    <%= form.categories_select :category_id, current_participatory_space.categories, include_blank: t(".select_a_category"), disable_parents: false %>
+  </div>
+<% end %>
+
+<% if @form.id.blank? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+  <div class="field">
+    <%= form.select :user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
+  </div>
+<% end %>

data/app/views/decidim/debates/debates/edit.html.erb

@@ -0,0 +1,22 @@
+<div class="row columns">
+  <%= link_to :back, class: "muted-link" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img" %>
+    <%= t(".back") %>
+  <% end %>
+  <h2 class="section-heading"><%= t(".title") %></h2>
+</div>
+
+<div class="row">
+  <div class="columns large-6 medium-centered">
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for(@form) do |form| %>
+          <%= render partial: "form", locals: { form: form } %>
+          <div class="actions">
+            <%= form.submit t(".save"), class: "button expanded", data: { disable: true } %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>