decidim-decidim_awesome 0.11.4 → 0.12.0

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.11.4"
-    COMPAT_DECIDIM_VERSION = [">= 0.28.0", "< 0.29"].freeze
+    VERSION = "0.12.0"
+    COMPAT_DECIDIM_VERSION = [">= 0.29.1", "< 0.30"].freeze
   end
 end

data/lib/decidim/decidim_awesome.rb

@@ -11,7 +11,6 @@ require "decidim/decidim_awesome/map_component/component"
 require "decidim/decidim_awesome/iframe_component/engine"
 require "decidim/decidim_awesome/iframe_component/admin_engine"
 require "decidim/decidim_awesome/iframe_component/component"
-require "decidim/decidim_awesome/content_parsers/editor_images_parser"
 
 # Engines to handle logic unrelated to participatory spaces or components
 Decidim.register_global_engine(

data/lib/tasks/decidim_awesome_upgrade_tasks.rake

@@ -7,7 +7,3 @@ end
 Rake::Task["decidim:choose_target_plugins"].enhance do
   ENV["FROM"] = "#{ENV.fetch("FROM", nil)},decidim_decidim_awesome"
 end
-
-Rake::Task["decidim:webpacker:upgrade"].enhance do
-  Rake::Task["decidim_decidim_awesome:webpacker:install"].invoke
-end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
@@ -34,26 +34,18 @@
   },
   "prettier": "@decidim/prettier-config",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.23.10",
-    "@babel/plugin-transform-classes": "^7.23.8",
-    "@babel/plugin-transform-regenerator": "^7.23.3",
-    "@babel/plugin-transform-runtime": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
-    "@babel/preset-react": "^7.23.3",
-    "@decidim/dev": "0.28.4",
-    "@decidim/eslint-config": "0.28.4",
-    "@decidim/prettier-config": "0.28.4",
-    "@decidim/stylelint-config": "0.28.4",
+    "@decidim/dev": "0.29.1",
+    "@decidim/eslint-config": "0.29.1",
+    "@decidim/prettier-config": "0.29.1",
+    "@decidim/stylelint-config": "0.29.1",
     "postcss-scss": "^4.0.9",
-    "sass-embedded": "~1.57.1",
-    "@tarekraafat/autocomplete.js": "10.2.7"
+    "sass-embedded": "^1.83.1",
+    "@tarekraafat/autocomplete.js": "^10.2.9"
   },
   "dependencies": {
-    "@rails/actioncable": "^6.1.7-6",
-    "codemirror": "^5.65.0",
+    "codemirror": "^5.65.16",
     "form-storage": "^1.3.5",
     "formBuilder": "^3.19.12",
-    "highlight.js": "^11.4.0",
     "inline-attacher": "^0.0.7",
     "jsrender": "^1.0.9",
     "leaflet.featuregroup.subgroup": "^1.0.2",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0
 platform: ruby
 authors:
 - Ivan Vergés
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ files:
 - app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb
 - app/commands/concerns/decidim/decidim_awesome/proposals/update_collaborative_draft_override.rb
 - app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb
-- app/commands/concerns/decidim/decidim_awesome/system/register_organization_override.rb
+- app/commands/concerns/decidim/decidim_awesome/system/create_organization_override.rb
 - app/commands/concerns/decidim/decidim_awesome/system/update_organization_override.rb
 - app/commands/concerns/decidim/decidim_awesome/update_account_override.rb
 - app/commands/decidim/decidim_awesome/admin/create_constraint.rb
@@ -161,8 +161,8 @@ files:
 - app/controllers/decidim/decidim_awesome/map_component/map_controller.rb
 - app/controllers/decidim/decidim_awesome/required_authorizations_controller.rb
 - app/forms/concerns/decidim/decidim_awesome/account_form_override.rb
+- app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_customizations.rb
 - app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_override.rb
-- app/forms/concerns/decidim/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb
 - app/forms/concerns/decidim/decidim_awesome/system/organization_form_override.rb
 - app/forms/decidim/decidim_awesome/admin/config_form.rb
 - app/forms/decidim/decidim_awesome/admin/constraint_form.rb
@@ -178,8 +178,6 @@ files:
 - app/helpers/decidim/decidim_awesome/map_helper.rb
 - app/jobs/decidim/decidim_awesome/destroy_private_data_job.rb
 - app/jobs/decidim/decidim_awesome/export_admin_actions_job.rb
-- app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb
-- app/middleware/decidim/decidim_awesome/current_config.rb
 - app/models/concerns/decidim/decidim_awesome/has_proposal_extra_fields.rb
 - app/models/concerns/decidim/decidim_awesome/has_vote_weight.rb
 - app/models/concerns/decidim/decidim_awesome/user_override.rb
@@ -209,6 +207,7 @@ files:
 - app/packs/entrypoints/decidim_admin_decidim_awesome.scss
 - app/packs/entrypoints/decidim_admin_decidim_awesome_global.js
 - app/packs/entrypoints/decidim_admin_decidim_awesome_global.scss
+- app/packs/entrypoints/decidim_admin_decidim_awesome_search_form.scss
 - app/packs/entrypoints/decidim_decidim_awesome.js
 - app/packs/entrypoints/decidim_decidim_awesome.scss
 - app/packs/entrypoints/decidim_decidim_awesome_custom_fields.js
@@ -252,6 +251,7 @@ files:
 - app/packs/src/decidim/decidim_awesome/proposals/images.js
 - app/packs/src/decidim/decidim_awesome/voting/voting_cards.js
 - app/packs/src/vendor/jquery.truncate.js
+- app/packs/stylesheets/decidim/decidim_awesome/admin/admin_accountability.scss
 - app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss
 - app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss
 - app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss
@@ -291,7 +291,6 @@ files:
 - app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb
 - app/types/concerns/decidim/decidim_awesome/add_proposal_type_custom_fields.rb
 - app/types/concerns/decidim/decidim_awesome/add_proposal_type_vote_weights.rb
-- app/uploaders/decidim/cw/decidim_awesome/image_uploader.rb
 - app/uploaders/decidim/decidim_awesome/image_uploader.rb
 - app/validators/concerns/decidim/decidim_awesome/etiquette_validator_override.rb
 - app/views/decidim/decidim_awesome/account/_timezone_select.html.erb
@@ -398,7 +397,6 @@ files:
 - lib/decidim/decidim_awesome/awesome_helpers.rb
 - lib/decidim/decidim_awesome/checksums.yml
 - lib/decidim/decidim_awesome/config.rb
-- lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb
 - lib/decidim/decidim_awesome/context_analyzers.rb
 - lib/decidim/decidim_awesome/context_analyzers/component_analyzer.rb
 - lib/decidim/decidim_awesome/context_analyzers/participatory_space_analyzer.rb
@@ -414,6 +412,7 @@ files:
 - lib/decidim/decidim_awesome/map_component/engine.rb
 - lib/decidim/decidim_awesome/menu.rb
 - lib/decidim/decidim_awesome/menu_hacker.rb
+- lib/decidim/decidim_awesome/middleware/current_config.rb
 - lib/decidim/decidim_awesome/request_memoizer.rb
 - lib/decidim/decidim_awesome/system_checker.rb
 - lib/decidim/decidim_awesome/test/factories.rb
@@ -434,7 +433,6 @@ files:
 - lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb
 - lib/decidim/decidim_awesome/version.rb
 - lib/decidim/decidim_awesome/voting_manifest.rb
-- lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake
 - lib/tasks/decidim_awesome_upgrade_tasks.rake
 - lib/tasks/decidim_awesome_webpacker_tasks.rake
 - package.json
@@ -451,7 +449,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DecidimAwesome
-    class MigrateLegacyImagesJob < ApplicationJob
-      queue_as :default
-
-      def perform(organization_id, mappings = [], logger = Rails.logger)
-        @organization_id = organization_id
-        @routes_mappings = mappings
-        @logger = logger
-
-        migrate_all!
-        transform_images_urls
-      end
-
-      private
-
-      attr_reader :routes_mappings, :logger
-
-      def migrate_all!
-        Decidim::CarrierWaveMigratorService.migrate_attachment!(
-          klass: Decidim::DecidimAwesome::EditorImage,
-          cw_attribute: "image",
-          cw_uploader: Decidim::Cw::DecidimAwesome::ImageUploader,
-          as_attribute: "file",
-          logger: @logger,
-          routes_mappings:
-        )
-      end
-
-      def transform_images_urls
-        mappings = routes_mappings.map do |mapping|
-          klass, id = mapping[:instance].split("#")
-          next unless klass == "Decidim::DecidimAwesome::EditorImage"
-
-          instance = Decidim::DecidimAwesome::EditorImage.find_by(id:)
-
-          next if instance.blank?
-
-          mapping.merge!(instance:)
-        end.compact
-
-        editor_images_available_attributes.each do |model, attributes|
-          model.all.each do |item|
-            attributes.each do |attribute|
-              item.update(attribute => rewrite_value(item.send(attribute), mappings))
-            end
-          end
-          @logger.info "Updated model #{model.name} (attributes: #{attributes.join(", ")})"
-        end
-      end
-
-      def rewrite_value(value, mappings)
-        if value.is_a?(Hash)
-          value.transform_values do |nested_value|
-            rewrite_value(nested_value, mappings)
-          end
-        else
-          parser = Decidim::DecidimAwesome::ContentParsers::EditorImagesParser.new(value, routes_mappings: mappings)
-          parser.rewrite
-        end
-      end
-
-      def editor_images_available_attributes
-        {
-          "Decidim::Accountability::Result" => %w(description),
-          "Decidim::Proposals::Proposal" => %w(body answer cost_report execution_period),
-          "Decidim::Votings::Voting" => %w(description),
-          "Decidim::Elections::Question" => %w(description),
-          "Decidim::Elections::Answer" => %w(description),
-          "Decidim::Elections::Election" => %w(description),
-          "Decidim::Initiative" => %w(description answer),
-          "Decidim::InitiativesType" => %w(description extra_fields_legal_information),
-          "Decidim::Assembly" => %w(short_description description purpose_of_action composition internal_organisation announcement closing_date_reason special_features),
-          "Decidim::Forms::Questionnaire" => %w(description tos),
-          "Decidim::Forms::Question" => %w(description),
-          "Decidim::Organization" => %w(welcome_notification_body admin_terms_of_service_body description highlighted_content_banner_short_description
-                                        id_documents_explanation_text),
-          "Decidim::StaticPage" => %w(content),
-          "Decidim::ContextualHelpSection" => %w(content),
-          "Decidim::Category" => %w(description),
-          "Decidim::Blogs::Post" => %w(body),
-          "Decidim::Pages::Page" => %w(body),
-          "Decidim::Sortitions::Sortition" => %w(additional_info witnesses cancel_reason),
-          "Decidim::Consultations::Question" => %w(title question_context what_is_decided instructions),
-          "Decidim::Consultation" => %w(description),
-          "Decidim::Debates::Debate" => %w(description instructions information_updates conclusions),
-          "Decidim::Budgets::Budget" => %w(description),
-          "Decidim::Budgets::Project" => %w(description),
-          "Decidim::ConferenceSpeaker" => %w(short_bio),
-          "Decidim::Conferences::RegistrationType" => %w(description),
-          "Decidim::Conference" => %w(short_description description objectives registration_terms),
-          "Decidim::ParticipatoryProcessGroup" => %w(description),
-          "Decidim::ParticipatoryProcess" => %w(short_description description announcement),
-          "Decidim::ParticipatoryProcessStep" => %w(description),
-          "Decidim::Meetings::AgendaItem" => %w(description),
-          "Decidim::Meetings::Meeting" => %w(registration_terms description registration_email_custom_content closing_report)
-        }.each_with_object({}) do |(main_model, attributes), hash|
-          hash[main_model.constantize] = attributes
-        rescue NameError
-          hash
-        end
-      end
-    end
-  end
-end

data/app/uploaders/decidim/cw/decidim_awesome/image_uploader.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim::Cw
-  module DecidimAwesome
-    # Transitional class to allow carrierwave to active storage migrations
-    class ImageUploader < Decidim::Cw::ImageUploader
-      process :validate_size, :validate_dimensions
-
-      version :thumbnail do
-        process resize_to_fit: [nil, 237]
-      end
-
-      def extension_whitelist
-        %w(jpg jpeg png)
-      end
-
-      def content_type_whitelist
-        %w(image/jpeg image/png)
-      end
-
-      def max_image_height_or_width
-        8000
-      end
-    end
-  end
-end

data/lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DecidimAwesome
-    module ContentParsers
-      # A parser that searches for editor images from CarrierWave in html
-      # contents and replaces them with migrated images to ActiveStorage
-      #
-      # @see BaseParser Examples of how to use a content parser
-      class EditorImagesParser < Decidim::ContentParsers::BaseParser
-        # @return [String] the content with the CarrierWave images replaced.
-        def rewrite
-          return content if editor_images.blank?
-
-          replace_editor_images
-          parsed_content.to_html
-        end
-
-        def editor_images
-          @editor_images ||= parsed_content.search(:img).index_with do |image|
-            context[:routes_mappings].find { |mapping| image.attr(:src).end_with?(mapping[:origin_path]) }
-          end.compact
-        end
-
-        private
-
-        def parsed_content
-          @parsed_content ||= Nokogiri::HTML(content)
-        end
-
-        def replace_editor_images
-          editor_images.each do |image, mapping|
-            image.set_attribute(:src, mapping[:instance].attached_uploader(:file).path)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-namespace :decidim_awesome do
-  namespace :active_storage_migrations do
-    desc "Migrates editor images from Carrierwave to ActiveStorage"
-    task migrate_from_carrierwave: :environment do
-      stdout = Logger.new($stdout)
-      stdout.level = Logger::INFO
-      Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout))
-      Decidim::Organization.find_each do |organization|
-        puts "Migrating Organization #{organization.id} (#{organization.host})..."
-        routes_mappings = []
-        Decidim::DecidimAwesome::MigrateLegacyImagesJob.perform_now(organization.id, routes_mappings)
-
-        path = Rails.root.join("tmp/decidim_awesome_editor_images_mappings.csv")
-        dirname = File.dirname(path)
-        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-        File.binwrite(path, Decidim::Exporters::CSV.new(routes_mappings).export.read)
-      end
-    end
-
-    desc "Checks editor images migrated from Carrierwave to ActiveStorage"
-    task check_migration_from_carrierwave: :environment do
-      logger = ActiveSupport::TaggedLogging.new(Logger.new($stdout))
-
-      Decidim::CarrierWaveMigratorService.check_migration(
-        klass: Decidim::DecidimAwesome::EditorImage,
-        cw_attribute: "image",
-        cw_uploader: Decidim::Cw::DecidimAwesome::ImageUploader,
-        as_attribute: "file",
-        logger:
-      )
-    end
-  end
-end