decidim-admin 0.26.10 → 0.27.0.rc1

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command to remove the admin privilege to an user.
-    class RemoveAdmin < Rectify::Command
+    class RemoveAdmin < Decidim::Command
       # Public: Initializes the command.
       #
       # user - the user that will no longer be an admin

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command that reorders a collection of content blocks. It also creates
     # the ones that might be missing.
-    class ReorderContentBlocks < Rectify::Command
+    class ReorderContentBlocks < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - the Organization where the content blocks reside

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic to transfer a managed user.
-    class TransferUser < Rectify::Command
+    class TransferUser < Decidim::Command
       # Public: Initializes the command.
       #
       # form

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnblockUser < Rectify::Command
+    class UnblockUser < Decidim::Command
       # Public: Initializes the command.
       #
       # blocked_user - the user that is unblocked
@@ -39,7 +39,7 @@ module Decidim
           @blocked_user.blocked = false
           @blocked_user.blocked_at = nil
           @blocked_user.block_id = nil
-          @blocked_user.name = @blocked_user.extended_data["user_name"]
+          @blocked_user.name = @blocked_user.user_name
           @blocked_user.save!
         end
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when a user hides a resource.
-    class UnhideResource < Rectify::Command
+    class UnhideResource < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::Reportable

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when unofficializing a user.
-    class UnofficializeUser < Rectify::Command
+    class UnofficializeUser < Decidim::Command
       # Public: Initializes the command.
       #
       # user - The user to be unofficialized.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # This command gets called when a component is unpublished from the admin panel.
-    class UnpublishComponent < Rectify::Command
+    class UnpublishComponent < Decidim::Command
       # Public: Initializes the command.
       #
       # component - The component to unpublish.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when a user unreports a resource.
-    class UnreportResource < Rectify::Command
+    class UnreportResource < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::Reportable

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    class UnreportUser < Rectify::Command
+    class UnreportUser < Decidim::Command
       # Public: Initializes the command.
       #
       # reportable - A Decidim::User - The user reported

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area.
-    class UpdateArea < Rectify::Command
+    class UpdateArea < Decidim::Command
       # Public: Initializes the command.
       #
       # area - The Area to update

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

@@ -3,14 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating an area type.
-    class UpdateAreaType < Rectify::Command
+    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)
+      def initialize(area_type, form, user)
         @area_type = area_type
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +32,11 @@ module Decidim
       attr_reader :form
 
       def update_area_type
-        @area_type.update!(attributes)
+        Decidim.traceability.update!(
+          @area_type,
+          @user,
+          attributes
+        )
       end
 
       def attributes

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic to update an attachment from a
     # participatory process.
-    class UpdateAttachment < Rectify::Command
+    class UpdateAttachment < Decidim::Command
       include ::Decidim::AttachmentAttributesMethods
 
       attr_reader :attachment
@@ -13,9 +13,10 @@ module Decidim
       #
       # attachment - the Attachment to update
       # form - A form object with the params.
-      def initialize(attachment, form)
+      def initialize(attachment, form, user)
         @attachment = attachment
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -36,7 +37,7 @@ module Decidim
       attr_reader :form
 
       def update_attachment
-        attachment.update!(attributes)
+        Decidim.traceability.update!(@attachment, @user, attributes)
       end
 
       def attributes

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

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

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

@@ -4,16 +4,17 @@ module Decidim
   module Admin
     # A command with all the business logic when updating a category in the
     # system.
-    class UpdateCategory < Rectify::Command
+    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)
+      def initialize(category, form, user)
         @category = category
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -34,15 +35,18 @@ module Decidim
       attr_reader :form
 
       def update_category
-        category.update!(attributes)
+        Decidim.traceability.update!(
+          category,
+          @user,
+          attributes
+        )
       end
 
       def attributes
         {
           name: form.name,
           weight: form.weight,
-          parent_id: form.parent_id,
-          description: form.description
+          parent_id: form.parent_id
         }
       end
     end

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

@@ -3,17 +3,18 @@
 module Decidim
   module Admin
     # This command gets called when a component is created from the admin panel.
-    class UpdateComponent < Rectify::Command
+    class UpdateComponent < Decidim::Command
       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)
+      def initialize(form, component, user)
         @manifest = component.manifest
         @form = form
         @component = component
+        @user = user
       end
 
       # Public: Creates the Component.
@@ -22,9 +23,11 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        transaction do
-          update_component
-          run_hooks
+        Decidim.traceability.perform_action!("update", @component, @user) do
+          transaction do
+            update_component
+            run_hooks
+          end
         end
 
         broadcast(:ok, settings_changed?, previous_settings, current_settings)

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

@@ -4,16 +4,17 @@ module Decidim
   module Admin
     # This command gets called when permissions for a component are updated
     # in the admin panel.
-    class UpdateComponentPermissions < Rectify::Command
+    class UpdateComponentPermissions < Decidim::Command
       # Public: Initializes the command.
       #
       # form    - The form from which the data in this component comes from.
       # component - The component to update.
       # resource - The resource to update.
-      def initialize(form, component, resource)
+      def initialize(form, component, resource, user)
         @form = form
         @component = component
         @resource = resource
+        @user = user
       end
 
       # Public: Sets the permissions for a component.
@@ -22,9 +23,11 @@ module Decidim
       def call
         return broadcast(:invalid) unless form.valid?
 
-        transaction do
-          update_permissions
-          run_hooks
+        Decidim.traceability.perform_action!("update_permissions", @component, @user) do
+          transaction do
+            update_permissions
+            run_hooks
+          end
         end
 
         broadcast(:ok)
@@ -45,7 +48,7 @@ module Decidim
           handlers_content = {}
 
           selected_handlers(value).each do |handler_key|
-            opts = value.authorization_handlers_options[handler_key.to_sym]
+            opts = value.authorization_handlers_options[handler_key.to_s]
             handlers_content[handler_key] = opts ? { options: opts } : {}
           end
 

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This command gets called when a content block is updated from the admin
     # panel.
-    class UpdateContentBlock < Rectify::Command
+    class UpdateContentBlock < Decidim::Command
       attr_reader :form, :content_block, :scope
 
       # Public: Initializes the command.

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

@@ -2,18 +2,21 @@
 
 module Decidim
   module Admin
-    class UpdateExternalDomainWhitelist < Rectify::Command
+    class UpdateExternalDomainWhitelist < Decidim::Command
       attr_reader :form, :organization
 
-      def initialize(form, organization)
+      def initialize(form, organization, user)
         @form = form
         @organization = organization
+        @user = user
       end
 
       def call
         return broadcast(:invalid) if form.invalid?
 
-        save_domains!
+        Decidim.traceability.perform_action!("update_external_domain", @organization, @user) do
+          save_domains!
+        end
 
         broadcast(:ok)
       end

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

@@ -4,10 +4,11 @@ module Decidim
   module Admin
     # This command gets called when a content block is updated from the admin
     # panel.
-    class UpdateHelpSections < Rectify::Command
-      def initialize(form, organization)
+    class UpdateHelpSections < Decidim::Command
+      def initialize(form, organization, user)
         @form = form
         @organization = organization
+        @user = user
       end
 
       def call
@@ -15,12 +16,25 @@ module Decidim
 
         ActiveRecord::Base.transaction do
           @form.sections.each do |section|
-            ContextualHelpSection.set_content(@organization, section.id, section.content)
+            next unless content_has_changed?(section)
+
+            Decidim.traceability.perform_action!("update", ContextualHelpSection, @user, { "resource" => { "title" => section.id.humanize } }) do
+              ContextualHelpSection.set_content(@organization, section.id, section.content)
+              ContextualHelpSection.find_by(organization: @organization, section_id: section.id)
+            end
           end
         end
 
         broadcast(:ok)
       end
+
+      private
+
+      def content_has_changed?(section)
+        return if ContextualHelpSection.find_by(organization: @organization, section_id: section.id).nil? && section.content.compact_blank.blank?
+
+        section.content != ContextualHelpSection.find_content(@organization, section.id).except("machine_translations")
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # Updates the newsletter given form data.
-    class UpdateNewsletter < Rectify::Command
+    class UpdateNewsletter < Decidim::Command
       # Initializes the command.
       #
       # newsletter - The Newsletter to update.

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic for updating the current
     # organization.
-    class UpdateOrganization < Rectify::Command
+    class UpdateOrganization < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - The Organization that will be updated.

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with all the business logic for updating the current
     # organization appearance.
-    class UpdateOrganizationAppearance < Rectify::Command
+    class UpdateOrganizationAppearance < Decidim::Command
       include ::Decidim::AttachmentAttributesMethods
 
       # Public: Initializes the command.

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # A command with the business logic for updating the current
     # organization tos_version attribute.
-    class UpdateOrganizationTosVersion < Rectify::Command
+    class UpdateOrganizationTosVersion < Decidim::Command
       # Public: Initializes the command.
       #
       # organization - The Organization that will be updated.

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

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This command gets called when permissions for a resource not related with
     # a component are updated in the admin panel.
-    class UpdateResourcePermissions < Rectify::Command
+    class UpdateResourcePermissions < Decidim::Command
       # Public: Initializes the command.
       #
       # form     - The form from which the data in this resource comes from.
@@ -40,7 +40,7 @@ module Decidim
       def update_permissions
         permissions = configured_permissions.inject({}) do |result, (key, value)|
           handlers_content = selected_handlers(value).inject({}) do |handlers_content_result, handler_key|
-            opts = value.authorization_handlers_options[handler_key.to_sym]
+            opts = value.authorization_handlers_options[handler_key.to_s]
 
             handlers_content_result.update(handler_key => opts ? { options: opts } : {})
           end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a scope.
-    class UpdateScope < Rectify::Command
+    class UpdateScope < Decidim::Command
       # Public: Initializes the command.
       #
       # scope - The Scope to update

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

@@ -3,14 +3,15 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a scope type.
-    class UpdateScopeType < Rectify::Command
+    class UpdateScopeType < Decidim::Command
       # Public: Initializes the command.
       #
       # scope_type - The ScopeType to update
       # form - A form object with the params.
-      def initialize(scope_type, form)
+      def initialize(scope_type, form, user)
         @scope_type = scope_type
         @form = form
+        @user = user
       end
 
       # Executes the command. Broadcasts these events:
@@ -31,7 +32,11 @@ module Decidim
       attr_reader :form
 
       def update_scope_type
-        @scope_type.update!(attributes)
+        Decidim.traceability.update!(
+          @scope_type,
+          @user,
+          attributes
+        )
       end
 
       def attributes

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a static page.
-    class UpdateStaticPage < Rectify::Command
+    class UpdateStaticPage < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPage to update

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a static page topic.
-    class UpdateStaticPageTopic < Rectify::Command
+    class UpdateStaticPageTopic < Decidim::Command
       # Public: Initializes the command.
       #
       # page - The StaticPageTopic to update

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when updating a usergroup.
-    class UpdateUserGroups < Rectify::Command
+    class UpdateUserGroups < Decidim::Command
       # Public: Initializes the command.
       #
       # scope - The Scope to update

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     # A command with all the business logic when verifying a user_group.
-    class VerifyUserGroup < Rectify::Command
+    class VerifyUserGroup < Decidim::Command
       # Public: Initializes the command.
       #
       # user_group - The user_group to verify

data/app/controllers/concerns/decidim/admin/filterable.rb

@@ -31,7 +31,7 @@ module Decidim
         delegate :scopes, to: :current_organization
 
         def query
-          @query ||= base_query.ransack(ransack_params)
+          @query ||= base_query.ransack(ransack_params, search_context: :admin, auth_object: current_user)
         end
 
         private

data/app/controllers/concerns/decidim/admin/participatory_space_export.rb

@@ -11,7 +11,9 @@ module Decidim
         def create
           enforce_permission_to :create, :export_space, participatory_space: exportable_space
 
-          ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, manifest_name, default_format)
+          Decidim.traceability.perform_action!("export", exportable_space, current_user) do
+            ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, manifest_name, default_format)
+          end
 
           flash[:notice] = t("decidim.admin.exports.notice")
 

data/app/controllers/concerns/decidim/moderations/admin/filterable.rb

@@ -47,10 +47,6 @@ module Decidim
           def reportable_types
             collection.pluck(:decidim_reportable_type).uniq.sort
           end
-
-          def extra_allowed_params
-            [:hidden]
-          end
         end
       end
     end

data/app/controllers/decidim/admin/admin_terms_controller.rb

@@ -9,7 +9,7 @@ module Decidim
         current_user.admin_terms_accepted_at = Time.current
         if current_user.save!
           flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_use")
-          redirect_to stored_location_for(current_user) || decidim_admin.root_path
+          redirect_to decidim_admin.root_path
         else
           flash[:alert] = t("accept.error", scope: "decidim.admin.admin_terms_of_use")
           redirect_to decidim_admin.admin_terms_show_path

data/app/controllers/decidim/admin/application_controller.rb

@@ -6,8 +6,8 @@ module Decidim
     class ApplicationController < ::DecidimController
       include NeedsOrganization
       include NeedsPermission
+      include NeedsPasswordChange
       include NeedsSnippets
-      include NeedsAdminTosAccepted
       include FormFactory
       include LocaleSwitcher
       include UseOrganizationTimeZone
@@ -29,7 +29,6 @@ module Decidim
       helper Decidim::LanguageChooserHelper
       helper Decidim::ComponentPathHelper
       helper Decidim::SanitizeHelper
-      helper Decidim::Templates::Admin::ApplicationHelper if Decidim.module_installed?(:templates) && defined?(Decidim::Templates::Admin::ApplicationHelper)
 
       default_form_builder Decidim::Admin::FormBuilder
 

data/app/controllers/decidim/admin/area_types_controller.rb

@@ -21,7 +21,7 @@ module Decidim
         enforce_permission_to :create, :area_type
         @form = form(AreaTypeForm).from_params(params)
 
-        CreateAreaType.call(@form) do
+        CreateAreaType.call(@form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.create.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -43,7 +43,7 @@ module Decidim
         enforce_permission_to :update, :area_type, area_type: area_type
         @form = form(AreaTypeForm).from_params(params)
 
-        UpdateAreaType.call(area_type, @form) do
+        UpdateAreaType.call(area_type, @form, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("area_types.update.success", scope: "decidim.admin")
             redirect_to area_types_path
@@ -58,7 +58,10 @@ module Decidim
 
       def destroy
         enforce_permission_to :destroy, :area_type, area_type: area_type
-        area_type.destroy!
+
+        Decidim.traceability.perform_action!("delete", area_type, current_user) do
+          area_type.destroy!
+        end
 
         flash[:notice] = I18n.t("area_types.destroy.success", scope: "decidim.admin")