decidim-proposals 0.25.2 → 0.26.0.rc1

data/config/locales/tr-TR.yml

@@ -122,7 +122,6 @@ tr:
         name: Teklifler
         settings:
           global:
-            allow_card_image: Kart resmine izin ver
             amendments_enabled: Değişiklikler etkinleştirildi
             amendments_enabled_help: Etkinse, her adım için Değişiklik özelliklerini yapılandırın.
             amendments_wizard_help_text: Değişiklik Sihirbazı yardım metni
@@ -169,7 +168,6 @@ tr:
             answers_with_costs: Teklif yanıtlarında maliyetleri etkinleştirin
             automatic_hashtags: Tüm tekliflere etiketler eklendi
             comments_blocked: Yorumlar engellendi
-            creation_enabled: Teklif oluşturma etkin
             endorsements_blocked: Onaylar engellendi
             endorsements_enabled: Onaylar etkin
             proposal_answering_enabled: Teklif yanıtlama etkin
@@ -262,7 +260,6 @@ tr:
           email_intro: '"%{resource_title}" teklifi takip ettiğiniz "%{participatory_space_title}" listesine eklendi.'
           email_outro: Bu bildirimi, "%{participatory_space_title}" takip ettiğiniz için aldınız. Bir önceki bağlantıdan takip etmeyi bırakabilirsiniz.
           email_subject: Yeni teklif "%{resource_title}" %{participatory_space_title} eklendi
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> önerisi %{participatory_space_title} alanına eklendi
         proposal_rejected:
           affected_user:
             email_intro: 'Teklifiniz "%{resource_title}" reddedildi. Cevabı bu sayfada okuyabilirsiniz:'
@@ -501,11 +498,9 @@ tr:
             title: Teklifleri içe aktar
         proposals_merges:
           create:
-            invalid: Seçilen teklifler birleştirilirken bir hata oluştu.
             success: Teklifler, yeni bir taneyle başarılı bir şekilde birleştirildi.
         proposals_splits:
           create:
-            invalid: Seçilen teklifleri bölerken bir sorun vardı.
             success: Teklifleri başarılı bir şekilde yenilere ayırdı.
         valuation_assignments:
           create:

data/config/locales/uk.yml

@@ -82,7 +82,6 @@ uk:
           step:
             announcement: Оголошення
             comments_blocked: Коментарі вимкнено
-            creation_enabled: Внесення пропозицій увімкнено
             endorsements_blocked: Надання підтримки вимкнене
             endorsements_enabled: Надання підтримки увімкнено
             proposal_answering_enabled: Відповіді на пропозиції увімкнено
@@ -122,7 +121,6 @@ uk:
         proposal_published_for_space:
           email_intro: До "%{participatory_space_title}", за яким ви стежите, була додана пропозиція "%{resource_title}".
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{participatory_space_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
-          notification_title: До %{participatory_space_title} було додано пропозицію <a href="%{resource_path}">%{resource_title}</a>
         proposal_rejected:
           follower:
             email_intro: 'Пропозиція "%{resource_title}" була відхилена. Ви можете прочитати відповідь на сторінці:'

data/config/locales/val-ES.yml

@@ -0,0 +1 @@
+val:

data/config/locales/zh-CN.yml

@@ -115,7 +115,6 @@ zh-CN:
         name: 建议
         settings:
           global:
-            allow_card_image: 允许卡片图像
             amendments_enabled: 修改已启用
             amendments_enabled_help: 如果激活，配置每一步的修正功能。
             amendments_wizard_help_text: 修正向导帮助文本
@@ -162,7 +161,6 @@ zh-CN:
             answers_with_costs: 启用建议答案的成本
             automatic_hashtags: 添加到所有建议的标签
             comments_blocked: 评论已阻止
-            creation_enabled: 建议创建已启用
             endorsements_blocked: 已阻止授权
             endorsements_enabled: 授权已启用
             proposal_answering_enabled: 建议答案已启用
@@ -248,7 +246,6 @@ zh-CN:
           email_intro: 提议 "%{resource_title}" 已被添加到"%{participatory_space_title}"，您正在关注它。
           email_outro: 您收到此通知是因为您正在关注 "%{participatory_space_title}"。您可以停止收到跟随上一个链接的通知。
           email_subject: 新提议 "%{resource_title}" 已添加到 %{participatory_space_title}
-          notification_title: 提议 <a href="%{resource_path}">%{resource_title}</a> 已被添加到 %{participatory_space_title}
         proposal_rejected:
           affected_user:
             email_intro: '您的提议 "%{resource_title}" 已被拒绝。您可以在此页中读取答案：'
@@ -480,11 +477,9 @@ zh-CN:
             select_states: 检查要导入的建议的状态
         proposals_merges:
           create:
-            invalid: 合并选定的建议时出现问题。
             success: 成功地将提案合并为一个新提案。
         proposals_splits:
           create:
-            invalid: 在分割选定的建议时遇到问题。
             success: 成功地将建议分成新的建议。
         valuation_assignments:
           create:

data/lib/decidim/proposals/component.rb

@@ -22,6 +22,8 @@ Decidim.register_component(:proposals) do |component|
 
   component.permissions_class_name = "Decidim::Proposals::Permissions"
 
+  POSSIBLE_SORT_ORDERS = %w(default random recent most_endorsed most_voted most_commented most_followed with_more_authors).freeze
+
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
@@ -34,12 +36,12 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :threshold_per_proposal, type: :integer, default: 0
     settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :default_sort_order, type: :select, default: "default", choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :attachments_allowed, type: :boolean, default: false
-    settings.attribute :allow_card_image, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
     settings.attribute :collaborative_drafts_enabled, type: :boolean, default: false
     settings.attribute :participatory_texts_enabled,
@@ -65,6 +67,7 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :default_sort_order, type: :select, include_blank: true, choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :publish_answers_immediately, type: :boolean, default: true
     settings.attribute :answers_with_costs, type: :boolean, default: false
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
@@ -128,7 +131,7 @@ Decidim.register_component(:proposals) do |component|
       collection = Decidim::Proposals::Proposal
                    .published
                    .where(component: component_instance)
-                   .includes(:category, :component)
+                   .includes(:scope, :category, :component)
 
       if space.user_roles(:valuator).where(user: user).any?
         collection.with_valuation_assigned_to(user, space)
@@ -146,7 +149,7 @@ Decidim.register_component(:proposals) do |component|
     exports.collection do |component_instance|
       Decidim::Comments::Export.comments_for_resource(
         Decidim::Proposals::Proposal, component_instance
-      )
+      ).includes(:author, :user_group, root_commentable: { component: { participatory_space: :organization } })
     end
 
     exports.include_in_open_data = true
@@ -155,7 +158,37 @@ Decidim.register_component(:proposals) do |component|
   end
 
   component.imports :proposals do |imports|
-    imports.creator Decidim::Proposals::ProposalCreator
+    imports.form_view = "decidim/proposals/admin/imports/proposals_fields"
+    imports.form_class_name = "Decidim::Proposals::Admin::ProposalsFileImportForm"
+
+    imports.messages do |msg|
+      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.proposals", count: count) }
+      msg.set(:title) { I18n.t("decidim.proposals.admin.imports.title.proposals") }
+      msg.set(:label) { I18n.t("decidim.proposals.admin.imports.label.proposals") }
+      msg.set(:help) { I18n.t("decidim.proposals.admin.imports.help.proposals") }
+    end
+
+    imports.creator Decidim::Proposals::Import::ProposalCreator
+  end
+
+  component.imports :answers do |imports|
+    imports.messages do |msg|
+      msg.set(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.answers", count: count) }
+      msg.set(:title) { I18n.t("decidim.proposals.admin.imports.title.answers") }
+      msg.set(:label) { I18n.t("decidim.proposals.admin.imports.label.answers") }
+      msg.set(:help) { I18n.t("decidim.proposals.admin.imports.help.answers") }
+    end
+
+    imports.creator Decidim::Proposals::Import::ProposalAnswerCreator
+    imports.example do |import_component|
+      organization = import_component.organization
+      [
+        %w(id state) + organization.available_locales.map { |l| "answer/#{l}" },
+        [1, "accepted"] + organization.available_locales.map { "Example answer" },
+        [2, "rejected"] + organization.available_locales.map { "Example answer" },
+        [3, "evaluating"] + organization.available_locales.map { "Example answer" }
+      ]
+    end
   end
 
   component.seeds do |participatory_space|

data/lib/decidim/proposals/import/proposal_answer_creator.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Import
+      # This class is responsible for creating the imported proposal answers
+      # and must be included in proposals component's import manifest.
+      class ProposalAnswerCreator < Decidim::Admin::Import::Creator
+        POSSIBLE_ANSWER_STATES = %w(evaluating accepted rejected).freeze
+
+        # Retuns the resource class to be created with the provided data.
+        def self.resource_klass
+          Decidim::Proposals::Proposal
+        end
+
+        # Returns a verifier class to be used to verify the correctness of the
+        # import data.
+        def self.verifier_klass
+          Decidim::Proposals::Import::ProposalsAnswersVerifier
+        end
+
+        # Add answer to proposal
+        #
+        # Returns a proposal
+        def produce
+          resource
+        end
+
+        def finish!
+          Decidim.traceability.perform_action!(
+            "answer",
+            resource,
+            current_user
+          ) do
+            resource.save!
+          end
+          notify(resource)
+        end
+
+        private
+
+        def resource
+          @resource ||= begin
+            proposal = Decidim::Proposals::Proposal.find_by(id: id)
+            return nil unless proposal
+            return nil if proposal.emendation?
+
+            if proposal.component != component
+              proposal.errors.add(:component, :invalid)
+              return proposal
+            end
+
+            proposal.answer = answer
+            proposal.answered_at = Time.current
+            if POSSIBLE_ANSWER_STATES.include?(state)
+              proposal.state = state
+              proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
+            else
+              proposal.errors.add(:state, :invalid)
+            end
+            proposal
+          end
+        end
+
+        def id
+          data[:id].to_i
+        end
+
+        def state
+          data[:state]
+        end
+
+        def answer
+          locale_hasher("answer", available_locales)
+        end
+
+        def available_locales
+          @available_locales ||= component.participatory_space.organization.available_locales
+        end
+
+        def component
+          context[:current_component]
+        end
+
+        def current_user
+          context[:current_user]
+        end
+
+        def notify(proposal)
+          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(proposal, proposal.state)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/import/proposal_creator.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Import
+      # This class is responsible for creating the imported proposals
+      # and must be included in proposals component's import manifest.
+      class ProposalCreator < Decidim::Admin::Import::Creator
+        # Retuns the resource class to be created with the provided data.
+        def self.resource_klass
+          Decidim::Proposals::Proposal
+        end
+
+        # Returns a verifier class to be used to verify the correctness of the
+        # import data.
+        def self.verifier_klass
+          Decidim::Proposals::Import::ProposalsVerifier
+        end
+
+        def initialize(data, context = nil)
+          @data = data.except(:id, "id")
+          @context = context
+        end
+
+        # Produces a proposal from parsed data
+        #
+        # Returns a proposal
+        def produce
+          resource.add_coauthor(context[:current_user], user_group: context[:user_group])
+
+          resource
+        end
+
+        # Saves the proposal
+        def finish!
+          super # resource.save!
+          notify(resource)
+          publish(resource)
+        end
+
+        private
+
+        def resource
+          @resource ||= Decidim::Proposals::Proposal.new(
+            category: category,
+            scope: scope,
+            title: title,
+            body: body,
+            address: address,
+            latitude: latitude,
+            longitude: longitude,
+            component: component,
+            published_at: Time.current
+          )
+        end
+
+        def category
+          id = data.has_key?(:category) ? data[:category]["id"] : data[:"category/id"].to_i
+          Decidim::Category.find_by(id: id)
+        end
+
+        def scope
+          id = data.has_key?(:scope) ? data[:scope]["id"] : data[:"scope/id"].to_i
+          Decidim::Scope.find_by(id: id)
+        end
+
+        def title
+          locale_hasher("title", available_locales)
+        end
+
+        def body
+          locale_hasher("body", available_locales)
+        end
+
+        def address
+          data.has_key?(:address) ? data[:address] : nil
+        end
+
+        def latitude
+          data.has_key?(:latitude) ? data[:latitude] : nil
+        end
+
+        def longitude
+          data.has_key?(:longitude) ? data[:longitude] : nil
+        end
+
+        def available_locales
+          @available_locales ||= component.participatory_space.organization.available_locales
+        end
+
+        def component
+          context[:current_component]
+        end
+
+        def notify(proposal)
+          return if proposal.coauthorships.empty?
+
+          Decidim::EventsManager.publish(
+            event: "decidim.events.proposals.proposal_published",
+            event_class: Decidim::Proposals::PublishProposalEvent,
+            resource: proposal,
+            followers: coauthors_followers(proposal)
+          )
+        end
+
+        def publish(proposal)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.proposals.proposal_published",
+            event_class: Decidim::Proposals::PublishProposalEvent,
+            resource: proposal,
+            followers: proposal.participatory_space.followers - coauthors_followers(proposal),
+            extra: {
+              participatory_space: true
+            }
+          )
+        end
+
+        def coauthors_followers(proposal)
+          @coauthors_followers ||= proposal.authors.flat_map(&:followers)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/import/proposals_answers_verifier.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Import
+      # This class is responsible for verifying the data for proposal answers
+      # import.
+      class ProposalsAnswersVerifier < Decidim::Admin::Import::Verifier
+        protected
+
+        def required_headers
+          %w(id state) + required_localized_headers("answer")
+        end
+
+        # Check if prepared resource is valid
+        #
+        # record - Decidim::Proposals::Proposal
+        #
+        # Returns true if record is valid
+        def valid_record?(record)
+          return false if record.nil?
+          return false if record.errors.any?
+
+          record.valid?
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/import/proposals_verifier.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Import
+      # This class is responsible for verifying the data for proposals import.
+      class ProposalsVerifier < Decidim::Admin::Import::Verifier
+        protected
+
+        def required_headers
+          required_localized_headers("title") + required_localized_headers("body")
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/import.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Import
+      autoload :ProposalAnswerCreator, "decidim/proposals/import/proposal_answer_creator"
+      autoload :ProposalCreator, "decidim/proposals/import/proposal_creator"
+      autoload :ProposalsAnswersVerifier, "decidim/proposals/import/proposals_answers_verifier"
+      autoload :ProposalsVerifier, "decidim/proposals/import/proposals_verifier"
+    end
+  end
+end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -33,17 +33,20 @@ module Decidim
           component: { id: component.id },
           title: proposal.title,
           body: proposal.body,
+          address: proposal.address,
+          latitude: proposal.latitude,
+          longitude: proposal.longitude,
           state: proposal.state.to_s,
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
           supports: proposal.proposal_votes_count,
           endorsements: {
-            total_count: proposal.endorsements.count,
+            total_count: proposal.endorsements.size,
             user_endorsements: user_endorsements
           },
           comments: proposal.comments_count,
-          attachments: proposal.attachments.count,
-          followers: proposal.followers.count,
+          attachments: proposal.attachments.size,
+          followers: proposal.follows.size,
           published_at: proposal.published_at,
           url: url,
           meeting_urls: meetings,

data/lib/decidim/proposals/test/factories.rb

@@ -214,14 +214,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_card_image_allowed do
-      settings do
-        {
-          allow_card_image: true
-        }
-      end
-    end
-
     trait :with_extra_hashtags do
       transient do
         automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
@@ -297,7 +289,7 @@ FactoryBot.define do
       proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
 
       if proposal.component
-        users = evaluator.users || [create(:user, organization: proposal.component.participatory_space.organization)]
+        users = evaluator.users || [create(:user, :confirmed, organization: proposal.component.participatory_space.organization)]
         users.each_with_index do |user, idx|
           user_group = evaluator.user_groups[idx]
           proposal.coauthorships.build(author: user, user_group: user_group)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.25.2"
+      "0.26.0.rc1"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -4,6 +4,7 @@ require "decidim/proposals/admin"
 require "decidim/proposals/api"
 require "decidim/proposals/engine"
 require "decidim/proposals/admin_engine"
+require "decidim/proposals/import"
 require "decidim/proposals/component"
 
 module Decidim
@@ -11,7 +12,6 @@ module Decidim
   # allows users to create proposals in a participatory process.
   module Proposals
     autoload :ProposalSerializer, "decidim/proposals/proposal_serializer"
-    autoload :ProposalCreator, "decidim/proposals/proposal_creator"
     autoload :CommentableProposal, "decidim/proposals/commentable_proposal"
     autoload :CommentableCollaborativeDraft, "decidim/proposals/commentable_collaborative_draft"
     autoload :MarkdownToProposals, "decidim/proposals/markdown_to_proposals"