decidim-admin 0.27.9 → 0.28.0.rc4

data/lib/decidim/admin/engine.rb

@@ -11,6 +11,8 @@ require "doorkeeper"
 require "doorkeeper-i18n"
 require "hashdiff"
 
+require "decidim/admin/menu"
+
 module Decidim
   module Admin
     # Decidim's core Rails Engine.
@@ -23,244 +25,72 @@ module Decidim
         end
       end
 
+      initializer "decidim_admin.register_icons" do |_app|
+        Decidim.icons.register(name: "layout-masonry-line", icon: "layout-masonry-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "service-line", icon: "service-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "fullscreen-line", icon: "fullscreen-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "lock-line", icon: "lock-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "download-line", icon: "download-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "mail-open-line", icon: "mail-open-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "forbid-2-line", icon: "forbid-2-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "key-2-line", icon: "key-2-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "arrow-go-back-line", icon: "arrow-go-back-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "computer-line", icon: "computer-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "arrow-right-s-line", icon: "arrow-right-s-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "arrow-up-line", icon: "arrow-up-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "arrow-down-line", icon: "arrow-down-line", category: "system", description: "", engine: :admin)
+
+        Decidim.icons.register(name: "attachment-2", icon: "attachment-2", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "spy-line", icon: "spy-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "refresh-line", icon: "refresh-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "zoom-in-line", icon: "zoom-in-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "add-line", icon: "add-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "upload-line", icon: "upload-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "settings-4-line", icon: "settings-4-line", category: "system", description: "", engine: :admin)
+
+        Decidim.icons.register(name: "folder-line", icon: "folder-line", category: "system", description: "", engine: :admin)
+        Decidim.icons.register(name: "attachment-line", icon: "attachment-line", category: "system", description: "", engine: :admin)
+      end
+
       initializer "decidim_admin.mime_types" do |_app|
         # Required for importer example downloads
         Mime::Type.register Decidim::Admin::Import::Readers::XLSX::MIME_TYPE, :xlsx
       end
 
       initializer "decidim_admin.global_moderation_menu" do
-        Decidim.menu :admin_global_moderation_menu do |menu|
-          menu.add_item :moderations,
-                        I18n.t("actions.not_hidden", scope: "decidim.moderations"),
-                        decidim_admin.moderations_path,
-                        position: 1,
-                        active: params[:hidden].blank?
-
-          menu.add_item :hidden_moderations,
-                        I18n.t("actions.hidden", scope: "decidim.moderations"),
-                        decidim_admin.moderations_path(hidden: true),
-                        position: 2,
-                        active: params[:hidden].present?
-        end
+        Decidim::Admin::Menu.register_admin_global_moderation_menu!
       end
 
       initializer "decidim_admin.workflows_menu" do
-        Decidim.menu :workflows_menu do |menu|
-          Decidim::Verifications.admin_workflows.each do |manifest|
-            next unless current_organization.available_authorizations.include?(manifest.name.to_s)
-
-            workflow = Decidim::Verifications::Adapter.new(manifest)
-
-            menu.add_item manifest.name.to_s,
-                          workflow.fullname,
-                          workflow.admin_root_path,
-                          active: is_active_link?(workflow.admin_root_path)
-          end
-        end
+        Decidim::Admin::Menu.register_workflows_menu!
       end
 
       initializer "decidim_admin.impersonate_menu" do
-        Decidim.menu :impersonate_menu do |menu|
-          menu.add_item :conflicts,
-                        I18n.t("title", scope: "decidim.admin.conflicts"),
-                        decidim_admin.conflicts_path,
-                        active: is_active_link?(decidim_admin.conflicts_path),
-                        if: allowed_to?(:index, :impersonatable_user)
-        end
+        Decidim::Admin::Menu.register_impersonate_menu!
       end
 
-      initializer "decidim_admin.admin_user_menu" do
-        Decidim.menu :admin_user_menu do |menu|
-          menu.add_item :users,
-                        I18n.t("menu.admins", scope: "decidim.admin"), decidim_admin.users_path,
-                        active: is_active_link?(decidim_admin.users_path),
-                        if: allowed_to?(:read, :admin_user)
-          menu.add_item :user_groups,
-                        I18n.t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path,
-                        active: is_active_link?(decidim_admin.user_groups_path),
-                        if: current_organization.user_groups_enabled? && allowed_to?(:index, :user_group)
-          menu.add_item :officializations,
-                        I18n.t("menu.participants", scope: "decidim.admin"), decidim_admin.officializations_path,
-                        active: is_active_link?(decidim_admin.officializations_path),
-                        if: allowed_to?(:index, :officialization)
-          menu.add_item :impersonatable_users,
-                        I18n.t("menu.impersonations", scope: "decidim.admin"), decidim_admin.impersonatable_users_path,
-                        active: is_active_link?(decidim_admin.impersonatable_users_path),
-                        if: allowed_to?(:index, :impersonatable_user),
-                        submenu: { target_menu: :impersonate_menu }
-
-          menu.add_item :moderated_users,
-                        I18n.t("menu.reported_users", scope: "decidim.admin"), decidim_admin.moderated_users_path,
-                        active: is_active_link?(decidim_admin.moderated_users_path),
-                        if: allowed_to?(:index, :moderate_users)
-          menu.add_item :authorization_workflows,
-                        I18n.t("menu.authorization_workflows", scope: "decidim.admin"), decidim_admin.authorization_workflows_path,
-                        active: is_active_link?(decidim_admin.authorization_workflows_path),
-                        if: allowed_to?(:index, :authorization),
-                        submenu: { target_menu: :workflows_menu }
-        end
+      initializer "decidim_admin.static_pages_menu" do
+        Decidim::Admin::Menu.register_admin_static_pages_menu!
       end
 
-      initializer "decidim_admin.admin_settings_menu" do
-        Decidim.menu :admin_settings_menu do |menu|
-          menu.add_item :edit_organization,
-                        I18n.t("menu.configuration", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_path,
-                        position: 1.0,
-                        if: allowed_to?(:update, :organization, organization: current_organization),
-                        active: is_active_link?(decidim_admin.edit_organization_path)
-
-          menu.add_item :edit_organization_appearance,
-                        I18n.t("menu.appearance", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_appearance_path,
-                        position: 1.1,
-                        if: allowed_to?(:update, :organization, organization: current_organization),
-                        active: is_active_link?(decidim_admin.edit_organization_appearance_path)
-
-          menu.add_item :edit_organization_homepage,
-                        I18n.t("menu.homepage", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_homepage_path,
-                        position: 1.2,
-                        if: allowed_to?(:update, :organization, organization: current_organization),
-                        active: is_active_link?(decidim_admin.edit_organization_homepage_path, %r{^/admin/organization/homepage})
-
-          menu.add_item :scopes,
-                        I18n.t("menu.scopes", scope: "decidim.admin"),
-                        decidim_admin.scopes_path,
-                        position: 1.3,
-                        if: allowed_to?(:read, :scope),
-                        active: is_active_link?(decidim_admin.scopes_path)
-          menu.add_item :scope_types,
-                        I18n.t("menu.scope_types", scope: "decidim.admin"),
-                        decidim_admin.scope_types_path,
-                        position: 1.4,
-                        if: allowed_to?(:read, :scope_type),
-                        active: is_active_link?(decidim_admin.scope_types_path)
-          menu.add_item :areas,
-                        I18n.t("menu.areas", scope: "decidim.admin"),
-                        decidim_admin.areas_path,
-                        position: 1.5,
-                        if: allowed_to?(:read, :area),
-                        active: is_active_link?(decidim_admin.areas_path)
+      initializer "decidim_admin.user_menu" do
+        Decidim::Admin::Menu.register_admin_user_menu!
+      end
 
-          menu.add_item :area_types,
-                        I18n.t("menu.area_types", scope: "decidim.admin"),
-                        decidim_admin.area_types_path,
-                        position: 1.6,
-                        if: allowed_to?(:read, :area_type),
-                        active: is_active_link?(decidim_admin.area_types_path)
+      initializer "decidim_admin.scopes_menu" do
+        Decidim::Admin::Menu.register_admin_scopes_menu!
+      end
 
-          menu.add_item :help_sections,
-                        I18n.t("menu.help_sections", scope: "decidim.admin"),
-                        decidim_admin.help_sections_path,
-                        position: 1.6,
-                        if: allowed_to?(:update, :help_sections),
-                        active: is_active_link?(decidim_admin.help_sections_path)
+      initializer "decidim_admin.areas_menu" do
+        Decidim::Admin::Menu.register_admin_areas_menu!
+      end
 
-          menu.add_item :external_domain_whitelist,
-                        I18n.t("menu.external_domain_whitelist", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_external_domain_whitelist_path,
-                        position: 1.7,
-                        if: allowed_to?(:update, :organization, organization: current_organization),
-                        active: is_active_link?(decidim_admin.edit_organization_external_domain_whitelist_path)
-        end
+      initializer "decidim_admin.settings_menu" do
+        Decidim::Admin::Menu.register_admin_settings_menu!
       end
 
       initializer "decidim_admin.menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.add_item :dashboard,
-                        I18n.t("menu.dashboard", scope: "decidim.admin"),
-                        decidim_admin.root_path,
-                        icon_name: "dashboard",
-                        position: 1,
-                        active: [%w(
-                          decidim/admin/dashboard
-                          decidim/admin/metrics
-                        ), []]
-
-          menu.add_item :moderations,
-                        I18n.t("menu.moderation", scope: "decidim.admin"),
-                        decidim_admin.moderations_path,
-                        icon_name: "flag",
-                        position: 4,
-                        active: [%w(
-                          decidim/admin/global_moderations
-                          decidim/admin/global_moderations/reports
-                        ), []],
-                        if: allowed_to?(:read, :global_moderation)
-
-          menu.add_item :static_pages,
-                        I18n.t("menu.static_pages", scope: "decidim.admin"),
-                        decidim_admin.static_pages_path,
-                        icon_name: "book",
-                        position: 4.5,
-                        active: [%w(
-                          decidim/admin/static_pages
-                          decidim/admin/static_page_topics
-                        ), []],
-                        if: allowed_to?(:read, :static_page)
-
-          menu.add_item :impersonatable_users,
-                        I18n.t("menu.users", scope: "decidim.admin"),
-                        allowed_to?(:read, :admin_user) ? decidim_admin.users_path : decidim_admin.impersonatable_users_path,
-                        icon_name: "person",
-                        position: 5,
-                        active: [%w(
-                          decidim/admin/users
-                          decidim/admin/user_groups
-                          decidim/admin/user_groups_csv_verifications
-                          decidim/admin/officializations
-                          decidim/admin/impersonatable_users
-                          decidim/admin/conflicts
-                          decidim/admin/moderated_users
-                          decidim/admin/managed_users/impersonation_logs
-                          decidim/admin/managed_users/promotions
-                          decidim/admin/authorization_workflows
-                          decidim/verifications/id_documents/admin/pending_authorizations
-                          decidim/verifications/id_documents/admin/config
-                          decidim/verifications/postal_letter/admin/pending_authorizations
-                          decidim/verifications/csv_census/admin/census
-                        ), []],
-                        if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
-
-          menu.add_item :newsletters,
-                        I18n.t("menu.newsletters", scope: "decidim.admin"),
-                        decidim_admin.newsletters_path,
-                        icon_name: "envelope-closed",
-                        position: 6,
-                        active: is_active_link?(decidim_admin.newsletters_path, :inclusive) ||
-                                is_active_link?(decidim_admin.newsletter_templates_path, :inclusive),
-                        if: allowed_to?(:index, :newsletter)
-
-          menu.add_item :edit_organization,
-                        I18n.t("menu.settings", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_path,
-                        icon_name: "wrench",
-                        position: 7,
-                        active: [
-                          %w(
-                            decidim/admin/organization
-                            decidim/admin/organization_appearance
-                            decidim/admin/organization_homepage
-                            decidim/admin/organization_homepage_content_blocks
-                            decidim/admin/scopes
-                            decidim/admin/scope_types
-                            decidim/admin/areas decidim/admin/area_types
-                            decidim/admin/help_sections
-                            decidim/admin/organization_external_domain_whitelist
-                          ),
-                          []
-                        ],
-                        if: allowed_to?(:update, :organization, organization: current_organization)
-
-          menu.add_item :logs,
-                        I18n.t("menu.admin_log", scope: "decidim.admin"),
-                        decidim_admin.logs_path,
-                        icon_name: "dashboard",
-                        position: 10,
-                        active: [%w(decidim/admin/logs), []],
-                        if: allowed_to?(:read, :admin_log)
-        end
+        Decidim::Admin::Menu.register_admin_menu!
       end
 
       initializer "decidim_admin.add_cells_view_paths" do
@@ -271,6 +101,14 @@ module Decidim
       initializer "decidim_admin.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_admin.register_events" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::BlockUserMailer.notify(data[:resource], data.dig(:extra, :justification)).deliver_later
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/admin/import/importer.rb

@@ -64,9 +64,9 @@ module Decidim
           data = prepare
           @verifier ||= creator.verifier_klass.new(
             headers: data_headers.map(&:to_s),
-            data: data,
-            reader: reader,
-            context: context
+            data:,
+            reader:,
+            context:
           )
         end
 

data/lib/decidim/admin/import/importer_factory.rb

@@ -9,7 +9,7 @@ module Decidim
           reader = Readers.search_by_mime_type(mime_type)
           raise NotImplementedError, "No reader implemented for mime type: #{mime_type}" if reader.nil?
 
-          Importer.new(file: file, reader: reader, **keyword_args)
+          Importer.new(file:, reader:, **keyword_args)
         end
       end
     end

data/lib/decidim/admin/import/readers/base.rb

@@ -5,7 +5,7 @@ module Decidim
     module Import
       module Readers
         # Abstract class with a very naive default implementation. Each importable
-        # file type should have it's own reader.
+        # file type should have it is own reader.
         class Base
           # Defines which index of the records defines the first line of actual
           # data. E.g. with spreadsheet formats, the first row contains column

data/lib/decidim/admin/import/readers/csv.rb

@@ -16,14 +16,14 @@ module Decidim
           end
 
           def read_rows
-            ::CSV.read(file, col_sep: ";").each_with_index do |row, index|
+            ::CSV.read(file, col_sep: Decidim.default_csv_col_sep, encoding: "BOM|UTF-8").each_with_index do |row, index|
               yield row, index
             end
           end
 
           # Returns a StringIO
           def example_file(data)
-            csv_data = ::CSV.generate(col_sep: ";") do |csv|
+            csv_data = ::CSV.generate(col_sep: Decidim.default_csv_col_sep) do |csv|
               data.each do |row|
                 csv << row
               end

data/lib/decidim/admin/import/verifier.rb

@@ -66,14 +66,14 @@ module Decidim
           indexes = humanize_indexes(invalid_indexes, reader.first_data_index)
           message =
             if reader.first_data_index.zero?
-              # If the data starts from index zero we don't want to say to the
+              # If the data starts from index zero we do not want to say to the
               # user that there are errors on "rows". We want to refer to record
               # numbers instead. This is the case e.g. with JSON data format.
               [
                 I18n.t(
                   "decidim.admin.imports.data_errors.invalid_indexes.records.message",
                   count: invalid_indexes.count,
-                  indexes: indexes
+                  indexes:
                 ),
                 I18n.t("decidim.admin.imports.data_errors.invalid_indexes.records.detail")
               ].join(" ")
@@ -82,7 +82,7 @@ module Decidim
                 I18n.t(
                   "decidim.admin.imports.data_errors.invalid_indexes.lines.message",
                   count: invalid_indexes.count,
-                  indexes: indexes
+                  indexes:
                 ),
                 I18n.t("decidim.admin.imports.data_errors.invalid_indexes.lines.detail")
               ].join(" ")
@@ -148,7 +148,7 @@ module Decidim
         #
         # Returns a String.
         def humanize_indexes(indexes, start_index)
-          # Humans don't start counting from zero and this message is shown
+          # Humans do not start counting from zero and this message is shown
           # for humans. This also takes the data start index into account.
           indexes = indexes.map { |i| i + start_index + 1 }