decidim-admin 0.27.5 → 0.28.0.rc4

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

@@ -52,7 +52,7 @@ module Decidim
           result.update(key => selected_handlers(value).any? ? serialized : {})
         end
 
-        resource_permissions.update!(permissions: permissions)
+        resource_permissions.update!(permissions:)
       end
 
       def resource_permissions

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

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -17,7 +17,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/controllers/concerns/decidim/admin/content_blocks/landing_page.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ContentBlocks
+      module LandingPage
+        extend ActiveSupport::Concern
+        included do
+          helper_method :active_blocks, :active_content_blocks_title, :add_content_block_text, :available_manifests,
+                        :content_block_destroy_confirmation_text, :content_blocks_title, :inactive_blocks,
+                        :inactive_content_blocks_title, :resource_content_block_cell, :resource_create_url,
+                        :resource_sort_url
+          def edit
+            enforce_permission_to_update_resource
+
+            render "decidim/admin/shared/landing_page/edit"
+          end
+
+          def update
+            enforce_permission_to_update_resource
+
+            ReorderContentBlocks.call(current_organization, content_block_scope, params[:ids_order], scoped_resource&.id) do
+              on(:ok) do
+                head :ok
+              end
+              on(:invalid) do
+                head :bad_request
+              end
+            end
+          end
+
+          # Method that specifies the i18n scope for this controller. This can be overwritten in your controller.
+          # so that you can pass a different scope to the i18n methods.
+          def i18n_scope = "decidim.admin.content_blocks"
+
+          # Method to be implemented at the controller. Returns a string
+          # with the text for the title of content blocks
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.title')
+          # Example: t("edit.title", scope: "decidim.admin.content_blocks")
+          def content_blocks_title = t("edit.title", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the text for the title of content blocks
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.add')
+          # Example: t("edit.add", scope: "decidim.admin.content_blocks")
+          def add_content_block_text = t("edit.add", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the text for the title of content blocks
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.destroy_confirmation')
+          # Example: t("edit.destroy_confirmation", scope: "decidim.admin.content_blocks")
+          def content_block_destroy_confirmation_text = t("edit.destroy_confirmation", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the header text for the active content_block column.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.active_content_blocks')
+          # Example: t("edit.active_content_blocks", scope: "decidim.admin.content_blocks")
+          def active_content_blocks_title = t("edit.active_content_blocks", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the header text for the inactive content_block column.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.inactive_content_blocks')
+          # Example: t("edit.inactive_content_blocks", scope: "decidim.admin.content_blocks")
+          def inactive_content_blocks_title = t("edit.inactive_content_blocks", scope: i18n_scope)
+
+          private
+
+          # Method to be implemented at the controller. You need to
+          # return a symbol that defines the content block scope.
+          # Examples of scopes could be `:homepage` or `:landing_page`.
+          def content_block_scope
+            raise "#{self.class.name} is expected to implement #content_block_scope"
+          end
+
+          # Method to be implemented at the controller. Defines the permissions for
+          # edit and update actions.
+          # For example `enforce_permission_to :manage_landing_page, :voting, voting: current_space`.
+          def enforce_permission_to_update_resource
+            raise "#{self.class.name} is expected to implement #enforce_permission_to_update_resource"
+          end
+
+          # Method to be implemented at the controller. Returns the URL
+          # where the ordered/activated content_blocks is submitted to.
+          def resource_sort_url
+            raise "#{self.class.name} is expected to implement #resource_sort_url"
+          end
+
+          # Method to be implemented at the controller. Returns the URL
+          # where the new content_blocks is submitted to.
+          def resource_create_url
+            raise "#{self.class.name} is expected to implement #resource_create_url"
+          end
+
+          # Method to be implemented at the controller. Returns a string
+          # with the cell name to be used for the drag'n'drop for each content_block.
+          #
+          # Example: "decidim/votings/content_block"
+          def resource_content_block_cell
+            raise "#{self.class.name} is expected to implement #resource_content_block_cell"
+          end
+
+          # Shared methods
+          def content_blocks
+            @content_blocks ||= Decidim::ContentBlock.for_scope(
+              content_block_scope,
+              organization: current_organization
+            ).where(scoped_resource_id: scoped_resource&.id, manifest_name: available_manifests.map(&:name))
+          end
+
+          def active_blocks
+            @active_blocks ||= content_blocks.published
+          end
+
+          def inactive_blocks
+            @inactive_blocks ||= content_blocks.unpublished
+          end
+
+          def available_manifests
+            @available_manifests ||= Decidim.content_blocks.for(content_block_scope)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/admin/content_blocks/landing_page_content_blocks.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ContentBlocks
+      module LandingPageContentBlocks
+        extend ActiveSupport::Concern
+        included do
+          helper_method :content_block, :resource_landing_page_content_block_path, :scoped_resource, :submit_button_text
+
+          def create
+            enforce_permission_to_update_resource
+
+            CreateContentBlock.call(current_organization, content_block_scope, params[:manifest_name], scoped_resource&.id) do
+              on(:ok) do
+                flash[:success] = content_block_create_success_text
+              end
+              on(:invalid) do
+                flash[:error] = content_block_create_error_text
+              end
+
+              redirect_to edit_resource_landing_page_path
+            end
+          end
+
+          def destroy
+            enforce_permission_to_update_resource
+
+            DestroyContentBlock.call(content_block) do
+              on(:ok) do
+                flash[:success] = content_block_destroy_success_text
+              end
+              on(:invalid) do
+                flash[:error] = content_block_destroy_error_text
+              end
+
+              redirect_to edit_resource_landing_page_path
+            end
+          end
+
+          def edit
+            enforce_permission_to_update_resource
+            @form = form(ContentBlockForm).from_model(content_block)
+
+            render "decidim/admin/shared/landing_page_content_blocks/edit"
+          end
+
+          def update
+            enforce_permission_to_update_resource
+
+            @form = form(ContentBlockForm).from_params(params)
+
+            UpdateContentBlock.call(@form, content_block, content_block_scope) do
+              on(:ok) do
+                redirect_to edit_resource_landing_page_path
+              end
+              on(:invalid) do
+                render "decidim/admin/shared/landing_page_content_blocks/edit"
+              end
+            end
+          end
+
+          private
+
+          # Method to be implemented at the controller. You need to
+          # return a symbol that defines the content block scope.
+          # Examples of scopes could be `:homepage` or `:voting_landing_page`.
+          def content_block_scope
+            raise "#{self.class.name} is expected to implement #content_block_scope"
+          end
+
+          # Method to be implemented at the controller. You need to
+          # return an Object to filter the content blocks for the given resource.
+          #
+          # For example a `Voting` record.
+          def scoped_resource
+            raise "#{self.class.name} is expected to implement #scoped_resource"
+          end
+
+          # Method to be implemented at the controller. Defines the permissions for
+          # create, destroy, edit and update actions.
+          #
+          # Example: `enforce_permission_to :manage_landing_page, :voting, voting: current_space`.
+          def enforce_permission_to_update_resource
+            raise "#{self.class.name} is expected to implement #enforce_permission_to_update_resource"
+          end
+
+          # Method to be implemented at the controller. Returns the URL
+          # to the edit landing page path.
+          #
+          # Example: `edit_voting_landing_page_path(scoped_resource)`
+          def edit_resource_landing_page_path
+            raise "#{self.class.name} is expected to implement #edit_resource_landing_page_path"
+          end
+
+          # Method to be implemented at the controller. Returns the URL
+          # where the ContentBlockForm is submitted.
+          #
+          # Example: `voting_landing_page_content_block_path(scoped_resource, params[:id])`
+          def resource_landing_page_content_block_path
+            raise "#{self.class.name} is expected to implement #resource_landing_page_content_block_path"
+          end
+
+          # Method that specifies the i18n scope for this controller. This can be overwritten in your controller.
+          # so that you can pass a different scope to the i18n methods.
+          def i18n_scope = "decidim.admin.content_blocks"
+
+          # Method to be implemented at the controller. Returns a string
+          # with the text for the submit button of the ContentBlockForm.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.edit.update')
+          # Example: t("edit.update", scope: "decidim.admin.content_blocks")
+          def submit_button_text = t("edit.update", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the success text after creating a content block.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.create.success')
+          # Example: t("create.success", scope: "decidim.admin.content_blocks")
+          def content_block_create_success_text = t("create.success", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the success text after creating a content block.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.create.error')
+          # Example: t("create.error", scope: "decidim.admin.content_blocks")
+          def content_block_create_error_text = t("create.error", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the success text after destroying a content block.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.destroy.success')
+          # Example: t("destroy.success", scope: "decidim.admin.content_blocks")
+          def content_block_destroy_success_text = t("destroy.success", scope: i18n_scope)
+
+          # Method to be implemented at the controller. Returns a string
+          # with the success text after destroying a content block.
+          #
+          # i18n-tasks-use t('decidim.admin.content_blocks.destroy.error')
+          # Example: t("destroy.error", scope: "decidim.admin.content_blocks")
+          def content_block_destroy_error_text = t("destroy.error", scope: i18n_scope)
+
+          # Shared methods
+          def content_block
+            @content_block ||= content_blocks.find(params[:id])
+          end
+
+          def content_blocks
+            @content_blocks ||= Decidim::ContentBlock.for_scope(
+              content_block_scope,
+              organization: current_organization
+            ).where(scoped_resource_id: scoped_resource&.id)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -103,7 +103,7 @@ module Decidim
         # Hash values are used to build nested dropdown submenus with many levels.
         # By default, uses the Symbols in `filters` as keys and injects an Array
         # with true and false as values. If these values fit your filtering needs,
-        # you won't have to declare a `filters_with_values` method in your concern.
+        # you will not have to declare a `filters_with_values` method in your concern.
         def filters_with_values
           filters.index_with { [true, false] }
         end
@@ -138,11 +138,11 @@ module Decidim
         end
 
         def translated_scope_id_eq(id)
-          translated_attribute(scopes.find_by(id: id).name)
+          translated_attribute(scopes.find_by(id:).name)
         end
 
         def translated_category_id_eq(id)
-          translated_attribute(categories.find_by(id: id).name)
+          translated_attribute(categories.find_by(id:).name)
         end
       end
     end

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

@@ -14,32 +14,13 @@ module Decidim
           :global_moderation
         end
 
-        # Private: Finds the participatory spaces the current user is admin to.
-        # This method will later be used to find out what moderations the
-        # current user can manage.
-        #
-        # Returns an Array.
-        def spaces_user_is_admin_to
-          @spaces_user_is_admin_to ||=
-            Decidim.participatory_space_manifests.flat_map do |manifest|
-              Decidim
-                .find_participatory_space_manifest(manifest.name)
-                .participatory_spaces
-                .call(current_organization)&.select do |space|
-                  space.moderators.exists?(id: current_user.id) ||
-                    space.admins.exists?(id: current_user.id)
-                end
-            end
-        end
-
         # Private: finds the moderations the current user can manage, taking into
         # account whether the user is an organization-wide admin or a
         # "participatory space admin".
         #
         # Returns an `ActiveRecord::Relation`
         def moderations_for_user
-          @moderations_for_user ||=
-            Decidim::Moderation.where(participatory_space: spaces_user_is_admin_to)
+          @moderations_for_user ||= Decidim::Admin::ModerationStats.new(current_user).content_moderations
         end
       end
     end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Logs
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :user_name_or_user_nickname_or_user_email_cont
+          end
+
+          def filters
+            []
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module contains all the logic needed to render breadcrumb items in
+    # the context of participatory spaces
+    module ParticipatorySpaceAdminBreadcrumb
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::TranslatableAttributes
+
+        helper_method :context_breadcrumb_items
+      end
+
+      private
+
+      def context_breadcrumb_items
+        @context_breadcrumb_items ||= [current_participatory_space_breadcrumb_item].flatten.compact_blank
+      end
+
+      def current_participatory_space_path
+        Decidim::ResourceLocatorPresenter.new(current_participatory_space).edit
+      end
+
+      def current_participatory_space_breadcrumb_item
+        return {} if current_participatory_space.blank?
+
+        {
+          label: translated_attribute(current_participatory_space.title),
+          url: current_participatory_space_path,
+          active: true,
+          resource: current_participatory_space
+        }
+      end
+    end
+  end
+end

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

@@ -24,6 +24,7 @@ module Decidim
 
       included do
         include Decidim::NeedsOrganization
+        include Decidim::Admin::ParticipatorySpaceAdminBreadcrumb
         helper ParticipatorySpaceHelpers
 
         helper_method :current_participatory_space
@@ -44,12 +45,12 @@ module Decidim
       end
 
       def authorize_participatory_space
-        enforce_permission_to :read, :participatory_space, current_participatory_space: current_participatory_space
+        enforce_permission_to :read, :participatory_space, current_participatory_space:
       end
 
       def permissions_context
         super.merge(
-          current_participatory_space: current_participatory_space
+          current_participatory_space:
         )
       end
 

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

@@ -3,15 +3,15 @@
 module Decidim
   module Admin
     # The controller to handle the Admin
-    # Terms of use agreement.
+    # Terms of service agreement.
     class AdminTermsController < Decidim::Admin::ApplicationController
       def accept
         current_user.admin_terms_accepted_at = Time.current
         if current_user.save!
-          flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_use")
+          flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_service")
           redirect_to stored_location_for(current_user) || decidim_admin.root_path
         else
-          flash[:alert] = t("accept.error", scope: "decidim.admin.admin_terms_of_use")
+          flash[:alert] = t("accept.error", scope: "decidim.admin.admin_terms_of_service")
           redirect_to decidim_admin.admin_terms_show_path
         end
       end

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

@@ -13,13 +13,16 @@ module Decidim
       include LocaleSwitcher
       include UseOrganizationTimeZone
       include PayloadInfo
-      include HttpCachingDisabler
+      include Headers::HttpCachingDisabler
+      include Headers::ContentSecurityPolicy
       include DisableRedirectionToExternalHost
+      include Decidim::Admin::Concerns::HasBreadcrumbItems
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper
       helper Decidim::Admin::SettingsHelper
       helper Decidim::Admin::IconLinkHelper
+      helper Decidim::Admin::IconWithTooltipHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
       helper Decidim::Admin::Paginable::PerPageHelper
@@ -30,6 +33,8 @@ module Decidim
       helper Decidim::LanguageChooserHelper
       helper Decidim::ComponentPathHelper
       helper Decidim::SanitizeHelper
+      helper Decidim::BreadcrumbHelper
+      helper Decidim::Templates::Admin::ApplicationHelper if Decidim.module_installed?(:templates)
 
       default_form_builder Decidim::Admin::FormBuilder
 

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

@@ -5,7 +5,12 @@ module Decidim
     # Controller that allows managing areatypes to group areas
 
     class AreaTypesController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Concerns::HasTabbedMenu
+
       layout "decidim/admin/settings"
+
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :area_types
 
       def index
@@ -35,12 +40,12 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :area_type, area_type: area_type
+        enforce_permission_to(:update, :area_type, area_type:)
         @form = form(AreaTypeForm).from_model(area_type)
       end
 
       def update
-        enforce_permission_to :update, :area_type, area_type: area_type
+        enforce_permission_to(:update, :area_type, area_type:)
         @form = form(AreaTypeForm).from_params(params)
 
         UpdateAreaType.call(area_type, @form, current_user) do
@@ -57,7 +62,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :area_type, area_type: area_type
+        enforce_permission_to(:destroy, :area_type, area_type:)
 
         Decidim.traceability.perform_action!("delete", area_type, current_user) do
           area_type.destroy!
@@ -70,6 +75,8 @@ module Decidim
 
       private
 
+      def tab_menu_name = :admin_areas_menu
+
       def area_type
         @area_type ||= area_types.find(params[:id])
       end

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

@@ -5,7 +5,12 @@ module Decidim
     # Controller that allows managing all areas at the admin panel.
     #
     class AreasController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Concerns::HasTabbedMenu
+
       layout "decidim/admin/settings"
+
+      add_breadcrumb_item_from_menu :admin_settings_menu
+
       helper_method :area, :organization_areas
 
       def index
@@ -35,12 +40,12 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :area, area: area
+        enforce_permission_to(:update, :area, area:)
         @form = form(AreaForm).from_model(area)
       end
 
       def update
-        enforce_permission_to :update, :area, area: area
+        enforce_permission_to(:update, :area, area:)
         @form = form(AreaForm).from_params(params)
 
         UpdateArea.call(area, @form) do
@@ -57,7 +62,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :area, area: area
+        enforce_permission_to(:destroy, :area, area:)
 
         DestroyArea.call(area, current_user) do
           on(:ok) do
@@ -73,6 +78,8 @@ module Decidim
 
       private
 
+      def tab_menu_name = :admin_areas_menu
+
       def organization_areas
         current_organization.areas
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Admin
     class BlockUserController < Decidim::Admin::ApplicationController
-      layout "decidim/admin/users"
+      layout "decidim/admin/global_moderations"
 
       helper_method :user
 
@@ -11,6 +11,7 @@ module Decidim
         enforce_permission_to :block, :admin_user
 
         @form = form(BlockUserForm).from_model(user)
+        @form.hide = params[:hide] || false
       end
 
       def create
@@ -21,7 +22,7 @@ module Decidim
         BlockUser.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("officializations.block.success", scope: "decidim.admin")
-            redirect_to moderated_users_path(blocked: true)
+            redirect_to moderated_users_path(blocked: true), notice:
           end
 
           on(:invalid) do
@@ -44,7 +45,7 @@ module Decidim
           end
         end
 
-        redirect_to moderated_users_path(blocked: false)
+        redirect_to moderated_users_path, notice:
       end
 
       private