decidim-admin 0.23.1 → 0.24.0.rc2

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: user.name), notice: notice
+            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
           end
         end
       end
@@ -44,7 +44,7 @@ module Decidim
           on(:ok) do
             notice = I18n.t("officializations.destroy.success", scope: "decidim.admin")
 
-            redirect_to officializations_path(q: user.name), notice: notice
+            redirect_to officializations_path(q: { name_or_nickname_or_email_cont: user.name }), notice: notice
           end
         end
       end
@@ -60,7 +60,7 @@ module Decidim
       private
 
       def collection
-        @collection ||= current_organization.users.not_deleted
+        @collection ||= current_organization.users.not_deleted.left_outer_joins(:user_moderation)
       end
 
       def user

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

@@ -31,11 +31,15 @@ module Decidim
       end
 
       def active_blocks
-        @active_blocks ||= content_blocks.published
+        @active_blocks ||= content_blocks.published.where(manifest_name: Decidim.content_blocks.for(:homepage).map(&:name))
+      end
+
+      def unpublished_blocks
+        @unpublished_blocks ||= content_blocks.unpublished.where(manifest_name: Decidim.content_blocks.for(:homepage).map(&:name))
       end
 
       def inactive_blocks
-        @inactive_blocks ||= content_blocks.unpublished + unused_manifests
+        @inactive_blocks ||= unpublished_blocks + unused_manifests
       end
 
       def used_manifests

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

@@ -82,6 +82,13 @@ module Decidim
         form_params = params.to_unsafe_hash
         form_params["static_page"] ||= {}
         form_params["static_page"]["organization"] = current_organization
+        form_params["static_page"]["allow_public_access"] ||= begin
+          if page
+            page.allow_public_access
+          else
+            false
+          end
+        end
 
         return form_params unless page
 

data/app/events/decidim/resource_hidden_event.rb

@@ -0,0 +1,37 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ResourceHiddenEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :resource_path, :report_reasons, :resource_type, :resource_content
+
+    def resource_path
+      @resource.reported_content_url
+    end
+
+    def resource_url
+      @resource.reported_content_url
+    end
+
+    def report_reasons
+      extra["report_reasons"].map do |reason|
+        I18n.t("decidim.admin.moderations.report.reasons.#{reason}").downcase
+      end.join(", ")
+    end
+
+    def resource_title
+      nil
+    end
+
+    def resource_content
+      translated_attribute(@resource[@resource.reported_attributes.first]).truncate(100, separator: " ")
+    end
+
+    def resource_text
+      "<i>#{resource_content}</i>"
+    end
+
+    def resource_type
+      @resource.model_name.human.downcase
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object used to officialize users from the admin dashboard.
+    class BlockUserForm < Form
+      attribute :user_id, Integer
+      attribute :justification, String
+
+      validates :user, presence: true
+      validates :justification, presence: true, length: { minimum: UserBlock::MINIMUM_JUSTIFICATION_LENGTH }
+
+      def map_model(user)
+        self.user_id = user.id
+      end
+
+      def user
+        @user ||= Decidim::User.find_by(
+          id: user_id,
+          organization: current_organization
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ImportForm < Form
+      ACCEPTED_MIME_TYPES = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES
+
+      attribute :creator, String, default: ->(form, _attribute) { form.creators.first[:creator].to_s }
+      attribute :file
+      attribute :user_group_id, Integer
+
+      validates :file, presence: true
+      validates :creator, presence: true
+      validate :accepted_mime_type
+      validate :check_invalid_lines
+
+      def check_invalid_lines
+        return if file.blank? || !accepted_mime_type
+
+        importer.prepare
+        invalid_lines = importer.invalid_lines
+        errors.add(:file, I18n.t("decidim.admin.imports.invalid_lines", invalid_lines: invalid_lines.join(","))) unless invalid_lines.empty?
+      end
+
+      def file_path
+        file&.path
+      end
+
+      def mime_type
+        file&.content_type
+      end
+
+      def accepted_mime_type
+        accepted_mime_types = ACCEPTED_MIME_TYPES.values
+        return true if accepted_mime_types.include?(mime_type)
+        # Avoid duplicating error messages
+        return false if errors[:file].present?
+
+        errors.add(
+          :file,
+          I18n.t(
+            "activemodel.errors.new_import.attributes.file.invalid_mime_type",
+            valid_mime_types: ACCEPTED_MIME_TYPES.keys.map do |m|
+              I18n.t("decidim.admin.new_import.accepted_mime_types.#{m}")
+            end.join(", ")
+          )
+        )
+        false
+      end
+
+      def creators
+        @creators ||= current_component.manifest.import_manifests.map do |manifest|
+          { creator: manifest.creator, name: manifest.creator.to_s.split("::").last.downcase }
+        end
+      end
+
+      def creator_class
+        return creator.constantize if creator.is_a?(String)
+
+        creator
+      end
+
+      def user_group
+        @user_group ||= Decidim::UserGroup.find_by(
+          organization: current_organization,
+          id: user_group_id.to_i
+        )
+      end
+
+      def importer
+        @importer ||= importer_for(file_path, mime_type)
+      end
+
+      def importer_for(filepath, mime_type)
+        context[:user_group] = user_group
+        Import::ImporterFactory.build(
+          filepath,
+          mime_type,
+          context: context,
+          creator: creator_class
+        )
+      end
+    end
+  end
+end

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

@@ -20,7 +20,6 @@ module Decidim
       attribute :official_img_footer
       attribute :remove_official_img_footer
       attribute :official_url
-      attribute :show_statistics, Boolean
       attribute :header_snippets, String
       attribute :cta_button_path, String
       attribute :highlighted_content_banner_enabled, Boolean, default: false
@@ -47,7 +46,7 @@ module Decidim
       translatable_attribute :omnipresent_banner_title, String
       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 :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,
                 :logo,

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

@@ -15,11 +15,10 @@ module Decidim
       validate :validate_csv
 
       def validate_csv
-        if file.present?
-          CSV.foreach(file.path) do |email, user_name|
-            errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
-            errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
-          end
+        return if file.blank?
+
+        CSV.foreach(file.path) do |_email, user_name|
+          errors.add(:user_name, :invalid) unless user_name.match?(UserBaseEntity::REGEXP_NAME)
         end
       end
     end

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

@@ -14,11 +14,6 @@ module Decidim
       validates :name, :email, presence: true
 
       validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-      validate :admin_uniqueness
-
-      def admin_uniqueness
-        errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
-      end
     end
   end
 end

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

@@ -24,6 +24,12 @@ module Decidim
         end
       end
 
+      # Make sure the empty scope is not passed because then some logic could
+      # assume erroneously that some scope is selected.
+      def scope_ids
+        super.select(&:presence)
+      end
+
       private
 
       def at_least_one_participatory_space_selected

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

@@ -11,6 +11,7 @@ module Decidim
       translatable_attribute :content, String
       attribute :changed_notably, Boolean
       attribute :show_in_footer, Boolean
+      attribute :allow_public_access, Boolean
       attribute :weight, Integer
       attribute :topic_id, Integer
 
@@ -18,7 +19,7 @@ module Decidim
 
       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
+      validates :slug, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-_/]+\z} }, allow_blank: true
 
       validate :slug, :slug_uniqueness
 
@@ -41,6 +42,10 @@ module Decidim
         )
       end
 
+      def control_public_access?
+        current_organization.force_users_to_authenticate_before_access_organization?
+      end
+
       private
 
       def slug_uniqueness

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object used to transfer conflicted users from the admin dashboard.
+    #
+    # This form will contain a dynamic attribute for the user authorization.
+    # This authorization will be selected by the admin user if more than one exists.
+    class TransferUserForm < Form
+      attribute :email, String
+      attribute :reason, String
+      attribute :current_user, Decidim::User
+      attribute :conflict, Decidim::Verifications::Conflict
+
+      validates :current_user, presence: true
+      validates :conflict, presence: true
+    end
+  end
+end

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

@@ -8,13 +8,6 @@ module Decidim
         current_organization.admin_terms_of_use_body.symbolize_keys[I18n.locale].html_safe
       end
 
-      def admin_terms_announcement_args
-        {
-          callout_class: current_user.admin_terms_accepted? ? "success" : "warning",
-          announcement: announcement_body
-        }
-      end
-
       def announcement_body
         if current_user.admin_terms_accepted?
           t("accept.success", scope: "decidim.admin.admin_terms_of_use")

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

@@ -15,10 +15,6 @@ module Decidim
       include Decidim::Admin::UserRolesHelper
       include Decidim::Admin::ResourceScopeHelper
 
-      def title
-        current_organization.name
-      end
-
       # Adds a link to the secondary navigation so admins can easily access the public page of the
       # element their working on.
       #
@@ -32,6 +28,11 @@ module Decidim
           end
         end
       end
+
+      def participatory_space_active_link?(component)
+        endpoints = component.manifest.admin_engine.try(:participatory_space_endpoints)
+        endpoints && is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space), %r{/\d+/manage/(#{endpoints.join("|")})\b})
+      end
     end
   end
 end

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

@@ -10,8 +10,8 @@ module Decidim
       #           current component.
       #
       # Returns a rendered dropdown.
-      def export_dropdown(component = current_component)
-        render partial: "decidim/admin/exports/dropdown", locals: { component: component }
+      def export_dropdown(component = current_component, resource_id = nil)
+        render partial: "decidim/admin/exports/dropdown", locals: { component: component, resource_id: resource_id }
       end
 
       # Routes to the correct exporter for a component.

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

@@ -15,9 +15,10 @@ module Decidim
 
         filters_with_values.each_with_object({}) do |(filter, values), hash|
           link = filter_link_label(filter, i18n_scope)
-          hash[link] = if values.is_a?(Array)
+          hash[link] = case values
+                       when Array
                          build_submenu_options_tree_from_array(filter, values, i18n_scope)
-                       elsif values.is_a?(Hash)
+                       when Hash
                          build_submenu_options_tree_from_hash(filter, values, i18n_scope)
                        end
         end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module ImportsHelper
+      # Renders an import dropdown for the provided component. Additional dropdown items
+      # can be given as block.
+      #
+      # component - The component to render the export dropdown for. Defaults to the
+      #           current component.
+      #
+      # resource_id - The resource id that is passed to route.
+      #
+      # Returns a rendered dropdown.
+      def import_dropdown(component = current_component, resource_id = nil)
+        locals = { component: component, resource_id: resource_id }
+        locals[:block] = yield if block_given?
+        render partial: "decidim/admin/imports/dropdown", locals: locals
+      end
+
+      # Routes to the correct importer for a component.
+      #
+      # component - The component to be routed.
+      # options - Extra options that need to be passed to the route.
+      #
+      # Returns the path to the component importer.
+      def admin_imports_path(component, options)
+        EngineRouter.admin_proxy(component.participatory_space).new_component_import_path(options.merge(component_id: component))
+      end
+
+      # Public: A formatted collection of mime_type to be used in forms.
+      def mime_types
+        accepted_mime_types = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES.keys
+        accepted_mime_types.map { |mime_type| t("decidim.admin.imports.new.accepted_mime_types.#{mime_type}") }.join(", ")
+      end
+
+      # Returns verified user groups of current user
+      def user_groups
+        Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module Decidim
   module Admin
     # This module includes helpers to manage menus in admin layout
     module MenuHelper
+      include Decidim::Admin::SidebarMenuHelper
+
       # Public: Returns the main menu presenter object
       def main_menu
         @main_menu ||= ::Decidim::MenuPresenter.new(
@@ -12,6 +14,14 @@ module Decidim
           active_class: "is-active"
         )
       end
+
+      def global_moderation_menu
+        @global_moderation_menu ||= sidebar_menu(:admin_global_moderation_menu)
+      end
+
+      def organization_settings_menu
+        @organization_settings_menu ||= sidebar_menu(:admin_settings_menu)
+      end
     end
   end
 end