decidim-admin 0.27.9 → 0.28.0.rc4

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

@@ -5,6 +5,7 @@ module Decidim
     # This controller allows admins to import resources from a file.
     class ImportsController < Decidim::Admin::ApplicationController
       include Decidim::ComponentPathHelper
+      before_action :set_import_breadcrumb_item
 
       helper_method :import_manifest
 
@@ -14,7 +15,7 @@ module Decidim
 
         @form = form(import_manifest.form_class).from_params(
           { name: import_manifest.name },
-          current_component: current_component
+          current_component:
         )
       end
 
@@ -24,8 +25,8 @@ module Decidim
 
         @form = form(import_manifest.form_class).from_params(
           params,
-          current_component: current_component,
-          current_organization: current_organization
+          current_component:,
+          current_organization:
         )
 
         CreateImport.call(@form) do
@@ -48,8 +49,8 @@ module Decidim
         raise ActionController::RoutingError, "Not Found" unless import_manifest
 
         @form = form(Decidim::Admin::ImportExampleForm).from_params(params).with_context(
-          current_component: current_component,
-          current_organization: current_organization
+          current_component:,
+          current_organization:
         )
 
         respond_to do |format|
@@ -58,7 +59,7 @@ module Decidim
               CreateImportExample.call(@form) do
                 on(:ok) do |data|
                   filename = "#{current_component.manifest_name}-#{import_manifest.name}-example.#{key}"
-                  send_data data.read, disposition: :attachment, filename: filename, type: mime
+                  send_data data.read, disposition: :attachment, filename:, type: mime
                 end
 
                 on(:invalid) do
@@ -86,6 +87,23 @@ module Decidim
       def current_component
         @current_component ||= current_participatory_space.components.find(params[:component_id])
       end
+
+      def parent_path
+        @parent_path ||= ::Decidim::EngineRouter.admin_proxy(current_participatory_space).components_path
+      end
+
+      def set_import_breadcrumb_item
+        context_breadcrumb_items << {
+          label: t("components", scope: "decidim.admin.menu"),
+          url: parent_path,
+          active: false
+        }
+        context_breadcrumb_items << {
+          label: translated_attribute(current_component.name),
+          url: ::Decidim::EngineRouter.admin_proxy(current_component).root_path,
+          active: true
+        }
+      end
     end
   end
 end

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

@@ -5,7 +5,9 @@ module Decidim
     # Controller that shows a simple dashboard.
     #
     class LogsController < Decidim::Admin::ApplicationController
-      helper_method :logs
+      include Decidim::Admin::Logs::Filterable
+
+      helper_method :logs, :no_logs_available?
 
       def index
         enforce_permission_to :read, :admin_log
@@ -14,13 +16,23 @@ module Decidim
       private
 
       def logs
-        @logs ||= Decidim::ActionLog
-                  .where(organization: current_organization)
-                  .includes(:participatory_space, :user, :resource, :component, :version)
-                  .for_admin
-                  .order(created_at: :desc)
-                  .page(params[:page])
-                  .per(20)
+        @logs ||= filtered_collection.order(created_at: :desc)
+      end
+
+      def no_logs_available?
+        root_query.none?
+      end
+
+      def base_query
+        root_query.includes(
+          :participatory_space, :user, :resource, :component, :version
+        )
+      end
+
+      def root_query
+        Decidim::ActionLog.where(
+          organization: current_organization
+        ).for_admin
       end
     end
   end

data/app/controllers/decidim/admin/managed_users/impersonation_logs_controller.rb

@@ -9,9 +9,7 @@ module Decidim
         layout "decidim/admin/users"
 
         def index
-          enforce_permission_to :index, :impersonatable_user
-
-          @impersonation_logs = Decidim::ImpersonationLog.where(user: user).order(started_at: :desc).page(params[:page]).per(15)
+          @impersonation_logs = Decidim::ImpersonationLog.where(user:).order(started_at: :desc).page(params[:page]).per(15)
         end
 
         private

data/app/controllers/decidim/admin/managed_users/promotions_controller.rb

@@ -9,12 +9,12 @@ module Decidim
         layout "decidim/admin/users"
 
         def new
-          enforce_permission_to :promote, :managed_user, user: user
+          enforce_permission_to(:promote, :managed_user, user:)
           @form = form(ManagedUserPromotionForm).instance
         end
 
         def create
-          enforce_permission_to :promote, :managed_user, user: user
+          enforce_permission_to(:promote, :managed_user, user:)
           @form = form(ManagedUserPromotionForm).from_params(params)
 
           PromoteManagedUser.call(@form, user, current_user) do

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

@@ -15,7 +15,7 @@ module Decidim
         @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
           summary: false,
           organization: current_organization,
-          view_context: view_context
+          view_context:
         )
       end
     end

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

@@ -5,7 +5,7 @@ module Decidim
     class ModeratedUsersController < Decidim::Admin::ApplicationController
       include Decidim::ModeratedUsers::Admin::Filterable
 
-      layout "decidim/admin/users"
+      layout "decidim/admin/global_moderations"
 
       def index
         enforce_permission_to :read, :moderate_users
@@ -36,12 +36,15 @@ module Decidim
       end
 
       def base_query_finder
-        UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: current_organization.id })
+        Decidim::Admin::ModerationStats.new(current_user).user_reports
       end
 
       def collection
-        target_scope = params[:blocked] && params[:blocked] == "true" ? :blocked : :unblocked
-        base_query_finder.send(target_scope)
+        @collection ||= if params[:blocked]
+                          base_query_finder.blocked
+                        else
+                          base_query_finder.unblocked
+                        end
       end
     end
   end

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

@@ -21,12 +21,21 @@ module Decidim
       end
 
       def show
-        enforce_permission_to :read, :newsletter, newsletter: newsletter
+        enforce_permission_to(:read, :newsletter, newsletter:)
         @email = NewsletterMailer.newsletter(current_user, newsletter)
       end
 
+      def send_to_user
+        enforce_permission_to :read, :newsletter, newsletter:
+
+        NewsletterMailer.newsletter(current_user, newsletter).deliver_later
+        flash[:notice] = I18n.t("newsletters.send_to_user.sent_successfully", scope: "decidim.admin", email: current_user.email)
+
+        redirect_back fallback_location: newsletters_path
+      end
+
       def preview
-        enforce_permission_to :read, :newsletter, newsletter: newsletter
+        enforce_permission_to(:read, :newsletter, newsletter:)
 
         email = NewsletterMailer.newsletter(current_user, newsletter, preview: true)
         Premailer::Rails::Hook.perform(email)
@@ -53,12 +62,12 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :newsletter, newsletter: newsletter
+        enforce_permission_to(:update, :newsletter, newsletter:)
         @form = form(NewsletterForm).from_model(content_block)
       end
 
       def update
-        enforce_permission_to :update, :newsletter, newsletter: newsletter
+        enforce_permission_to(:update, :newsletter, newsletter:)
         @form = form(NewsletterForm).from_params(params)
         @form.images = images_block_context unless has_images_block_context?
 
@@ -77,7 +86,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :newsletter, newsletter: newsletter
+        enforce_permission_to(:destroy, :newsletter, newsletter:)
 
         DestroyNewsletter.call(newsletter, current_user) do
           on(:already_sent) do
@@ -93,7 +102,7 @@ module Decidim
       end
 
       def select_recipients_to_deliver
-        enforce_permission_to :update, :newsletter, newsletter: newsletter
+        enforce_permission_to(:update, :newsletter, newsletter:)
         @form = form(SelectiveNewsletterForm).from_model(newsletter)
         @form.send_to_all_users = current_user.admin?
       end
@@ -105,7 +114,7 @@ module Decidim
       end
 
       def deliver
-        enforce_permission_to :update, :newsletter, newsletter: newsletter
+        enforce_permission_to(:update, :newsletter, newsletter:)
         @form = form(SelectiveNewsletterForm).from_params(params)
 
         DeliverNewsletter.call(newsletter, @form, current_user) do

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

@@ -32,7 +32,7 @@ module Decidim
           on(:ok) do |user|
             notice = I18n.t("officializations.create.success", scope: "decidim.admin")
 
-            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice:
           end
         end
       end
@@ -44,13 +44,13 @@ module Decidim
           on(:ok) do
             notice = I18n.t("officializations.destroy.success", scope: "decidim.admin")
 
-            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
+            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice:
           end
         end
       end
 
       def show_email
-        enforce_permission_to :show_email, :user, user: user
+        enforce_permission_to(:show_email, :user, user:)
 
         Decidim.traceability.perform_action! :show_email, user, current_user
 

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

@@ -5,6 +5,9 @@ module Decidim
     # Controller that allows managing the appearance of the organization.
     class OrganizationAppearanceController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
+
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper Decidim::Admin::UploaderImageDimensionsHelper
 
       def edit

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

@@ -7,6 +7,8 @@ module Decidim
     class OrganizationController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       def edit
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationForm).from_model(current_organization)
@@ -44,16 +46,13 @@ module Decidim
         respond_to do |format|
           format.json do
             if (term = params[:term].to_s).present?
+              query = relation.order(name: :asc)
               query = if term.start_with?("@")
-                        nickname = term.delete("@")
-                        relation.where("nickname ILIKE ?", "#{nickname}%")
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("similarity(nickname, '#{nickname}') DESC")))
+                        query.where("nickname ILIKE ?", "#{term.delete("@")}%")
                       else
-                        relation.where("name ILIKE ?", "%#{term}%").or(
-                          relation.where("email ILIKE ?", "%#{term}%")
+                        query.where("name ILIKE ?", "%#{term}%").or(
+                          query.where("email ILIKE ?", "%#{term}%")
                         )
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("GREATEST(similarity(name, '#{term}'), similarity(email, '#{term}')) DESC")))
-                                .order(Arel.sql(ActiveRecord::Base.sanitize_sql_array("(similarity(name, '#{term}') + similarity(email, '#{term}')) / 2 DESC")))
                       end
               render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
             else

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

@@ -5,6 +5,8 @@ module Decidim
     class OrganizationExternalDomainWhitelistController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :blank_external_domain
 
       def edit

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

@@ -4,61 +4,32 @@ module Decidim
   module Admin
     # Controller that allows managing the organization homepage content blocks
     class OrganizationHomepageContentBlocksController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::ContentBlocks::LandingPageContentBlocks
+
       layout "decidim/admin/settings"
 
       helper_method :content_block
 
-      def edit
-        enforce_permission_to :update, :organization, organization: current_organization
-        @form = form(ContentBlockForm).from_model(content_block)
-      end
-
-      def update
-        enforce_permission_to :update, :organization, organization: current_organization
-        @form = form(ContentBlockForm).from_params(params)
-
-        UpdateContentBlock.call(@form, content_block, :homepage) do
-          on(:ok) do
-            redirect_to edit_organization_homepage_path
-          end
-          on(:invalid) do
-            edit # Sets the model to the view so that it can render the form
-            render :edit
-          end
-        end
-      end
-
       private
 
-      def content_block
-        @content_block ||= content_blocks.find_by(manifest_name: params[:id]) ||
-                           content_block_from_manifest
+      def content_block_scope
+        :homepage
       end
 
-      def content_block_manifest
-        @content_block_manifest = unused_content_block_manifests.find { |manifest| manifest.name.to_s == params[:id] }
+      def scoped_resource
+        nil
       end
 
-      def content_blocks
-        @content_blocks ||= Decidim::ContentBlock.for_scope(:homepage, organization: current_organization)
-      end
-
-      def used_content_block_manifests
-        @used_content_block_manifests ||= content_blocks.map(&:manifest_name)
+      def enforce_permission_to_update_resource
+        enforce_permission_to :update, :organization, organization: current_organization
       end
 
-      def unused_content_block_manifests
-        @unused_content_block_manifests ||= Decidim.content_blocks.for(:homepage).reject do |manifest|
-          used_content_block_manifests.include?(manifest.name.to_s)
-        end
+      def edit_resource_landing_page_path
+        edit_organization_homepage_path
       end
 
-      def content_block_from_manifest
-        Decidim::ContentBlock.create!(
-          organization: current_organization,
-          scope_name: :homepage,
-          manifest_name: params[:id]
-        )
+      def resource_landing_page_content_block_path
+        organization_homepage_content_block_path(params[:id])
       end
     end
   end

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

@@ -4,52 +4,34 @@ module Decidim
   module Admin
     # Controller that allows managing the organization homepage
     class OrganizationHomepageController < Decidim::Admin::ApplicationController
-      layout "decidim/admin/settings"
-
-      helper_method :active_blocks, :inactive_blocks
-
-      def edit
-        enforce_permission_to :update, :organization, organization: current_organization
-      end
+      include Decidim::Admin::ContentBlocks::LandingPage
 
-      def update
-        enforce_permission_to :update, :organization, organization: current_organization
-        ReorderContentBlocks.call(current_organization, :homepage, params[:manifests]) do
-          on(:ok) do
-            head :ok
-          end
-          on(:invalid) do
-            head :bad_request
-          end
-        end
-      end
+      layout "decidim/admin/settings"
 
-      private
+      add_breadcrumb_item_from_menu :admin_settings_menu
 
-      def content_blocks
-        @content_blocks ||= Decidim::ContentBlock.for_scope(:homepage, organization: current_organization)
+      def content_block_scope
+        :homepage
       end
 
-      def active_blocks
-        @active_blocks ||= content_blocks.published.where(manifest_name: Decidim.content_blocks.for(:homepage).map(&:name))
+      def scoped_resource
+        nil
       end
 
-      def unpublished_blocks
-        @unpublished_blocks ||= content_blocks.unpublished.where(manifest_name: Decidim.content_blocks.for(:homepage).map(&:name))
+      def enforce_permission_to_update_resource
+        enforce_permission_to :update, :organization, organization: current_organization
       end
 
-      def inactive_blocks
-        @inactive_blocks ||= unpublished_blocks + unused_manifests
+      def resource_sort_url
+        organization_homepage_path
       end
 
-      def used_manifests
-        @used_manifests ||= content_blocks.map(&:manifest_name)
+      def resource_create_url(manifest_name)
+        organization_homepage_content_blocks_path(manifest_name:)
       end
 
-      def unused_manifests
-        @unused_manifests ||= Decidim.content_blocks.for(:homepage).reject do |manifest|
-          used_manifests.include?(manifest.name.to_s)
-        end
+      def resource_content_block_cell
+        "decidim/admin/homepage_content_block"
       end
     end
   end

data/app/controllers/decidim/admin/participatory_space/user_role_controller.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module ParticipatorySpace
+      class UserRoleController < Decidim::Admin::ApplicationController
+        include Decidim::Admin::Officializations::Filterable
+
+        helper_method :filtered_collection
+
+        def index
+          enforce_permission_to :index, authorization_scope
+          @user_roles = filtered_collection
+        end
+
+        def new
+          enforce_permission_to :create, authorization_scope
+          @form = resource_form.instance
+        end
+
+        def edit
+          @user_role = collection.find(params[:id])
+          enforce_permission_to :update, authorization_scope, user_role: @user_role
+          @form = resource_form.from_model(@user_role.user)
+        end
+
+        def create
+          enforce_permission_to :create, authorization_scope
+          @form = resource_form.from_params(params)
+
+          create_command.call(@form, current_participatory_space, event_class:, event:, role_class:) do
+            on(:ok) do
+              flash[:notice] = I18n.t("create.success", scope: i18n_scope)
+              redirect_to space_index_path
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("create.error", scope: i18n_scope)
+              render :new
+            end
+          end
+        end
+
+        def update
+          @user_role = collection.find(params[:id])
+          enforce_permission_to :update, authorization_scope, user_role: @user_role
+          @form = resource_form.from_params(params)
+
+          update_command.call(@form, @user_role, event_class:, event:) do
+            on(:ok) do
+              flash[:notice] = I18n.t("update.success", scope: i18n_scope)
+              redirect_to space_index_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("update.error", scope: i18n_scope)
+              render :edit
+            end
+          end
+        end
+
+        def destroy
+          @user_role = collection.find(params[:id])
+          enforce_permission_to :destroy, authorization_scope, user_role: @user_role
+
+          destroy_command.call(@user_role, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("destroy.success", scope: i18n_scope)
+              redirect_to space_index_path
+            end
+          end
+        end
+
+        def resend_invitation
+          @user_role = collection.find(params[:id])
+          enforce_permission_to :invite, authorization_scope, user_role: @user_role
+
+          InviteUserAgain.call(@user_role.user, "invite_admin") do
+            on(:ok) do
+              flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
+            end
+          end
+
+          redirect_to space_index_path
+        end
+
+        private
+
+        def event = raise NotImplementedError, "Event method must be implemented for #{self.class.name}"
+
+        def event_class = raise NotImplementedError, "Event class method must be implemented for #{self.class.name}"
+
+        def collection
+          @collection ||= role_class.joins(:user).for_space(current_participatory_space)
+        end
+
+        def destroy_command = Decidim::Admin::ParticipatorySpace::DestroyAdmin
+
+        def update_command = Decidim::Admin::ParticipatorySpace::UpdateAdmin
+
+        def create_command = Decidim::Admin::ParticipatorySpace::CreateAdmin
+
+        def search_field_predicate
+          :name_or_nickname_or_email_cont
+        end
+
+        def filters
+          [:invitation_accepted_at_present, :last_sign_in_at_present]
+        end
+      end
+    end
+  end
+end

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

@@ -37,7 +37,7 @@ module Decidim
       def reminder_form_from_params(params)
         form(reminder_manifest.form_class).from_params(
           params,
-          current_component: current_component
+          current_component:
         )
       end
 

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

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def update
-        @permissions_form = PermissionsForm.from_params(params).with_context(current_organization: current_organization)
+        @permissions_form = PermissionsForm.from_params(params).with_context(current_organization:)
 
         UpdateResourcePermissions.call(@permissions_form, resource) do
           on(:ok) do

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

@@ -5,7 +5,12 @@ module Decidim
     # Controller that allows managing scopes types at the admin panel.
     #
     class ScopeTypesController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Concerns::HasTabbedMenu
+
       layout "decidim/admin/settings"
+
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :scope_types
 
       def index
@@ -35,12 +40,12 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :scope_type, scope_type: scope_type
+        enforce_permission_to(:update, :scope_type, scope_type:)
         @form = form(ScopeTypeForm).from_model(scope_type)
       end
 
       def update
-        enforce_permission_to :update, :scope_type, scope_type: scope_type
+        enforce_permission_to(:update, :scope_type, scope_type:)
         @form = form(ScopeTypeForm).from_params(params)
 
         UpdateScopeType.call(scope_type, @form, current_user) do
@@ -57,7 +62,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :scope_type, scope_type: scope_type
+        enforce_permission_to(:destroy, :scope_type, scope_type:)
 
         Decidim.traceability.perform_action!("delete", scope_type, current_user) do
           scope_type.destroy!
@@ -70,6 +75,8 @@ module Decidim
 
       private
 
+      def tab_menu_name = :admin_scopes_menu
+
       def scope_type
         @scope_type ||= scope_types.find(params[:id])
       end