decidim-proposals 0.28.1 → 0.28.2

data/config/locales/zh-TW.yml

@@ -138,9 +138,7 @@ zh-TW:
             comments_enabled: 已啟用留言
             comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
             default_sort_order: 預設提案排序
-            default_sort_order_help: 默認意味著如果啟用了支持，則建議將提案按隨機順序排序，如果封鎖了支持，則將按最受支持的順序排序。
             default_sort_order_options:
-              default: 預設值
               most_commented: 最多評論
               most_endorsed: 最多已連署
               most_followed: 最多追蹤者
@@ -167,7 +165,6 @@ zh-TW:
             proposal_wizard_step_1_help_text: 提案向導「創建」步驟說明文字
             proposal_wizard_step_2_help_text: 提案向導「比較」步驟說明文字
             proposal_wizard_step_3_help_text: 提案向導「完成」步驟說明文字
-            proposal_wizard_step_4_help_text: 提案向導「發佈」步驟說明文字
             resources_permissions_enabled: 每個提案都可以設定行動權限
             scope_id: 範圍
             scopes_enabled: 啟用範圍
@@ -192,9 +189,7 @@ zh-TW:
             creation_enabled: 參與者可以建立提案
             creation_enabled_readonly: 啟用參與式文本功能後，此設置將被禁用。要將提案上傳為參與式文本，請點擊“參與式文本”按鈕，然後按照說明進行操作。
             default_sort_order: 預設提案排序
-            default_sort_order_help: 默認意味著如果啟用了支持，則建議將提案按隨機順序排序，如果封鎖了支持，則將按最受支持的順序排序。
             default_sort_order_options:
-              default: 預設值
               most_commented: 最多評論
               most_endorsed: 最多已連署
               most_followed: 最多追蹤者

data/lib/decidim/proposals/component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "decidim/meetings"
-
 Decidim.register_component(:proposals) do |component|
   component.engine = Decidim::Proposals::Engine
   component.admin_engine = Decidim::Proposals::AdminEngine
@@ -23,7 +21,7 @@ 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
+  POSSIBLE_SORT_ORDERS = %w(automatic 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
@@ -37,7 +35,7 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
     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 :default_sort_order, type: :select, default: "automatic", 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: true

data/lib/decidim/proposals/proposal_serializer.rb

@@ -19,6 +19,9 @@ module Decidim
       def serialize
         {
           id: proposal.id,
+          author: {
+            **author_fields
+          },
           category: {
             id: proposal.category.try(:id),
             name: proposal.category.try(:name) || empty_translatable
@@ -102,6 +105,54 @@ module Decidim
 
         convert_to_text(value)
       end
+
+      def author_fields
+        is_author_user_group = resource.coauthorships.map(&:decidim_user_group_id).any?
+
+        {
+          id: resource.authors.map(&:id),
+          name: resource.authors.map do |author|
+            author_name(is_author_user_group ? resource.coauthorships.first.user_group : author)
+          end,
+          url: resource.authors.map do |author|
+            author_url(is_author_user_group ? resource.coauthorships.first.user_group : author)
+          end
+        }
+      end
+
+      def author_name(author)
+        if author.respond_to?(:name)
+          translated_attribute(author.name) # is a Decidim::User or Decidim::Organization or Decidim::UserGroup
+        elsif author.respond_to?(:title)
+          translated_attribute(author.title) # is a Decidim::Meetings::Meeting
+        end
+      end
+
+      def author_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author.nickname) # is a Decidim::User or Decidim::UserGroup
+        elsif author.respond_to?(:title)
+          meeting_url(author) # is a Decidim::Meetings::Meeting
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+
+      def profile_url(nickname)
+        Decidim::Core::Engine.routes.url_helpers.profile_url(nickname, host:)
+      end
+
+      def meeting_url(meeting)
+        Decidim::EngineRouter.main_proxy(meeting.component).meeting_url(id: meeting.id, host:)
+      end
+
+      def root_url
+        Decidim::Core::Engine.routes.url_helpers.root_url(host:)
+      end
+
+      def host
+        resource.organization.host
+      end
     end
   end
 end

data/lib/decidim/proposals/seeds.rb

@@ -69,6 +69,7 @@ module Decidim
         end
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
       def create_proposal!(component:)
         n = rand(5)
         state, answer, state_published_at = if n > 3
@@ -103,7 +104,7 @@ module Decidim
           visibility: "all"
         ) do
           proposal = Decidim::Proposals::Proposal.new(params)
-          meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+          n = 3 if n == 2 && !Decidim.module_installed?(:meetings)
 
           coauthor = case n
                      when 0
@@ -111,6 +112,8 @@ module Decidim
                      when 1
                        Decidim::UserGroup.where(organization:).sample
                      when 2
+                       meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+
                        Decidim::Meetings::Meeting.where(component: meeting_component).sample
                      else
                        organization
@@ -120,6 +123,7 @@ module Decidim
           proposal
         end
       end
+      # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
       def random_nickname
         "#{::Faker::Twitter.unique.screen_name}-#{SecureRandom.hex(4)}"[0, 20]

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

@@ -411,6 +411,12 @@ FactoryBot.define do
         proposal.attachments << create(:attachment, :with_pdf, attached_to: proposal, skip_injection: evaluator.skip_injection)
       end
     end
+
+    trait :moderated do
+      after(:create) do |proposal, evaluator|
+        create(:moderation, reportable: proposal, hidden_at: 2.days.ago, skip_injection: evaluator.skip_injection)
+      end
+    end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
@@ -435,7 +441,13 @@ FactoryBot.define do
     transient do
       skip_injection { false }
     end
-    body { Faker::Lorem.sentences(number: 3).join("\n") }
+    body do
+      if skip_injection
+        generate(:title)
+      else
+        "<script>alert(\"proposal_note_body\");</script> #{generate(:title)}"
+      end
+    end
     proposal { build(:proposal, skip_injection:) }
     author { build(:user, organization: proposal.organization, skip_injection:) }
   end

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-conference
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.28.2
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -333,6 +333,7 @@ files:
 - app/packs/documents/decidim/proposals/participatory_texts/participatory_text.odt
 - app/packs/entrypoints/decidim_proposals.js
 - app/packs/entrypoints/decidim_proposals_admin.js
+- app/packs/entrypoints/participatory_texts_admin.js
 - app/packs/images/decidim/gamification/badges/decidim_gamification_badges_accepted_proposals.svg
 - app/packs/images/decidim/gamification/badges/decidim_gamification_badges_proposal_votes.svg
 - app/packs/images/decidim/gamification/badges/decidim_gamification_badges_proposals.svg
@@ -342,6 +343,7 @@ files:
 - app/packs/src/decidim/proposals/admin/proposals_form.js
 - app/packs/src/decidim/proposals/choose_proposals.js
 - app/packs/src/decidim/proposals/utils.js
+- app/packs/stylesheets/decidim/proposals/admin/participatory_texts.scss
 - app/packs/stylesheets/decidim/proposals/proposals.scss
 - app/permissions/decidim/proposals/admin/permissions.rb
 - app/permissions/decidim/proposals/permissions.rb
@@ -352,7 +354,6 @@ files:
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb
 - app/presenters/decidim/proposals/collaborative_draft_presenter.rb
-- app/presenters/decidim/proposals/log/resource_presenter.rb
 - app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/official_author_presenter.rb
 - app/presenters/decidim/proposals/proposal_presenter.rb
@@ -618,7 +619,7 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -633,8 +634,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Decidim proposals module
 test_files: []

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    module Log
-      class ResourcePresenter < 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).title
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end