decidim-core 0.30.1 → 0.31.0.rc1

data/lib/tasks/{decidim_webpacker_tasks.rake → decidim_shakapacker_tasks.rake}

@@ -3,8 +3,8 @@
 require "decidim/gem_manager"
 
 namespace :decidim do
-  namespace :webpacker do
-    desc "Installs Decidim webpacker files in Rails instance application"
+  namespace :shakapacker do
+    desc "Installs Decidim shakapacker files in Rails instance application"
     task install: :environment do
       raise "Decidim gem is not installed" if decidim_path.nil?
 
@@ -13,20 +13,20 @@ namespace :decidim do
       remove_file_from_application "yarn.lock"
       remove_file_from_application "node_modules/.yarn-integrity"
       # PostCSS configuration
-      copy_file_to_application "decidim-core/lib/decidim/webpacker/postcss.config.js", "postcss.config.js"
+      copy_file_to_application "decidim-core/lib/decidim/shakapacker/postcss.config.js", "postcss.config.js"
 
-      copy_file_to_application "decidim-core/lib/decidim/webpacker/esbuild.config.js", "config/esbuild.config.js"
-      copy_file_to_application "decidim-core/lib/decidim/webpacker/tsconfig.json", "tsconfig.json"
+      copy_file_to_application "decidim-core/lib/decidim/shakapacker/esbuild.config.js", "config/esbuild.config.js"
+      copy_file_to_application "decidim-core/lib/decidim/shakapacker/tsconfig.json", "tsconfig.json"
 
-      # Remove the Webpacker config and deploy shakapacker
-      migrate_shakapacker
+      # Install shakapacker
+      install_or_migrate_shakapacker
 
       # Install JS dependencies
       install_decidim_npm
 
-      # Remove the webpacker dependencies as they come through Decidim dependencies.
+      # Remove the Shakapacker dependencies as they come through Decidim dependencies.
       # This ensures we can control their versions from Decidim dependencies to avoid version conflicts.
-      webpacker_packages = %w(
+      shakapacker_packages = %w(
         @babel/core
         @babel/plugin-transform-runtime
         @babel/preset-env
@@ -45,7 +45,7 @@ namespace :decidim do
         @rails/ujs
         turbolinks
       )
-      system! "npm uninstall #{webpacker_packages.join(" ")}"
+      system! "npm uninstall #{shakapacker_packages.join(" ")}"
 
       # Add the Browserslist configuration to the project
       add_decidim_browserslist_configuration
@@ -53,40 +53,43 @@ namespace :decidim do
   end
 
   namespace :upgrade do
-    desc "Upgrades Decidim webpacker dependencies in Rails instance application"
-    task webpacker: :environment do
+    desc "Upgrades the shakapacker required npm package"
+    task :shakapacker_npm do
+      require "shakapacker"
+      system! "npm uninstall shakapacker"
+      system! "npm install --save-dev shakapacker@#{Shakapacker::VERSION}"
+    end
+
+    desc "Upgrades Decidim Shakapacker dependencies in Rails instance application"
+    task shakapacker: :environment do
       raise "Decidim gem is not installed" if decidim_path.nil?
 
       remove_file_from_application "bin/yarn"
 
       unless File.exist?(rails_app_path.join("config/esbuild.config.js"))
-        copy_file_to_application "decidim-core/lib/decidim/webpacker/esbuild.config.js",
+        copy_file_to_application "decidim-core/lib/decidim/shakapacker/esbuild.config.js",
                                  "config/esbuild.config.js"
       end
       unless File.exist?(rails_app_path.join("tsconfig.json"))
-        copy_file_to_application "decidim-core/lib/decidim/webpacker/tsconfig.json",
+        copy_file_to_application "decidim-core/lib/decidim/shakapacker/tsconfig.json",
                                  "tsconfig.json"
       end
 
-      # Remove the Webpacker config and deploy shakapacker
-      migrate_shakapacker
+      # Remove the Shakapacker config and deploy shakapacker
+      install_or_migrate_shakapacker
 
       # Update JS dependencies
       install_decidim_npm
     end
   end
 
-  def migrate_shakapacker
-    remove_file_from_application "config/webpacker.yml"
-    remove_file_from_application "bin/webpack"
-    remove_file_from_application "bin/webpack-dev-server"
-
+  def install_or_migrate_shakapacker
     unless File.exist?(rails_app_path.join("config/shakapacker.yml"))
-      copy_file_to_application "decidim-core/lib/decidim/webpacker/shakapacker.yml", "config/shakapacker.yml"
+      copy_file_to_application "decidim-core/lib/decidim/shakapacker/shakapacker.yml", "config/shakapacker.yml"
       remove_folder_from_application "config/webpack"
     end
 
-    copy_folder_to_application "decidim-core/lib/decidim/webpacker/webpack", "config"
+    copy_folder_to_application "decidim-core/lib/decidim/shakapacker/webpack", "config"
 
     system!("bin/rails shakapacker:binstubs") unless File.exist?(rails_app_path.join("bin/shakapacker"))
 
@@ -199,17 +202,16 @@ namespace :decidim do
 
     # Skip if the load path is already added
     return if lines.grep(
-      %r{^\$LOAD_PATH.unshift "#\{Gem.loaded_specs\["decidim-core"\].full_gem_path\}/lib/gem_overrides"$}
+      %r{^require "decidim/shakapacker/shakapacker"$}
     ).size.positive?
 
     contents = ""
     lines.each do |line|
-      contents += line
-      next unless line =~ %r{^require "bundler/setup"$}
-
-      contents += "\n"
-      contents += "# Add the Decidim override load path to override webpacker functionality\n"
-      contents += "$LOAD_PATH.unshift \"\#{Gem.loaded_specs[\"decidim-core\"].full_gem_path}/lib/gem_overrides\"\n"
+      contents += if line =~ /^require "shakapacker"$/
+                    %(require "decidim/shakapacker/shakapacker"\n)
+                  else
+                    line
+                  end
     end
 
     File.write(file, contents)
@@ -220,11 +222,11 @@ namespace :decidim do
   end
 end
 
-# Override the Webpacker instance for the rake tasks to correctly assign the
+# Override the Shakapacker instance for the rake tasks to correctly assign the
 # configuration file path. This is needed e.g. when `rails assets:precompile` is
-# being run. Otherwise webpacker might not recognize if the assets need to be
+# being run. Otherwise Shakapacker might not recognize if the assets need to be
 # compiled again (i.e. if the asset hash has been changed).
-if (config_path = Decidim::Webpacker.configuration.configuration_file)
+if (config_path = Decidim::Shakapacker.configuration.configuration_file)
   Shakapacker.instance = Shakapacker::Instance.new(
     config_path: Pathname.new(config_path)
   )

data/lib/tasks/decidim_tasks.rake

@@ -5,9 +5,10 @@ namespace :decidim do
   task upgrade: [
     :choose_target_plugins,
     :"decidim:upgrade_app",
+    :"decidim:upgrade:shakapacker_npm",
     :"railties:install:migrations",
     :"decidim:upgrade:migrations",
-    :"decidim:upgrade:webpacker",
+    :"decidim:upgrade:shakapacker",
     :"decidim_api:generate_docs"
   ]
 
@@ -22,9 +23,11 @@ namespace :decidim do
       decidim_assemblies
       decidim_blogs
       decidim_budgets
+      decidim_collaborative_texts
       decidim_comments
       decidim_conferences
       decidim_debates
+      decidim_elections
       decidim_forms
       decidim_initiatives
       decidim_meetings

data/lib/tasks/decidim_taxonomies.rake

@@ -87,40 +87,6 @@ namespace :decidim do
       end
     end
 
-    desc "Adds taxonomies to metrics from old categories"
-    task :update_metrics, [:file] => :environment do |_task, args|
-      file = args[:file].to_s
-      abort "File not found! [#{file}]" unless File.exist?(file)
-
-      data = JSON.parse(File.read(file))
-      taxonomies = data["taxonomy_map"]
-      unless taxonomies && taxonomies&.any?
-        log.warn "No metric (categories) taxonomies found in the file"
-        next
-      end
-
-      total = taxonomies.count
-      taxonomies.each_with_index do |(id, object_id), index|
-        next unless object_id.include?("ImportModels::Category")
-
-        category_id = object_id.split("/").last
-        percent = ((index + 1) * 100 / total).to_i
-
-        count = Decidim::Metric.where(decidim_category_id: category_id).count
-        log.info "...#{percent}% Updating #{count} metrics for category #{category_id} to taxonomy #{id}"
-        Decidim::Metric.where(decidim_category_id: category_id).update_all(decidim_taxonomy_id: id) # rubocop:disable Rails/SkipsModelValidations
-      end
-    end
-
-    desc "Processes all metrics for result files in tmp/taxonomies"
-    task :update_all_metrics, [] => :environment do |_task, _args|
-      Rails.root.glob("tmp/taxonomies/*_result.json").each do |file|
-        log.info "Processing metrics from #{file}"
-        Rake::Task["decidim:taxonomies:update_metrics"].reenable
-        Rake::Task["decidim:taxonomies:update_metrics"].invoke(file)
-      end
-    end
-
     desc "Reset counters for taxonomies and taxonomy filters"
     task :reset_counters, [] => :environment do |_task, _args|
       Decidim::Taxonomy.find_each do |taxonomy|

data/lib/tasks/upgrade/clean.rake

@@ -143,7 +143,7 @@ namespace :decidim do
 
       desc "Removes all the invalid records from private downloads"
       task invalid_private_exports: :environment do
-        invalid_private_exports = Decidim::PrivateExport.where("export_type ~ '^survey_user_answers_[0-9a-f]{64}$'")
+        invalid_private_exports = Decidim::PrivateExport.where("export_type ~ '^survey_user_responses_[0-9a-f]{64}$'")
         logger.info("=== Removing #{invalid_private_exports.length} private exports")
         invalid_private_exports.delete_all
       end

data/lib/tasks/upgrade/decidim_action_log_valuation_assignment.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Upgrade the ActionLog model's attribute resource_type from ValuationAssignment to EvaluationAssignment"
+    task decidim_action_log_valuation_assignment: :environment do
+      old_type = "Decidim::Proposals::ValuationAssignment"
+      new_type = "Decidim::Proposals::EvaluationAssignment"
+
+      Decidim::ActionLog.where(resource_type: old_type).update_all(resource_type: new_type) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_change_valuator_tasks.rake

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Upgrade evaluators roles in Spaces"
+    task decidim_update_valuators: :environment do
+      Decidim::ParticipatoryProcessUserRole.where(role: "valuator").update_all(role: "evaluator") if Decidim.module_installed?(:participatory_processes) # rubocop:disable Rails/SkipsModelValidations
+      Decidim::AssemblyUserRole.where(role: "valuator").update_all(role: "evaluator") if Decidim.module_installed?(:assemblies) # rubocop:disable Rails/SkipsModelValidations
+      Decidim::ConferenceUserRole.where(role: "valuator").update_all(role: "evaluator") if Decidim.module_installed?(:conferences) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

data/lib/tasks/upgrade/{decidim_deduplicate_endorsements.rake → decidim_deduplicate_likes.rake}

@@ -2,10 +2,10 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Removes duplicated endorsements"
-    task fix_duplicate_endorsements: :environment do
+    desc "Removes duplicated likes"
+    task fix_duplicate_likes: :environment do
       logger = Logger.new($stdout)
-      logger.info("Removing duplicate endorsements...")
+      logger.info("Removing duplicate likes...")
       has_count = 0
 
       columns = [:resource_type, :resource_id, :decidim_author_type, :decidim_author_id, :decidim_user_group_id]
@@ -14,24 +14,24 @@ namespace :decidim do
         while row_count(issue) > 1
           find_next(issue)&.destroy
           has_count += 1
-          logger.info("Removed duplicate endorsement for #{issue.resource_type} #{issue.resource_id}")
+          logger.info("Removed duplicate like for #{issue.resource_type} #{issue.resource_id}")
         end
       end
 
-      logger.info("Patch remaining endorsements.")
-      Decidim::Endorsement.where(decidim_user_group_id: nil).update(decidim_user_group_id: 0)
-      logger.info("Process terminated, #{has_count} endorsements have been removed.")
+      logger.info("Patch remaining likes.")
+      Decidim::Like.where(decidim_user_group_id: nil).update(decidim_user_group_id: 0)
+      logger.info("Process terminated, #{has_count} likes have been removed.")
       logger.info("Done")
     end
 
     private
 
     def get_duplicates(*columns)
-      Decidim::Endorsement.select("#{columns.join(",")}, COUNT(*)").group(columns).having("COUNT(*) > 1")
+      Decidim::Like.select("#{columns.join(",")}, COUNT(*)").group(columns).having("COUNT(*) > 1")
     end
 
     def row_count(issue)
-      Decidim::Endorsement.where(
+      Decidim::Like.where(
         resource_type: issue.resource_type,
         resource_id: issue.resource_id,
         decidim_author_type: issue.decidim_author_type,
@@ -41,7 +41,7 @@ namespace :decidim do
     end
 
     def find_next(issue)
-      Decidim::Endorsement.find_by(
+      Decidim::Like.find_by(
         resource_type: issue.resource_type,
         resource_id: issue.resource_id,
         decidim_author_type: issue.decidim_author_type,

data/lib/tasks/upgrade/decidim_migrate_wysiwyg_content.rake

@@ -7,7 +7,7 @@ namespace :decidim do
       # Core
       Decidim::Upgrade::WysiwygMigrator.register_model(
         "Decidim::Organization",
-        [:description, :omnipresent_banner_short_description, :highlighted_content_banner_short_description, :welcome_notification_body, :admin_terms_of_service_body]
+        [:description, :omnipresent_banner_short_description, :welcome_notification_body, :admin_terms_of_service_body]
       )
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Category", [:description])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::ContextualHelpSection", [:content])
@@ -27,7 +27,7 @@ namespace :decidim do
       # Components
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Accountability::Result", [:description])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Accountability::Status", [:description])
-      Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Accountability::TimelineEntry", [:description])
+      Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Accountability::Milestone", [:description])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Blogs::Post", [:body])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Budgets::Budget", [:description])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Budgets::Project", [:description])

data/lib/tasks/upgrade/decidim_paper_trail_valuation_assignment.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Upgrade PaperTrail model's attribute item_type from ValuationAssignment to EvaluationAssignment"
+    task decidim_paper_trail_valuation_assignment: :environment do
+      old_type = "Decidim::Proposals::ValuationAssignment"
+      new_type = "Decidim::Proposals::EvaluationAssignment"
+
+      PaperTrail::Version.where(item_type: old_type).update_all(item_type: new_type) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

data/lib/tasks/upgrade/user_groups_migration.rake

@@ -0,0 +1,155 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :user_groups do
+      desc "Main task to notify users and change references to groups"
+      task remove: [
+        :"decidim:upgrade:user_groups:send_reset_password_instructions",
+        :"decidim:upgrade:user_groups:send_user_group_changes_notification_to_members",
+        :"decidim:upgrade:user_groups:transfer_user_groups_authorships",
+        :"decidim:upgrade:user_groups:fix_user_groups_action_logs",
+        :"decidim:upgrade:user_groups:remove_groups_notifications"
+      ]
+
+      desc "Send reset password instructions to groups"
+      task send_reset_password_instructions: :environment do
+        Decidim::User.user_group.where(encrypted_password: "").find_each do |group|
+          Decidim::UserGroupMailer.notify_deprecation_to_owner(group).deliver_later
+        end
+      end
+
+      desc "Notify user group changes to members"
+      task send_user_group_changes_notification_to_members: :environment do
+        class UserGroupMembership < ApplicationRecord
+          self.table_name = "decidim_user_group_memberships"
+
+          belongs_to :user, class_name: "Decidim::User", foreign_key: :decidim_user_id
+          belongs_to :group, class_name: "Decidim::User", foreign_key: :decidim_user_group_id
+
+          scope :member, -> { where(role: %w(creator admin member)) }
+        end
+
+        Decidim::User.user_group.where(encrypted_password: "").find_each do |group|
+          UserGroupMembership.where(group:).member.find_each do |membership|
+            user = membership.user
+            next if user.deleted? || user.blocked? || !user.confirmed?
+
+            Decidim::UserGroupMailer
+              .notify_deprecation_to_member(
+                user,
+                group.name,
+                group.email
+              ).deliver_later
+          end
+        end
+      end
+
+      desc "Transfer user groups authorships"
+      task transfer_user_groups_authorships: :environment do
+        coauthorable_models = %w(
+          Decidim::Proposals::Proposal
+          Decidim::Proposals::CollaborativeDraft
+        )
+        authorable_models = %w(
+          Decidim::Like
+          Decidim::Initiative
+          Decidim::Blogs::Post
+          Decidim::Comments::Comment
+          Decidim::Debates::Debate
+          Decidim::Meetings::Meeting
+        )
+
+        authorships = []
+        authorable_models.map(&:safe_constantize).compact.each do |model|
+          model.find_each do |item|
+            next unless item.decidim_user_group_id&.positive?
+            next unless Decidim::User.exists?(item.decidim_user_group_id)
+
+            authorships << {
+              item:,
+              gid: item.to_gid,
+              model: model.name,
+              id: item.id,
+              author_type: item.decidim_author_type,
+              author_id: item.decidim_author_id,
+              group_id: item.decidim_user_group_id
+            }
+          end
+        end
+
+        Decidim::Coauthorship.where(coauthorable_type: coauthorable_models).find_each do |item|
+          next unless item.decidim_user_group_id&.positive?
+          next unless Decidim::User.exists?(item.decidim_user_group_id)
+
+          authorships << {
+            item:,
+            gid: item.to_gid,
+            model: item.coauthorable_type,
+            id: item.id,
+            author_type: item.decidim_author_type,
+            author_id: item.decidim_author_id,
+            group_id: item.decidim_user_group_id
+          }
+        end
+
+        puts "===== Transferring #{authorships.count} authorships..."
+        authorships.each do |a|
+          item = a[:item]
+
+          # rubocop:disable Rails/SkipsModelValidations
+          item.update_attribute(:decidim_author_type, "Decidim::UserBaseEntity") if item.decidim_author_type != "Decidim::UserBaseEntity"
+          item.update_attribute(:decidim_author_id, a[:group_id])
+          item.update_attribute(:decidim_user_group_id, a[:author_id])
+          # rubocop:enable Rails/SkipsModelValidations
+
+          puts "Transferred authorship in #{a[:model]} with id #{a[:id]} and gid #{a[:gid]} from #{a[:author_type]} with id #{a[:author_id]} to user with id #{a[:group_id]}"
+        end
+        puts "===== Transfer finished."
+      end
+
+      desc "Transform action log entries related with user groups to user"
+      task fix_user_groups_action_logs: :environment do
+        items = Decidim::ActionLog.where(resource_type: "Decidim::UserGroup")
+
+        if (count = items.count).positive?
+          # rubocop:disable Rails/SkipsModelValidations
+          items.update_all(resource_type: "Decidim::User")
+          # rubocop:enable Rails/SkipsModelValidations
+
+          puts "===== Transformed #{count} action log entries."
+        else
+          puts "===== Skipped, no entries found to transform."
+        end
+      end
+
+      desc "Remove notification entries related with user groups"
+      task remove_groups_notifications: :environment do
+        items = Decidim::Notification.where(
+          event_class: %w(
+            Decidim::Comments::CommentByFollowedUserGroupEvent
+            Decidim::Comments::UserGroupMentionedEvent
+            Decidim::DemotedMembershipEvent
+            Decidim::InvitedToGroupEvent
+            Decidim::JoinRequestAcceptedEvent
+            Decidim::JoinRequestCreatedEvent
+            Decidim::JoinRequestRejectedEvent
+            Decidim::PromotedToAdminEvent
+            Decidim::RemovedFromGroupEvent
+            Decidim::UserGroupAdminEvent
+            Decidim::UserGroupCreatedEvent
+            Decidim::UserGroupUpdatedEvent
+          )
+        )
+
+        if (count = items.count).positive?
+          items.find_each(&:destroy)
+
+          puts "===== Removed #{count} action log entries."
+        else
+          puts "===== Skipped, no entries found to remove."
+        end
+      end
+    end
+  end
+end