decidim-proposals 0.26.7 → 0.27.0.rc1

data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb

@@ -4,6 +4,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end

data/lib/decidim/proposals/component.rb

@@ -28,19 +28,19 @@ Decidim.register_component(:proposals) do |component|
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
-    settings.attribute :vote_limit, type: :integer, default: 0, required: true
-    settings.attribute :minimum_votes_per_user, type: :integer, default: 0, required: true
-    settings.attribute :proposal_limit, type: :integer, default: 0, required: true
+    settings.attribute :vote_limit, type: :integer, default: 0
+    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, required: true
-    settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
+    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
     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: 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 :resources_permissions_enabled, type: :boolean, default: true
@@ -131,7 +131,6 @@ Decidim.register_component(:proposals) do |component|
 
       collection = Decidim::Proposals::Proposal
                    .published
-                   .not_hidden
                    .where(component: component_instance)
                    .includes(:scope, :category, :component)
 
@@ -267,26 +266,31 @@ Decidim.register_component(:proposals) do |component|
         visibility: "all"
       ) do
         proposal = Decidim::Proposals::Proposal.new(params)
-        proposal.add_coauthor(participatory_space.organization)
+        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 n.positive?
-        Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
-        end
-      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: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -351,8 +355,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -373,8 +377,8 @@ Decidim.register_component(:proposals) do |component|
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,

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

@@ -32,16 +32,13 @@ module Decidim
             resource,
             current_user
           ) do
-            resource.try(:save!)
+            resource.save!
           end
-
-          notify
+          notify(resource)
         end
 
         private
 
-        attr_reader :initial_state
-
         def resource
           @resource ||= fetch_resource
         end
@@ -58,8 +55,6 @@ module Decidim
 
           proposal.answer = answer
           proposal.answered_at = Time.current
-          @initial_state = proposal.state
-
           if POSSIBLE_ANSWER_STATES.include?(state)
             proposal.state = state
             proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
@@ -93,9 +88,8 @@ module Decidim
           context[:current_user]
         end
 
-        def notify
-          state = initial_state || resource.try(:state)
-          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(resource, state)
+        def notify(proposal)
+          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(proposal, proposal.state)
         end
       end
     end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -8,7 +8,6 @@ module Decidim
       include Decidim::ApplicationHelper
       include Decidim::ResourceHelper
       include Decidim::TranslationsHelper
-      include HtmlToPlainText
 
       # Public: Initializes the serializer with a proposal.
       def initialize(proposal)
@@ -33,7 +32,7 @@ module Decidim
           },
           component: { id: component.id },
           title: proposal.title,
-          body: convert_to_plain_text(proposal.body),
+          body: proposal.body,
           address: proposal.address,
           latitude: proposal.latitude,
           longitude: proposal.longitude,
@@ -94,13 +93,6 @@ module Decidim
 
         Decidim::ResourceLocatorPresenter.new(proposal.amendable).url
       end
-
-      # Recursively strips HTML tags from given Hash strings using convert_to_text from Premailer
-      def convert_to_plain_text(value)
-        return value.transform_values { |v| convert_to_plain_text(v) } if value.is_a?(Hash)
-
-        convert_to_text(value)
-      end
     end
   end
 end

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

@@ -305,7 +305,7 @@ FactoryBot.define do
       published_at { nil }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       after :build do |proposal|
         proposal.coauthorships.clear
         user = build(:user, organization: proposal.component.participatory_space.organization)

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.7
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.7
+        version: 0.27.0.rc1
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -361,7 +361,6 @@ files:
 - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
 - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
 - app/queries/decidim/proposals/similar_proposals.rb
-- app/services/decidim/proposals/collaborative_draft_search.rb
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
@@ -376,7 +375,6 @@ files:
 - app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
 - app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
-- app/views/decidim/proposals/admin/proposals/_js-callout.html.erb
 - app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb
@@ -391,8 +389,7 @@ files:
 - app/views/decidim/proposals/admin/proposals/new.html.erb
 - app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
 - app/views/decidim/proposals/admin/proposals/show.html.erb
-- app/views/decidim/proposals/admin/proposals/update_category.js.erb
-- app/views/decidim/proposals/admin/proposals/update_scope.js.erb
+- app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
 - app/views/decidim/proposals/admin/proposals_imports/new.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
@@ -469,7 +466,6 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
-- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -478,7 +474,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -487,13 +482,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
-- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -501,7 +493,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -619,14 +610,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim proposals module

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

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    # A service to encapsualte all the logic when searching and filtering
-    # collaborative drafts in a participatory process.
-    class CollaborativeDraftSearch < ResourceSearch
-      text_search_fields :title, :body
-
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the drafts from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of drafts to return per page.
-      def initialize(options = {})
-        super(CollaborativeDraft.all, options)
-      end
-
-      # Handle the search_text filter
-      #
-      # We can't use the search from `ResourceFilter` since these fields aren't
-      # translated.
-      def search_search_text
-        query
-          .where("title::text ILIKE ?", "%#{search_text}%")
-          .or(query.where("body ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the state filter
-      def search_state
-        return query if state.member?("all")
-
-        apply_scopes(%w(open withdrawn published), state)
-      end
-
-      # Filters drafts by the name of the classes they are linked to. By default,
-      # returns all drafts. When a `related_to` param is given, then it camelcases item
-      # to find the real class name and checks the links for the Collaborative Draft.
-      #
-      # The `related_to` param is expected to be in this form:
-      #
-      #   "decidim/meetings/meeting"
-      #
-      # This can be achieved by performing `klass.name.underscore`.
-      #
-      # Returns only those drafts that are linked to the given class name.
-      def search_related_to
-        from = query
-               .joins(:resource_links_from)
-               .where(decidim_resource_links: { to_type: related_to.camelcase })
-
-        to = query
-             .joins(:resource_links_to)
-             .where(decidim_resource_links: { from_type: related_to.camelcase })
-
-        query.where(id: from).or(query.where(id: to))
-      end
-    end
-  end
-end

data/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb

@@ -1,6 +0,0 @@
-<div class="callout callout--full <%= css %>" data-closable>
-  <%= text %>
-  <button class="close-button" type="button" data-close="">
-    <span aria-hidden="true">×</span>
-  </button>
-</div>

data/app/views/decidim/proposals/admin/proposals/update_category.js.erb

@@ -1,26 +0,0 @@
-<% if flash.now[:error].present? %>
-  $("#js-form-recategorize-proposals #category_id").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:alert].present? %>
-  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
-
-  <% proposal_ids.each do |id| %>
-    $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
-  <% end %>
-
-  $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
-  $(".js-check-all").prop('checked', false);
-  $(".js-check-all-proposal").prop('checked', false);
-  window.hideBulkActionsButton();
-  window.hideBulkActionForms();
-  window.showOtherActionsButtons();
-  window.selectedProposalsCountUpdate();
-<% end %>

data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb

@@ -1,27 +0,0 @@
-<% if flash.now[:error].present? %>
-  $("#js-form-scope-change-proposals #scope_id").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:alert].present? %>
-  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
-<% end %>
-
-<% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
-
-  <% @proposal_ids.each do |id| %>
-    $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
-  <% end %>
-
-  $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
-  $(".js-check-all").prop('checked', false);
-  $(".js-check-all-proposal").prop('checked', false);
-
-  window.hideBulkActionForms();
-  window.hideBulkActionsButton();
-  window.showOtherActionsButtons();
-  window.selectedProposalsCountUpdate();
-<% end %>

data/config/locales/fa-IR.yml

@@ -1 +0,0 @@
-fa:

data/config/locales/gn-PY.yml

@@ -1 +0,0 @@
-gn:

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka:

data/config/locales/kaa.yml

@@ -1 +0,0 @@
-kaa:

data/config/locales/lo-LA.yml

@@ -1 +0,0 @@
-lo:

data/config/locales/oc-FR.yml

@@ -1 +0,0 @@
-oc: