decidim-proposals 0.23.0 → 0.24.0.rc1

data/config/locales/uk.yml

@@ -139,10 +139,6 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: У %{participatory_space_title} почалось голосування щодо пропозицій
           notification_title: Тепер в <a href="%{participatory_space_url}">%{participatory_space_title}</a> відкрилась можливість <a href="%{resource_path}">голосувати щодо пропозицій</a>
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_proposals:
-          proposals: Пропозиції
     proposals:
       actions:
         import: Запозичити з іншої складової
@@ -152,7 +148,6 @@ uk:
         actions:
           preview: Попередній перегляд
         exports:
-          comments: Коментарі
           proposals: Пропозиції
         models:
           proposal:

data/config/locales/zh-CN.yml

@@ -324,10 +324,6 @@ zh-CN:
         description: 支持提议的数量
         object: 支持
         title: 支持
-    participatory_processes:
-      participatory_process_groups:
-        highlighted_proposals:
-          proposals: 建议
     participatory_spaces:
       highlighted_proposals:
         see_all: 查看所有建议 (%{count})
@@ -344,7 +340,6 @@ zh-CN:
         actions:
           preview: 预览
         exports:
-          comments: 评论
           proposals: 建议
         models:
           proposal:
@@ -368,9 +363,7 @@ zh-CN:
           new_import:
             accepted_mime_types:
               md: Markdown
-              odt: 好的
             bottom_hint: "(您将能够预览和排序文档部分)"
-            document_legend: '添加一个小于2MB的文档，每个部分直到3级深度将被解析为建议书。支持的格式为： %{valid_mime_types}'
             title: 添加文档
             upload_document: 上传文档
           publish:
@@ -555,13 +548,6 @@ zh-CN:
               ok: 撤回协作草稿
               title: 以下操作是不可逆的
             success: 协作草案已成功撤销。
-        compare:
-          mine_is_different: 我的合作草稿是不同的
-          no_similars_found: 干得好！找不到类似的协作草稿
-          title: 类似的合作草稿
-        complete:
-          send: 发送
-          title: 完成您的协作草稿
         count:
           drafts_count:
             other: "%{count} 协作草稿"
@@ -592,7 +578,6 @@ zh-CN:
           unfold: 展开...
         new:
           send: 继续
-          title: 创建您的协作草稿
         new_collaborative_draft_button:
           new_collaborative_draft: 新的协作草稿
         orders:
@@ -636,23 +621,11 @@ zh-CN:
         update:
           error: 保存合作草稿时出现问题。
           success: 协作草稿已成功更新。
-          title: 编辑协作草稿
         wizard_aside:
-          back: 后退
           back_from_collaborative_draft: 返回协作草稿
-          back_from_step_1: 返回协作草稿
-          back_from_step_2: 返回协作草稿
-          back_from_step_3: 返回比较协作草稿
-          back_from_step_4: 返回编辑草稿
           info: 您正在创建一个 <strong>协作草案</strong>。
-        wizard_steps:
-          current_step: 当前步骤
-          see_steps: 查看步骤
-          step_1: 创建您的协作草稿
-          step_2: 与协作草稿比较
-          step_3: 完成您的协作草稿
-          step_of: 步骤 %{current_step_num} / %{total_steps}
-          title: 协作创建步骤草案
+        wizard_header:
+          title: 创建您的协作草稿
       create:
         error: 保存建议时出现问题。
         success: 建议已成功创建为草稿。

data/db/migrate/20200708091228_move_proposals_fields_to_i18n.rb

@@ -11,7 +11,13 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
       Decidim::Proposals::Proposal.find_each do |proposal|
         author = proposal.coauthorships.first.author
 
-        locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
+        locale = if author
+                   author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
+                 elsif proposal.component && proposal.component.participatory_space
+                   proposal.component.participatory_space.organization.default_locale
+                 else
+                   I18n.default_locale.to_s
+                 end
 
         proposal.new_title = {
           locale => proposal.title
@@ -20,7 +26,7 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
           locale => proposal.body
         }
 
-        proposal.save!
+        proposal.save(validate: false)
       end
     end
 

data/db/migrate/20210127115628_fix_answered_proposals_after_copy.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class FixAnsweredProposalsAfterCopy < ActiveRecord::Migration[5.2]
+  def change
+    proposals_after_copy = Decidim::ResourceLink.where(from_type: "Decidim::Proposals::Proposal").pluck(:from_id)
+
+    result = Decidim::Proposals::Proposal.where.not(state_published_at: nil).where(state: nil, id: proposals_after_copy)
+
+    result.find_each do |proposal|
+      proposal.state_published_at = nil
+      proposal.save!
+    end
+  end
+end

data/{app/types/decidim/proposals → lib/decidim/api}/proposal_input_sort.rb

@@ -9,14 +9,12 @@ module Decidim
       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 :id, GraphQL::Types::String, "Sort by ID, valid values are ASC or DESC", required: false
       argument :vote_count,
-               type: String,
+               type: GraphQL::Types::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
+               as: :proposal_votes_count
     end
   end
 end

data/lib/decidim/api/proposal_type.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalType < Decidim::Api::Types::BaseObject
+      description "A proposal"
+
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::CoauthorableInterface
+      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::FingerprintInterface
+      implements Decidim::Core::AmendableInterface
+      implements Decidim::Core::AmendableEntityInterface
+      implements Decidim::Core::TraceableInterface
+      implements Decidim::Core::EndorsableInterface
+      implements Decidim::Core::TimestampsInterface
+
+      field :id, GraphQL::Types::ID, null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this title", null: true
+      field :body, Decidim::Core::TranslatedFieldType, "The description for this body", null: true
+      field :address, GraphQL::Types::String, "The physical address (location) of this proposal", null: true
+      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal", null: true
+
+      def coordinates
+        [object.latitude, object.longitude]
+      end
+      field :reference, GraphQL::Types::String, "This proposal's unique reference", null: true
+      field :state, GraphQL::Types::String, "The answer status in which proposal is in", null: true
+      field :answer, Decidim::Core::TranslatedFieldType, "The answer feedback for the status for this proposal", null: true
+
+      field :answered_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was answered", null: true
+
+      field :published_at, Decidim::Core::DateTimeType, description: "The date and time this proposal was published", null: true
+
+      field :participatory_text_level, GraphQL::Types::String, description: "If it is a participatory text, the level indicates the type of paragraph", null: true
+      field :position, GraphQL::Types::Int, "Position of this proposal in the participatory text", null: true
+
+      field :official, GraphQL::Types::Boolean, "Whether this proposal is official or not", method: :official?, null: true
+      field :created_in_meeting, GraphQL::Types::Boolean, "Whether this proposal comes from a meeting or not", method: :official_meeting?, null: true
+      field :meeting, Decidim::Meetings::MeetingType, description: "If the proposal comes from a meeting, the related meeting", null: true
+
+      def meeting
+        object.authors.first if object.official_meeting?
+      end
+
+      field :vote_count, GraphQL::Types::Int, description: "The total amount of votes the proposal has received", null: true
+
+      def vote_count
+        current_component = object.component
+        object.proposal_votes_count unless current_component.current_settings.votes_hidden?
+      end
+    end
+  end
+end

data/lib/decidim/api/proposals_type.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalListHelper < Decidim::Core::ComponentListBase
+      # only querying published posts
+      def query_scope
+        super.published
+      end
+    end
+
+    class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
+      # only querying published posts
+      def query_scope
+        super.published
+      end
+    end
+
+    class ProposalsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Proposals"
+      description "A proposals component of a participatory space."
+
+      field :proposals, type: Decidim::Proposals::ProposalType.connection_type, description: "List all proposals", connection: true, null: true do
+        argument :order, Decidim::Proposals::ProposalInputSort, "Provides several methods to order the results", required: false
+        argument :filter, Decidim::Proposals::ProposalInputFilter, "Provides several methods to filter the results", required: false
+      end
+
+      field :proposal, type: Decidim::Proposals::ProposalType, description: "Finds one proposal", null: true do
+        argument :id, GraphQL::Types::ID, "The ID of the proposal", required: true
+      end
+
+      def proposals(filter: {}, order: {})
+        Decidim::Proposals::ProposalListHelper.new(model_class: Proposal).call(object, { filter: filter, order: order }, context)
+      end
+
+      def proposal(id:)
+        Decidim::Proposals::ProposalFinderHelper.new(model_class: Proposal).call(object, { id: id }, context)
+      end
+    end
+  end
+end

data/lib/decidim/content_renderers/proposal_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class ProposalRenderer < BaseRenderer
       # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid:\/\/([\w-]*\/Decidim::Proposals::Proposal\/(\d+))}i.freeze
+      GLOBAL_ID_REGEX = %r{gid://([\w-]*/Decidim::Proposals::Proposal/(\d+))}i.freeze
 
       # Replaces found Global IDs matching an existing proposal with
       # a link to its show page. The Global IDs representing an

data/lib/decidim/proposals.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/proposals/admin"
+require "decidim/proposals/api"
 require "decidim/proposals/engine"
 require "decidim/proposals/admin_engine"
 require "decidim/proposals/component"
@@ -11,6 +12,7 @@ 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"

data/lib/decidim/proposals/api.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    autoload :ProposalInputFilter, "decidim/api/proposal_input_filter"
+    autoload :ProposalInputSort, "decidim/api/proposal_input_sort"
+    autoload :ProposalType, "decidim/api/proposal_type"
+    autoload :ProposalsType, "decidim/api/proposals_type"
+  end
+end

data/lib/decidim/proposals/component.rb

@@ -5,6 +5,7 @@ require "decidim/components/namer"
 Decidim.register_component(:proposals) do |component|
   component.engine = Decidim::Proposals::Engine
   component.admin_engine = Decidim::Proposals::AdminEngine
+  component.stylesheet = "decidim/proposals/proposals"
   component.icon = "decidim/proposals/icon.svg"
 
   component.on(:before_destroy) do |instance|
@@ -28,6 +29,7 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :minimum_votes_per_user, type: :integer, default: 0
     settings.attribute :proposal_limit, type: :integer, default: 0
     settings.attribute :proposal_length, type: :integer, default: 500
+    settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(limited infinite) }
     settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5
     settings.attribute :threshold_per_proposal, type: :integer, default: 0
     settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
@@ -80,6 +82,7 @@ Decidim.register_component(:proposals) do |component|
     resource.model_class_name = "Decidim::Proposals::Proposal"
     resource.template = "decidim/proposals/proposals/linked_proposals"
     resource.card = "decidim/proposals/proposal"
+    resource.reported_content_cell = "decidim/proposals/reported_content"
     resource.actions = %w(endorse vote amend)
     resource.searchable = true
   end
@@ -87,6 +90,7 @@ Decidim.register_component(:proposals) do |component|
   component.register_resource(:collaborative_draft) do |resource|
     resource.model_class_name = "Decidim::Proposals::CollaborativeDraft"
     resource.card = "decidim/proposals/collaborative_draft"
+    resource.reported_content_cell = "decidim/proposals/collaborative_drafts/reported_content"
   end
 
   component.register_stat :proposals_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
@@ -138,16 +142,22 @@ Decidim.register_component(:proposals) do |component|
     exports.serializer Decidim::Proposals::ProposalSerializer
   end
 
-  component.exports :comments do |exports|
+  component.exports :proposal_comments do |exports|
     exports.collection do |component_instance|
       Decidim::Comments::Export.comments_for_resource(
         Decidim::Proposals::Proposal, component_instance
       )
     end
 
+    exports.include_in_open_data = true
+
     exports.serializer Decidim::Comments::CommentSerializer
   end
 
+  component.imports :proposals do |imports|
+    imports.creator Decidim::Proposals::ProposalCreator
+  end
+
   component.seeds do |participatory_space|
     admin_user = Decidim::User.find_by(
       organization: participatory_space.organization,
@@ -191,13 +201,13 @@ Decidim.register_component(:proposals) do |component|
 
     5.times do |n|
       state, answer, state_published_at = if n > 3
-                                            ["accepted", Decidim::Faker::Localized.sentence(10), Time.current]
+                                            ["accepted", Decidim::Faker::Localized.sentence(word_count: 10), Time.current]
                                           elsif n > 2
                                             ["rejected", nil, Time.current]
                                           elsif n > 1
                                             ["evaluating", nil, Time.current]
                                           elsif n.positive?
-                                            ["accepted", Decidim::Faker::Localized.sentence(10), nil]
+                                            ["accepted", Decidim::Faker::Localized.sentence(word_count: 10), nil]
                                           else
                                             [nil, nil, nil]
                                           end
@@ -205,9 +215,9 @@ Decidim.register_component(:proposals) do |component|
       params = {
         component: component,
         category: participatory_space.categories.sample,
-        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-        title: { en: Faker::Lorem.sentence(2) },
-        body: { en: Faker::Lorem.paragraphs(2).join("\n") },
+        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
+        title: { en: Faker::Lorem.sentence(word_count: 2) },
+        body: { en: Faker::Lorem.paragraphs(number: 2).join("\n") },
         state: state,
         answer: answer,
         answered_at: state.present? ? Time.current : nil,
@@ -271,9 +281,9 @@ Decidim.register_component(:proposals) do |component|
         params = {
           component: component,
           category: participatory_space.categories.sample,
-          scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-          title: { en: "#{proposal.title["en"]} #{Faker::Lorem.sentence(1)}" },
-          body: { en: "#{proposal.body["en"]} #{Faker::Lorem.sentence(3)}" },
+          scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
+          title: { en: "#{proposal.title["en"]} #{Faker::Lorem.sentence(word_count: 1)}" },
+          body: { en: "#{proposal.body["en"]} #{Faker::Lorem.sentence(word_count: 3)}" },
           state: "evaluating",
           answer: nil,
           answered_at: Time.current,
@@ -314,7 +324,7 @@ Decidim.register_component(:proposals) do |component|
           tos_agreement: "1",
           confirmed_at: Time.current,
           personal_url: Faker::Internet.url,
-          about: Faker::Lorem.paragraph(2)
+          about: Faker::Lorem.paragraph(sentence_count: 2)
         )
 
         Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.published_state? && proposal.rejected?
@@ -366,7 +376,7 @@ Decidim.register_component(:proposals) do |component|
         Decidim::Proposals::ProposalNote.create!(
           proposal: proposal,
           author: author_admin,
-          body: Faker::Lorem.paragraphs(2).join("\n")
+          body: Faker::Lorem.paragraphs(number: 2).join("\n")
         )
       end
 
@@ -388,9 +398,9 @@ Decidim.register_component(:proposals) do |component|
         draft = Decidim::Proposals::CollaborativeDraft.new(
           component: component,
           category: participatory_space.categories.sample,
-          scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-          title: Faker::Lorem.sentence(2),
-          body: Faker::Lorem.paragraphs(2).join("\n"),
+          scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
+          title: Faker::Lorem.sentence(word_count: 2),
+          body: Faker::Lorem.paragraphs(number: 2).join("\n"),
           state: state,
           published_at: Time.current
         )
@@ -399,7 +409,8 @@ Decidim.register_component(:proposals) do |component|
         draft
       end
 
-      if n == 2
+      case n
+      when 2
         author2 = Decidim::User.where(organization: component.organization).all.sample
         Decidim::Coauthorship.create(coauthorable: draft, author: author2)
         author3 = Decidim::User.where(organization: component.organization).all.sample
@@ -410,7 +421,7 @@ Decidim.register_component(:proposals) do |component|
         Decidim::Coauthorship.create(coauthorable: draft, author: author5)
         author6 = Decidim::User.where(organization: component.organization).all.sample
         Decidim::Coauthorship.create(coauthorable: draft, author: author6)
-      elsif n == 3
+      when 3
         author2 = Decidim::User.where(organization: component.organization).all.sample
         Decidim::Coauthorship.create(coauthorable: draft, author: author2)
       end
@@ -423,9 +434,9 @@ Decidim.register_component(:proposals) do |component|
       Decidim::User.where(organization: component.organization).all.sample,
       component: component,
       category: participatory_space.categories.sample,
-      scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-      title: Faker::Lorem.sentence(2),
-      body: Faker::Lorem.paragraphs(2).join("\n")
+      scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
+      title: Faker::Lorem.sentence(word_count: 2),
+      body: Faker::Lorem.paragraphs(number: 2).join("\n")
     )
   end
 end