decidim-proposals 0.21.0 → 0.22.0

data/config/locales/tr-TR.yml

@@ -50,7 +50,6 @@ tr:
       decidim/proposals/creation_enabled_event: Teklif oluşturma etkin
       decidim/proposals/endorsing_enabled_event: Teklif onayı etkin
       decidim/proposals/evaluating_proposal_event: Teklif değerlendiriliyor
-      decidim/proposals/proposal_endorsed_event: Teklif onaylandı
       decidim/proposals/proposal_mentioned_event: Bahsi geçen teklif
       decidim/proposals/publish_proposal_event: Teklif yayınlandı
       decidim/proposals/rejected_proposal_event: Teklif reddedildi
@@ -63,9 +62,6 @@ tr:
       decidim/proposals/proposal:
         one: öneri
         other: Teklif
-      decidim/proposals/proposal_endorsement:
-        one: ciro
-        other: Cirolar
       decidim/proposals/proposal_note:
         one: Not
         other: notlar
@@ -191,11 +187,6 @@ tr:
             email_outro: Bu bildirimi "%{resource_title}" takip ettiğiniz için aldınız. Bir önceki bağlantıdan takip etmeyi bırakabilirsiniz.
             email_subject: Takip ettiğiniz bir teklif kabul edildi
             notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif kabul edildi.
-        proposal_endorsed:
-          email_intro: 'Takip ettiğiniz %{endorser_name} %{endorser_nickname}, "%{resource_title}" teklifini onayladı ve sizin için ilginç olabileceğini düşünüyoruz. Bir göz atın ve katkıda bulunun:'
-          email_outro: Bu bildirimi, %{endorser_nickname}izlediğiniz için aldınız. Önceki bağlantıyı takip ederek bildirimleri almayı durdurabilirsiniz.
-          email_subject: "%{endorser_nickname} yeni bir teklifi onayladı"
-          notification_title: <a href="%{resource_path}">%{resource_title}</a> teklif <a href="%{endorser_path}">%{endorser_name} %{endorser_nickname}</a>tarafından onaylanmıştır.
         proposal_evaluating:
           affected_user:
             email_intro: 'Şu anda "%{resource_title}" teklifiniz değerlendiriliyor. Bu sayfadaki cevabı kontrol edebilirsiniz:'
@@ -550,14 +541,11 @@ tr:
             one: ve %{count} kişi daha
             other: ve %{count} kişi daha
           info-message: Bu, bir teklif için <strong>ortak çalışma taslağı</strong> . Bu, yazarlarının aşağıdaki yorum bölümünü kullanarak teklifi şekillendirmesine yardımcı olabilir veya düzenleme için erişim isteğinde bulunarak doğrudan iyileştirebilirsiniz. Yazarlar size erişim izni verdiğinde, bu taslakta değişiklikler yapabileceksiniz.
-          of_versions: "( %{number})"
           publish: Yayınla
           publish_info: Taslak bu sürümünü yayınlayın veya
           published_proposal: yayınlanan teklif
           request_access: Erişim talep etmek
           requested_access: Erişim istendi
-          see_other_versions: diğer versiyonları gör
-          version: Sürüm %{number}
           version_history: bu teklifin sürüm geçmişini gör
           withdraw: taslağı geri çekmek
         states:
@@ -594,7 +582,6 @@ tr:
           fields:
             category: Kategori
             comments: Yorumlar
-            endorsements: Cirolar
             id: İD
             notes: notlar
             official_proposal: Resmi teklif
@@ -611,19 +598,6 @@ tr:
           amend: değiştirmek
           comment: Yorum Yap
           comments: Yorumlar
-          endorse: desteklemek
-      proposal_endorsements:
-        create:
-          error: Teklifin onaylanması sırasında hatalar oluştu.
-        identities:
-          done: tamam
-          select_identity: Kimlik seç
-      proposal_endorsements_helper:
-        endorsement_button:
-          already_endorsed: Onaylanan
-          endorse: desteklemek
-        render_endorsements_button_card_part:
-          endorse: desteklemek
       proposal_votes:
         create:
           error: Teklif oylanırken hatalar oluştu.
@@ -650,10 +624,6 @@ tr:
           discard_confirmation: Bu teklif taslağını silmek istediğinizden emin misiniz?
           send: Ön izleme
           title: Teklif Taslaklarını Düzenle
-        endorsement_identities_cabin:
-          endorse: desteklemek
-        endorsements_card_row:
-          comments: Yorumlar
         filters:
           amendment_type: tip
           category: Kategori
@@ -704,6 +674,7 @@ tr:
         show:
           answer: Cevap
           back_to: Geri
+          comments: Yorumlar
           edit_proposal: Teklifi düzenle
           endorsements_list: Onay Listesi
           hidden_endorsers_count:
@@ -717,7 +688,6 @@ tr:
           proposal_rejected_reason: 'Bu teklif reddedildi çünkü:'
           report: Rapor
           withdraw_btn_hint: Herhangi bir destek almadığınız sürece fikrinizi değiştirirseniz teklifinizi geri çekebilirsiniz. Teklif silinmemiş, iptal edilen teklifler listesinde görünecektir.
-          withdraw_confirmation: Bu teklifi geri çektiğinizden emin misiniz?
           withdraw_proposal: Teklifi geri çek
         vote_button:
           already_voted: Çoktan oy verildi
@@ -768,20 +738,12 @@ tr:
         error: Teklif taslağını kaydederken hatalar oluştu.
         success: Teklif taslağı başarıyla güncellendi.
       versions:
-        changes_at_title: '"%{title}" daki değişiklikler'
+        collaborative_drafts:
+          back_to_resource: İşbirliği taslağına geri dönün
         index:
           title: Sürümler
-        stats:
-          back_to_collaborative_draft: İşbirliği taslağına geri dönün
-          back_to_proposal: Teklife geri dön
-          number_of_versions: Sürümler
-          show_all_versions: Tüm versiyonları göster
-          version_author: Sürüm yazarı
-          version_created_at: Sürümde oluşturuldu
-          version_number: Versiyon numarası
-          version_number_out_of_total: "%{current_version} üzerinden %{total_count}"
-        version:
-          version_index: Sürüm %{index}
+        proposals:
+          back_to_resource: Teklife geri dön
       withdraw:
         errors:
           has_supports: Zaten destekleri olduğu için bu teklif geri çekilemez.

data/config/locales/uk.yml

@@ -27,7 +27,6 @@ uk:
       decidim/proposals/creation_enabled_event: Внесення пропозицій увімкнено
       decidim/proposals/endorsing_enabled_event: Увімкнене надання підтримки пропозиціям
       decidim/proposals/evaluating_proposal_event: Пропозиція розглядається
-      decidim/proposals/proposal_endorsed_event: Пропозицію підтримано
       decidim/proposals/proposal_mentioned_event: Пропозицію було згадано
       decidim/proposals/publish_proposal_event: Пропозицію оприлюднено
       decidim/proposals/rejected_proposal_event: Пропозицію відхилено
@@ -39,11 +38,6 @@ uk:
         few: Пропозиції
         many: Пропозицій
         other: Пропозицій
-      decidim/proposals/proposal_endorsement:
-        one: Прояв підтримки
-        few: Прояви підтримки
-        many: Проявів підтримки
-        other: Проявів підтримки
       decidim/proposals/proposal_note:
         one: Примітка
         few: Примітки
@@ -55,18 +49,6 @@ uk:
         many: Голосів
         other: Голосів
   decidim:
-    admin:
-      filters:
-        is_emendation_true:
-          values:
-            'false': Пропозиції
-        state_eq:
-          values:
-            evaluating: Розглядається
-            withdrawn: Відкликана
-        state_null:
-          values:
-            'true': Без відповідей
     components:
       proposals:
         actions:
@@ -123,10 +105,6 @@ uk:
             email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
             email_subject: Пропозиція, за якою ви стежите, була прийнята
             notification_title: Пропозицію <a href="%{resource_path}">%{resource_title}</a> було прийнято.
-        proposal_endorsed:
-          email_outro: Ви отримали це сповіщення, тому що ви стежите за %{endorser_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
-          email_subject: "%{endorser_nickname} підтримав нову пропозицію"
-          notification_title: <a href="%{endorser_path}">%{endorser_name} %{endorser_nickname}</a> підтримав пропозицію <a href="%{resource_path}">%{resource_title}</a>.
         proposal_evaluating:
           follower:
             email_intro: 'Пропозиція "%{resource_title}" зараз розглядається. Ви можете перевірити наявність відповіді на сторінці:'
@@ -264,7 +242,6 @@ uk:
           fields:
             category: Категорія
             comments: Коментарі
-            endorsements: Прояви підтримки
             id: Псевдонім
             notes: Примітки
             official_proposal: Службова пропозиція
@@ -275,18 +252,6 @@ uk:
             votes: Голоси
       new:
         limit_reached: Ви не можете вносити нові пропозиції, оскільки ви перевищили ліміт.
-      proposal_endorsements:
-        create:
-          error: При спробі надати підтримку цій пропозиції виникла помилка.
-        identities:
-          done: Зроблено
-          select_identity: Оберіть роль
-      proposal_endorsements_helper:
-        endorsement_button:
-          already_endorsed: Підтримано
-          endorse: Підтримати
-        render_endorsements_button_card_part:
-          endorse: Підтримати
       proposal_votes:
         create:
           error: При голосуванні щодо пропозиції сталися помилки.
@@ -308,10 +273,6 @@ uk:
           discard_confirmation: Ви дійсно бажаєте відкинути чернетку цієї пропозиції?
           send: Попередній перегляд
           title: Редагувати чернетку пропозиції
-        endorsement_identities_cabin:
-          endorse: Підтримати
-        endorsements_card_row:
-          comments: Коментарі
         filters:
           category: Категорія
           origin: Джерело
@@ -356,6 +317,7 @@ uk:
           view_proposal: Переглянути пропозицію
         show:
           answer: Відповісти
+          comments: Коментарі
           edit_proposal: Редагувати пропозицію
           endorsements_list: Перелік тих, хто підтримав
           proposal_accepted_reason: 'Ця пропозиція була прийнята, тому що:'
@@ -363,7 +325,6 @@ uk:
           proposal_rejected_reason: 'Ця пропозиція була відхилена, оскільки:'
           report: Поскаржитись
           withdraw_btn_hint: Ви можете зняти свою пропозицію, якщо ви передумали, доки ви не отримали жодної підтримки. Пропозиція не видаляється, вона з'явиться у списку відкликаних пропозицій.
-          withdraw_confirmation: Ви впевнені, що бажаєте зняти цю пропозицію?
           withdraw_proposal: Зняти пропозицію
         vote_button:
           already_voted: Вже проголосували

data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class FixUserGroupsIdsInProposalsEndorsements < ActiveRecord::Migration[5.2]
+  class ProposalEndorsement < ApplicationRecord
+    self.table_name = :decidim_proposals_proposal_endorsements
+  end
+
   # rubocop:disable Rails/SkipsModelValidations
   def change
     Decidim::UserGroup.find_each do |group|

data/db/migrate/20191206154128_add_endorsements_counter_cache_to_proposals.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddEndorsementsCounterCacheToProposals < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_proposals_proposals, :endorsements_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20200120215928_move_proposal_endorsements_to_core_endorsements.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# This migration must be executed after CreateDecidimEndorsements migration in decidim-core.
+class MoveProposalEndorsementsToCoreEndorsements < ActiveRecord::Migration[5.2]
+  class ProposalEndorsement < ApplicationRecord
+    self.table_name = :decidim_proposals_proposal_endorsements
+  end
+  class Endorsement < ApplicationRecord
+    self.table_name = :decidim_endorsements
+  end
+  # Move ProposalEndorsements to Endorsements
+  def up
+    non_duplicated_group_endorsements = ProposalEndorsement.select(
+      "MIN(id) as id, decidim_user_group_id"
+    ).group(:decidim_user_group_id).where.not(decidim_user_group_id: nil).map(&:id)
+
+    ProposalEndorsement.where("id IN (?) OR decidim_user_group_id IS NULL", non_duplicated_group_endorsements).find_each do |prop_endorsement|
+      Endorsement.create!(
+        resource_type: Decidim::Proposals::Proposal.name,
+        resource_id: prop_endorsement.decidim_proposal_id,
+        decidim_author_type: prop_endorsement.decidim_author_type,
+        decidim_author_id: prop_endorsement.decidim_author_id,
+        decidim_user_group_id: prop_endorsement.decidim_user_group_id
+      )
+    end
+    # update new `decidim_proposals_proposal.endorsements_count` counter cache
+    Decidim::Proposals::Proposal.select(:id).all.find_each do |proposal|
+      Decidim::Proposals::Proposal.reset_counters(proposal.id, :endorsements)
+    end
+  end
+
+  def down
+    non_duplicated_group_endorsements = Endorsement.select(
+      "MIN(id) as id, decidim_user_group_id"
+    ).group(:decidim_user_group_id).where.not(decidim_user_group_id: nil).map(&:id)
+
+    Endorsement
+      .where(resource_type: "Decidim::Proposals::Proposal")
+      .where("id IN (?) OR decidim_user_group_id IS NULL", non_duplicated_group_endorsements).find_each do |endorsement|
+      ProposalEndorsement.find_or_create_by!(
+        decidim_proposal_id: endorsement.resource_id,
+        decidim_author_type: endorsement.decidim_author_type,
+        decidim_author_id: endorsement.decidim_author_id,
+        decidim_user_group_id: endorsement.decidim_user_group_id
+      )
+    end
+    # update `decidim_proposals_proposal.proposal_endorsements_count` counter cache
+    Decidim::Proposals::Proposal.select(:id).all.find_each do |proposal|
+      Decidim::Proposals::Proposal.reset_counters(proposal.id, :proposal_endorsements)
+    end
+  end
+end

data/db/migrate/20200730131631_move_proposal_endorsed_event_notifications_to_resource_endorsed_event.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class MoveProposalEndorsedEventNotificationsToResourceEndorsedEvent < ActiveRecord::Migration[5.2]
+  def up
+    Decidim::Notification.where(event_name: "decidim.events.proposals.proposal_endorsed", event_class: "Decidim::Proposals::ProposalEndorsedEvent").find_each do |notification|
+      notification.update(event_name: "decidim.events.resource_endorsed", event_class: "Decidim::ResourceEndorsedEvent")
+    end
+  end
+
+  def down
+    Decidim::Notification.where(
+      event_name: "decidim.events.resource_endorsed",
+      event_class: "Decidim::ResourceEndorsedEvent",
+      decidim_resource_type: "Decidim::Proposals::Proposal"
+    )
+                         .find_each do |notification|
+      notification.update(event_name: "decidim.events.proposals.proposal_endorsed", event_class: "Decidim::Proposals::ProposalEndorsedEvent")
+    end
+  end
+end

data/lib/decidim/proposals/component.rb

@@ -37,7 +37,9 @@ Decidim.register_component(:proposals) do |component|
     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, type: :boolean, default: false
+    settings.attribute :participatory_texts_enabled,
+                       type: :boolean, default: false,
+                       readonly: ->(context) { Decidim::Proposals::Proposal.where(component: context[:component]).any? }
     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
@@ -63,7 +65,9 @@ Decidim.register_component(:proposals) do |component|
     settings.attribute :amendment_creation_enabled, type: :boolean, default: true
     settings.attribute :amendment_reaction_enabled, type: :boolean, default: true
     settings.attribute :amendment_promotion_enabled, type: :boolean, default: true
-    settings.attribute :amendments_visibility, type: :string, default: "all"
+    settings.attribute :amendments_visibility,
+                       type: :enum, default: "all",
+                       choices: -> { Decidim.config.amendments_visibility_options }
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :automatic_hashtags, type: :text, editor: false, required: false
     settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
@@ -97,7 +101,7 @@ Decidim.register_component(:proposals) do |component|
 
   component.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).not_hidden
-    Decidim::Proposals::ProposalEndorsement.where(proposal: proposals).count
+    Decidim::Endorsement.where(resource_id: proposals.pluck(:id), resource_type: Decidim::Proposals::Proposal.name).count
   end
 
   component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|
@@ -349,7 +353,7 @@ Decidim.register_component(:proposals) do |component|
               user_group: group
             )
           end
-          Decidim::Proposals::ProposalEndorsement.create!(proposal: proposal, author: author, user_group: author.user_groups.first)
+          Decidim::Endorsement.create!(resource: proposal, author: author, user_group: author.user_groups.first)
         end
       end
 

data/lib/decidim/proposals/engine.rb

@@ -17,9 +17,6 @@ module Decidim
 
       routes do
         resources :proposals, except: [:destroy] do
-          resource :proposal_endorsement, only: [:create, :destroy] do
-            get :identities, on: :collection
-          end
           member do
             get :compare
             get :complete
@@ -50,8 +47,7 @@ module Decidim
       end
 
       initializer "decidim_proposals.assets" do |app|
-        app.config.assets.precompile += %w(decidim_proposals_manifest.js
-                                           decidim/proposals/identity_selector_dialog.js)
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js)
       end
 
       initializer "decidim.content_processors" do |_app|

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "decidim/dev/test/rspec_support/capybara_data_picker"
+
+module Capybara
+  module ProposalsPicker
+    include DataPicker
+
+    RSpec::Matchers.define :have_proposals_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{proposal.title}\")]]")
+        end
+      end
+    end
+
+    RSpec::Matchers.define :have_proposals_not_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).not_to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).not_to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{proposal.title}\")]]")
+        end
+      end
+    end
+
+    def proposals_pick(proposals_picker, proposals)
+      data_picker = proposals_picker.data_picker
+
+      expect(data_picker).to have_selector(".picker-prompt")
+      data_picker.find(".picker-prompt").click
+
+      proposals.each do |proposal|
+        data_picker_choose_value(proposal.id)
+      end
+      data_picker_close
+
+      expect(proposals_picker).to have_proposals_picked(proposals)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::ProposalsPicker, type: :system
+end

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

@@ -372,7 +372,9 @@ FactoryBot.define do
 
     trait :with_endorsements do
       after :create do |proposal|
-        create_list(:proposal_endorsement, 5, proposal: proposal)
+        5.times.collect do
+          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization))
+        end
       end
     end
 
@@ -388,11 +390,6 @@ FactoryBot.define do
     author { build(:user, organization: proposal.organization) }
   end
 
-  factory :proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
-  end
-
   factory :proposal_amendment, class: "Decidim::Amendment" do
     amendable { build(:proposal) }
     emendation { build(:proposal, component: amendable.component) }
@@ -400,12 +397,6 @@ FactoryBot.define do
     state { Decidim::Amendment::STATES.sample }
   end
 
-  factory :user_group_proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
-    user_group { create(:user_group, verified_at: Time.current, organization: proposal.organization, users: [author]) }
-  end
-
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
     body { Faker::Lorem.sentences(3).join("\n") }
     proposal { build(:proposal) }