decidim-proposals 0.8.4 → 0.9.0

data/app/forms/decidim/proposals/proposal_form.rb

@@ -24,6 +24,7 @@ module Decidim
       validates :address, presence: true, if: ->(form) { form.has_address? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
+      validate { errors.add(:scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
 
       delegate :categories, to: :current_feature
 
@@ -33,28 +34,27 @@ module Decidim
         self.category_id = model.categorization.decidim_category_id
       end
 
-      def organization_scopes
-        current_organization.scopes
-      end
-
-      def process_scope
-        current_feature.participatory_space.scope
-      end
-
       alias feature current_feature
 
       # Finds the Category from the category_id.
       #
       # Returns a Decidim::Category
       def category
-        @category ||= categories.where(id: category_id).first
+        @category ||= categories.find_by(id: category_id)
       end
 
-      # Finds the Scope from the scope_id.
+      # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= organization_scopes.where(id: scope_id).first || process_scope
+        @scope ||= @scope_id ? current_feature.scopes.find_by(id: @scope_id) : current_participatory_space&.scope
+      end
+
+      # Scope identifier
+      #
+      # Returns the scope identifier related to the proposal
+      def scope_id
+        @scope_id || scope&.id
       end
 
       def has_address?

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

@@ -52,6 +52,8 @@ module Decidim
           "warning"
         when "evaluating"
           "secondary"
+        when "withdrawn"
+          "alert"
         end
       end
 

data/app/models/decidim/proposals/abilities/admin_ability.rb

@@ -14,6 +14,7 @@ module Decidim
           can :hide, Proposal
           cannot :create, Proposal unless can_create_proposal?
           cannot :update, Proposal unless can_update_proposal?
+          can :create, ProposalNote
         end
 
         private

data/app/models/decidim/proposals/abilities/current_user_ability.rb

@@ -29,6 +29,10 @@ module Decidim
             proposal.editable_by?(user)
           end
 
+          can :withdraw, Proposal do |proposal|
+            can_withdraw?(proposal)
+          end
+
           can :report, Proposal
         end
 
@@ -77,6 +81,10 @@ module Decidim
 
           feature
         end
+
+        def can_withdraw?(proposal)
+          proposal.decidim_author_id == @user.id
+        end
       end
     end
   end

data/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -15,6 +15,7 @@ module Decidim
 
           cannot :create, Proposal unless can_create_proposal?
           cannot :update, Proposal unless can_update_proposal?
+          can :create, ProposalNote
         end
 
         private

data/app/models/decidim/proposals/proposal.rb

@@ -18,6 +18,7 @@ module Decidim
       feature_manifest_name "proposals"
 
       has_many :votes, foreign_key: "decidim_proposal_id", class_name: "ProposalVote", dependent: :destroy, counter_cache: "proposal_votes_count"
+      has_many :notes, foreign_key: "decidim_proposal_id", class_name: "ProposalNote", dependent: :destroy, counter_cache: "proposal_notes_count"
 
       validates :title, :body, presence: true
 
@@ -26,6 +27,8 @@ module Decidim
       scope :accepted, -> { where(state: "accepted") }
       scope :rejected, -> { where(state: "rejected") }
       scope :evaluating, -> { where(state: "evaluating") }
+      scope :withdrawn, -> { where(state: "withdrawn") }
+      scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
 
       def self.order_randomly(seed)
         transaction do
@@ -34,15 +37,6 @@ module Decidim
         end
       end
 
-      def author_name
-        return I18n.t("decidim.proposals.models.proposal.fields.official_proposal") if official?
-        user_group&.name || author.name
-      end
-
-      def author_avatar_url
-        author&.avatar&.url || ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
-      end
-
       # Public: Check if the user has voted the proposal.
       #
       # Returns Boolean.
@@ -78,6 +72,13 @@ module Decidim
         answered? && state == "evaluating"
       end
 
+      # Public: Checks if the author has withdrawn the proposal.
+      #
+      # Returns Boolean.
+      def withdrawn?
+        state == "withdrawn"
+      end
+
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
         feature.settings.comments_enabled?
@@ -148,6 +149,26 @@ module Decidim
         authored_by?(user) && !answered? && within_edit_time_limit?
       end
 
+      # Checks whether the user can withdraw the given proposal.
+      #
+      # user - the user to check for withdrawability.
+      def withdrawable_by?(user)
+        user && !withdrawn? && authored_by?(user)
+      end
+
+      # method for sort_link by number of comments
+      ransacker :commentable_comments_count do
+        query = <<-SQL
+              (SELECT COUNT(decidim_comments_comments.id)
+                 FROM decidim_comments_comments
+                WHERE decidim_comments_comments.decidim_commentable_id = decidim_proposals_proposals.id
+                  AND decidim_comments_comments.decidim_commentable_type = 'Decidim::Proposals::Proposal'
+                GROUP BY decidim_comments_comments.decidim_commentable_id
+              )
+            SQL
+        Arel.sql(query)
+      end
+
       private
 
       # Checks whether the proposal is inside the time window to be editable or not.

data/app/models/decidim/proposals/proposal_note.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A proposal can include a notes created by admins.
+    class ProposalNote < ApplicationRecord
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
+      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
+
+      default_scope { order(created_at: :asc) }
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    #
+    # A dummy presenter to abstract out the author of an official proposal.
+    #
+    class OfficialAuthorPresenter
+      def name
+        I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
+      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
+    end
+  end
+end

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    #
+    # Decorator for proposals
+    #
+    class ProposalPresenter < SimpleDelegator
+      def author
+        @author ||= if official?
+                      Decidim::Proposals::OfficialAuthorPresenter.new
+                    elsif user_group
+                      Decidim::UserGroupPresenter.new(user_group)
+                    else
+                      Decidim::UserPresenter.new(super)
+                    end
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/proposal_search.rb

@@ -54,8 +54,10 @@ module Decidim
           query.rejected
         when "evaluating"
           query.evaluating
-        else # Assume 'all'
-          query
+        when "withdrawn"
+          query.withdrawn
+        else # Assume 'not_withdrawn'
+          query.except_withdrawn
         end
       end
 

data/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -1,3 +1,4 @@
+<%= render 'decidim/proposals/admin/shared/info_proposal' %>
 <%=  decidim_form_for(@form, url: proposal_proposal_answer_path(proposal, @form), html: { class: "form edit_proposal_answer" }) do |f| %>
   <div class="card">
     <div class="card-divider">

data/app/views/decidim/proposals/admin/proposal_notes/_form.html.erb

@@ -0,0 +1,8 @@
+<%=  decidim_form_for(@form, url: proposal_proposal_notes_path(proposal, @form), html: { class: "form new_proposal_note" }) do |f| %>
+  <div class="row column">
+    <%= f.text_area :body, rows: 10, label: t('.note')  %>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".submit") %>
+  </div>
+<% end %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -0,0 +1,45 @@
+<section class="comments">
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t("title", scope: 'decidim.proposals.admin.proposal_notes') %></h2>
+    </div>
+
+    <div class="card-section">
+      <div class="comment-thread">
+        <% proposal.notes.each do |note| %>
+          <div class="card">
+            <div class="card-divider">
+              <article class="comment">
+                <div class="comment__header">
+                  <div class="author-data">
+                    <div class="author-data__main">
+                      <div class="author author--inline">
+                        <strong><span class="author__name"><%= note.author.name %></span></strong>
+                        <span><%= l note.created_at, format: :decidim_short %></span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div class="comment__content">
+                  <%= note.body %>
+                </div>
+              </article>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div class="card-section">
+      <div class="add-comment">
+        <div class="card">
+          <div class="card-divider">
+            <h2 class="card-title"><%= t("leave_your_note", scope: 'decidim.proposals.admin.proposal_notes') %></h2>
+          </div>
+          <div class="card-section">
+            <%= render 'form' %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>

data/app/views/decidim/proposals/admin/proposal_notes/index.html.erb

@@ -0,0 +1,3 @@
+<%= render 'decidim/proposals/admin/shared/info_proposal' %>
+
+<%= render "proposal_notes" %>

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

@@ -26,7 +26,7 @@
 
     <% if current_participatory_space.has_subscopes? %>
       <div class="row column">
-        <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_space.scope) %>
+        <%= scopes_picker_field form, :scope_id %>
       </div>
     <% end %>
 

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

@@ -19,19 +19,48 @@
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.proposal.fields.id", scope: "decidim.proposals") %></th>
-            <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
-            <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
+            <th>
+              <%= sort_link(query, :id, t("models.proposal.fields.id", scope: "decidim.proposals"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :category_name, t("models.proposal.fields.category", scope: "decidim.proposals") ) %>
+            </th>
+
             <% if scopes_enabled?(current_participatory_space) %>
-              <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
+              <th>
+                <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
+              </th>
             <% end %>
 
-            <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
+            <th>
+              <%= sort_link(query, :state, t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
+            </th>
 
             <% if current_settings.votes_enabled? %>
-              <th><%= t("models.proposal.fields.votes", scope: "decidim.proposals") %></th>
+              <th>
+                <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
+              </th>
+            <% end %>
+
+            <% if current_feature.settings.comments_enabled? and !current_settings.comments_blocked? %>
+              <th>
+                <%= sort_link(query, :commentable_comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
+              </th>
             <% end %>
 
+            <% if can? :create, Decidim::Proposals::ProposalNote %>
+              <th>
+                <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+              </th>
+            <% end %>
+
+            <th>
+              <%= sort_link(query, :created_at, t("models.proposal.fields.created_at", scope: "decidim.proposals") ) %>
+            </th>
+
             <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
           </tr>
         </thead>
@@ -63,14 +92,37 @@
                   <%= humanize_proposal_state proposal.state %>
                 </strong>
               </td>
+
               <% if current_settings.votes_enabled? %>
                 <td>
-                  <%= proposal.votes.count %>
+                  <%= proposal.proposal_votes_count %>
+                </td>
+              <% end %>
+
+              <% if current_feature.settings.comments_enabled? and !current_settings.comments_blocked? %>
+                <td>
+                  <%= proposal.comments.count %>
                 </td>
               <% end %>
+
+              <% if can? :create, Decidim::Proposals::ProposalNote %>
+                <td>
+                  <%= proposal.proposal_notes_count %>
+                </td>
+              <% end %>
+
+              <td>
+                <%= l proposal.created_at, format: :decidim_short %>
+              </td>
+
               <td class="table-list__actions">
+
+                <% if can? :create, Decidim::Proposals::ProposalNote %>
+                  <%= icon_link_to "chat", proposal_proposal_notes_path(proposal_id: proposal.id), t("actions.private_notes", scope: "decidim.proposals"), class: "action-icon--index-notes" %>
+                <% end %>
+
                 <% if can? :update, proposal %>
-                  <%= icon_link_to "conversation", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
+                  <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
                 <% end %>
                 <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
               </td>

data/app/views/decidim/proposals/admin/shared/_info_proposal.html.erb

@@ -0,0 +1,20 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to "#{t ".proposals"} > ", proposals_path %>
+      <%= proposal.title %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <strong><%= t ".body" %>: </strong><%= proposal.body %>
+    </div>
+    <div class="row column">
+      <strong><%= t ".created_at" %>: </strong> <%= l proposal.created_at, format: :decidim_short  %>
+    </div>
+    <div class="row column">
+      <strong><%= t ".proposal_votes_count" %>: </strong> <%= proposal.proposal_votes_count %>
+    </div>
+  </div>
+</div>