decidim-debates 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc30c91b8b1754325501a2d193748df71ddf35344a6162a56784189faf5e37b
-  data.tar.gz: 1baf08c4025770f4d6bfce209a279ea90312d05118857b8b96d61c6eb8c0416f
+  metadata.gz: 664bbd747df385c87e046c4563b78d9c029958d5b38103f2155cea6a59f86599
+  data.tar.gz: 7b75cd3c7f303891fa3ba81d2f4e88c666cbc8f5adc19e8698eb4d0af92d74e4
 SHA512:
-  metadata.gz: 56c4b2858559a7a96eb0fbfd727b9c352ec109083255f403f4433752372d71a60843f558e98fa3bc47fed4427aa27c70fcb986bdcdcd11ffebf07238ae54c613
-  data.tar.gz: e2dc00d6efd0687e86a44119c35d28e1e14c08eca9a1062762d0681e5e238bc4b6af8944f1e66a2c0dc93ade4aa007207f1623199930567ec986e9b2d8eca1d0
+  metadata.gz: c96e12f56d599d9f9bf08bdec070277fa38861e46e6ba53baa4dd4bd0686a74acf773c308ccfac2681354a50a2bf3db5ac2e70a0cf3c18a55694d3154db1e42e
+  data.tar.gz: 1a3799201411f850752960df69a95b82d7fa142e80af78525ae23d85fda90aefb56a604d56ed278aa966c3db0ff1f8291cec153e8f6fce93c5d00a602b49a454

data/app/cells/decidim/debates/debate_activity_cell.rb

@@ -10,6 +10,10 @@ module Decidim
           link: participatory_space_link
         )
       end
+
+      def resource_link_text
+        Decidim::Debates::DebatePresenter.new(resource).title
+      end
     end
   end
 end

data/app/cells/decidim/debates/debate_m/data.erb

@@ -1,8 +1,10 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.debates.debates.show.date") %>
-    </li>
-    <%= debate_date %>
-  </ul>
-</div>
+<% if debate_date.present? %>
+  <div class="card__icondata">
+    <ul class="card-data">
+      <li class="card-data__item">
+        <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.debates.debates.show.date") %>
+      </li>
+      <%= debate_date %>
+    </ul>
+  </div>
+<% end %>

data/app/cells/decidim/debates/debate_m/footer.erb

@@ -1,5 +1,10 @@
 <div class="card__footer">
   <div class="card__support">
+    <% if presenter.last_comment_by %>
+      <% author = presenter.last_comment_by %>
+      <%= cell "decidim/author", author, from: model, author_name_text: t(".commented_time_ago", time: presenter.last_comment_at), context: { extra_classes: ["author-data--small"] } %>
+    <% end %>
+
     <%= link_to t("participate", scope: "decidim.debates.debates.debate"), resource_path, class: "card__button button button--sc small" %>
   </div>
 </div>

data/app/cells/decidim/debates/debate_m_cell.rb

@@ -11,14 +11,36 @@ module Decidim
         render
       end
 
+      def has_state?
+        model.closed?
+      end
+
+      def badge_name
+        I18n.t("decidim.debates.debates.closed") if model.closed?
+      end
+
+      def state_classes
+        return ["muted"] if model.closed?
+
+        super
+      end
+
+      def presenter
+        present(model)
+      end
+
       private
 
       def title
-        present(model).title
+        presenter.title
+      end
+
+      def body
+        decidim_sanitize(present(model).description)
       end
 
       def description
-        present(model).description(strip_tags: true)
+        strip_tags(body).truncate(200, separator: /\s/)
       end
 
       def resource_icon

data/app/commands/decidim/debates/admin/close_debate.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module Admin
+      # A command with all the business logic when an admin closes a debate.
+      class CloseDebate < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form         - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid, together with the debate.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          close_debate
+          broadcast(:ok, debate)
+        end
+
+        private
+
+        attr_reader :form
+
+        def close_debate
+          @debate = Decidim.traceability.perform_action!(
+            :close,
+            form.debate,
+            form.current_user
+          ) do
+            form.debate.update!(
+              conclusions: form.conclusions,
+              closed_at: form.closed_at
+            )
+          end
+
+          Decidim::EventsManager.publish(
+            event: "decidim.events.debates.debate_closed",
+            event_class: Decidim::Debates::CloseDebateEvent,
+            resource: debate,
+            followers: debate.followers
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/debates/admin/create_debate.rb

@@ -28,10 +28,12 @@ module Decidim
         attr_reader :debate, :form
 
         def create_debate
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
           params = {
             category: form.category,
-            title: form.title,
-            description: form.description,
+            title: parsed_title,
+            description: parsed_description,
             information_updates: form.information_updates,
             instructions: form.instructions,
             end_time: form.end_time,

data/app/commands/decidim/debates/admin/update_debate.rb

@@ -30,12 +30,15 @@ module Decidim
         attr_reader :debate, :form
 
         def update_debate
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+
           Decidim.traceability.update!(
             debate,
             form.current_user,
             category: form.category,
-            title: form.title,
-            description: form.description,
+            title: parsed_title,
+            description: parsed_description,
             information_updates: form.information_updates,
             instructions: form.instructions,
             end_time: form.end_time,

data/app/commands/decidim/debates/close_debate.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # A command with all the business logic when a user updates a debate.
+    class CloseDebate < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the debate.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        close_debate
+        broadcast(:ok, debate)
+      end
+
+      private
+
+      attr_reader :form
+
+      def close_debate
+        @debate = Decidim.traceability.perform_action!(
+          :close,
+          form.debate,
+          form.current_user
+        ) do
+          form.debate.update!(attributes)
+        end
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.debates.debate_closed",
+          event_class: Decidim::Debates::CloseDebateEvent,
+          resource: debate,
+          followers: debate.followers
+        )
+      end
+
+      def attributes
+        {
+          conclusions: {
+            I18n.locale => form.conclusions
+          },
+          closed_at: form.closed_at
+        }
+      end
+    end
+  end
+end

data/app/commands/decidim/debates/create_debate.rb

@@ -20,6 +20,8 @@ module Decidim
           send_notification_to_author_followers
           send_notification_to_space_followers
         end
+
+        follow_debate
         broadcast(:ok, debate)
       end
 
@@ -27,23 +29,19 @@ module Decidim
 
       attr_reader :debate, :form
 
-      def organization
-        @organization = form.current_component.organization
-      end
-
-      def i18n_field(field)
-        organization.available_locales.inject({}) do |i18n, locale|
-          i18n.update(locale => field)
-        end
-      end
-
       def create_debate
+        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
         params = {
           author: form.current_user,
           decidim_user_group_id: form.user_group_id,
           category: form.category,
-          title: i18n_field(form.title),
-          description: i18n_field(form.description),
+          title: {
+            I18n.locale => parsed_title
+          },
+          description: {
+            I18n.locale => parsed_description
+          },
           component: form.current_component
         }
 
@@ -78,6 +76,13 @@ module Decidim
           }
         )
       end
+
+      def follow_debate
+        follow_form = Decidim::FollowForm
+                      .from_params(followable_gid: debate.to_signed_global_id.to_s)
+                      .with_context(current_user: debate.author)
+        Decidim::CreateFollow.call(follow_form, debate.author)
+      end
     end
   end
 end

data/app/commands/decidim/debates/update_debate.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # A command with all the business logic when a user updates a debate.
+    class UpdateDebate < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      def initialize(form)
+        @form = form
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the debate.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        return broadcast(:invalid) unless form.debate.editable_by?(form.current_user)
+
+        update_debate
+        broadcast(:ok, @debate)
+      end
+
+      private
+
+      attr_reader :form
+
+      def update_debate
+        @debate = Decidim.traceability.update!(
+          @form.debate,
+          @form.current_user,
+          attributes,
+          visibility: "public-only"
+        )
+      end
+
+      def attributes
+        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        {
+          category: form.category,
+          title: {
+            I18n.locale => parsed_title
+          },
+          description: {
+            I18n.locale => parsed_description
+          }
+        }
+      end
+    end
+  end
+end

data/app/controllers/decidim/debates/admin/debate_closes_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module Admin
+      # This controller allows an admin to close debates
+      class DebateClosesController < Admin::ApplicationController
+        helper_method :debate
+
+        def edit
+          enforce_permission_to :close, :debate, debate: debate
+
+          @form = form(Admin::CloseDebateForm).from_model(debate)
+        end
+
+        def update
+          enforce_permission_to :close, :debate, debate: debate
+
+          @form = form(Admin::CloseDebateForm).from_params(params)
+          @form.debate = debate
+
+          CloseDebate.call(@form) do
+            on(:ok) do |_debate|
+              flash[:notice] = I18n.t("debates.close.success", scope: "decidim.debates")
+              redirect_to debates_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
+              render action: "edit"
+            end
+          end
+        end
+
+        private
+
+        def debate
+          @debate ||= Debate.where(component: current_component).find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/debates/admin/debates_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # This controller allows an admin to manage debates from a Participatory Space
       class DebatesController < Decidim::Debates::Admin::ApplicationController
+        helper Decidim::ApplicationHelper
+
         helper_method :debates
 
         def index
@@ -38,13 +40,13 @@ module Decidim
         def edit
           enforce_permission_to :update, :debate, debate: debate
 
-          @form = form(DebateForm).from_model(debate)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate)
         end
 
         def update
           enforce_permission_to :update, :debate, debate: debate
 
-          @form = form(DebateForm).from_params(params, current_component: current_component)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component: current_component)
 
           UpdateDebate.call(@form, debate) do
             on(:ok) do

data/app/controllers/decidim/debates/debates_controller.rb

@@ -6,11 +6,14 @@ module Decidim
     class DebatesController < Decidim::Debates::ApplicationController
       helper Decidim::ApplicationHelper
       helper Decidim::Messaging::ConversationHelper
+      helper Decidim::WidgetUrlsHelper
       include FormFactory
       include FilterResource
       include Paginable
+      include Flaggable
+      include Decidim::Debates::Orderable
 
-      helper_method :debates, :debate, :paginated_debates, :report_form
+      helper_method :debates, :debate, :form_presenter, :paginated_debates, :report_form, :close_debate_form
 
       def new
         enforce_permission_to :create, :debate
@@ -21,7 +24,7 @@ module Decidim
       def create
         enforce_permission_to :create, :debate
 
-        @form = form(DebateForm).from_params(params, current_component: current_component)
+        @form = form(DebateForm).from_params(params)
 
         CreateDebate.call(@form) do
           on(:ok) do |debate|
@@ -36,25 +39,80 @@ module Decidim
         end
       end
 
+      def show
+        raise ActionController::RoutingError, "Not Found" if debate.blank?
+      end
+
+      def edit
+        enforce_permission_to :edit, :debate, debate: debate
+
+        @form = form(DebateForm).from_model(debate)
+      end
+
+      def update
+        enforce_permission_to :edit, :debate, debate: debate
+
+        @form = form(DebateForm).from_params(params)
+        @form.debate = debate
+
+        UpdateDebate.call(@form) do
+          on(:ok) do |debate|
+            flash[:notice] = I18n.t("debates.update.success", scope: "decidim.debates")
+            redirect_to Decidim::ResourceLocatorPresenter.new(debate).path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("debates.update.invalid", scope: "decidim.debates")
+            render :edit
+          end
+        end
+      end
+
+      def close
+        enforce_permission_to :close, :debate, debate: debate
+
+        @form = form(CloseDebateForm).from_params(params)
+        @form.debate = debate
+
+        CloseDebate.call(@form) do
+          on(:ok) do |debate|
+            flash[:notice] = I18n.t("debates.close.success", scope: "decidim.debates")
+            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("debates.close.invalid", scope: "decidim.debates")
+            redirect_back fallback_location: Decidim::ResourceLocatorPresenter.new(debate).path
+          end
+        end
+      end
+
       private
 
+      def form_presenter
+        @form_presenter ||= present(@form, presenter_class: Decidim::Debates::DebatePresenter)
+      end
+
       def paginated_debates
-        @paginated_debates ||= paginate(debates)
-                               .includes(:category)
+        @paginated_debates ||= paginate(debates).includes(:category)
       end
 
       def debates
-        @debates ||= search.results
+        @debates ||= reorder(search.results)
       end
 
       def debate
-        @debate ||= debates.find(params[:id])
+        @debate ||= debates.find_by(id: params[:id])
       end
 
       def report_form
         @report_form ||= form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
+      def close_debate_form
+        @close_debate_form ||= form(CloseDebateForm).from_model(debate)
+      end
+
       def search_klass
         DebateSearch
       end
@@ -69,9 +127,12 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          order_start_time: "asc",
-          origin: "all",
-          category_id: ""
+          origin: %w(official citizens user_group),
+          activity: "all",
+          category_id: default_filter_category_params,
+          scope_id: default_filter_scope_params,
+          status: "all",
+          state: %w(open closed)
         }
       end
     end