decidim-plans 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bb5cf37b415f9c5db47541f2f0b578cbfa39c5d1faca7f9a5662ed42fb87644
-  data.tar.gz: 252ae73f002014e3c22fe3658475dee84ccd8cc5468378a93fd2b7bc34f7887a
+  metadata.gz: 8f496c0cd1c6ee3f73085fc296508701d44434eb5a1c9dc3375c33ac99ea3a45
+  data.tar.gz: 2893280cdc00ae08eb9096e94da371496e43a2d993ea49ef6345def50a767176
 SHA512:
-  metadata.gz: a650628a11c3dffd10f1036cd522bc45aa966fd3dc03488eb98ca6dc0da87f4ebb1808d8cd204e954bf4cd00bb11dd27f194894022119397577c853c9fcaaf8d
-  data.tar.gz: f90fa030b8070a3f5107cfffe4cfb95afa8739a07591284b4627b1a81a651373ef60946491228122e0e857ad037ddd7c58170a084ec82391d70d657d92193c49
+  metadata.gz: 2751ff4b10252cf2b3bbf59deccb36692b7866dcd9ec90d649b3ca0cb640812601c2fa4ab938228a5425b8a4c96adfd9cd6ca71b147bcaa9834a2df4a815ccd3
+  data.tar.gz: f2db56458ab76aade2d06b91e67061b6bdd857e33a848ae720579fe851e18b3007e4f89847cb51aa71daf8c50947ba0d926b33aac09b4315f7d35788869a4ebf

data/app/commands/decidim/plans/accept_access_to_plan.rb

@@ -29,8 +29,8 @@ module Decidim
         broadcast(:ok, @requester_user)
       end
 
-      def recipient_ids
-        @plan.authors.pluck(:id) - [@requester_user.id]
+      def recipients
+        @plan.authors - [@requester_user]
       end
 
       def authors_event

data/app/commands/decidim/plans/admin/answer_plan.rb

@@ -73,7 +73,8 @@ module Decidim
             event: event,
             event_class: event_class,
             resource: plan,
-            recipient_ids: plan.followers.pluck(:id)
+            affected_users: plan.notifiable_identities,
+            followers: plan.followers - plan.notifiable_identities
           )
         end
       end

data/app/commands/decidim/plans/admin/create_plan.rb

@@ -90,7 +90,7 @@ module Decidim
             event: "decidim.events.plans.plan_published",
             event_class: Decidim::Plans::PublishPlanEvent,
             resource: plan,
-            recipient_ids: @plan.participatory_space.followers.pluck(:id),
+            followers: plan.participatory_space.followers,
             extra: {
               participatory_space: true
             }

data/app/commands/decidim/plans/publish_plan.rb

@@ -51,7 +51,7 @@ module Decidim
           event: "decidim.events.plans.plan_published",
           event_class: Decidim::Plans::PublishPlanEvent,
           resource: @plan,
-          recipient_ids: coauthors_followers
+          followers: coauthors_followers
         )
       end
 
@@ -60,7 +60,7 @@ module Decidim
           event: "decidim.events.plans.plan_published",
           event_class: Decidim::Plans::PublishPlanEvent,
           resource: @plan,
-          recipient_ids: @plan.participatory_space.followers.pluck(:id) - coauthors_followers,
+          followers: @plan.participatory_space.followers - coauthors_followers,
           extra: {
             participatory_space: true
           }
@@ -68,11 +68,7 @@ module Decidim
       end
 
       def coauthors_followers
-        followers_ids = []
-        @plan.authors.each do |author|
-          followers_ids += author.followers.pluck(:id)
-        end
-        followers_ids
+        @coauthors_followers ||= @plan.authors.flat_map(&:followers)
       end
     end
   end

data/app/commands/decidim/plans/reject_access_to_plan.rb

@@ -22,8 +22,8 @@ module Decidim
         broadcast(:ok, @requester_user)
       end
 
-      def recipient_ids
-        @plan.authors.pluck(:id)
+      def recipients
+        @plan.authors
       end
 
       def authors_event

data/app/commands/decidim/plans/request_access_to_plan.rb

@@ -34,12 +34,11 @@ module Decidim
       private
 
       def notify_plan_authors
-        recipient_ids = @plan.authors.pluck(:id)
         Decidim::EventsManager.publish(
           event: "decidim.events.plans.plan_access_requested",
           event_class: Decidim::Plans::PlanAccessRequestedEvent,
           resource: @plan,
-          recipient_ids: recipient_ids.uniq,
+          followers: @plan.authors,
           extra: {
             requester_id: @current_user.id
           }

data/app/commands/decidim/plans/respond_to_access_request.rb

@@ -46,7 +46,7 @@ module Decidim
           event: authors_event,
           event_class: authors_event_class,
           resource: @plan,
-          recipient_ids: recipient_ids.uniq,
+          followers: recipients.uniq,
           extra: {
             requester_id: @requester_user.id
           }
@@ -58,11 +58,11 @@ module Decidim
           event: requester_event,
           event_class: requester_event_class,
           resource: @plan,
-          recipient_ids: [@requester_user.id]
+          affected_users: [@requester_user]
         )
       end
 
-      def recipient_ids; end
+      def recipients; end
 
       def authors_event; end
 

data/app/helpers/decidim/plans/traceability_helper.rb

@@ -42,6 +42,8 @@ module Decidim
             Decidim::Plans::DiffRenderer::Content
           when "Decidim::Categorization"
             Decidim::Plans::DiffRenderer::Categorization
+          when "Decidim::Component"
+            Decidim::Plans::DiffRenderer::Component
           end
 
         renderer_klass.new(version, locale)

data/app/presenters/decidim/plans/official_author_presenter.rb

@@ -33,6 +33,10 @@ module Decidim
       def can_be_contacted?
         false
       end
+
+      def has_tooltip?
+        false
+      end
     end
   end
 end

data/app/services/decidim/plans/diff_renderer/component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Plans
+    module DiffRenderer
+      class Component < Base
+        protected
+
+        def i18n_scope
+          "activemodel.attributes.plan"
+        end
+
+        # Lists which attributes will be diffable and how
+        # they should be rendered.
+        def attribute_types
+          {
+            decidim_component_id: :component
+          }
+        end
+      end
+    end
+  end
+end

data/lib/decidim/plans/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Plans
-    VERSION = "0.15.1"
-    DECIDIM_VERSION = "~> 0.15.0"
+    VERSION = "0.16.0"
+    DECIDIM_VERSION = "~> 0.16.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-plans
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Antti Hukkanen
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 description: Plans component allows people to author plans based on the proposals
   that can be converted into budgeting projects.
 email:
@@ -220,6 +220,7 @@ files:
 - app/queries/decidim/plans/filtered_plans.rb
 - app/services/decidim/plans/diff_renderer/base.rb
 - app/services/decidim/plans/diff_renderer/categorization.rb
+- app/services/decidim/plans/diff_renderer/component.rb
 - app/services/decidim/plans/diff_renderer/content.rb
 - app/services/decidim/plans/diff_renderer/plan.rb
 - app/services/decidim/plans/loggability.rb