decidim-debates 0.29.2 → 0.30.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e33b33f45eb7ee4bb5a22738d16a2d228cb136ffb14de44eaf45b244e483c6
-  data.tar.gz: 10812d25f44712fad5a7f69082dab94e7ef68b49c1f3e18353c5d6189cc04807
+  metadata.gz: 8c4a6d81f56b373ffa43a4b57a29918322a4f256736d991636cdf7bb0b51ee45
+  data.tar.gz: c921fc4407ba9208afa983d5e9a5115910527e11e541a5095775651f27d6e43a
 SHA512:
-  metadata.gz: 40dfcf61dd255eb0a0d76357eb397c0b224ddfe045755d2f9a55dcd9916a355a111445624c734bb7e613bd8e9a7a3229e58cd34b4366630837ca9c18e8cfa777
-  data.tar.gz: 7522cc0b99b73b541ce8e7d10328d74fb4c211a72efda7f62fb42354ab25057941b8bde1c3d4e4bc59e7cab1b07fdafbaafcc603cd00704fffb774e6db245a65
+  metadata.gz: 3bffeb3beeec14c73845569807f763f6f681ef72e439e003f053e9d24a8e577d644dbfc17ee5d5710064d9783ebd23bbcb8951045653f3effe81519b9f43222d
+  data.tar.gz: bf3551e5cf3edc6be82ba8ece0e0caeca51f62a90515bce1d47113480d23bd8cd14da98f6431b3e4fa3a1af2d6205a9bae69af1bb6ea09add6af46662bf904cc

data/app/cells/decidim/debates/content_blocks/highlighted_debates/content.erb

@@ -0,0 +1,16 @@
+<div class="content-block__title">
+  <h2 class="h2 decorator"><%= single_component ? translated_attribute(single_component.name) : t("name", scope: "decidim.components.debates") %></h2>
+  <div class="label text-lg"><%= items_count %></div>
+  <% if single_component %>
+    <%= link_to decidim_debates.root_path, class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.debates.content_blocks.highlighted_debates.see_all") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="participatory-space__block-grid">
+  <% debates_to_render.each do |debate| %>
+    <%= cell "decidim/debates/debate_g", debate %>
+  <% end %>
+</div>

data/app/cells/decidim/debates/content_blocks/highlighted_debates_cell.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    module ContentBlocks
+      class HighlightedDebatesCell < Decidim::ContentBlocks::HighlightedElementsCell
+        def show
+          render unless items_count.zero?
+        end
+
+        private
+
+        def debates
+          @debates ||= Decidim::Debates::Debate.open.where(component: published_components).updated_at_desc
+        end
+
+        def decidim_debates
+          return unless single_component
+
+          Decidim::EngineRouter.main_proxy(single_component)
+        end
+
+        def single_component
+          @single_component ||= published_components.one? ? published_components.first : nil
+        end
+
+        def debates_to_render
+          @debates_to_render ||= debates.includes([:author, :component]).limit(limit)
+        end
+
+        def items_count
+          debates_to_render.size
+        end
+
+        def cache_hash
+          hash = []
+          hash << "decidim/debates/content_blocks/highlighted_debates"
+          hash << debates.cache_key_with_version
+          hash << I18n.locale.to_s
+          hash.join(Decidim.cache_key_separator)
+        end
+
+        def limit
+          3
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Decidim
 
       alias debate model
 
-      delegate :type_of_meeting, :start_time, :end_time, :category, :withdrawn?, to: :debate
+      delegate :type_of_meeting, :start_time, :end_time, :withdrawn?, to: :debate
 
       def initialize(*)
         super
@@ -17,17 +17,8 @@ module Decidim
         @items.prepend(*debate_items)
       end
 
-      def category_item
-        return if category.blank?
-
-        {
-          text: category.translated_name,
-          icon: resource_type_icon_key("Decidim::Category")
-        }
-      end
-
       def debate_items
-        [duration, comments_count_item, endorsements_count_item, category_item, coauthors_item]
+        [duration, comments_count_item, endorsements_count_item] + taxonomy_items + [coauthors_item]
       end
 
       def duration

data/app/cells/decidim/debates/debate_g/show.erb

@@ -0,0 +1,12 @@
+<%= link_to resource_path, class: classes[:default], id: resource_id do %>
+  <div class="<%= classes[:text] %>">
+    <%= content_tag title_tag, title, class: title_class %>
+    <%= description if show_description? %>
+
+    <% if metadata_cell.present? %>
+      <div class="<%= classes[:metadata] %>">
+        <%= cell metadata_cell, resource, links: false, **options %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cell renders the Grid (:g) debate card
+    # for a given instance of a Debate
+    class DebateGCell < Decidim::CardGCell
+      def show
+        render
+      end
+
+      private
+
+      def show_description?
+        true
+      end
+
+      def metadata_cell
+        "decidim/debates/debate_metadata_g"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Debates
+    # This cell renders metadata for an instance of a Debate
+    class DebateMetadataGCell < Decidim::Debates::DebateCardMetadataCell
+      private
+
+      def debate_items
+        [author_item, comments_count_item]
+      end
+    end
+  end
+end

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

@@ -6,7 +6,26 @@ module Decidim
       # This command is executed when the user creates a Debate from the admin
       # panel.
       class CreateDebate < Decidim::Commands::CreateResource
-        fetch_form_attributes :category, :component, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
+        include ::Decidim::MultipleAttachmentsMethods
+
+        fetch_form_attributes :taxonomizations, :component, :information_updates, :instructions, :start_time, :end_time, :comments_enabled
+
+        def call
+          return broadcast(:invalid) if invalid?
+
+          if process_attachments?
+            build_attachments
+            return broadcast(:invalid) if attachments_invalid?
+          end
+
+          perform!
+          broadcast(:ok, resource)
+        rescue ActiveRecord::RecordInvalid
+          add_file_attribute_errors!
+          broadcast(:invalid)
+        rescue Decidim::Commands::HookError
+          broadcast(:invalid)
+        end
 
         protected
 
@@ -22,11 +41,15 @@ module Decidim
                         title: parsed_title,
                         description: parsed_description,
                         end_time: (form.end_time if form.finite),
-                        start_time: (form.start_time if form.finite)
+                        start_time: (form.start_time if form.finite),
+                        comments_layout: form.comments_layout
                       })
         end
 
         def run_after_hooks
+          @attached_to = resource
+          create_attachments(first_weight: 1) if process_attachments?
+
           Decidim::EventsManager.publish(
             event: "decidim.events.debates.debate_created",
             event_class: Decidim::Debates::CreateDebateEvent,

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

@@ -6,7 +6,26 @@ module Decidim
       # This command is executed when the user changes a Debate from the admin
       # panel.
       class UpdateDebate < Decidim::Commands::UpdateResource
-        fetch_form_attributes :category, :information_updates, :instructions, :scope, :start_time, :end_time, :comments_enabled
+        include Decidim::MultipleAttachmentsMethods
+
+        fetch_form_attributes :taxonomizations, :information_updates, :instructions, :start_time, :end_time, :comments_enabled
+
+        def call
+          return broadcast(:invalid) if invalid?
+
+          if process_attachments?
+            build_attachments
+            return broadcast(:invalid) if attachments_invalid?
+          end
+
+          perform!
+          broadcast(:ok, resource)
+        rescue ActiveRecord::RecordInvalid
+          add_file_attribute_errors!
+          broadcast(:invalid)
+        rescue Decidim::Commands::HookError
+          broadcast(:invalid)
+        end
 
         private
 
@@ -14,10 +33,20 @@ module Decidim
           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
 
-          super.merge({
-                        title: parsed_title,
-                        description: parsed_description
-                      })
+          attrs = {
+            title: parsed_title,
+            description: parsed_description
+          }
+
+          attrs[:comments_layout] = form.comments_layout if resource.comments_count.zero?
+
+          super.merge(attrs)
+        end
+
+        def run_after_hooks
+          @attached_to = resource
+          document_cleanup!(include_all_attachments: true)
+          create_attachments(first_weight: 1) if process_attachments?
         end
       end
     end

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

@@ -5,7 +5,26 @@ module Decidim
     # This command is executed when the user creates a Debate from the public
     # views.
     class CreateDebate < Decidim::Commands::CreateResource
-      fetch_form_attributes :category, :scope
+      include ::Decidim::MultipleAttachmentsMethods
+
+      fetch_form_attributes :taxonomizations
+
+      def call
+        return broadcast(:invalid) if invalid?
+
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
 
       private
 
@@ -20,6 +39,8 @@ module Decidim
       end
 
       def run_after_hooks
+        @attached_to = resource
+        create_attachments(first_weight: 1) if process_attachments?
         send_notification_to_author_followers
         send_notification_to_space_followers
         follow_debate

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

@@ -4,7 +4,26 @@ module Decidim
   module Debates
     # A command with all the business logic when a user updates a debate.
     class UpdateDebate < Decidim::Commands::UpdateResource
-      fetch_form_attributes :category, :scope
+      include Decidim::MultipleAttachmentsMethods
+
+      fetch_form_attributes :taxonomizations
+
+      def call
+        return broadcast(:invalid) if invalid?
+
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
 
       private
 
@@ -29,12 +48,17 @@ module Decidim
       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
-
         super.merge({
                       title: { I18n.locale => parsed_title },
                       description: { I18n.locale => parsed_description }
                     })
       end
+
+      def run_after_hooks
+        @attached_to = resource
+        document_cleanup!(include_all_attachments: true)
+        create_attachments(first_weight: 1) if process_attachments?
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Decidim
     module Admin
       # This controller allows an admin to manage debates from a Participatory Space
       class DebatesController < Decidim::Debates::Admin::ApplicationController
+        include Decidim::Admin::HasTrashableResources
         helper Decidim::ApplicationHelper
 
         helper_method :debates
@@ -15,8 +16,9 @@ module Decidim
 
         def new
           enforce_permission_to :create, :debate
-
-          @form = form(Decidim::Debates::Admin::DebateForm).instance
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(
+            attachment: form(AttachmentForm).from_params({})
+          )
         end
 
         def create
@@ -39,14 +41,13 @@ module Decidim
 
         def edit
           enforce_permission_to(:update, :debate, debate:)
-
           @form = form(Decidim::Debates::Admin::DebateForm).from_model(debate)
         end
 
         def update
           enforce_permission_to(:update, :debate, debate:)
 
-          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component:)
+          @form = form(Decidim::Debates::Admin::DebateForm).from_params(params, current_component:, debate:)
 
           UpdateDebate.call(@form, debate) do
             on(:ok) do
@@ -61,24 +62,26 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to(:delete, :debate, debate:)
-
-          debate.destroy!
-
-          flash[:notice] = I18n.t("debates.destroy.success", scope: "decidim.debates.admin")
+        private
 
-          redirect_to debates_path
+        def trashable_deleted_resource_type
+          :debate
         end
 
-        private
-
         def debates
           @debates ||= Debate.where(component: current_component).not_hidden
         end
 
+        def trashable_deleted_collection
+          @trashable_deleted_collection ||= Debate.where(component: current_component).only_deleted.deleted_at_desc
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= Debate.with_deleted.find_by(component: current_component, id: params[:id])
+        end
+
         def debate
-          @debate ||= debates.find(params[:id])
+          @debate ||= Debate.find_by(component: current_component, id: params[:id])
         end
       end
     end

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

@@ -11,8 +11,9 @@ module Decidim
       include Paginable
       include Flaggable
       include Decidim::Debates::Orderable
+      include Decidim::AttachmentsHelper
 
-      helper_method :debates, :debate, :form_presenter, :paginated_debates, :close_debate_form
+      helper_method :debates, :debate, :form_presenter, :paginated_debates, :close_debate_form, :tab_panel_items
       before_action :authenticate_user!, only: [:new, :create]
 
       def new
@@ -92,7 +93,7 @@ module Decidim
       end
 
       def paginated_debates
-        @paginated_debates ||= paginate(debates).includes(:category)
+        @paginated_debates ||= paginate(debates).includes(:taxonomies)
       end
 
       def debates
@@ -116,11 +117,14 @@ module Decidim
           search_text_cont: "",
           with_any_origin: nil,
           activity: %w(all),
-          with_any_category: nil,
-          with_any_scope: nil,
+          with_any_taxonomies: nil,
           with_any_state: %w(open closed)
         }
       end
+
+      def tab_panel_items
+        @tab_panel_items ||= attachments_tab_panel_items(debate)
+      end
     end
   end
 end

data/app/forms/decidim/debates/admin/debate_form.rb

@@ -5,7 +5,12 @@ module Decidim
     module Admin
       # This class holds a Form to create/update debates from Decidim's admin panel.
       class DebateForm < Decidim::Form
-        include TranslatableAttributes
+        mimic :debate
+
+        include Decidim::HasUploadValidations
+        include Decidim::AttachmentAttributes
+        include Decidim::TranslatableAttributes
+        include Decidim::HasTaxonomyFormAttributes
 
         translatable_attribute :title, String
         translatable_attribute :description, Decidim::Attributes::RichText
@@ -13,52 +18,43 @@ module Decidim
         translatable_attribute :information_updates, Decidim::Attributes::RichText
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
-        attribute :decidim_category_id, Integer
         attribute :finite, Boolean, default: true
-        attribute :scope_id, Integer
+        attribute :comments_layout, String, default: "single_column"
         attribute :comments_enabled, Boolean, default: true
+        attribute :attachment, AttachmentForm
+
+        attachments_attribute :documents
 
-        validates :title, translatable_presence: true
-        validates :description, translatable_presence: true
+        validates :title, :description, translatable_presence: true
+        validates :title, :description, translated_etiquette: true
         validates :instructions, translatable_presence: true
         validates :start_time, presence: { if: :validate_start_time? }, date: { before: :end_time, allow_blank: true, if: :validate_start_time? }
         validates :end_time, presence: { if: :validate_end_time? }, date: { after: :start_time, allow_blank: true, if: :validate_end_time? }
+        validates :comments_layout, presence: true, inclusion: { in: %w(single_column two_columns) }
+        validate :comments_layout_change, if: -> { debate&.comments_count&.positive? }
 
-        validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
-        validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
-        validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
+        validate :notify_missing_attachment_if_errored
 
         def map_model(model)
           self.finite = model.start_time.present? && model.end_time.present?
-          self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
           presenter = DebatePresenter.new(model)
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.description = presenter.description(all_locales: description.is_a?(Hash))
+          self.comments_layout = model.comments_layout || "single_column"
+          self.documents = model.attachments
         end
 
-        def category
-          return unless current_component
-
-          @category ||= current_component.categories.find_by(id: decidim_category_id)
+        def participatory_space_manifest
+          @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
 
-        # Finds the Scope from the given decidim_scope_id, uses the component scope if missing.
-        #
-        # Returns a Decidim::Scope
-        def scope
-          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
-        end
+        private
 
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the meeting
-        def scope_id
-          super || scope&.id
+        def debate
+          @debate ||= context[:debate]
         end
 
-        private
-
         def validate_end_time?
           finite && start_time.present?
         end
@@ -66,6 +62,18 @@ module Decidim
         def validate_start_time?
           end_time.present?
         end
+
+        def comments_layout_change
+          errors.add(:comments_layout, I18n.t("form.errors.comments_layout_locked", scope: "decidim.debates.admin.debates")) if debate.comments_layout != comments_layout
+        end
+
+        # This method will add an error to the `add_documents` field only if there is
+        # any error in any other field. This is needed because when the form has
+        # an error, the attachment is lost, so we need a way to inform the user of
+        # this problem.
+        def notify_missing_attachment_if_errored
+          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
+        end
       end
     end
   end

data/app/forms/decidim/debates/debate_form.rb

@@ -4,20 +4,21 @@ module Decidim
   module Debates
     # This class holds a Form to create/update debates from Decidim's public views.
     class DebateForm < Decidim::Form
-      include TranslatableAttributes
+      include Decidim::HasUploadValidations
+      include Decidim::AttachmentAttributes
+      include Decidim::TranslatableAttributes
+      include Decidim::HasTaxonomyFormAttributes
 
       attribute :title, String
       attribute :description, String
-      attribute :category_id, Integer
-      attribute :scope_id, Integer
       attribute :user_group_id, Integer
+      attribute :attachment, AttachmentForm
 
-      validates :title, presence: true
-      validates :description, presence: true
-      validates :category, presence: true, if: ->(form) { form.category_id.present? }
-      validate :editable_by_user
+      attachments_attribute :documents
 
-      validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
+      validates :title, :description, presence: true
+      validates :title, :description, etiquette: true
+      validate :editable_by_user
 
       def map_model(debate)
         super
@@ -27,29 +28,11 @@ module Decidim
         self.title = debate.title.values.first
         self.description = debate.description.values.first
         self.user_group_id = debate.decidim_user_group_id
-
-        if debate.category.present?
-          self.category_id = debate.category.id
-          @category = debate.category
-        end
-      end
-
-      def category
-        @category ||= current_component.categories.find_by(id: category_id)
-      end
-
-      # Finds the Scope from the given scope_id, uses component scope if missing.
-      #
-      # Returns a Decidim::Scope
-      def scope
-        @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
+        self.documents = debate.attachments
       end
 
-      # Scope identifier
-      #
-      # Returns the scope identifier related to the debate
-      def scope_id
-        super || scope&.id
+      def participatory_space_manifest
+        @participatory_space_manifest ||= current_component.participatory_space.manifest.name
       end
 
       def debate

data/app/helpers/decidim/debates/application_helper.rb

@@ -74,18 +74,18 @@ module Decidim
           items = [{
             method: :with_any_state,
             collection: filter_debates_state_values,
-            label_scope: "decidim.meetings.meetings.filters",
+            label: t("decidim.meetings.meetings.filters.date"),
             id: "date",
             type: :radio_buttons
           }]
-          if current_component.has_subscopes?
-            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope")
+          current_component.available_taxonomy_filters.each do |taxonomy_filter|
+            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                         collection: filter_taxonomy_values_for(taxonomy_filter),
+                         label: decidim_sanitize_translated(taxonomy_filter.name),
+                         id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
           end
-          if current_participatory_space.categories.any?
-            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.debates.debates.filters", id: "category")
-          end
-          items.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.debates.debates.filters", id: "origin")
-          items.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.debates.debates.filters", id: "activity") if current_user
+          items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.debates.debates.filters.origin"), id: "origin")
+          items.append(method: :activity, collection: activity_filter_values, label: t("decidim.debates.debates.filters.activity"), id: "activity") if current_user
 
           items.reject { |item| item[:collection].blank? }
         end