decidim-proposals 0.27.4 → 0.28.0.rc4

data/lib/decidim/proposals/component.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
 require "decidim/meetings"
 
 Decidim.register_component(:proposals) do |component|
@@ -8,9 +7,10 @@ Decidim.register_component(:proposals) do |component|
   component.admin_engine = Decidim::Proposals::AdminEngine
   component.stylesheet = "decidim/proposals/proposals"
   component.icon = "media/images/decidim_proposals.svg"
+  component.icon_key = "chat-new-line"
 
   component.on(:before_destroy) do |instance|
-    raise "Can't destroy this component when there are proposals" if Decidim::Proposals::Proposal.where(component: instance).any?
+    raise "Cannot destroy this component when there are proposals" if Decidim::Proposals::Proposal.where(component: instance).any?
   end
 
   component.data_portable_entities = ["Decidim::Proposals::Proposal"]
@@ -51,7 +51,10 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :amendments_enabled, type: :boolean, default: false
     settings.attribute :amendments_wizard_help_text, type: :text, translated: true, editor: true, required: false
     settings.attribute :announcement, type: :text, translated: true, editor: true
-    settings.attribute :new_proposal_body_template, type: :text, translated: true, editor: true, required: false
+    settings.attribute :new_proposal_body_template,
+                       type: :text, translated: true,
+                       editor: ->(context) { context[:component].organization.rich_text_editor_in_public_views },
+                       required: false
     settings.attribute :new_proposal_help_text, type: :text, translated: true, editor: true
     settings.attribute :proposal_wizard_step_1_help_text, type: :text, translated: true, editor: true
     settings.attribute :proposal_wizard_step_2_help_text, type: :text, translated: true, editor: true
@@ -135,7 +138,7 @@ Decidim.register_component(:proposals) do |component|
                    .where(component: component_instance)
                    .includes(:scope, :category, :component)
 
-      if space.user_roles(:valuator).where(user: user).any?
+      if space.user_roles(:valuator).where(user:).any?
         collection.with_valuation_assigned_to(user, space)
       else
         collection
@@ -164,7 +167,7 @@ Decidim.register_component(:proposals) do |component|
     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(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.proposals", 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") }
@@ -175,7 +178,7 @@ Decidim.register_component(:proposals) do |component|
 
   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(:resource_name) { |count: 1| I18n.t("decidim.proposals.admin.imports.resources.answers", 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") }
@@ -194,289 +197,8 @@ Decidim.register_component(:proposals) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    step_settings = if participatory_space.allows_steps?
-                      { participatory_space.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true } }
-                    else
-                      {}
-                    end
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name,
-      manifest_name: :proposals,
-      published_at: Time.current,
-      participatory_space: participatory_space,
-      settings: {
-        vote_limit: 0,
-        collaborative_drafts_enabled: true
-      },
-      step_settings: step_settings
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    if participatory_space.scope
-      scopes = participatory_space.scope.descendants
-      global = participatory_space.scope
-    else
-      scopes = participatory_space.organization.scopes
-      global = nil
-    end
-
-    5.times do |n|
-      state, answer, state_published_at = if n > 3
-                                            ["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(word_count: 10), nil]
-                                          else
-                                            [nil, nil, nil]
-                                          end
-
-      params = {
-        component: component,
-        category: participatory_space.categories.sample,
-        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,
-        state_published_at: state_published_at,
-        published_at: Time.current
-      }
-
-      proposal = Decidim.traceability.perform_action!(
-        "publish",
-        Decidim::Proposals::Proposal,
-        admin_user,
-        visibility: "all"
-      ) do
-        proposal = Decidim::Proposals::Proposal.new(params)
-        meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
-
-        coauthor = case n
-                   when 0
-                     Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
-                   when 1
-                     Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
-                   when 2
-                     Decidim::Meetings::Meeting.where(component: meeting_component).order(Arel.sql("RANDOM()")).first
-                   else
-                     participatory_space.organization
-                   end
-        proposal.add_coauthor(coauthor)
-        proposal.save!
-        proposal
-      end
-
-      if proposal.state.nil?
-        email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
-        name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
-
-        author = Decidim::User.find_or_initialize_by(email: email)
-        author.update!(
-          password: "decidim123456789",
-          password_confirmation: "decidim123456789",
-          name: name,
-          nickname: Faker::Twitter.unique.screen_name,
-          organization: component.organization,
-          tos_agreement: "1",
-          confirmed_at: Time.current
-        )
-
-        group = Decidim::UserGroup.create!(
-          name: Faker::Name.name,
-          nickname: Faker::Twitter.unique.screen_name,
-          email: Faker::Internet.email,
-          extended_data: {
-            document_number: Faker::Code.isbn,
-            phone: Faker::PhoneNumber.phone_number,
-            verified_at: Time.current
-          },
-          decidim_organization_id: component.organization.id,
-          confirmed_at: Time.current
-        )
-
-        Decidim::UserGroupMembership.create!(
-          user: author,
-          role: "creator",
-          user_group: group
-        )
-
-        params = {
-          component: component,
-          category: participatory_space.categories.sample,
-          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,
-          published_at: Time.current
-        }
-
-        emendation = Decidim.traceability.perform_action!(
-          "create",
-          Decidim::Proposals::Proposal,
-          author,
-          visibility: "public-only"
-        ) do
-          emendation = Decidim::Proposals::Proposal.new(params)
-          emendation.add_coauthor(author, user_group: author.user_groups.first)
-          emendation.save!
-          emendation
-        end
-
-        Decidim::Amendment.create!(
-          amender: author,
-          amendable: proposal,
-          emendation: emendation,
-          state: "evaluating"
-        )
-      end
-
-      (n % 3).times do |m|
-        email = "vote-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-#{m}@example.org"
-        name = "#{Faker::Name.name} #{participatory_space.id} #{n} #{m}"
-
-        author = Decidim::User.find_or_initialize_by(email: email)
-        author.update!(
-          password: "decidim123456789",
-          password_confirmation: "decidim123456789",
-          name: name,
-          nickname: Faker::Twitter.unique.screen_name,
-          organization: component.organization,
-          tos_agreement: "1",
-          confirmed_at: Time.current,
-          personal_url: Faker::Internet.url,
-          about: Faker::Lorem.paragraph(sentence_count: 2)
-        )
-
-        Decidim::Proposals::ProposalVote.create!(proposal: proposal, author: author) unless proposal.published_state? && proposal.rejected?
-        Decidim::Proposals::ProposalVote.create!(proposal: emendation, author: author) if emendation
-      end
-
-      unless proposal.published_state? && proposal.rejected?
-        (n * 2).times do |index|
-          email = "endorsement-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-endr#{index}@example.org"
-          name = "#{Faker::Name.name} #{participatory_space.id} #{n} endr#{index}"
-
-          author = Decidim::User.find_or_initialize_by(email: email)
-          author.update!(
-            password: "decidim123456789",
-            password_confirmation: "decidim123456789",
-            name: name,
-            nickname: Faker::Twitter.unique.screen_name,
-            organization: component.organization,
-            tos_agreement: "1",
-            confirmed_at: Time.current
-          )
-          if index.even?
-            group = Decidim::UserGroup.create!(
-              name: Faker::Name.name,
-              nickname: Faker::Twitter.unique.screen_name,
-              email: Faker::Internet.email,
-              extended_data: {
-                document_number: Faker::Code.isbn,
-                phone: Faker::PhoneNumber.phone_number,
-                verified_at: Time.current
-              },
-              decidim_organization_id: component.organization.id,
-              confirmed_at: Time.current
-            )
-
-            Decidim::UserGroupMembership.create!(
-              user: author,
-              role: "creator",
-              user_group: group
-            )
-          end
-          Decidim::Endorsement.create!(resource: proposal, author: author, user_group: author.user_groups.first)
-        end
-      end
-
-      (n % 3).times do
-        author_admin = Decidim::User.where(organization: component.organization, admin: true).all.sample
-
-        Decidim::Proposals::ProposalNote.create!(
-          proposal: proposal,
-          author: author_admin,
-          body: Faker::Lorem.paragraphs(number: 2).join("\n")
-        )
-      end
-
-      Decidim::Comments::Seed.comments_for(proposal)
-
-      #
-      # Collaborative drafts
-      #
-      state = if n > 3
-                "published"
-              elsif n > 2
-                "withdrawn"
-              else
-                "open"
-              end
-      author = Decidim::User.where(organization: component.organization).all.sample
-
-      draft = Decidim.traceability.perform_action!("create", Decidim::Proposals::CollaborativeDraft, author) do
-        draft = Decidim::Proposals::CollaborativeDraft.new(
-          component: component,
-          category: participatory_space.categories.sample,
-          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
-        )
-        draft.coauthorships.build(author: participatory_space.organization)
-        draft.save!
-        draft
-      end
-
-      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
-        Decidim::Coauthorship.create(coauthorable: draft, author: author3)
-        author4 = Decidim::User.where(organization: component.organization).all.sample
-        Decidim::Coauthorship.create(coauthorable: draft, author: author4)
-        author5 = Decidim::User.where(organization: component.organization).all.sample
-        Decidim::Coauthorship.create(coauthorable: draft, author: author5)
-        author6 = Decidim::User.where(organization: component.organization).all.sample
-        Decidim::Coauthorship.create(coauthorable: draft, author: author6)
-      when 3
-        author2 = Decidim::User.where(organization: component.organization).all.sample
-        Decidim::Coauthorship.create(coauthorable: draft, author: author2)
-      end
-
-      Decidim::Comments::Seed.comments_for(draft)
-    end
+    require "decidim/proposals/seeds"
 
-    Decidim.traceability.update!(
-      Decidim::Proposals::CollaborativeDraft.all.sample,
-      Decidim::User.where(organization: component.organization).all.sample,
-      component: component,
-      category: participatory_space.categories.sample,
-      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")
-    )
+    Decidim::Proposals::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/proposals/doc_to_markdown.rb

@@ -17,7 +17,6 @@ module Decidim
       # sometimes markdown documents are classified as text/plain
       TEXT_PLAIN_MIME_TYPE = "text/plain"
       ODT_MIME_TYPE = "application/vnd.oasis.opendocument.text"
-      DOCX_MIME_TYPE = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
 
       # Accepted mime types
       # keys: are used for dynamic help text on admin form.
@@ -36,9 +35,6 @@ module Decidim
                        when ODT_MIME_TYPE
                          # convert libreoffice odt to markdown
                          OdtToMarkdown.new(doc)
-                       when DOCX_MIME_TYPE
-                         # convert word 2013 docx to markdown
-                         DocxToMarkdown.new(doc)
                        end
       end
 

data/lib/decidim/proposals/engine.rb

@@ -23,8 +23,7 @@ module Decidim
             put :withdraw
           end
           resource :proposal_vote, only: [:create, :destroy]
-          resource :widget, only: :show, path: "embed"
-          resources :versions, only: [:show, :index]
+          resources :versions, only: [:show]
         end
         resources :collaborative_drafts, except: [:destroy] do
           member do
@@ -34,12 +33,33 @@ module Decidim
             post :withdraw
             post :publish
           end
-          resources :versions, only: [:show, :index]
+          resources :versions, only: [:show]
         end
-        root to: "proposals#index"
+        scope "/proposals" do
+          root to: "proposals#index"
+        end
+        get "/", to: redirect("proposals", status: 301)
+      end
+
+      initializer "decidim_proposals.register_icons" do
+        Decidim.icons.register(name: "Decidim::Proposals::CollaborativeDraft", icon: "draft-line", category: "activity",
+                               description: "Collaborative draft", engine: :proposals)
+        Decidim.icons.register(name: "Decidim::Proposals::Proposal", icon: "chat-new-line", category: "activity",
+                               description: "Proposal", engine: :proposals)
+        Decidim.icons.register(name: "participatory_texts_item", icon: "bookmark-line", description: "Index item", category: "participatory_texts",
+                               engine: :proposals)
+
+        Decidim.icons.register(name: "scan-line", icon: "scan-line", category: "system", description: "", engine: :proposals)
+        Decidim.icons.register(name: "edit-2-line", icon: "edit-2-line",
+                               category: "action", description: "Edit icon for Collaborative Drafts", engine: :proposals)
+
+        Decidim.icons.register(name: "bookmark-line", icon: "bookmark-line", category: "system", description: "", engine: :proposals)
+        Decidim.icons.register(name: "arrow-right-s-fill", icon: "arrow-right-s-fill", category: "system", description: "", engine: :proposals)
+        Decidim.icons.register(name: "bar-chart-2-line", icon: "bar-chart-2-line", category: "system", description: "", engine: :proposals)
+        Decidim.icons.register(name: "scales-line", icon: "scales-line", category: "system", description: "", engine: :proposals)
       end
 
-      initializer "decidim.content_processors" do |_app|
+      initializer "decidim_proposals.content_processors" do |_app|
         Decidim.configure do |config|
           config.content_processors += [:proposal]
         end
@@ -51,7 +71,7 @@ module Decidim
         end
       end
 
-      initializer "decidim_changes" do
+      initializer "decidim_proposals.settings_changes" do
         config.to_prepare do
           Decidim::SettingsChange.subscribe "surveys" do |changes|
             Decidim::Proposals::SettingsChangeJob.perform_later(
@@ -91,7 +111,7 @@ module Decidim
       end
 
       initializer "decidim_proposals.remove_space_admins" do
-        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
+        ActiveSupport::Notifications.subscribe("decidim.admin.participatorty_space.destroy_admin:after") do |_event_name, klass, id|
           Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
         end
       end
@@ -208,6 +228,22 @@ module Decidim
       initializer "decidim_proposals.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_proposals.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:proposals) do |transfer|
+            transfer.move_records(Decidim::Proposals::ProposalVote, :decidim_author_id)
+          end
+        end
+      end
+
+      initializer "decidim_proposals.moderation_content" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::Proposals::HideAllCreatedByAuthorJob.perform_later(**data)
+          end
+        end
+      end
     end
   end
 end

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

@@ -47,7 +47,7 @@ module Decidim
         end
 
         def fetch_resource
-          proposal = Decidim::Proposals::Proposal.find_by(id: id)
+          proposal = Decidim::Proposals::Proposal.find_by(id:)
           return nil unless proposal
           return nil if proposal.emendation?
 

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

@@ -45,26 +45,26 @@ module Decidim
 
         def resource
           @resource ||= Decidim::Proposals::Proposal.new(
-            category: category,
-            scope: scope,
-            title: title,
-            body: body,
-            address: address,
-            latitude: latitude,
-            longitude: longitude,
-            component: component,
+            category:,
+            scope:,
+            title:,
+            body:,
+            address:,
+            latitude:,
+            longitude:,
+            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)
+          Decidim::Category.find_by(id:)
         end
 
         def scope
           id = data.has_key?(:scope) ? data[:scope]["id"] : data[:"scope/id"].to_i
-          Decidim::Scope.find_by(id: id)
+          Decidim::Scope.find_by(id:)
         end
 
         def title

data/lib/decidim/proposals/markdown_to_proposals.rb

@@ -41,6 +41,12 @@ module Decidim
 
       # Block-level calls ######################
 
+      # Recarpet callback to preprocess the document.
+      # Removes the HTML comment from the markdown file
+      def preprocess(document)
+        document.gsub(/<!--.*-->/, "")
+      end
+
       # Recarpet callback to process headers.
       # Creates Paricipatory Text Proposals at Section and Subsection levels.
       def header(title, level)
@@ -133,12 +139,12 @@ module Decidim
           component: @component,
           title: { I18n.locale => title },
           body: { I18n.locale => body },
-          participatory_text_level: participatory_text_level
+          participatory_text_level:
         }
 
         PaperTrail.request(enabled: false) do
           proposal = Decidim::Proposals::ProposalBuilder.create(
-            attributes: attributes,
+            attributes:,
             author: @component.organization,
             action_user: @current_user
           )

data/lib/decidim/proposals/proposal_serializer.rb

@@ -43,15 +43,15 @@ module Decidim
           supports: proposal.proposal_votes_count,
           endorsements: {
             total_count: proposal.endorsements.size,
-            user_endorsements: user_endorsements
+            user_endorsements:
           },
           comments: proposal.comments_count,
-          attachments: proposal.attachments.size,
+          attachments: proposal.attachments.count,
           followers: proposal.follows.size,
           published_at: proposal.published_at,
-          url: url,
+          url:,
           meeting_urls: meetings,
-          related_proposals: related_proposals,
+          related_proposals:,
           is_amend: proposal.emendation?,
           original_proposal: {
             title: proposal&.amendable&.title,