decidim-cdtb 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa565b7eeda2d143b2fb496a4129288d4e054904f6edcf1c8da23712c212a025
-  data.tar.gz: f5862f5bef01ccb6bd19e172f378339cd69786924df835a8793825b8faf817e7
+  metadata.gz: d0b361d3eb8cfb633bb64e0e1d1820c50787d02628851ec5256166b5b95944e5
+  data.tar.gz: ccd0707e4aca2e20583d22105687c03b9c60f853bfa832a9d0d72eb4e517ee0b
 SHA512:
-  metadata.gz: c5461ffafd0c6d562fe1a197fba854a9c03856eec585a573f4298cc3d9d0c7f7f7f1faacf505d27d6404cefb1aa837e96e0686ffd1d4816daaec7e62f0d5272f
-  data.tar.gz: 8e88fd9d1bb77d669c73eba22d28a8adfaa0e22cae69b5d3a8eb2cca0caa55c1c126ed0ad029a636d44658b23d2a32d496fb1ea3dec30c8090b6d4206410dddf
+  metadata.gz: 21dc807af452077d84a6561bf2ac8440d14ba0d0dd2ed3a4f38f68980edcd7b7c871f744dcf061efc6247d1645d5e9e75ca38d75f210333f96b625fdc4bd7807
+  data.tar.gz: a3ffaaadad6055fd9d563e5152128272c80ca78877234133f61ecc2b06e8a66d73396e2306eca12202b54f83b24c3892a61f741af71c5e2212f9fec8a50854d1

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 ## [Unreleased]
 
+## [0.4.1] - 2025-02-10 (patch -  Afamada i enfadada)
+
+- Fix error in disabling/enabling emails on remove users task
+
+## [0.4.0] - 2025-02-10 (minor - Llefiscós però deliciós)
+
+- Add task to move images to hero content block in participatory spaces
+- Improve remove users task disabling and enabling email on moderations
+
 ## [0.3.0] - 2024-12-24 (minor - L'artista de la pista)
 
 - Fix YouTube embeds to Decidim v0.28 format in different places. Only YouTube is supported right now.
-- Add task to add new content blocks in participatory processes
+- Add task to add new content blocks in participatory spaces
 
 ## [0.2.1] - 2024-09-25 (patch - Una idea sobre rodes)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decidim-cdtb (0.3.0)
+    decidim-cdtb (0.4.1)
       decidim (>= 0.27.0)
       rails (>= 6)
       ruby-progressbar

data/README.md

@@ -142,15 +142,17 @@ You can delete users through a CSV with the user ID and a reporter user mailer.
 
 This task reports and hide the user's comments, blocks the user, and finally deletes the user.
 
-The CSV will have a header and one column with the user ID.
+The CSV will have a header and one column with the user ID and must be separated by ",".
 
 To execute the task run:
 
 ```
-bundle exec rake cdtb:users:remove[spam_users.csv, reporter_user@example.org]
+bundle exec rake cdtb:users:remove[spam_users.csv,reporter_user@example.org]
 ```
 
-### Participatory Spaces / Add content blocks 
+### Participatory Spaces
+
+#### Add content blocks 
 
 You can add content blocks to a participatory spaces with the content block name (manifest_name).
 This rake task affects spaces in all organizations.
@@ -219,6 +221,23 @@ bundle exec rake cdtb:participatory_spaces:add_content_blocks[['extra_data relat
 
 ```
 
+#### Move banner images to hero content block
+
+In previous versions of Decidim (0.27 and previous) banner images are in participatory space configuration. Now, this image is in a content block but for old spaces are in configuration yet.
+
+This task move the banner image to a hero content block.
+
+Spaces supported:
+
+- Decidim::ParticipatoryProcess
+- Decidim::Assembly
+
+To execute the task run:
+
+```
+bundle exec rake cdtb:participatory_spaces:move_images_to_content_block
+```
+
 ### Upgrades:
 
 #### Upgrade modules

data/lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require "decidim/cdtb/participatory_spaces/manages_content_blocks"
+
 module Decidim
   module Cdtb
     module ParticipatorySpaces
       # Add content blocks to participatory spaces
       class AddContentBlocks < ::Decidim::Cdtb::Task
+        include ::Decidim::Cdtb::ParticipatorySpaces::ManagesContentBlocks
+
         def initialize(processed_models, content_block_names)
           progress_bar= { title: self.class.name }
           @processed_models = processed_models
@@ -18,7 +22,7 @@ module Decidim
           @num_added= @num_items= 0
 
           @processed_models.each do |model_name|
-            @num_items+= model_name.constantize.count
+            @num_items+= model_name.count
           end
           log_task_info("Adding content blocks in #{@num_items} spaces...")
         end
@@ -32,9 +36,9 @@ module Decidim
           progress_bar= context[:progress_bar]
 
           @processed_models.each do |processed_model|
-            log_task_step("Processing #{processed_model.pluralize}")
+            log_task_step("Processing #{processed_model}")
 
-            spaces = processed_model.constantize
+            spaces = processed_model
 
             @content_block_names.each do |content_block_name|
               log_task_step("Adding #{content_block_name} content block")
@@ -42,7 +46,7 @@ module Decidim
               spaces.find_each do |space|
                 current_content_blocks = current_space_content_blocks(scope_name(space), space.organization, space.id)
 
-                new_content_block = create_content_block!(space, content_block_name, current_content_blocks)
+                new_content_block = find_or_create_content_block(space, content_block_name)
                 if content_block_name == "extra_data" && space.instance_of?(Decidim::ParticipatoryProcess)
                   next if new_content_block.weight == 20
 
@@ -55,31 +59,12 @@ module Decidim
             end
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         def end_execution(_ctx)
           log_task_step("#{@num_added} content blocks added")
         end
 
-        def create_content_block!(space, content_block_name, current_content_blocks)
-          exists_content_block = Decidim::ContentBlock.find_by(decidim_organization_id: space.organization.id,
-                                                               scope_name: scope_name(space), manifest_name: content_block_name,
-                                                               scoped_resource_id: space.id)
-
-          return exists_content_block if exists_content_block.present?
-
-          weight = (current_content_blocks.last.weight + 1) * 10
-          log_task_step("Adding #{content_block_name} to #{space.slug}[#{space.id}]")
-          Decidim::ContentBlock.create(
-            decidim_organization_id: space.organization.id,
-            weight: weight,
-            scope_name: scope_name(space),
-            scoped_resource_id: space.id,
-            manifest_name: content_block_name,
-            published_at: Time.current
-          )
-        end
-        # rubocop:enable Metrics/AbcSize
-
         # +extra_data+ content block usually be down of hero image, therefore, it's weight is 20 and all others content blocks
         # go one position down added 10
         def force_extra_data_content_block_weight!(content_block_name, current_content_blocks)
@@ -93,24 +78,6 @@ module Decidim
             content_block.update(weight: content_block.weight + 10)
           end
         end
-
-        def current_space_content_blocks(scope_name, organization, scoped_resource_id)
-          Decidim::ContentBlock.for_scope(scope_name, organization: organization).where(scoped_resource_id: scoped_resource_id)
-        end
-
-        # --------------------------------------------------
-        private
-
-        # --------------------------------------------------
-
-        def manifest_for(resource)
-          return resource.manifest if resource.is_a? Decidim::Participable
-          return resource.resource_manifest if resource.is_a? Decidim::Resourceable
-        end
-
-        def scope_name(space)
-          manifest_for(space).content_blocks_scope_name
-        end
       end
     end
   end

data/lib/decidim/cdtb/participatory_spaces/manages_content_blocks.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Cdtb
+    module ParticipatorySpaces
+      # Methods for use in participatory spaces tasks
+      module ManagesContentBlocks
+        # rubocop:disable Metrics/AbcSize
+        def find_or_create_content_block(space, content_block_name)
+          current_content_blocks = current_space_content_blocks(scope_name(space), space.organization, space.id)
+          exists_content_block = Decidim::ContentBlock.find_by(decidim_organization_id: space.organization.id,
+                                                               scope_name: scope_name(space), manifest_name: content_block_name,
+                                                               scoped_resource_id: space.id)
+
+          return exists_content_block if exists_content_block.present?
+
+          weight = (current_content_blocks.last.weight + 1) * 10
+          log_task_step("Adding #{content_block_name} to #{space.slug}[#{space.id}]")
+          Decidim::ContentBlock.create(
+            decidim_organization_id: space.organization.id,
+            weight: weight,
+            scope_name: scope_name(space),
+            scoped_resource_id: space.id,
+            manifest_name: content_block_name,
+            published_at: Time.current
+          )
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def update_content_block_image(content_block, image)
+          content_block.manifest.images.each do |image_config|
+            image_name = image_config[:name]
+
+            next if content_block.images_container.send(image_name).present?
+
+            content_block.images_container.send("#{image_name}=", image.blob)
+            content_block.save
+          end
+        end
+
+        def current_space_content_blocks(scope_name, organization, scoped_resource_id)
+          Decidim::ContentBlock.for_scope(scope_name, organization: organization).where(scoped_resource_id: scoped_resource_id)
+        end
+
+        def manifest_for(resource)
+          return resource.manifest if resource.is_a? Decidim::Participable
+          return resource.resource_manifest if resource.is_a? Decidim::Resourceable
+        end
+
+        def scope_name(space)
+          manifest_for(space).content_blocks_scope_name
+        end
+      end
+    end
+  end
+end

data/lib/decidim/cdtb/participatory_spaces/move_images_to_content_block.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "decidim/cdtb/participatory_spaces/manages_content_blocks"
+
+module Decidim
+  module Cdtb
+    module ParticipatorySpaces
+      # Move images to content block for participatory spaces
+      class MoveImagesToContentBlock < ::Decidim::Cdtb::Task
+        include ::Decidim::Cdtb::ParticipatorySpaces::ManagesContentBlocks
+
+        def initialize(processed_models)
+          progress_bar= { title: self.class.name }
+          @processed_models = processed_models
+          super("MOVING IMAGES...", progress_bar: progress_bar)
+        end
+
+        attr_reader :num_added
+
+        def prepare_execution(_ctx = nil)
+          @num_added= @num_items= 0
+
+          @processed_models.each do |model_name|
+            @num_items+= model_name.count
+          end
+          log_task_info("Moving images to content block in #{@num_items} spaces...")
+        end
+
+        def total_items
+          @num_items
+        end
+
+        def do_execution(context)
+          progress_bar= context[:progress_bar]
+
+          @processed_models.each do |processed_model|
+            log_task_step("Processing #{processed_model}")
+
+            spaces = processed_model
+
+            spaces.find_each do |space|
+              image_content_block = find_or_create_content_block(space, "hero")
+
+              next if image_content_block.images.present?
+
+              update_content_block_image(image_content_block, space.banner_image)
+
+              @num_added += 1
+              progress_bar.increment
+            end
+          end
+        end
+
+        def end_execution(_ctx)
+          log_task_step("#{@num_added} content blocks added")
+        end
+      end
+    end
+  end
+end

data/lib/decidim/cdtb/tasks.rb

@@ -7,6 +7,7 @@ require "decidim/cdtb/fixes/you_tube_embeds_fixer"
 require "decidim/cdtb/users/remover"
 require "decidim/cdtb/multitenants/org_by_host_like"
 require "decidim/cdtb/participatory_spaces/add_content_blocks"
+require "decidim/cdtb/participatory_spaces/move_images_to_content_block"
 require "decidim/cdtb/spam/user_spam_detector"
 require "decidim/cdtb/storage/local_sharding"
 require "decidim/cdtb/storage/set_local_on_blobs"

data/lib/decidim/cdtb/users/remover.rb

@@ -20,9 +20,14 @@ module Decidim
           File.open(@csv_path).readlines.size - 1
         end
 
+        # rubocop:disable Metrics/AbcSize
         def do_execution(context)
           progress_bar = context[:progress_bar]
 
+          emails_on_moderations = Decidim::User.where(email_on_moderations: true).pluck(:email)
+
+          disable_email_moderations(emails_on_moderations)
+
           CSV.foreach(@csv_path, headers: true, col_sep: ",") do |row|
             user = Decidim::User.find_by(id: row[0])
             next unless user.present?
@@ -34,7 +39,10 @@ module Decidim
             destroy_user(user) if block_user(user, reporter_user)
             progress_bar.increment
           end
+        ensure
+          enable_email_moderations(emails_on_moderations)
         end
+        # rubocop:enable Metrics/AbcSize
 
         def end_execution(_ctx)
           log_task_step("#{@num_applied} users removed")
@@ -42,6 +50,28 @@ module Decidim
 
         private
 
+        def disable_email_moderations(users_emails)
+          log_task_step("Disabling email on moderations...")
+
+          users = Decidim::User.where(email: users_emails)
+
+          users.find_each do |user|
+            user.email_on_moderations = false
+            user.save(validate: false)
+          end
+        end
+
+        def enable_email_moderations(users_emails)
+          log_task_step("Enabling email on moderations...")
+
+          users = Decidim::User.where(email: users_emails)
+
+          users.find_each do |user|
+            user.email_on_moderations = true
+            user.save(validate: false)
+          end
+        end
+
         def manage_comments(comments, user, reporter_user)
           comments.find_each do |comment|
             report_comment(comment, user, reporter_user)

data/lib/decidim/cdtb/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Cdtb
-    VERSION = "0.3.0"
+    VERSION = "0.4.1"
     DECIDIM_MIN_VERSION = ">= 0.27.0"
   end
 end

data/lib/tasks/participatory_spaces.rake

@@ -27,16 +27,16 @@ namespace :cdtb do
       case selected_option
       when "1"
         processed_models = [
-          "Decidim::ParticipatoryProcess"
+          Decidim::ParticipatoryProcess
         ].freeze
       when "2"
         processed_models = [
-          "Decidim::Assembly"
+          Decidim::Assembly
         ].freeze
       when "3"
         processed_models = [
-          "Decidim::ParticipatoryProcess",
-          "Decidim::Assembly"
+          Decidim::ParticipatoryProcess,
+          Decidim::Assembly
         ].freeze
       else
         return "Please, select an option"
@@ -45,5 +45,44 @@ namespace :cdtb do
       adder = ::Decidim::Cdtb::ParticipatorySpaces::AddContentBlocks.new(processed_models, content_block_names)
       adder.execute!
     end
+
+    desc <<~EODESC
+      Move images to content block for the participatory spaces
+    EODESC
+    task move_images_to_content_block: :environment do
+      unless Decidim.version >= "0.28"
+        puts "This command is only compatible with Decidim v0.28 or higher"
+        exit(-1)
+      end
+
+      puts "\n Select participatory spaces you want to move the images"
+      puts "\n 1. Decidim::ParticipatoryProcess"
+      puts "\n 2. Decidim::Assembly"
+      puts "\n 3. All"
+
+      selected_option = $stdin.gets.chomp
+      puts selected_option
+
+      case selected_option
+      when "1"
+        processed_models = [
+          Decidim::ParticipatoryProcess
+        ].freeze
+      when "2"
+        processed_models = [
+          Decidim::Assembly
+        ].freeze
+      when "3"
+        processed_models = [
+          Decidim::ParticipatoryProcess,
+          Decidim::Assembly
+        ].freeze
+      else
+        return "Please, select an option"
+      end
+
+      adder = ::Decidim::Cdtb::ParticipatorySpaces::MoveImagesToContentBlock.new(processed_models)
+      adder.execute!
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-cdtb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Oliver Valls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim
@@ -108,6 +108,8 @@ files:
 - lib/decidim/cdtb/fixes/you_tube_embeds_fixer.rb
 - lib/decidim/cdtb/multitenants/org_by_host_like.rb
 - lib/decidim/cdtb/participatory_spaces/add_content_blocks.rb
+- lib/decidim/cdtb/participatory_spaces/manages_content_blocks.rb
+- lib/decidim/cdtb/participatory_spaces/move_images_to_content_block.rb
 - lib/decidim/cdtb/spam/user_spam_detector.rb
 - lib/decidim/cdtb/storage/local_sharding.rb
 - lib/decidim/cdtb/storage/set_local_on_blobs.rb