decidim-debates 0.21.0 → 0.23.2

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">
@@ -30,7 +30,7 @@
     </div>
 
     <div class="row column">
-      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
+      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
     </div>
   </div>
 </div>

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

@@ -1,20 +1,34 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "debates" } %>
+
 <%= filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
-            <%= icon "magnifying-glass", aria_label: t(".search") %>
+          <button type="submit" class="button" aria-controls="debates">
+            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
           </button>
         </div>
       </div>
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :origin, [["all", t(".all")], ["official", t(".official")], ["citizens", t(".citizens")]], :first, :last, legend_title: t(".origin") %>
+  <%= form.check_boxes_tree :state, filter_debates_state_values, legend_title: t(".state"), "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_component.categories.any? %>
-    <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
+  <% 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,24 @@
+<div class="row columns">
+  <div class="m-bottom">
+    <%= link_to :back, class: "muted-link" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img" %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
+  <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>

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

@@ -2,16 +2,15 @@
 
 <div class="row columns">
   <div class="title-action">
-    <h2 id="debates-count" class="title-action__title section-heading">
+    <h3 id="debates-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h2>
+    </h3>
     <% if current_settings.creation_enabled? && current_component.participatory_space.can_participate?(current_user) %>
       <%= action_authorized_link_to :create, new_debate_path, class: "title-action__action button small", data: { "redirect_url" => new_debate_path } do %>
         <%= t(".new_debate") %>
-        <%= icon "plus" %>
+        <%= icon "plus", role: "img", "aria-hidden": true %>
       <% end %>
     <% end %>
-    </a>
   </div>
 </div>
 <div class="row">
@@ -21,7 +20,7 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="debates" class="columns mediumlarge-8 large-9">
+  <div id="debates" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "debates" %>
   </div>
 </div>

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

@@ -1,8 +1,10 @@
 <div class="row columns">
-  <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
-    <%= t(".back") %>
-  <% end %>
+  <div class="m-bottom">
+    <%= link_to :back, class: "muted-link" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
   <h2 class="section-heading"><%= t(".title") %></h2>
 </div>
 
@@ -11,26 +13,7 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>
-          <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, prompt: t(".select_a_category"), disable_parents: false %>
-            </div>
-          <% end %>
-
-          <% if 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 %>
-
+          <%= render partial: "form", locals: { form: form } %>
           <div class="actions">
             <%= form.submit t(".create"), class: "button expanded", data: { disable: true } %>
           </div>
@@ -39,5 +22,3 @@
     </div>
   </div>
 </div>
-
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>

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

@@ -14,16 +14,35 @@ edit_link(
 %>
 
 <div class="row column view-header">
-  <h2 class="heading2">
-    <%== present(debate).title %>
-  </h2>
+  <div class="m-bottom">
+    <%= link_to debates_path(filter_link_params), class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
 
-  <%= cell "decidim/author", Decidim::Debates::DebatePresenter.new(debate).author, context: { extra_classes: ["author-data--small"] } %>
+  <h2 class="heading3">
+    <%== present(debate).title(links: true) %>
+  </h2>
 
+  <% debate_presenter = Decidim::Debates::DebatePresenter.new(debate) %>
+  <%= cell "decidim/author", debate_presenter.author, from: debate, context: { extra_classes: ["author-data--small"] } %>
 </div>
 <div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8
-    large-3 large-push-9">
+  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+    <% if allowed_to?(:edit, :debate, debate: debate) %>
+      <%= link_to t(".edit_debate"), edit_debate_path(debate), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
+    <% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
+      <%= link_to t(".edit_debate"), resource_locator(debate).edit, class: "button secondary hollow expanded button-sc button--icon follow-button" %>
+    <% end %>
+    <% close_debate_action_text = (debate.closed? ? ".edit_conclusions" : ".close_debate" ) %>
+    <% if allowed_to?(:close, :debate, debate: debate) %>
+      <button type="button" data-open="closeDebateModal" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="true" tabindex="0" class="button hollow expanded button-sc button--icon follow-button">
+        <%= t(close_debate_action_text) %>
+      </button>
+    <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
+      <%= link_to t(close_debate_action_text), Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "button hollow expanded button-sc button--icon follow-button" %>
+    <% end %>
     <div class="card extra">
       <div class="card__content">
         <% if debate.start_time.present? && debate.end_time.present? %>
@@ -34,23 +53,74 @@ edit_link(
             <%= l debate.start_time, format: "%H:%M" %> - <%= l debate.end_time, format: "%H:%M" %>
           </div>
         <% end %>
-        <%= render partial: "decidim/shared/follow_button", locals: { followable: debate, large: false } %>
+
+        <% if endorsements_enabled? && allowed_to?(:endorse, :debate, debate: debate) %>
+          <div class="row collapse buttons__row">
+            <div class="column small-12 collapse">
+              <%= endorsement_buttons_cell(debate) %>
+            </div>
+          </div>
+        <% end %>
+        <%= follow_button_for(debate) %>
+      </div>
+    </div>
+    <div class="card extra">
+      <div class="definition-data">
+        <div class="definition-data__item definition-data__item">
+          <span class="definition-data__title">
+            <%= t ".last_comment_by" %>
+          </span>
+          <span class="definition-data__text">
+            <% if debate_presenter.last_comment_by %>
+              <%= cell "decidim/author", debate_presenter.last_comment_by, context: { extra_classes: ["author-data--small"] } %>
+            <% else %>
+              <%= t ".no_comments_yet" %>
+            <% end %>
+          </span>
+        </div>
+
+        <div class="definition-data__item definition-data__item--double">
+          <span class="definition-data__title">
+            <%= t ".participants_count" %>
+          </span>
+          <span class="definition-data__number"><%= debate_presenter.participants_count %></span>
+        </div>
+
+        <div class="definition-data__item definition-data__item--double">
+          <span class="definition-data__title">
+            <%= t ".groups_count" %>
+          </span>
+          <span class="definition-data__number"><%= debate_presenter.groups_count %></span>
+        </div>
       </div>
     </div>
     <%= resource_reference(debate) %>
+    <%= resource_version(debate_presenter, versions_path: debate_versions_path(debate)) %>
     <%= render partial: "decidim/shared/share_modal" %>
+    <%= embed_modal_for debate_widget_url(debate, format: :js) %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
+      <% if debate.closed? %>
+        <span class="success label proposal-status">
+          <%= t(".debate_closed") %>
+        </span>
+      <% end %>
+
       <%= render_debate_description(debate) %>
+
+      <% if debate.closed? %>
+        <%= cell("decidim/announcement", { announcement: { title: t(".debate_conclusions_are", date: l(debate.closed_at, format: :decidim_short)), body: simple_format(translated_attribute(debate.conclusions)) }, callout_class: "success" }) %>
+      <% end %>
+
       <% if translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
-          <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions))) %>
+          <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if translated_attribute(debate.information_updates).present? %>
         <div class="callout success">
-          <%= simple_format(translated_attribute(debate.information_updates)) %>
+          <%= decidim_sanitize(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if debate.category %>
@@ -58,6 +128,8 @@ edit_link(
           <li><%= link_to translated_attribute(debate.category.name), debates_path(filter: { category_id: debate.category.id }) %></li>
         </ul>
       <% end %>
+
+      <%= cell "decidim/endorsers_list", debate %>
     </div>
   </div>
 </div>
@@ -71,3 +143,9 @@ edit_link(
     url: decidim.report_path(sgid: debate.to_sgid.to_s)
   }
 %>
+<%=
+  render partial: "close_debate_modal", locals: {
+    debate: debate,
+    form: close_debate_form
+  }
+%>