decidim-core 0.28.2 → 0.29.0.rc2

data/lib/decidim/commands/create_resource.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class CreateResource < ::Decidim::Command
+      include Decidim::Commands::ResourceHandler
+
+      # Initializes the command.
+      # @param form [Decidim::Form] the form object to create the resource.
+      def initialize(form)
+        @form = form
+      end
+
+      # Creates the result if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      # @usage
+      #  create_resource - Will create the resource, raising any validation errors.
+      def create_resource
+        @resource = Decidim.traceability.send(create_method, resource_class, current_user, attributes, **extra_params)
+        @resource.persisted? ? resource : raise(ActiveRecord::RecordInvalid, resource)
+      end
+
+      attr_reader :form, :resource
+
+      delegate :current_user, to: :form
+
+      def create_method
+        has_file_attributes? ? :create : :create!
+      end
+
+      # Useful for running any code that you may want to execute before creating the resource.
+      def run_before_hooks; end
+
+      # Useful for running any code that you may want to execute after creating the resource.
+      def run_after_hooks; end
+
+      private
+
+      def perform!
+        transaction do
+          run_before_hooks
+          create_resource
+          run_after_hooks
+        end
+      end
+    end
+  end
+end

data/lib/decidim/commands/destroy_resource.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class DestroyResource < ::Decidim::Command
+      # Initializes the command.
+      #
+      # @param resource [ActiveRecord::Base] the resource to destroy.
+      # @param current_user [Decidim::User] the current user.
+      def initialize(resource, current_user)
+        @resource = resource
+        @current_user = current_user
+      end
+
+      # Destroys the result.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        run_before_hooks
+        destroy_resource
+        run_after_hooks
+
+        broadcast(:ok, resource)
+      rescue Decidim::Commands::HookError, StandardError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :resource, :current_user
+
+      def invalid? = false
+
+      def destroy_resource
+        Decidim.traceability.perform_action!(
+          :delete,
+          resource,
+          current_user,
+          **extra_params
+        ) do
+          resource.destroy!
+        end
+      end
+
+      # Any extra params that you want to pass to the traceability service.
+      #
+      # @usage
+      #  def extra_params = { "visibility" => "all"}
+      #  def extra_params = { "visibility" => "public-only" }
+      #  def extra_params = { "visibility" => "admin-only" }
+      #  def extra_params
+      #    {
+      #      resource: {
+      #        title: resource.title
+      #      },
+      #      participatory_space: {
+      #        title: resource.participatory_space.title
+      #      }
+      #    }
+      #  end
+      #
+      # @return [Hash] a hash with the extra params.
+      def extra_params = {}
+
+      # Useful for running any code that you may want to execute before deleting the resource.
+      def run_before_hooks; end
+
+      # Useful for running any code that you may want to execute after deleting the resource.
+      def run_after_hooks; end
+    end
+  end
+end

data/lib/decidim/commands/hook_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class HookError < StandardError
+    end
+  end
+end

data/lib/decidim/commands/resource_handler.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    module ResourceHandler
+      extend ActiveSupport::Concern
+
+      included do
+        include ::Decidim::AttachmentAttributesMethods
+
+        protected
+
+        attr_reader :form
+
+        def resource_class = raise "#{self.class.name} needs to implement #{__method__}"
+
+        # Hydrates the attributes from the form object that you need to update/create the resource.
+        #
+        # @return [Hash] a hash with the attributes.
+        def attributes
+          @attributes ||= {}.merge(form_attribute_values).merge(file_attribute_values)
+        end
+
+        def form_attribute_values
+          raise "You need to define the list of attributes to be fetched from form object fetch_form_attributes" unless defined?(:form_attributes)
+
+          form_attributes.index_with do |field|
+            form.send(field)
+          end
+        end
+
+        def file_attribute_values
+          return {} unless defined?(:file_attributes)
+
+          attachment_attributes(*file_attributes)
+        end
+
+        def has_file_attributes?
+          file_attributes.any?
+        end
+
+        def add_file_attribute_errors!
+          file_attributes.each do |field|
+            form.errors.add(field, resource.errors.messages_for(field)&.first) if resource.errors.include? field
+          end
+        end
+
+        # Any extra params that you want to pass to the traceability service.
+        #
+        # @usage
+        #  def extra_params = { "visibility" => "all"}
+        #  def extra_params = { "visibility" => "public-only" }
+        #  def extra_params = { "visibility" => "admin-only" }
+        #  def extra_params
+        #    {
+        #      resource: {
+        #        title: resource.title
+        #      },
+        #      participatory_space: {
+        #        title: resource.participatory_space.title
+        #      }
+        #    }
+        #  end
+        # @return [Hash] a hash with the extra params.
+        def extra_params = {}
+
+        delegate :invalid?, to: :form
+
+        class_attribute :form_attributes
+        self.form_attributes = []
+
+        class_attribute :file_attributes
+        self.file_attributes = []
+
+        def self.fetch_form_attributes(*fields)
+          self.form_attributes += Array(fields)
+        end
+
+        def self.fetch_file_attributes(*fields)
+          self.file_attributes += Array(fields)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/commands/update_resource.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Commands
+    class UpdateResource < ::Decidim::Command
+      include Decidim::Commands::ResourceHandler
+
+      # Initializes the command.
+      #
+      # @param form [Decidim::Form] the form object to update the resource.
+      # @param resource [Decidim::Resource] the resource to update.
+      def initialize(form, resource)
+        @form = form
+        @resource = resource
+      end
+
+      # Updates the resource if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if invalid?
+
+        perform!
+        broadcast(:ok, resource)
+      rescue ActiveRecord::RecordInvalid
+        add_file_attribute_errors!
+        broadcast(:invalid)
+      rescue Decidim::Commands::HookError
+        broadcast(:invalid)
+      end
+
+      protected
+
+      attr_reader :form, :resource
+
+      delegate :current_user, to: :form
+
+      def update_resource
+        Decidim.traceability.update!(
+          resource,
+          current_user,
+          attributes,
+          **extra_params
+        )
+      end
+
+      # Useful for running any code that you may want to execute before updating the resource.
+      def run_before_hooks; end
+
+      # Useful for running any code that you may want to execute after updating the resource.
+      def run_after_hooks; end
+
+      private
+
+      def perform!
+        transaction do
+          run_before_hooks
+          update_resource
+          run_after_hooks
+        end
+      end
+    end
+  end
+end

data/lib/decidim/component_manifest.rb

@@ -136,7 +136,9 @@ module Decidim
     #
     # Returns nothing.
     def seed!(participatory_space)
+      # rubocop:disable Rails/Output
       print "-- Creating #{name} component seeds for the participatory space with ID: #{participatory_space.id}...\n" unless Rails.env.test?
+      # rubocop:enable Rails/Output
       @seeds&.call(participatory_space)
     end
 
@@ -259,7 +261,7 @@ module Decidim
     end
 
     # Public: Finds the specific data importer class from its name, using the
-    # `specific_data_importerer_class_name` attribute. If the class does not exist,
+    # `specific_data_importer_class_name` attribute. If the class does not exist,
     # it raises an exception. If the class name is not set, it returns nil.
     #
     # Returns a Decidim::Importers::Importer subclass or nil.

data/lib/decidim/component_validator.rb

@@ -4,7 +4,7 @@
 #
 # Adds a presence validation and checks that the manifest is the correct one.
 class ComponentValidator < ActiveModel::EachValidator
-  # Validates the arguiments passed to the validator.
+  # Validates the arguments passed to the validator.
   def check_validity!
     raise ArgumentError, "You must include a `manifest` option with the name of the manifest to validate when validating a component" if options[:manifest].blank?
   end

data/lib/decidim/content_blocks/has_related_components.rb

@@ -6,7 +6,7 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        # This method allows us to detect the components related whith a
+        # This method allows us to detect the components related with a
         # content block. The content block can have different components
         # associated depending on the scope_name. The scope names and their
         # associated models are configured in Decidim::ContentBlocks::BaseCell

data/lib/decidim/content_parsers/resource_parser.rb

@@ -19,8 +19,8 @@ module Decidim
       #
       # @return [String] the content with the valid mentions replaced by a global id.
       def rewrite
-        rewrited_content = parse_for_urls(content)
-        parse_for_ids(rewrited_content)
+        rewritten_content = parse_for_urls(content)
+        parse_for_ids(rewritten_content)
       end
 
       private

data/lib/decidim/content_processor.rb

@@ -127,7 +127,7 @@ module Decidim
     #
     # @return [String] sanitized content.
     def self.sanitize(text, options = {})
-      Rails::Html::WhiteListSanitizer.new.sanitize(
+      Rails::Html::SafeListSanitizer.new.sanitize(
         text,
         { scrubber: Decidim::UserInputScrubber.new }.merge(options)
       ).try(:html_safe)

data/lib/decidim/content_security_policy.rb

@@ -122,7 +122,7 @@ module Decidim
         "style-src" => %w('self' 'unsafe-inline'),
         "img-src" => %w('self' *.hereapi.com data:),
         "font-src" => %w('self'),
-        "connect-src" => %w('self' *.hereapi.com *.jsdelivr.net data:),
+        "connect-src" => %w('self' *.hereapi.com data:),
         "frame-src" => %w('self' www.youtube-nocookie.com player.vimeo.com),
         "media-src" => %w('self')
       }

data/lib/decidim/core/engine.rb

@@ -13,7 +13,6 @@ require "devise-i18n"
 require "devise_invitable"
 require "foundation_rails_helper"
 require "active_link_to"
-require "carrierwave"
 require "rails-i18n"
 require "date_validator"
 require "file_validators"
@@ -40,15 +39,13 @@ require "ransack"
 require "wisper"
 require "shakapacker"
 
-# Needed for the assets:precompile task, for configuring webpacker instance
-require "decidim/webpacker"
-
 require "decidim/api"
 require "decidim/core/content_blocks/registry_manager"
 require "decidim/core/menu"
 require "decidim/middleware/strip_x_forwarded_host"
 require "decidim/middleware/static_dispatcher"
 require "decidim/middleware/current_organization"
+require "decidim/webpacker"
 
 module Decidim
   module Core
@@ -159,6 +156,7 @@ module Decidim
 
         # Attachments
         Decidim.icons.register(name: "file-text-line", icon: "file-text-line", category: "system", description: "", engine: :core)
+        Decidim.icons.register(name: "file-upload-line", icon: "file-upload-line", category: "documents", description: "File upload", engine: :core)
         Decidim.icons.register(name: "scales-2-line", icon: "scales-2-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "image-line", icon: "image-line", category: "system", description: "", engine: :core)
         Decidim.icons.register(name: "error-warning-line", icon: "error-warning-line", category: "system", description: "", engine: :core)
@@ -225,6 +223,10 @@ module Decidim
         ENV["SHAKAPACKER_CONFIG"] = Decidim::Webpacker.configuration.configuration_file
       end
 
+      initializer "decidim_core.active_storage_variant_processor" do |app|
+        app.config.active_storage.variant_processor = :mini_magick
+      end
+
       initializer "decidim_core.action_controller" do |_app|
         config.to_prepare do
           ActiveSupport.on_load :action_controller do
@@ -282,7 +284,7 @@ module Decidim
         Ransack.configure do |config|
           # Avoid turning parameter values such as user_id[]=1&user_id[]=2 into
           # { user_id: [true, "2"] }. This option allows us to handle the type
-          # convertions manually instead for each case.
+          # conversions manually instead for each case.
           # See: https://github.com/activerecord-hackery/ransack/issues/593
           # See: https://github.com/activerecord-hackery/ransack/pull/742
           config.sanitize_custom_scope_booleans = false
@@ -298,8 +300,8 @@ module Decidim
         end
       end
 
-      initializer "decidim_core.i18n_exceptions" do
-        ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
+      initializer "decidim_core.i18n_exceptions" do |app|
+        app.config.i18n.raise_on_missing_translations = true unless Rails.env.production?
       end
 
       initializer "decidim_core.geocoding", after: :load_config_initializers do
@@ -379,18 +381,13 @@ module Decidim
 
       initializer "decidim_core.menu" do
         Decidim::Core::Menu.register_menu!
+        Decidim::Core::Menu.register_mobile_menu!
         Decidim::Core::Menu.register_user_menu!
       end
 
       initializer "decidim_core.notifications" do
-        if Rails.autoloaders.zeitwerk_enabled?
-          config.after_initialize do
-            Decidim::EventsManager.subscribe_events!
-          end
-        else
-          config.to_prepare do
-            Decidim::EventsManager.subscribe_events!
-          end
+        config.after_initialize do
+          Decidim::EventsManager.subscribe_events!
         end
       end
 

data/lib/decidim/core/menu.rb

@@ -10,12 +10,22 @@ module Decidim
                         decidim.root_path,
                         position: 1,
                         active: :exclusive
+        end
+      end
 
-          menu.add_item :pages,
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
+          menu.add_item :root,
+                        I18n.t("menu.home", scope: "decidim"),
+                        decidim.root_path,
+                        position: 1,
+                        active: :exclusive
+
+          menu.add_item :help,
                         I18n.t("menu.help", scope: "decidim"),
                         decidim.pages_path,
-                        position: 7,
-                        active: :inclusive
+                        position: 10,
+                        active: :exclusive
         end
       end