decidim-admin 0.23.1 → 0.24.0.rc2

data/config/locales/uk.yml

@@ -55,7 +55,6 @@ uk:
         omnipresent_banner_title: Заголовок
         omnipresent_banner_url: Веб-адреса
         reference_prefix: Довідковий префікс
-        show_statistics: Показувати статистику
         tos_version: Версія умов участі
         twitter_handler: Адреса Twitter
         youtube_handler: Адреса YouTube
@@ -440,7 +439,6 @@ uk:
           instagram: Інстаграм
           social_handlers: Соціальні мережі
           twitter: Твіттер
-          url: Веб-адреса
           youtube: ЮТуб
         update:
           error: При спробі оновити цю організацію сталася помилка.
@@ -598,7 +596,6 @@ uk:
           fields:
             hidden_at: 'Приховано:'
             report_count: Кількість
-            reportable: Різновид скарги
             reported_content_url: Веб-адреса оскарженого вмісту
             reports: Скарги
             visit_url: Відвідайте веб-адресу

data/config/locales/zh-CN.yml

@@ -30,7 +30,6 @@ zh-CN:
         body: 正文内容
         subject: 议 题
       organization:
-        address: SMTP hostname
         alert_color: 警告
         badges_enabled: 启用徽章
         comments_max_length: 评论最大长度 (默认值留0)
@@ -66,20 +65,16 @@ zh-CN:
         omnipresent_banner_short_description: 简短描述
         omnipresent_banner_title: 标题
         omnipresent_banner_url: 网址
-        password: 密码
-        port: 端口
         primary_color: 主要的
         reference_prefix: 参考前缀
         rich_text_editor_in_public_views: 为参与者启用富文本编辑器
         secondary_color: 次要文件
         send_welcome_notification: 发送欢迎通知
-        show_statistics: 显示统计
         success_color: 成功
         time_zone: 时区
         tos_version: 服务条款版本
         twitter_handler: Twitter handler
         user_groups_enabled: 启用组
-        user_name: 用户名
         warning_color: 警告
         welcome_notification_body: 欢迎通知机构
         welcome_notification_subject: 欢迎通知主题
@@ -150,7 +145,6 @@ zh-CN:
           error: 接受管理员使用条款时出错。
           success: 太棒了！您已经接受了管理员使用条款。
         actions:
-          accept: 我同意这个管理条款
           are_you_sure: 您确定要拒绝管理员条款吗？
           refuse: 拒绝管理条款
           title: 同意使用条款
@@ -586,7 +580,6 @@ zh-CN:
           rich_text_editor_in_public_views_help: 在某些文本领域，参与者将能够通过使用丰富的文本编辑器插入一些HTML标签。
           social_handlers: 社交活动
           twitter: 推特
-          url: 网址
           youtube: YouTube
         update:
           error: 更新这个组织时出现问题。
@@ -621,7 +614,6 @@ zh-CN:
           error: 删除这个参与空间的私人参与者时出错。
           success: 参与性空间私人参与者访问成功被摧毁。
         index:
-          import_via_csv: 通过 csv 导入
           title: 参与性空间私人参与者
         new:
           create: 创建
@@ -831,7 +823,6 @@ zh-CN:
           fields:
             hidden_at: 隐藏于
             report_count: 计数
-            reportable: 可重写
             reported_content_url: 报告的内容 URL
             reports: 报告
             visit_url: 访问 URL

data/config/routes.rb

@@ -38,10 +38,19 @@ Decidim::Admin::Engine.routes.draw do
       member do
         post :resend_invitation, to: "users#resend_invitation"
       end
+      resource :block, only: [:new, :create, :destroy], controller: :block_user
     end
 
     resources :officializations, only: [:new, :create, :index, :destroy], param: :user_id do
-      get :show_email, on: :member
+      member do
+        get :show_email
+      end
+    end
+
+    resources :moderated_users, only: [:index] do
+      member do
+        put :ignore
+      end
     end
 
     resources :impersonatable_users, only: [:index] do
@@ -90,6 +99,17 @@ Decidim::Admin::Engine.routes.draw do
 
     resources :share_tokens, only: :destroy
 
+    resources :moderations, controller: "global_moderations" do
+      member do
+        put :unreport
+        put :hide
+        put :unhide
+      end
+      resources :reports, controller: "global_moderations/reports", only: [:index, :show]
+    end
+
+    resources :conflicts, only: [:index, :edit, :update], controller: "conflicts"
+
     root to: "dashboard#show"
   end
 end

data/lib/decidim/admin.rb

@@ -11,6 +11,7 @@ module Decidim
   module Admin
     autoload :Components, "decidim/admin/components"
     autoload :FormBuilder, "decidim/admin/form_builder"
+    autoload :Import, "decidim/admin/import"
 
     include ActiveSupport::Configurable
 
@@ -28,5 +29,10 @@ module Decidim
       config.default_per_page = Decidim::Admin.per_page_range.first
       config.max_per_page = Decidim::Admin.per_page_range.last
     end
+
+    # Public: Stores an instance of ViewHooks
+    def self.view_hooks
+      @view_hooks ||= ViewHooks.new
+    end
   end
 end

data/lib/decidim/admin/engine.rb

@@ -32,6 +32,70 @@ module Decidim
         app.config.assets.precompile += %w(decidim_admin_manifest.js)
       end
 
+      initializer "decidim_admin.global_moderation_menu" do
+        Decidim.menu :admin_global_moderation_menu do |menu|
+          menu.item I18n.t("actions.not_hidden", scope: "decidim.moderations"),
+                    decidim_admin.moderations_path,
+                    position: 1,
+                    active: params[:hidden].blank?
+
+          menu.item I18n.t("actions.hidden", scope: "decidim.moderations"),
+                    decidim_admin.moderations_path(hidden: true),
+                    position: 2,
+                    active: params[:hidden].present?
+        end
+      end
+
+      initializer "decidim_admin.admin_settings_menu" do
+        Decidim.menu :admin_settings_menu do |menu|
+          menu.item 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.item 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.item 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.item 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.item 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.item 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)
+
+          menu.item 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)
+
+          menu.item 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)
+        end
+      end
+
       initializer "decidim_admin.menu" do
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.dashboard", scope: "decidim.admin"),
@@ -40,10 +104,20 @@ module Decidim
                     position: 1,
                     active: ["decidim/admin/dashboard" => :show]
 
+          menu.item 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.item I18n.t("menu.static_pages", scope: "decidim.admin"),
                     decidim_admin.static_pages_path,
                     icon_name: "book",
-                    position: 4,
+                    position: 4.5,
                     active: [%w(
                       decidim/admin/static_pages
                       decidim/admin/static_page_topics
@@ -60,6 +134,7 @@ module Decidim
                       decidim/admin/user_groups_csv_verifications
                       decidim/admin/officializations
                       decidim/admin/impersonatable_users
+                      decidim/admin/moderated_users
                       decidim/admin/managed_users/impersonation_logs
                       decidim/admin/managed_users/promotions
                       decidim/admin/authorization_workflows

data/lib/decidim/admin/import.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Import
+      autoload :ImporterFactory, "decidim/admin/import/importer_factory"
+      autoload :Importer, "decidim/admin/import/importer"
+      autoload :Creator, "decidim/admin/import/creator"
+      autoload :Readers, "decidim/admin/import/readers"
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Import
+      # This is an abstract class with a very naive default implementation
+      # for the importers to use. It can also serve as a superclass of your
+      # own implementation.
+      #
+      # It is used to be run against each element of an importable collection
+      # in order to parse relevant fields. Every import should specify their
+      # own creator or this default will be used.
+      class Creator
+        attr_reader :data
+
+        # Initializes the creator with a resource.
+        #
+        # data - The data hash to parse.
+        # context - The context needed by the producer
+        def initialize(data, context = nil)
+          @data = data.except(:id, "id")
+          @context = context
+        end
+
+        # Retuns the resource class to be created with the provided data.
+        def self.resource_klass
+          raise NotImplementedError, "#{self.class.name} does not define resource class"
+        end
+
+        # Can be used to convert the data hash to the resource attributes in
+        # case the data hash to be imported has different column names than the
+        # resource object to be created of it.
+        #
+        # By default returns the data hash but can be implemented by each creator
+        # implementation.
+        #
+        # Returns the resource attributes to be passed for the constructor.
+        def resource_attributes
+          @data
+        end
+
+        # Public: Returns a created object with the parsed data.
+        #
+        # Returns a target object.
+        def produce
+          self.class.resource_klass.new(resource_attributes)
+        end
+
+        def finish!
+          resource.save!
+        end
+
+        private
+
+        def resource
+          raise NotImplementedError, "#{self.class.name} does not define resource"
+        end
+
+        #
+        # Collect field's language specified cells to one hash
+        #
+        # field - The field name eg. "title"
+        # locales - Available locales
+        #
+        # Returns the hash including locale-imported_data pairs. eg. {en: "Heading", ca: "Cap", es: "Bóveda"}
+        #
+        def locale_hasher(field, locales)
+          return data[field.to_sym] if data.has_key?(field.to_sym)
+
+          hash = {}
+          locales.each do |locale|
+            parsed = data[:"#{field}/#{locale}"]
+            next if parsed.nil?
+
+            hash[locale] = parsed
+          end
+          hash
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Import
+      # Class providing the interface and implementation of an importer. Needs
+      # a reader to be passed to the constructor which handles the import file
+      # reading depending on its type.
+      #
+      # You can also use the ImporterFactory class to create an Importer
+      # instance.
+      class Importer
+        # Public: Initializes an Importer.
+        #
+        # file   - A file with the data to be imported.
+        # reader - A Reader to be used to read the data from the file.
+        # creator - A Creator to be used during the import.
+        # context - A hash including component specific data.
+        def initialize(file:, reader: Readers::Base, creator: Creator, context: nil)
+          @file = file
+          @reader = reader
+          @creator = creator
+          @context = context
+        end
+
+        # Import data and create resources
+        #
+        # Returns an array of resources
+        def prepare
+          @prepare ||= collection.map(&:produce)
+        end
+
+        # Save resources
+        def import!
+          collection.map(&:finish!)
+        end
+
+        # Returns a collection of creators
+        def collection
+          @collection ||= collection_data.map { |item| creator.new(item, context) }
+        end
+
+        # Returns array of all resource indexes where validations fail.
+        def invalid_lines
+          @invalid_lines ||= check_invalid_lines(prepare)
+        end
+
+        private
+
+        attr_reader :file, :reader, :creator, :context
+
+        def collection_data
+          return @collection_data if @collection_data
+
+          @collection_data = []
+          data_headers = []
+          reader.new(file).read_rows do |rowdata, index|
+            if index.zero?
+              data_headers = rowdata.map(&:to_sym)
+            else
+              @collection_data << Hash[
+                rowdata.each_with_index.map do |val, ind|
+                  [data_headers[ind], val]
+                end
+              ]
+            end
+          end
+
+          @collection_data
+        end
+
+        def check_invalid_lines(imported_data)
+          invalid_lines = []
+          imported_data.each_with_index do |record, index|
+            invalid_lines << index + 1 unless record.valid?
+          end
+          invalid_lines
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Import
+      # A factory class providing easier way to create new importers.
+      class ImporterFactory
+        def self.build(file, mime_type, **keyword_args)
+          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)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Import
+      module Readers
+        autoload :Base, "decidim/admin/import/readers/base"
+        autoload :CSV, "decidim/admin/import/readers/csv"
+        autoload :JSON, "decidim/admin/import/readers/json"
+        autoload :XLS, "decidim/admin/import/readers/xls"
+
+        # Accepted mime types
+        # keys: are used for dynamic help text on admin form.
+        # values: are used to validate the file format of imported document.
+        ACCEPTED_MIME_TYPES = {
+          json: Readers::JSON::MIME_TYPE,
+          csv: Readers::CSV::MIME_TYPE,
+          xls: Readers::XLS::MIME_TYPE
+        }.freeze
+
+        def self.all
+          [
+            Readers::CSV,
+            Readers::JSON,
+            Readers::XLS
+          ]
+        end
+
+        def self.search_by_mime_type(mime_type)
+          all.each do |reader_klass|
+            return reader_klass if mime_type == reader_klass::MIME_TYPE
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end