decidim-core 0.31.5 → 0.32.0.rc2

data/lib/decidim/shakapacker/runner.rb

@@ -7,15 +7,15 @@ module Decidim
         base.alias_method :original_initialize, :initialize
         base.send :private, :original_initialize
 
-        base.define_method :initialize do |argv|
-          decidim_initialize(argv)
-          original_initialize(argv)
+        base.define_method :initialize do |argv, build_config = nil, bundler_override = nil|
+          decidim_initialize(argv, build_config, bundler_override)
+          original_initialize(argv, build_config, bundler_override)
         end
       end
 
       private
 
-      def decidim_initialize(_argv)
+      def decidim_initialize(_argv, _build_config = nil, _bundler_override = nil)
         # Write runtime configuration for Tailwind
         # This method is called here because in Decidim CSS compilation is done via Webpack.
         # If CSS is decoupled from JS in the future, this call should be removed.

data/lib/decidim/shakapacker/shakapacker.yml

@@ -21,8 +21,12 @@ default: &default
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
-  webpack_loader: 'esbuild'
+  # Select JavaScript transpiler to use
+  # Available options: 'swc' (default, 20x faster), 'babel', 'esbuild', or 'none'
+  # Use 'none' when providing a completely custom webpack configuration
+  # Note: When using rspack, swc is used automatically regardless of this setting
+  javascript_transpiler: 'esbuild'
+  assets_bundler: "webpack"
 
   # Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used
   ensure_consistent_versioning: true
@@ -35,15 +39,36 @@ default: &default
   # https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
   useContentHash: false
 
+  # Utilizing webpack-subresource-integrity plugin, will generate integrity hashes for all entries in manifest.json
+  # https://github.com/waysact/webpack-subresource-integrity/tree/main/webpack-subresource-integrity
+  integrity:
+    enabled: false
+    # Which cryptographic function(s) to use, for generating the integrity hash(es). Default sha-384. Other possible values sha256, sha512
+    hash_functions: [ "sha384" ]
+    # Default "anonymous". Other possible value "use-credentials"
+    # https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity#cross-origin_resource_sharing_and_subresource_integrity
+    cross_origin: "anonymous"
+
+  # HTTP 103 Early Hints support for faster asset loading
+  # Sends Link headers to browsers so they can preload assets while Rails is rendering
+  # See docs/early_hints_new_api.md for setup instructions and requirements
+  # https://api.rubyonrails.org/classes/ActionDispatch/Request.html#method-i-send_early_hints
+  early_hints:
+    enabled: false
+    # css: "preload" # 'preload' | 'prefetch' | 'none' - default: 'preload'
+    # js: "preload" # 'preload' | 'prefetch' | 'none' - default: 'preload'
+    # debug: false # Output early hints info as HTML comments for troubleshooting
+
 development:
   <<: *default
   compile: true
   compiler_strategy: mtime
   # Compile test packs to decidim decidim-packs folder
 
+  useContentHash: false
+
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server:
-    https: false
     host: localhost
     # Notice that we use a different port (to prevent blocking the default one) as
     # there will be at least two webpack servers running

data/lib/decidim/taxonomizable.rb

@@ -51,7 +51,7 @@ module Decidim
           Arel::Nodes::Intersect.new(memo, query)
         end
 
-        @klass.from(Arel::Nodes::As.new(subquery, Arel.sql(@klass.arel_table.name)))
+        from(Arel::Nodes::As.new(subquery, Arel.sql(arel_table.name)))
       }
 
       private

data/lib/decidim/translatable_attributes.rb

@@ -96,8 +96,7 @@ module Decidim
         given_organization ||= try(:organization)
         organization_locale = given_organization.try(:default_locale)
 
-        attribute[I18n.locale.to_s].presence ||
-          machine_translation_value(attribute, given_organization, override_machine_translation_settings) ||
+        translated_value(attribute, given_organization, override_machine_translation_settings) ||
           attribute[organization_locale].presence ||
           attribute[attribute.keys.first].presence ||
           ""
@@ -112,7 +111,7 @@ module Decidim
         return unless organization
         return unless organization.enable_machine_translations?
 
-        attribute.dig("machine_translations", I18n.locale.to_s).presence if must_render_translation?(organization, override_machine_translation_settings)
+        attribute.dig("machine_translations", I18n.locale.to_s)&.gsub("<p></p>", "").presence if must_render_translation?(organization, override_machine_translation_settings)
       end
 
       def must_render_translation?(organization, override_machine_translation_settings = nil)
@@ -131,5 +130,12 @@ module Decidim
     def attachment?(value)
       value.is_a?(String) && value.include?(ActiveStorage.routes_prefix)
     end
+
+    private
+
+    def translated_value(attribute, given_organization, override_machine_translation_settings = nil)
+      attribute[I18n.locale.to_s]&.gsub("<p></p>", "").presence ||
+        machine_translation_value(attribute, given_organization, override_machine_translation_settings)
+    end
   end
 end

data/lib/decidim/view_model.rb

@@ -35,6 +35,10 @@ module Decidim
       end
     end
 
+    def current_locale
+      I18n.locale
+    end
+
     # Rails cells is delegating those methods to some internal view layer which messes up with shakapacker asset loading strategy
     # generating 2 or more queues for the javascript to be loading, resulting in the fact that no js / style pack appended or
     # prepended is added to main view rendering queue.

data/lib/devise/models/decidim_newsletterable.rb

@@ -13,7 +13,7 @@ module Devise
       def newsletter_opt_in_notify
         unless newsletter_opt_in_valid?
           set_newsletter_token!
-          Decidim::NewslettersOptInJob.perform_later(self, newsletter_token)
+          Decidim::NewslettersOptInMailer.notify(self, newsletter_token).deliver_later
         end
       end
 

data/lib/tasks/decidim_procfile.rake

@@ -30,7 +30,7 @@ if ! gem list foreman -i --silent; then
   gem install foreman
 fi
 
-exec foreman start -f Procfile.dev "$@")
+exec foreman start -f Procfile.dev "$@"), force: true
 
       actions :chmod, "bin/dev", 0o755
     end

data/lib/tasks/decidim_tasks.rake

@@ -34,7 +34,6 @@ namespace :decidim do
       decidim_pages
       decidim_participatory_processes
       decidim_proposals
-      decidim_sortitions
       decidim_surveys
       decidim_system
       decidim_templates

data/lib/tasks/decidim_taxonomies.rake

@@ -106,7 +106,7 @@ namespace :decidim do
     end
 
     def planner(organization)
-      models = ENV.fetch("IMPORTS", "ParticipatoryProcessType AssemblyType Scope Area Category").split.map do |model_name|
+      models = ENV.fetch("IMPORTS", "Scope Area Category").split.map do |model_name|
         "Decidim::Maintenance::ImportModels::#{model_name}".constantize
       end
       Decidim::Maintenance::TaxonomyPlan.new(organization, models)

data/lib/tasks/upgrade/decidim_active_storage_migration_tasks.rake

@@ -57,7 +57,6 @@ namespace :decidim do
           "Decidim::Category" => %w(description),
           "Decidim::Blogs::Post" => %w(body),
           "Decidim::Pages::Page" => %w(body),
-          "Decidim::Sortitions::Sortition" => %w(additional_info witnesses cancel_reason),
           "Decidim::Debates::Debate" => %w(description instructions information_updates conclusions),
           "Decidim::Budgets::Budget" => %w(description),
           "Decidim::Budgets::Project" => %w(description),

data/lib/tasks/upgrade/decidim_encryption.rake

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Upgrade the encryption environment"
+    task encryption: :environment do
+      # Authorization is using the RecordEncryptor which automatically decrypts or encrypts before using.
+      # A simple save will retrigger the encryption using SHA256
+      Decidim::Authorization.find_each(&:save)
+    end
+  end
+end

data/lib/tasks/upgrade/decidim_migrate_wysiwyg_content.rake

@@ -39,7 +39,6 @@ namespace :decidim do
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Meetings::Meeting", [:description, :registration_terms, :registration_email_custom_content, :closing_report])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Pages::Page", [:body])
       Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Proposals::Proposal", [:body, :answer, :cost_report, :execution_period])
-      Decidim::Upgrade::WysiwygMigrator.register_model("Decidim::Sortitions::Sortition", [:witnesses, :additional_info, :cancel_reason])
     end
 
     desc "Updates the content entered through the WYSIWYG editors"

data/lib/tasks/upgrade/decidim_remove_deleted_users_left_data_tasks.rake

@@ -8,7 +8,7 @@ namespace :decidim do
       Decidim::User.where.not(deleted_at: nil).find_each do |deleted_user|
         Decidim::Follow.where(followable: deleted_user).find_each(&:destroy)
         Decidim::Follow.where(user: deleted_user).find_each(&:destroy)
-        Decidim::ParticipatorySpacePrivateUser.where(user: deleted_user).find_each(&:destroy)
+        Decidim::ParticipatorySpace::Member.where(user: deleted_user).find_each(&:destroy)
         Decidim::Gamification::BadgeScore.where(user: deleted_user).find_each(&:destroy)
         Decidim::UserModeration.where(user: deleted_user).find_each(&:destroy)
         Decidim::Like.where(author: deleted_user).find_each(&:destroy)

data/lib/tasks/upgrade/{fix_deleted_private_follows.rake → fix_deleted_members_follows.rake}

@@ -2,14 +2,14 @@
 
 namespace :decidim do
   namespace :upgrade do
-    desc "Delete follows of private users deleted from a private space"
-    task fix_deleted_private_follows: :environment do
+    desc "Delete follows of members deleted from a restricted space"
+    task fix_deleted_members_follows: :environment do
       Decidim::Organization.all.each do |organization|
-        spaces = organization.participatory_spaces.collect { |space| space if space.respond_to?(:private_space?) && space.private_space? }.compact_blank
+        spaces = organization.participatory_spaces.collect { |space| space if space.respond_to?(:restricted?) && space.restricted? }.compact_blank
 
         next if spaces.blank?
 
-        spaces = spaces.map { |space| space.respond_to?(:is_transparent?) ? (space unless space.is_transparent?) : space }.compact_blank
+        spaces = spaces.map { |space| space.respond_to?(:transparent?) ? (space unless space.transparent?) : space }.compact_blank
 
         next if spaces.blank?
 
@@ -17,7 +17,7 @@ namespace :decidim do
           next unless user.following_follows.count.positive?
 
           spaces.each do |space|
-            Decidim::Admin::DestroyPrivateUsersFollowsJob.perform_later(user, space)
+            Decidim::Admin::ParticipatorySpace::DestroyMembersFollowsJob.perform_later(user, space)
           end
         end
       end

data/lib/tasks/upgrade/migrations.rake

@@ -24,7 +24,6 @@ namespace :decidim do
         "pages" => "Pages",
         "participatory_processes" => "ParticipatoryProcesses",
         "proposals" => "Proposals",
-        "sortitions" => "Sortitions",
         "surveys" => "Surveys",
         "system" => "System",
         "templates" => "Templates",

data/lib/tasks/upgrade/user_groups_migration.rake

@@ -80,7 +80,6 @@ namespace :decidim do
       task transfer_user_groups_authorships: :environment do
         coauthorable_models = %w(
           Decidim::Proposals::Proposal
-          Decidim::Proposals::CollaborativeDraft
         )
         authorable_models = %w(
           Decidim::Like