decidim-admin 0.27.5 → 0.28.0.rc4

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing the organization privacy policy content blocks
+    class StaticPageContentBlocksController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::ContentBlocks::LandingPageContentBlocks
+
+      helper_method :page
+
+      private
+
+      def content_block_scope
+        :static_page
+      end
+
+      def scoped_resource
+        @scoped_resource ||= collection.find_by(slug: params[:static_page_id])
+      end
+
+      def enforce_permission_to_update_resource
+        enforce_permission_to :update, :static_page, static_page: scoped_resource
+      end
+
+      def edit_resource_landing_page_path
+        edit_static_page_path(scoped_resource.slug)
+      end
+
+      def resource_landing_page_content_block_path
+        static_page_content_block_path(scoped_resource, params[:id])
+      end
+
+      def collection
+        @collection ||= current_organization.static_pages
+      end
+
+      alias page scoped_resource
+    end
+  end
+end

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

@@ -3,8 +3,13 @@
 module Decidim
   module Admin
     class StaticPageTopicsController < Decidim::Admin::ApplicationController
-      layout "decidim/admin/pages"
-      helper_method :topic
+      include Decidim::Admin::Concerns::HasTabbedMenu
+
+      helper_method :topic, :topics
+
+      def index
+        enforce_permission_to :read, :static_page_topic
+      end
 
       def new
         enforce_permission_to :create, :static_page_topic
@@ -18,7 +23,7 @@ module Decidim
         CreateStaticPageTopic.call(@form) do
           on(:ok) do
             flash[:notice] = I18n.t("static_page_topics.create.success", scope: "decidim.admin")
-            redirect_to static_pages_path
+            redirect_to static_page_topics_path
           end
 
           on(:invalid) do
@@ -40,7 +45,7 @@ module Decidim
         UpdateStaticPageTopic.call(topic, @form) do
           on(:ok) do
             flash[:notice] = I18n.t("static_page_topics.update.success", scope: "decidim.admin")
-            redirect_to static_pages_path
+            redirect_to static_page_topics_path
           end
 
           on(:invalid) do
@@ -53,18 +58,24 @@ module Decidim
       def destroy
         enforce_permission_to :destroy, :static_page_topic, static_page_topic: topic
 
-        DestroyStaticPage.call(topic, current_user) do
+        DestroyStaticPageTopic.call(topic, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("static_page_topics.destroy.success", scope: "decidim.admin")
-            redirect_to static_pages_path
+            redirect_to static_page_topics_path
           end
         end
       end
 
       private
 
+      def tab_menu_name = :admin_static_pages_menu
+
       def topic
-        @topic ||= current_organization.static_page_topics.find(params[:id])
+        @topic ||= topics.find(params[:id])
+      end
+
+      def topics
+        @topics ||= current_organization.static_page_topics
       end
     end
   end

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

@@ -5,11 +5,40 @@ module Decidim
     # Controller that allows managing all pages at the admin panel.
     #
     class StaticPagesController < Decidim::Admin::ApplicationController
-      layout "decidim/admin/pages"
+      include Decidim::Admin::Concerns::HasTabbedMenu
+      include Decidim::Admin::ContentBlocks::LandingPage
+      include Concerns::HasContentBlocks
+
       before_action :tos_version_formatted, only: [:index, :edit]
 
       helper_method :topics
 
+      alias update_content_blocks update
+
+      def content_block_scope
+        :static_page
+      end
+
+      def scoped_resource
+        @scoped_resource ||= collection.find_by(slug: params[:id])
+      end
+
+      def enforce_permission_to_update_resource
+        enforce_permission_to :update, :static_page, static_page: scoped_resource
+      end
+
+      def resource_sort_url
+        update_content_blocks_static_page_path(scoped_resource)
+      end
+
+      def resource_create_url(manifest_name)
+        static_page_content_blocks_path(scoped_resource, manifest_name:)
+      end
+
+      def resource_content_block_cell
+        "decidim/admin/static_page_content_block"
+      end
+
       def index
         enforce_permission_to :read, :static_page
         @topics = Decidim::StaticPageTopic.where(organization: current_organization)
@@ -61,10 +90,6 @@ module Decidim
         end
       end
 
-      def show
-        enforce_permission_to :read, :static_page
-      end
-
       def destroy
         enforce_permission_to :destroy, :static_page, static_page: page
 
@@ -78,6 +103,8 @@ module Decidim
 
       private
 
+      def tab_menu_name = :admin_static_pages_menu
+
       def form_params
         form_params = params.to_unsafe_hash
         form_params["static_page"] ||= {}
@@ -91,7 +118,7 @@ module Decidim
       end
 
       def page
-        @page ||= collection.find_by(slug: params[:id])
+        @page ||= scoped_resource
       end
 
       def collection

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

@@ -42,7 +42,7 @@ module Decidim
       end
 
       def resend_invitation
-        enforce_permission_to :invite, :admin_user, user: user
+        enforce_permission_to(:invite, :admin_user, user:)
 
         InviteUserAgain.call(user, "invite_admin") do
           on(:ok) do
@@ -58,7 +58,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :admin_user, user: user
+        enforce_permission_to(:destroy, :admin_user, user:)
 
         RemoveAdmin.call(user, current_user) do
           on(:ok) do

data/app/events/decidim/attachment_created_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class AttachmentCreatedEvent < Decidim::Events::SimpleEvent

data/app/events/decidim/component_published_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class ComponentPublishedEvent < Decidim::Events::SimpleEvent

data/app/events/decidim/resource_hidden_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class ResourceHiddenEvent < Decidim::Events::SimpleEvent

data/app/forms/decidim/admin/area_form.rb

@@ -19,7 +19,7 @@ module Decidim
 
       def name_uniqueness
         return unless organization
-        return unless organization.areas.where(name: name, area_type: area_type).where.not(id: id).any?
+        return unless organization.areas.where(name:, area_type:).where.not(id:).any?
 
         errors.add(:name, :taken)
       end

data/app/forms/decidim/admin/block_user_form.rb

@@ -6,6 +6,7 @@ module Decidim
     class BlockUserForm < Form
       attribute :user_id, Integer
       attribute :justification, String
+      attribute :hide, Boolean, default: false
 
       validates :user, presence: true
       validates :justification, presence: true, length: { minimum: UserBlock::MINIMUM_JUSTIFICATION_LENGTH }

data/app/forms/decidim/admin/category_form.rb

@@ -19,7 +19,7 @@ module Decidim
       delegate :current_participatory_space, to: :context, prefix: false
 
       def parent_categories
-        @parent_categories ||= current_participatory_space.categories.first_class.where.not(id: id)
+        @parent_categories ||= current_participatory_space.categories.first_class.where.not(id:)
       end
 
       private

data/app/forms/decidim/admin/managed_user_promotion_form.rb

@@ -15,7 +15,7 @@ module Decidim
       def unique_email
         return true if Decidim::User.where(
           organization: context.current_organization,
-          email: email
+          email:
         ).where.not(id: context.current_user.id).empty?
 
         errors.add :email, :taken

data/app/forms/decidim/admin/organization_appearance_form.rb

@@ -15,8 +15,6 @@ module Decidim
       attribute :remove_logo, Boolean, default: false
       attribute :favicon
       attribute :remove_favicon, Boolean, default: false
-      attribute :official_img_header
-      attribute :remove_official_img_header, Boolean, default: false
       attribute :official_img_footer
       attribute :remove_official_img_footer, Boolean, default: false
       attribute :official_url
@@ -29,14 +27,12 @@ module Decidim
       attribute :enable_omnipresent_banner, Boolean, default: false
       attribute :omnipresent_banner_url, String
 
-      attribute :primary_color, String, default: "#ef604d"
-      attribute :secondary_color, String, default: "#599aa6"
-      attribute :success_color, String, default: "#57d685"
-      attribute :warning_color, String, default: "#ffae00"
-      attribute :alert_color, String, default: "#ec5840"
-      attribute :highlight_color, String, default: "#be6400"
-      attribute :highlight_alternative_color, String, default: "#ff5731"
-      attribute :theme_color, String, default: "#ef604d"
+      attribute :primary_color, String
+      attribute :secondary_color, String
+      attribute :tertiary_color, String
+      attribute :success_color, String
+      attribute :warning_color, String
+      attribute :alert_color, String
 
       translatable_attribute :cta_button_text, String
       translatable_attribute :description, String
@@ -48,8 +44,7 @@ module Decidim
       translatable_attribute :omnipresent_banner_short_description, String
 
       validates :cta_button_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-_/]+\z} }, allow_blank: true
-      validates :official_img_header,
-                :official_img_footer,
+      validates :official_img_footer,
                 :logo,
                 passthru: { to: Decidim::Organization }
 

data/app/forms/decidim/admin/organization_form.rb

@@ -33,7 +33,7 @@ module Decidim
       translatable_attribute :welcome_notification_subject, String
       translatable_attribute :welcome_notification_body, String
 
-      translatable_attribute :admin_terms_of_use_body, String
+      translatable_attribute :admin_terms_of_service_body, String
 
       validates :welcome_notification_subject, :welcome_notification_body, translatable_presence: true, if: proc { |form| form.customize_welcome_notification }
 
@@ -42,7 +42,7 @@ module Decidim
       validates :time_zone, time_zone: true
       validates :default_locale, :reference_prefix, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
-      validates :admin_terms_of_use_body, translatable_presence: true
+      validates :admin_terms_of_service_body, translatable_presence: true
       validates :comments_max_length, presence: true, numericality: { greater_than_or_equal_to: 0 }
       validates :machine_translation_display_priority,
                 inclusion: { in: Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES },

data/app/forms/decidim/admin/participatory_space_admin_user_form.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ParticipatorySpaceAdminUserForm < ParticipatorySpacePrivateUserForm
+      attribute :role, String
+
+      validates :role, presence: true
+      validates :role, inclusion: { in: ParticipatorySpaceUser::ROLES }
+
+      def roles
+        ParticipatorySpaceUser::ROLES.map { |role| [I18n.t(role, scope:), role] }
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb

@@ -8,7 +8,7 @@ module Decidim
     #
     class ParticipatorySpacePrivateUserCsvImportForm < Form
       include Decidim::HasUploadValidations
-      include Decidim::ProcessesFileLocally
+      include Decidim::Admin::CustomImport
 
       attribute :file, Decidim::Attributes::Blob
       attribute :user_name, String
@@ -20,10 +20,8 @@ module Decidim
       def validate_csv
         return if file.blank?
 
-        process_file_locally(file) do |file_path|
-          CSV.foreach(file_path, encoding: "BOM|UTF-8") do |_email, user_name|
-            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
-          end
+        process_import_file(file) do |(_email, user_name)|
+          errors.add(:user_name, :invalid) if user_name.blank? || !user_name.match?(UserBaseEntity::REGEXP_NAME)
         end
       rescue CSV::MalformedCSVError
         errors.add(:file, :malformed)

data/app/forms/decidim/admin/scope_form.rb

@@ -28,7 +28,7 @@ module Decidim
 
       def code_uniqueness
         return unless organization
-        return unless organization.scopes.where(code: code).where.not(id: id).any?
+        return unless organization.scopes.where(code:).where.not(id:).any?
 
         errors.add(:code, :taken)
       end

data/app/forms/decidim/admin/selective_newsletter_form.rb

@@ -20,7 +20,7 @@ module Decidim
 
       def map_model(_newsletter)
         self.participatory_space_types = Decidim.participatory_space_manifests.map do |manifest|
-          SelectiveNewsletterParticipatorySpaceTypeForm.from_model(manifest: manifest)
+          SelectiveNewsletterParticipatorySpaceTypeForm.from_model(manifest:)
         end
       end
 

data/app/forms/decidim/admin/static_page_form.rb

@@ -7,6 +7,7 @@ module Decidim
       include TranslatableAttributes
 
       attribute :slug, String
+      validates :title, translatable_presence: true
       translatable_attribute :title, String
       translatable_attribute :content, String
       attribute :changed_notably, Boolean
@@ -18,7 +19,6 @@ module Decidim
       mimic :static_page
 
       validates :slug, presence: true
-      validates :title, :content, translatable_presence: true
       validates :slug, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-_/]+\z} }, allow_blank: true
 
       validate :slug, :slug_uniqueness
@@ -31,7 +31,7 @@ module Decidim
 
       def topic
         @topic ||= StaticPageTopic.find_by(
-          organization: organization,
+          organization:,
           id: topic_id
         )
       end
@@ -50,7 +50,7 @@ module Decidim
 
       def slug_uniqueness
         return unless organization
-        return unless organization.static_pages.where(slug: slug).where.not(id: id).any?
+        return unless organization.static_pages.where(slug:).where.not(id:).any?
 
         errors.add(:slug, :taken)
       end

data/app/helpers/decidim/admin/admin_terms_helper.rb

@@ -2,36 +2,36 @@
 
 module Decidim
   module Admin
-    # This module includes helpers to show Admin Terms of Use
+    # This module includes helpers to show admin terms of service
     module AdminTermsHelper
-      def admin_terms_of_use_body
-        current_organization.admin_terms_of_use_body.symbolize_keys[I18n.locale].html_safe
+      def admin_terms_of_service_body
+        current_organization.admin_terms_of_service_body.symbolize_keys[I18n.locale].html_safe
       end
 
       def announcement_body
         if current_user.admin_terms_accepted?
-          t("accept.success", scope: "decidim.admin.admin_terms_of_use")
+          t("accept.success", scope: "decidim.admin.admin_terms_of_service")
         else
-          t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+          t("required_review.callout", scope: "decidim.admin.admin_terms_of_service")
         end
       end
 
       def button_to_accept_admin_terms
         button_to(
-          t("decidim.admin.admin_terms_of_use.actions.accept"),
+          t("decidim.admin.admin_terms_of_service.actions.accept"),
           admin_terms_accept_path,
-          class: "button success",
+          class: "button button__sm button__secondary success",
           method: :put
         )
       end
 
       def button_to_refuse_admin_terms
         link_to(
-          t("decidim.admin.admin_terms_of_use.actions.refuse"),
+          t("decidim.admin.admin_terms_of_service.actions.refuse"),
           decidim.root_path,
-          class: "button clear",
+          class: "button button__sm button__secondary clear",
           data: {
-            confirm: t("actions.are_you_sure", scope: "decidim.admin.admin_terms_of_use")
+            confirm: t("actions.are_you_sure", scope: "decidim.admin.admin_terms_of_service")
           }
         )
       end

data/app/helpers/decidim/admin/application_helper.rb

@@ -14,20 +14,7 @@ module Decidim
       include Decidim::Admin::LogRenderHelper
       include Decidim::Admin::UserRolesHelper
       include Decidim::Admin::ResourceScopeHelper
-
-      # Adds a link to the secondary navigation so admins can easily access the public page of the
-      # element their working on.
-      #
-      # url - The String with the URL to link to.
-      #
-      # Returns a String with a link wrapped in a <li> element.
-      def public_page_link(url)
-        content_tag(:li) do
-          link_to url, class: "button", style: "color: #fff", target: "_blank", rel: "noopener" do
-            I18n.t("decidim.admin.view_public_page")
-          end
-        end
-      end
+      include Decidim::Admin::SearchFormHelper
 
       def participatory_space_active_link?(component)
         endpoints = component.manifest.admin_engine.try(:participatory_space_endpoints)

data/app/helpers/decidim/admin/attributes_display_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     #
     module AttributesDisplayHelper
       # Displays the given attributes list in a list. This is a simple
-      # `show_for` alternative, so there's no way to modify how an attribute is
+      # `show_for` alternative, so there is no way to modify how an attribute is
       # shown and there is no intention on adding this. It is intended to be
       # used inside a `dl` HTML tag, so you can customize how a specific
       # attribute has to be shown directly:

data/app/helpers/decidim/admin/bulk_actions_helper.rb

@@ -11,7 +11,7 @@ module Decidim
       def bulk_categories_select(collection)
         categories = bulk_categories_for_select collection
         prompt = t("decidim.proposals.admin.proposals.index.change_category")
-        select(:category, :id, options_for_select(categories, selected: []), prompt: prompt)
+        select(:category, :id, options_for_select(categories, selected: []), prompt:)
       end
 
       def bulk_categories_for_select(scope)
@@ -45,7 +45,7 @@ module Decidim
         end
 
         prompt = t("decidim.proposals.admin.proposals.index.select_component")
-        select(:target_component_id, nil, options_for_select(components, selected: []), prompt: prompt)
+        select(:target_component_id, nil, options_for_select(components, selected: []), prompt:)
       end
     end
   end

data/app/helpers/decidim/admin/dashboard_helper.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Admin
-    # This module includes helpers to be used in the admin dashboard, including helper methods to show the Admin Terms of Use.
+    # This module includes helpers to be used in the admin dashboard, including helper methods to show the admin terms of service.
     module DashboardHelper
       def admin_terms_announcement_args
         {
@@ -12,10 +12,10 @@ module Decidim
       end
 
       def announcement_body
-        body = t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+        body = t("required_review.callout", scope: "decidim.admin.admin_terms_of_service")
         body += " "
         body += link_to(
-          t("required_review.cta", scope: "decidim.admin.admin_terms_of_use"),
+          t("required_review.cta", scope: "decidim.admin.admin_terms_of_service"),
           admin_terms_show_path
         )
         body

data/app/helpers/decidim/admin/exports_helper.rb

@@ -10,8 +10,20 @@ module Decidim
       #           current component.
       #
       # Returns a rendered dropdown.
-      def export_dropdown(component = current_component, resource_id = nil)
-        render partial: "decidim/admin/exports/dropdown", locals: { component: component, resource_id: resource_id }
+      def export_dropdown(component = current_component, resource_id = nil, apply_search: false)
+        filters =
+          if apply_search && respond_to?(:query)
+            { id_in: query.result.map(&:id) }
+          else
+            {}
+          end
+        render_dropdown(component:, resource_id:, filters:)
+      end
+
+      def export_dropdowns(query, component = current_component, resource_id = nil)
+        return export_dropdown(component, resource_id, apply_search: false) if query.conditions.empty?
+
+        export_dropdown(component, resource_id, apply_search: false).concat(export_dropdown(component, resource_id, apply_search: true))
       end
 
       # Routes to the correct exporter for a component.
@@ -23,6 +35,18 @@ module Decidim
       def exports_path(component, options)
         EngineRouter.admin_proxy(component.participatory_space).component_exports_path(options.merge(component_id: component))
       end
+
+      def dropdown_id(filters)
+        return "export-dropdown" if filters.empty?
+
+        "export-selection-dropdown"
+      end
+
+      private
+
+      def render_dropdown(component:, resource_id:, filters:)
+        render partial: "decidim/admin/exports/dropdown", locals: { component:, resource_id:, filters: }
+      end
     end
   end
 end

data/app/helpers/decidim/admin/filterable_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module FilterableHelper
       # Renders the filters selector with tags in the admin panel.
       def admin_filter_selector(i18n_ctx = nil)
-        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: i18n_ctx }
+        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: }
       end
 
       # Builds a tree of links from Decidim::Admin::Filterable::filters_with_values
@@ -113,7 +113,7 @@ module Decidim
 
       def remove_filter_icon_link(filter)
         icon_link_to(
-          "circle-x",
+          "delete-bin-line",
           url_for(query_params_without(filter)),
           t("decidim.admin.actions.cancel"),
           class: "action-icon--remove"

data/app/helpers/decidim/admin/icon_link_helper.rb

@@ -5,8 +5,7 @@ module Decidim
     module IconLinkHelper
       # This helper adds the necessary boilerplate for the admin icon links.
       #
-      # icon_name - A String representing the icon name from Iconic
-      #             http://useiconic.com/open
+      # icon_name - A String representing the icon name
       # link      - The path or url where the link should point to.
       # title     - A String that will be shown when hovering the icon.
       # options   - An optional Hash containing extra data for the link:
@@ -15,15 +14,17 @@ module Decidim
       #             data   - This option can be used to add custom data attributes.
       #
       def icon_link_to(icon_name, link, title, options = {})
-        link_to(link,
-                method: options[:method],
-                class: "action-icon #{options[:class]}",
-                data: options[:data] || {},
-                title: title,
-                target: options[:target]) do
-          content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
-                             title: title) do
-            icon(icon_name, aria_label: title, role: "img")
+        with_tooltip(title, options.merge(class: "top")) do
+          link_to(link,
+                  method: options[:method],
+                  class: "action-icon #{options[:class]}",
+                  data: options[:data] || {},
+                  title:,
+                  target: options[:target]) do
+            content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
+                               title:) do
+              icon(icon_name, aria_label: title, role: "img")
+            end
           end
         end
       end

data/app/helpers/decidim/admin/icon_with_tooltip_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module IconWithTooltipHelper
+      # This helper adds the necessary boilerplate for the admin icon with tooltip.
+      #
+      # icon_name - A String representing the icon name
+      # title     - A String that will be shown when hovering the icon.
+      #             class  - Any extra class that will be added to the link.
+      #             data   - This option can be used to add custom data attributes.
+      def icon_with_tooltip(icon_name, title, options = {})
+        with_tooltip(title, options.merge(class: "top")) do
+          content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
+                             title:) do
+            icon(icon_name, aria_label: title, role: "img")
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/admin/imports_helper.rb

@@ -13,7 +13,7 @@ module Decidim
       #
       # Returns a rendered dropdown.
       def import_dropdown(component = current_component, resource_id: nil)
-        render "decidim/admin/imports/dropdown", component: component, resource_id: resource_id, custom: block_given? do
+        render "decidim/admin/imports/dropdown", component:, resource_id:, custom: block_given? do
           yield if block_given?
         end
       end