decidim-admin 0.28.3 → 0.29.0.rc1

data/app/commands/decidim/admin/destroy_area.rb

@@ -3,16 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy an area.
-    class DestroyArea < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # area - The area to destroy
-      # current_user - the user performing the action
-      def initialize(area, current_user)
-        @area = area
-        @current_user = current_user
-      end
-
+    class DestroyArea < Decidim::Commands::DestroyResource
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
@@ -20,25 +11,11 @@ module Decidim
       #
       # Returns nothing.
       def call
-        destroy_area
+        destroy_resource
         broadcast(:ok)
       rescue ActiveRecord::RecordNotDestroyed
         broadcast(:has_spaces)
       end
-
-      private
-
-      attr_reader :current_user
-
-      def destroy_area
-        Decidim.traceability.perform_action!(
-          "delete",
-          @area,
-          current_user
-        ) do
-          @area.destroy!
-        end
-      end
     end
   end
 end

data/app/commands/decidim/admin/destroy_category.rb

@@ -4,36 +4,11 @@ module Decidim
   module Admin
     # A command with all the business logic to destroy a category in the
     # system.
-    class DestroyCategory < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # category - A Category that will be destroyed
-      def initialize(category, user)
-        @category = category
-        @user = user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the data was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if category.nil? || category.subcategories.any? || !category.unused?
-
-        destroy_category
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :category
+    class DestroyCategory < Decidim::Commands::DestroyResource
+      protected
 
-      def destroy_category
-        Decidim.traceability.perform_action!(:delete, category, @user) do
-          category.destroy!
-        end
+      def invalid?
+        resource.nil? || resource.subcategories.any? || !resource.unused?
       end
     end
   end

data/app/commands/decidim/admin/destroy_component.rb

@@ -2,54 +2,16 @@
 
 module Decidim
   module Admin
-    # This command deals with destroying a Component from the admin panel.
-    class DestroyComponent < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # component - The Component to be destroyed.
-      # current_user - the user performing the action
-      def initialize(component, current_user)
-        @component = component
-        @current_user = current_user
-      end
-
-      # Public: Executes the command.
-      #
-      # Broadcasts :ok if it got destroyed, raises an exception otherwise.
-      def call
-        begin
-          destroy_component
-        rescue StandardError
-          return broadcast(:invalid)
-        end
-        broadcast(:ok)
-      end
-
+    # This command deals with destroying a component from the admin panel.
+    class DestroyComponent < Decidim::Commands::DestroyResource
       private
 
-      def destroy_component
-        transaction do
-          run_before_hooks
-
-          Decidim.traceability.perform_action!(
-            "delete",
-            @component,
-            @current_user
-          ) do
-            @component.destroy!
-          end
-
-          run_hooks
-        end
-      end
-
       def run_before_hooks
-        Decidim::Reminder.where(component: @component).destroy_all
-        @component.manifest.run_hooks(:before_destroy, @component)
+        resource.manifest.run_hooks(:before_destroy, resource)
       end
 
-      def run_hooks
-        @component.manifest.run_hooks(:destroy, @component)
+      def run_after_hooks
+        resource.manifest.run_hooks(:destroy, resource)
       end
     end
   end

data/app/commands/decidim/admin/destroy_newsletter.rb

@@ -3,38 +3,10 @@
 module Decidim
   module Admin
     # This command deals with destroying a newsletter from the admin panel.
-    class DestroyNewsletter < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # newsletter - The Newsletter to be destroyed.
-      def initialize(newsletter, current_user)
-        @newsletter = newsletter
-        @current_user = current_user
-      end
-
-      # Public: Executes the command.
-      #
-      # Broadcasts :ok if it got destroyed
-      def call
-        return broadcast(:already_sent) if newsletter.sent?
-
-        destroy_newsletter
-        broadcast(:ok)
-      end
-
+    class DestroyNewsletter < Decidim::Commands::DestroyResource
       private
 
-      attr_reader :newsletter, :current_user
-
-      def destroy_newsletter
-        Decidim.traceability.perform_action!(
-          "delete",
-          newsletter,
-          current_user
-        ) do
-          newsletter.destroy!
-        end
-      end
+      def invalid? = resource.sent?
     end
   end
 end

data/app/commands/decidim/admin/destroy_participatory_space_private_user.rb

@@ -3,42 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy a participatory space private user.
-    class DestroyParticipatorySpacePrivateUser < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # participatory_space_private_user - The participatory space private user to destroy
-      # current_user - the user performing the action
-      def initialize(participatory_space_private_user, current_user)
-        @participatory_space_private_user = participatory_space_private_user
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        destroy_participatory_space_private_user
-        broadcast(:ok)
-      end
-
+    class DestroyParticipatorySpacePrivateUser < Decidim::Commands::DestroyResource
       private
 
-      attr_reader :current_user
-
-      def destroy_participatory_space_private_user
-        Decidim.traceability.perform_action!(
-          "delete",
-          @participatory_space_private_user,
-          current_user,
+      def extra_params
+        {
           resource: {
-            title: @participatory_space_private_user.user.name
+            title: resource.user.name
           }
-        ) do
-          @participatory_space_private_user.destroy!
-        end
+        }
       end
     end
   end

data/app/commands/decidim/admin/destroy_scope.rb

@@ -3,43 +3,16 @@
 module Decidim
   module Admin
     # A command with all the business logic to destroy a scope.
-    class DestroyScope < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # scope - The Scope to destroy
-      # current_user - the user performing the action
-      def initialize(scope, current_user)
-        @scope = scope
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        update_scope
-        broadcast(:ok)
-      end
-
+    class DestroyScope < Decidim::Commands::DestroyResource
       private
 
-      attr_reader :current_user
-
-      def update_scope
-        Decidim.traceability.perform_action!(
-          "delete",
-          @scope,
-          current_user,
+      def extra_params
+        {
           extra: {
-            parent_name: @scope.parent.try(:name),
-            scope_type_name: @scope.scope_type.try(:name)
+            parent_name: resource.parent.try(:name),
+            scope_type_name: resource.scope_type.try(:name)
           }
-        ) do
-          @scope.destroy!
-        end
+        }
       end
     end
   end

data/app/commands/decidim/admin/officialize_user.rb

@@ -13,7 +13,7 @@ module Decidim
 
       # Executes the command. Broadcasts these events:
       #
-      # - :ok when the officialization suceeds.
+      # - :ok when the officialization succeeds.
       # - :invalid when the form is invalid.
       #
       # Returns nothing.

data/app/commands/decidim/admin/participatory_space/create_admin.rb

@@ -4,6 +4,7 @@ module Decidim
   module Admin
     module ParticipatorySpace
       class CreateAdmin < Decidim::Command
+        delegate :current_user, to: :form
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -11,7 +12,6 @@ module Decidim
         #   user role
         def initialize(form, participatory_space, options = {})
           @form = form
-          @current_user = form.current_user
           @participatory_space = participatory_space
           @event_class = options.delete(:event_class)
           @event = options.delete(:event)
@@ -41,7 +41,7 @@ module Decidim
 
         private
 
-        attr_reader :form, :participatory_space, :current_user, :user
+        attr_reader :form, :participatory_space, :user
 
         def event_class = @event_class || (raise NotImplementedError, "You must define an event_class")
 
@@ -67,7 +67,7 @@ module Decidim
 
         def extra_info = { resource: { title: user.name } }
 
-        def role_params = { role: form.role.to_sym, user:, role_class.new.target_space_association => participatory_space }
+        def role_params = { :role => form.role.to_sym, :user => user, role_class.new.target_space_association => participatory_space }
 
         def send_notification(user)
           Decidim::EventsManager.publish(
@@ -114,7 +114,7 @@ module Decidim
                    current_user: user
                  )
 
-          Decidim::CreateFollow.new(form, user).call
+          Decidim::CreateFollow.new(form).call
         end
 
         def existing_user

data/app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb

@@ -7,14 +7,13 @@ module Decidim
     class ProcessParticipatorySpacePrivateUserImportCsv < Decidim::Command
       include Decidim::Admin::CustomImport
 
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # form - the form object containing the uploaded file
-      # current_user - the user performing the action
       # private_users_to - The private_users_to that will hold the user role
-      def initialize(form, current_user, private_users_to)
+      def initialize(form, private_users_to)
         @form = form
-        @current_user = current_user
         @private_users_to = private_users_to
       end
 
@@ -33,9 +32,11 @@ module Decidim
 
       private
 
+      attr_reader :form
+
       def process_csv
         process_import_file(@form.file) do |(email, user_name)|
-          ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, @current_user) if email.present? && user_name.present?
+          ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, current_user) if email.present? && user_name.present?
         end
       end
     end

data/app/commands/decidim/admin/promote_managed_user.rb

@@ -8,15 +8,14 @@ module Decidim
     # will be invited to the application and will lose the managed flag
     # so the user cannot be impersonated anymore.
     class PromoteManagedUser < Decidim::Command
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
       # user         - The user to promote
-      # promoted_by  - The user performing the operation
-      def initialize(form, user, promoted_by)
+      def initialize(form, user)
         @form = form
         @user = user
-        @promoted_by = promoted_by
       end
 
       # Executes the command. Broadcasts these events:
@@ -35,7 +34,7 @@ module Decidim
         broadcast(:ok)
       end
 
-      attr_reader :form, :user, :promoted_by
+      attr_reader :form, :user
 
       private
 
@@ -46,7 +45,7 @@ module Decidim
       end
 
       def invite_user
-        user.invite!(promoted_by)
+        user.invite!(current_user)
       end
 
       def email_already_exists?

data/app/commands/decidim/admin/unofficialize_user.rb

@@ -15,7 +15,7 @@ module Decidim
 
       # Executes the command. Broadcasts these events:
       #
-      # - :ok when the unofficialization suceeds.
+      # - :ok when the unofficialization succeeds.
       # - :invalid when the form is invalid.
       #
       # Returns nothing.

data/app/commands/decidim/admin/update_area.rb

@@ -3,47 +3,8 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area.
-    class UpdateArea < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # area - The Area to update
-      # form - A form object with the params.
-      def initialize(area, form)
-        @area = area
-        @form = form
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-
-        update_area
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :form
-
-      def update_area
-        Decidim.traceability.update!(
-          @area,
-          form.current_user,
-          attributes
-        )
-      end
-
-      def attributes
-        {
-          name: form.name,
-          area_type: form.area_type
-        }
-      end
+    class UpdateArea < Decidim::Commands::UpdateResource
+      fetch_form_attributes :name, :area_type
     end
   end
 end

data/app/commands/decidim/admin/update_area_type.rb

@@ -3,48 +3,8 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area type.
-    class UpdateAreaType < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # area_type - The AreaType to update
-      # form - A form object with the params.
-      def initialize(area_type, form, user)
-        @area_type = area_type
-        @form = form
-        @user = user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-
-        update_area_type
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :form
-
-      def update_area_type
-        Decidim.traceability.update!(
-          @area_type,
-          @user,
-          attributes
-        )
-      end
-
-      def attributes
-        {
-          name: form.name,
-          plural: form.plural
-        }
-      end
+    class UpdateAreaType < Decidim::Commands::UpdateResource
+      fetch_form_attributes :name, :plural
     end
   end
 end

data/app/commands/decidim/admin/update_attachment.rb

@@ -9,14 +9,14 @@ module Decidim
 
       attr_reader :attachment
 
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # attachment - the Attachment to update
       # form - A form object with the params.
-      def initialize(attachment, form, user)
+      def initialize(attachment, form)
         @attachment = attachment
         @form = form
-        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -37,20 +37,23 @@ module Decidim
       attr_reader :form
 
       def update_attachment
-        Decidim.traceability.update!(@attachment, @user, attributes)
+        Decidim.traceability.update!(@attachment, current_user, attributes)
       end
 
       def attributes
         {
           title: form.title,
           file: form.file,
+          link: form.link,
           description: form.description,
-          weight: form.weight,
-          attachment_collection: form.attachment_collection
+          weight: form.weight
         }.merge(
           attachment_attributes(:file)
-        ).reject do |attribute, value|
-          value.blank? && attribute != :attachment_collection
+        ).compact_blank.merge(
+          attachment_collection: form.attachment_collection
+        ).tap do |attrs|
+          attrs[:file] = nil if form.link.present? && form.file.blank?
+          attrs[:link] = nil if form.file.present? && form.link.blank?
         end
       end
     end

data/app/commands/decidim/admin/update_attachment_collection.rb

@@ -4,14 +4,14 @@ module Decidim
   module Admin
     # A command with all the business logic when updating an attachment collection.
     class UpdateAttachmentCollection < Decidim::Command
+      delegate :current_user, to: :form
       # Public: Initializes the command.
       #
       # attachment_collection - The AttachmentCollection to update
       # form - A form object with the params.
-      def initialize(attachment_collection, form, user)
+      def initialize(attachment_collection, form)
         @attachment_collection = attachment_collection
         @form = form
-        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -34,7 +34,7 @@ module Decidim
       def update_attachment_collection
         Decidim.traceability.update!(
           @attachment_collection,
-          @user,
+          current_user,
           attributes
         )
       end

data/app/commands/decidim/admin/update_category.rb

@@ -4,51 +4,8 @@ module Decidim
   module Admin
     # A command with all the business logic when updating a category in the
     # system.
-    class UpdateCategory < Decidim::Command
-      attr_reader :category
-
-      # Public: Initializes the command.
-      #
-      # category - the Category to update
-      # form - A form object with the params.
-      def initialize(category, form, user)
-        @category = category
-        @form = form
-        @user = user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-
-        update_category
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :form
-
-      def update_category
-        Decidim.traceability.update!(
-          category,
-          @user,
-          attributes
-        )
-      end
-
-      def attributes
-        {
-          name: form.name,
-          weight: form.weight,
-          parent_id: form.parent_id
-        }
-      end
+    class UpdateCategory < Decidim::Commands::UpdateResource
+      fetch_form_attributes :name, :weight, :parent_id
     end
   end
 end

data/app/commands/decidim/admin/update_component.rb

@@ -3,18 +3,17 @@
 module Decidim
   module Admin
     # This command gets called when a component is created from the admin panel.
-    class UpdateComponent < Decidim::Command
+    class UpdateComponent < Decidim::Commands::UpdateResource
       attr_reader :form, :component, :previous_settings
 
       # Public: Initializes the command.
       #
       # form    - The form from which the data in this component comes from.
       # component - The component to update.
-      def initialize(form, component, user)
-        @manifest = component.manifest
+      def initialize(form, component)
         @form = form
         @component = component
-        @user = user
+        @manifest = component.manifest
       end
 
       # Public: Creates the Component.
@@ -23,7 +22,7 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        Decidim.traceability.perform_action!("update", @component, @user) do
+        Decidim.traceability.perform_action!("update", @component, form.current_user) do
           transaction do
             update_component
             run_hooks