decidim-proposals 0.20.1 → 0.21.0

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

@@ -31,7 +31,7 @@ module Decidim
 
         def action_string
           case action
-          when "answer", "create", "update"
+          when "answer", "create", "update", "publish_answer"
             "decidim.proposals.admin_log.proposal.#{action}"
           else
             super

data/app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Proposals::ValuationAssignment`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    ValuationAssignmentPresenter.new(action_log, view_helpers).present
+      class ValuationAssignmentPresenter < Decidim::Log::BasePresenter
+        private
+
+        def resource_presenter
+          @resource_presenter ||= Decidim::Proposals::Log::ValuationAssignmentPresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
+        def diff_fields_mapping
+          {
+            valuator_role_id: "Decidim::Proposals::AdminLog::ValueTypes::ValuatorRoleUserPresenter"
+          }
+        end
+
+        def action_string
+          case action
+          when "create", "delete"
+            "decidim.proposals.admin_log.valuation_assignment.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.valuation_assignment.admin_log"
+        end
+
+        def has_diff?
+          %w(create delete).include?(action) || super
+        end
+
+        def i18n_params
+          super.merge(proposal_title: h.translated_attribute(action_log.extra["proposal_title"]))
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module AdminLog
+      module ValueTypes
+        class ValuatorRoleUserPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          def present
+            return unless value
+
+            role = Decidim::Proposals::ValuationAssignment.find_by(valuator_role_id: value).valuator_role
+            user = role.user
+            user.try(:name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,12 +5,7 @@ module Decidim
     #
     # Decorator for collaborative drafts
     #
-    class CollaborativeDraftPresenter < SimpleDelegator
-      include Rails.application.routes.mounted_helpers
-      include ActionView::Helpers::UrlHelper
-      include ActionView::Helpers::SanitizeHelper
-      include Decidim::SanitizeHelper
-
+    class CollaborativeDraftPresenter < ProposalPresenter
       def author
         coauthorship = __getobj__.coauthorships.first
         @author ||= if coauthorship.user_group
@@ -20,32 +15,11 @@ module Decidim
                     end
       end
 
-      def collaborative_draft
-        __getobj__
-      end
+      alias collaborative_draft proposal
 
       def collaborative_draft_path
         Decidim::ResourceLocatorPresenter.new(collaborative_draft).path
       end
-
-      def title(links: false, extras: true, html_escape: false)
-        text = collaborative_draft.title
-        text = decidim_html_escape(text) if html_escape
-
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        renderer.render(links: links, extras: extras).html_safe
-      end
-
-      def body(links: false, extras: true, strip_tags: false)
-        text = collaborative_draft.body
-        text = strip_tags(text) if strip_tags
-
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
-        text = renderer.render(links: links, extras: extras).html_safe
-
-        text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
-        text
-      end
     end
   end
 end

data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Log
+      class ValuationAssignmentPresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          if resource.present?
+            Decidim::Proposals::ProposalPresenter.new(resource.proposal).title
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,6 @@ module Decidim
     class ProposalPresenter < SimpleDelegator
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
-      include ActionView::Helpers::SanitizeHelper
       include Decidim::SanitizeHelper
 
       def author
@@ -56,6 +55,32 @@ module Decidim
         text = Decidim::ContentRenderers::LinkRenderer.new(text).render if links
         text
       end
+
+      # Returns the proposal versions, hiding not published answers
+      #
+      # Returns an Array.
+      def versions
+        version_state_published = false
+        pending_state_change = nil
+
+        proposal.versions.map do |version|
+          state_published_change = version.changeset["state_published_at"]
+          version_state_published = state_published_change.last.present? if state_published_change
+
+          if version_state_published
+            version.changeset["state"] = pending_state_change if pending_state_change
+            pending_state_change = nil
+          elsif version.changeset["state"]
+            pending_state_change = version.changeset.delete("state")
+          end
+
+          next if version.event == "update" && Decidim::Proposals::DiffRenderer.new(version).diff.empty?
+
+          version
+        end.compact
+      end
+
+      delegate :count, to: :versions, prefix: true
     end
   end
 end

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

@@ -22,16 +22,24 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        case state
-        when "open"
-          query.open
-        when "withdrawn"
-          query.withdrawn
-        when "published"
-          query.published
-        else
-          query
-        end
+        return query if state.member?("all")
+
+        open_drafts = state.member?("open") ? query.open : nil
+        withdrawn = state.member?("withdrawn") ? query.withdrawn : nil
+        published = state.member?("published") ? query.published : nil
+
+        query
+          .where(id: open_drafts)
+          .or(query.where(id: withdrawn))
+          .or(query.where(id: published))
+      end
+
+      def search_category_id
+        super
+      end
+
+      def search_scope_id
+        super
       end
 
       # Filters drafts by the name of the classes they are linked to. By default,

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

@@ -12,7 +12,9 @@ module Decidim
       def initialize(options = {})
         @component = options[:component]
         @current_user = options[:current_user]
-        super(Proposal.all, options)
+
+        base = options[:state]&.member?("withdrawn") ? Proposal.withdrawn : Proposal.except_withdrawn
+        super(base, options)
       end
 
       # Handle the search_text filter
@@ -24,31 +26,16 @@ module Decidim
 
       # Handle the origin filter
       def search_origin
-        case origin
-        when "official"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-        when "citizens"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
-        when "user_group"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
-        when "meeting"
-          query
-            .where.not(coauthorships_count: 0)
-            .joins(:coauthorships)
-            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
-        else # Assume 'all'
-          query
-        end
+        official = origin.member?("official") ? query.official_origin : nil
+        citizens = origin.member?("citizens") ? query.citizens_origin : nil
+        user_group = origin.member?("user_group") ? query.user_group_origin : nil
+        meeting = origin.member?("meeting") ? query.meeting_origin : nil
+
+        query
+          .where(id: official)
+          .or(query.where(id: citizens))
+          .or(query.where(id: user_group))
+          .or(query.where(id: meeting))
       end
 
       # Handle the activity filter
@@ -71,20 +58,18 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        case state
-        when "accepted"
-          query.accepted
-        when "rejected"
-          query.rejected
-        when "evaluating"
-          query.evaluating
-        when "withdrawn"
-          query.withdrawn
-        when "except_rejected"
-          query.except_rejected.except_withdrawn
-        else # Assume 'not_withdrawn'
-          query.except_withdrawn
-        end
+        return query if state.member? "withdrawn"
+
+        accepted = state.member?("accepted") ? query.accepted : nil
+        rejected = state.member?("rejected") ? query.rejected : nil
+        evaluating = state.member?("evaluating") ? query.evaluating : nil
+        not_answered = state.member?("not_answered") ? query.state_not_published : nil
+
+        query
+          .where(id: accepted)
+          .or(query.where(id: rejected))
+          .or(query.where(id: evaluating))
+          .or(query.where(id: not_answered))
       end
 
       # Handle the amendment type filter
@@ -99,6 +84,14 @@ module Decidim
         end
       end
 
+      def search_category_id
+        super
+      end
+
+      def search_scope_id
+        super
+      end
+
       # Filters Proposals by the name of the classes they are linked to. By default,
       # returns all Proposals. When a `related_to` param is given, then it camelcases item
       # to find the real class name and checks the links for the Proposals.

data/app/types/decidim/proposals/proposal_input_filter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalInputFilter < Decidim::Core::BaseInputFilter
+      include Decidim::Core::HasPublishableInputFilter
+
+      graphql_name "ProposalFilter"
+      description "A type used for filtering proposals inside a participatory space.
+
+A typical query would look like:
+
+```
+  {
+    participatoryProcesses {
+      components {
+        ...on Proposals {
+          proposals(filter:{ publishedBefore: \"2020-01-01\" }) {
+            id
+          }
+        }
+      }
+    }
+  }
+```
+"
+    end
+  end
+end

data/app/types/decidim/proposals/proposal_input_sort.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalInputSort < Decidim::Core::BaseInputSort
+      include Decidim::Core::HasPublishableInputSort
+
+      graphql_name "ProposalSort"
+      description "A type used for sorting proposals"
+
+      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+      argument :endorsement_count,
+               type: String,
+               description: "Sort by number of endorsements, valid values are ASC or DESC",
+               required: false,
+               prepare: ->(value, _ctx) do
+                          { proposal_endorsements_count: value }
+                        end
+      argument :vote_count,
+               type: String,
+               description: "Sort by number of votes, valid values are ASC or DESC. Will be ignored if votes are hidden",
+               required: false,
+               prepare: ->(value, _ctx) do
+                          { proposal_votes_count: value }
+                        end
+    end
+  end
+end

data/app/types/decidim/proposals/proposal_type.rb

@@ -8,24 +8,55 @@ module Decidim
 
       interfaces [
         -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::AuthorableInterface },
+        -> { Decidim::Core::CoauthorableInterface },
         -> { Decidim::Core::CategorizableInterface },
         -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface }
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::FingerprintInterface },
+        -> { Decidim::Core::AmendableInterface },
+        -> { Decidim::Core::AmendableEntityInterface },
+        -> { Decidim::Core::TraceableInterface },
+        -> { Decidim::Core::TimestampsInterface }
       ]
 
       field :id, !types.ID
       field :title, !types.String, "This proposal's title"
       field :body, types.String, "This proposal's body"
-      field :state, types.String, "The state in which proposal is in"
       field :address, types.String, "The physical address (location) of this proposal"
-      field :reference, types.String, "This proposa'ls unique reference"
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal" do
+        resolve ->(proposal, _args, _ctx) {
+          [proposal.latitude, proposal.longitude]
+        }
+      end
+      field :reference, types.String, "This proposal's unique reference"
+      field :state, types.String, "The answer status in which proposal is in"
+      field :answer, Decidim::Core::TranslatedFieldType, "The answer feedback for the status for this proposal"
+
+      field :answeredAt, Decidim::Core::DateTimeType do
+        description "The date and time this proposal was answered"
+        property :answered_at
+      end
 
       field :publishedAt, Decidim::Core::DateTimeType do
         description "The date and time this proposal was published"
         property :published_at
       end
 
+      field :participatoryTextLevel, types.String do
+        description "If it is a participatory text, the level indicates the type of paragraph"
+        property :participatory_text_level
+      end
+      field :position, types.Int, "Position of this proposal in the participatory text"
+
+      field :official, types.Boolean, "Whether this proposal is official or not", property: :official?
+      field :createdInMeeting, types.Boolean, "Whether this proposal comes from a meeting or not", property: :official_meeting?
+      field :meeting, Decidim::Meetings::MeetingType do
+        description "If the proposal comes from a meeting, the related meeting"
+        resolve ->(proposal, _, _) {
+          proposal.authors.first if proposal.official_meeting?
+        }
+      end
+
       field :endorsements, !types[Decidim::Core::AuthorInterface], "The endorsements of this proposal." do
         resolve ->(proposal, _, _) {
           proposal.endorsements.map(&:normalized_author)