decidim-admin 0.25.0.rc4 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea05dffe648cb9ed9ec858c4c53df7fe0fa3c3eba2b50caaf262c9ed94019ba
-  data.tar.gz: 5acc3334f8aaf0dab7165b632a61c790ac4027ca6b28e97c83da8569c584af32
+  metadata.gz: 6dd32d7d06cf46663a36708d5b0ee6a9cdf2ff4b2382c7c389222ea62e2ac765
+  data.tar.gz: ad9b4239d7ff4e76eae1f2ad68cc281016e117b14b5daa6f194d45a69fdda513
 SHA512:
-  metadata.gz: 880981f7f0c5bd52a2514dcd6eaffba8da6e6aae8ce2a18c464b78c75204790b4c6f494eea517d9bf14395b5e595933dd3f4c96d0728eefd86e53a859caca3fe
-  data.tar.gz: fee5bed6ee9306bd4c488732db89ccbb56520e67ec9c199dce8590a2b1016fdb4d1fcb02f71cb220e0b08801ed83004d3490561d4f7fa568d81df1b448b32618
+  metadata.gz: 0a4a0e4fd1e25a3ed486009740d5748ea3704f59ff537e5c6807a3f91d2b812a5fba16da051096083a41c0adf5d10949016a845cf0ff36c512d2367067d1e1c6
+  data.tar.gz: 7391b190aafcdd002353a4bacabd3d0020343c605e590772997fff861ec6a44e7cc7b6f18a8326122b43188922d4434b0bca15a77b49b2f9fcd4f06c25a2809e

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class CreateImportExample < Rectify::Command
+      def initialize(form)
+        @form = form
+      end
+
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        broadcast(:ok, form.example)
+      end
+
+      private
+
+      attr_reader :form
+    end
+  end
+end

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

@@ -49,15 +49,11 @@ module Decidim
           organization: @participatory_space.organization
         )
 
-        InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user && invitation_pending?(@existing_user)
+        InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user&.invitation_pending?
 
         @existing_user
       end
 
-      def invitation_pending?(user)
-        user.invited_to_sign_up? && !user.invitation_accepted?
-      end
-
       def new_user
         @new_user ||= InviteUser.call(user_form) do
           on(:ok) do |user|

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

@@ -66,7 +66,7 @@ module Decidim
           organization: private_user_to.organization
         )
 
-        InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user && !@existing_user.invitation_accepted?
+        InviteUserAgain.call(@existing_user, invitation_instructions) if @existing_user&.invitation_pending?
 
         @existing_user
       end

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

@@ -34,15 +34,21 @@ module Decidim
         @page = Decidim.traceability.create!(
           StaticPage,
           form.current_user,
+          attributes
+        )
+      end
+
+      def attributes
+        {
+          organization: form.organization,
           title: form.title,
           slug: form.slug,
-          content: form.content,
           show_in_footer: form.show_in_footer,
           weight: form.weight,
           topic: form.topic,
-          organization: form.organization,
+          content: form.content,
           allow_public_access: form.allow_public_access
-        )
+        }
       end
 
       def update_organization_tos_version

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

@@ -102,7 +102,8 @@ module Decidim
             warning: form.warning_color,
             alert: form.alert_color,
             highlight: form.highlight_color,
-            "highlight-alternative": form.highlight_alternative_color
+            "highlight-alternative": form.highlight_alternative_color,
+            theme: form.theme_color
           }
         }
       end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module UserGroups
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :name_or_nickname_or_email_cont
+          end
+
+          def filters
+            [
+              :state_eq
+            ]
+          end
+
+          def filters_with_values
+            {
+              state_eq: user_groups_states
+            }
+          end
+
+          protected
+
+          def user_groups_states
+            %w(all pending rejected verified)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ModeratedUsers
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def filters
+            [
+              :reports_reason_eq
+            ]
+          end
+
+          def filters_with_values
+            {
+              reports_reason_eq: report_reasons
+            }
+          end
+
+          def dynamically_translated_filters
+            []
+          end
+
+          def search_field_predicate
+            :user_name_or_user_nickname_or_user_email_cont
+          end
+
+          def report_reasons
+            Decidim::UserReport::REASONS
+          end
+
+          def extra_allowed_params
+            [:per_page, :blocked]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Decidim
       include UseOrganizationTimeZone
       include PayloadInfo
       include HttpCachingDisabler
+      include DisableRedirectionToExternalHost
 
       helper Decidim::Admin::ApplicationHelper
       helper Decidim::Admin::AttributesDisplayHelper

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

@@ -5,24 +5,24 @@ module Decidim
     # This controller allows admins to import resources from a file.
     class ImportsController < Decidim::Admin::ApplicationController
       include Decidim::ComponentPathHelper
-      helper UserGroupHelper
+
+      helper_method :import_manifest
 
       def new
         enforce_permission_to :import, :component_data, component: current_component
-        @form = form(Admin::ImportForm).from_params(
-          {
-            # We need to set "default" creator because form-class doesn't have context / current_component
-            # when it sets it's default values.
-            creator: current_component.manifest.import_manifests.first.creator
-          },
+        raise ActionController::RoutingError, "Not Found" unless import_manifest
+
+        @form = form(import_manifest.form_class).from_params(
+          { name: import_manifest.name },
           current_component: current_component
         )
       end
 
       def create
         enforce_permission_to :import, :component_data, component: current_component
+        raise ActionController::RoutingError, "Not Found" unless import_manifest
 
-        @form = form(Admin::ImportForm).from_params(
+        @form = form(import_manifest.form_class).from_params(
           params,
           current_component: current_component,
           current_organization: current_organization
@@ -31,8 +31,8 @@ module Decidim
         CreateImport.call(@form) do
           on(:ok) do |imported_data|
             flash[:notice] = t("decidim.admin.imports.notice",
-                               number: imported_data.length,
-                               resource_name: imported_data.first.resource_manifest.name.pluralize)
+                               count: imported_data.length,
+                               resource_name: import_manifest.message(:resource_name, count: imported_data.length))
             redirect_to manage_component_path(current_component)
           end
 
@@ -43,8 +43,46 @@ module Decidim
         end
       end
 
+      def example
+        enforce_permission_to :import, :component_data, component: current_component
+        raise ActionController::RoutingError, "Not Found" unless import_manifest
+
+        @form = form(Decidim::Admin::ImportExampleForm).from_params(params).with_context(
+          current_component: current_component,
+          current_organization: current_organization
+        )
+
+        respond_to do |format|
+          @form.available_formats.each do |key, mime|
+            format.public_send(key) do
+              CreateImportExample.call(@form) do
+                on(:ok) do |data|
+                  filename = "#{current_component.manifest_name}-#{import_manifest.name}-example.#{key}"
+                  send_data data.read, disposition: :attachment, filename: filename, type: mime
+                end
+
+                on(:invalid) do
+                  flash[:alert] = t("decidim.admin.imports.example_error")
+                  redirect_to admin_imports_path(current_component, name: import_name)
+                end
+              end
+            end
+          end
+        end
+      end
+
       private
 
+      def import_manifest
+        @import_manifest ||= current_component.manifest.import_manifests.find do |import_manifest|
+          import_manifest.name.to_s == import_name
+        end
+      end
+
+      def import_name
+        params[:name]
+      end
+
       def current_component
         @current_component ||= current_participatory_space.components.find(params[:component_id])
       end

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

@@ -3,14 +3,14 @@
 module Decidim
   module Admin
     class ModeratedUsersController < Decidim::Admin::ApplicationController
-      include Decidim::Moderations::Admin::Filterable
+      include Decidim::ModeratedUsers::Admin::Filterable
 
       layout "decidim/admin/users"
 
       def index
         enforce_permission_to :read, :moderate_users
 
-        @moderated_users = filtered_collection.page(params[:page]).per(15)
+        @moderated_users = filtered_collection
       end
 
       def ignore

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

@@ -10,7 +10,8 @@ module Decidim
 
       def index
         enforce_permission_to :read, :scope
-        @scopes = children_scopes.order(Arel.sql("name->'#{I18n.locale}' ASC"))
+        field = Arel::Nodes::InfixOperation.new("->", Decidim::Scope.arel_table[:name], Arel::Nodes.build_quoted(I18n.locale))
+        @scopes = children_scopes.order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("ASC")))
       end
 
       def new

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

@@ -6,6 +6,7 @@ module Decidim
     #
     class UserGroupsController < Decidim::Admin::ApplicationController
       include UserGroups
+      include Decidim::Admin::UserGroups::Filterable
 
       before_action :enforce_user_groups_enabled
 
@@ -13,11 +14,8 @@ module Decidim
 
       def index
         enforce_permission_to :index, :user_group
-        @query = params[:q]
-        @state = params[:state]
 
-        @user_groups = Decidim::Admin::UserGroupsEvaluation.for(collection, @query, @state)
-                                                           .page(params[:page]).per(15)
+        @user_groups = filtered_collection
       end
 
       def verify
@@ -56,10 +54,20 @@ module Decidim
 
       private
 
+      def filtered_collection
+        paginate(query.result)
+      end
+
+      def base_query
+        Decidim::Admin::UserGroupsEvaluation.for(collection, @query, @state)
+      end
+
       def collection
         UserGroup
-          .includes(:memberships)
+          .left_outer_joins(:memberships)
+          .select("decidim_users.*, COUNT(decidim_user_group_memberships.decidim_user_group_id) as users_count")
           .where(decidim_user_group_memberships: { decidim_user_id: current_organization.users })
+          .group(Arel.sql("decidim_users.id"))
       end
     end
   end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ImportExampleForm < Form
+      attribute :name, String
+      attribute :format, String
+
+      validates :name, presence: true
+      validates :format, presence: true
+      validates :manifest, presence: true
+      validates :reader_klass, presence: true
+      validates :example_data, presence: true
+
+      def example
+        reader.example_file(example_data)
+      end
+
+      def available_formats
+        Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES
+      end
+
+      private
+
+      def manifest
+        @manifest ||= current_component.manifest.import_manifests.find do |import_manifest|
+          import_manifest.name.to_s == name
+        end
+      end
+
+      def example_data
+        return unless manifest
+
+        manifest.example(self, current_component)
+      end
+
+      def reader
+        @reader ||= begin
+          return unless reader_klass
+
+          reader_klass.new("/dev/null")
+        end
+      end
+
+      def reader_klass
+        @reader_klass ||= Decidim::Admin::Import::Readers.search_by_file_extension(format)
+      end
+    end
+  end
+end

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

@@ -6,36 +6,23 @@ module Decidim
       ACCEPTED_MIME_TYPES = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES
       include Decidim::HasUploadValidations
 
-      attribute :creator, String, default: ->(form, _attribute) { form.creators.first[:creator].to_s }
+      attribute :name, String
       attribute :file
-      attribute :user_group_id, Integer
 
       validates :file, presence: true
-      validates :creator, presence: true
-      validate :accepted_mime_type
-      validate :check_invalid_lines
+      validates :name, presence: true
+      validate :check_accepted_mime_type
+      validate :check_invalid_file, if: -> { file.present? && accepted_mime_type? }
+      validate :verify_import, if: -> { file.present? && accepted_mime_type? && !importer.invalid_file? }
 
-      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
+      def importer
+        @importer ||= importer_for(file_path, mime_type)
       end
 
-      def mime_type
-        file&.content_type
-      end
+      private
 
-      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?
+      def check_accepted_mime_type
+        return if accepted_mime_type?
 
         errors.add(
           :file,
@@ -46,41 +33,60 @@ module Decidim
             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
+      def check_invalid_file
+        return unless importer.invalid_file?
+
+        errors.add(:file, I18n.t("activemodel.errors.new_import.attributes.file.invalid_file"))
       end
 
-      def creator_class
-        return creator.constantize if creator.is_a?(String)
+      def verify_import
+        return if importer.verify
 
-        creator
+        importer.errors.each do |_col, message|
+          errors.add(:file, message)
+        end
       end
 
-      def user_group
-        @user_group ||= Decidim::UserGroup.find_by(
-          organization: current_organization,
-          id: user_group_id.to_i
-        )
+      def file_path
+        file&.path
       end
 
-      def importer
-        @importer ||= importer_for(file_path, mime_type)
+      def mime_type
+        file&.content_type
+      end
+
+      def creator_class
+        manifest.creator
       end
 
       def importer_for(filepath, mime_type)
-        context[:user_group] = user_group
         Import::ImporterFactory.build(
           filepath,
           mime_type,
-          context: context,
+          context: importer_context,
           creator: creator_class
         )
       end
+
+      protected
+
+      def accepted_mime_type?
+        return true if ACCEPTED_MIME_TYPES.values.include?(mime_type)
+
+        false
+      end
+
+      def importer_context
+        context
+      end
+
+      def manifest
+        @manifest ||= current_component.manifest.import_manifests.find do |import_manifest|
+          import_manifest.name.to_s == name
+        end
+      end
     end
   end
 end

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

@@ -36,6 +36,7 @@ module Decidim
       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"
 
       translatable_attribute :cta_button_text, String
       translatable_attribute :description, String

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

@@ -12,13 +12,13 @@ module Decidim
       # 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
+      def import_dropdown(component = current_component, resource_id: nil)
+        render "decidim/admin/imports/dropdown", component: component, resource_id: resource_id, custom: block_given? do
+          yield if block_given?
+        end
       end
 
-      # Routes to the correct importer for a component.
+      # Route to the correct importer for a component.
       #
       # component - The component to be routed.
       # options - Extra options that need to be passed to the route.
@@ -28,10 +28,20 @@ module Decidim
         EngineRouter.admin_proxy(component.participatory_space).new_component_import_path(options.merge(component_id: component))
       end
 
+      # Route to the correct importer example 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 example.
+      def admin_imports_example_path(component, options)
+        EngineRouter.admin_proxy(component.participatory_space).example_component_imports_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(", ")
+        accepted_mime_types.index_with { |mime_type| I18n.t("decidim.admin.imports.new.accepted_mime_types.#{mime_type}") }
       end
 
       # Returns verified user groups of current user

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

@@ -29,6 +29,15 @@ module Decidim
         content_tag(:td, scope_name)
       end
 
+      # Public: This helper shows th with the sort link element.
+      def th_scope_sort_link
+        return unless resource_with_scopes_enabled?
+
+        content_tag(:th) do
+          sort_link(query, :scope_name, t("decidim.admin.resources.index.headers.scope"))
+        end
+      end
+
       private
 
       def resource_with_scopes_enabled?

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

@@ -12,6 +12,7 @@ module Decidim
         integer: :number_field,
         string: :text_field,
         text: :text_area,
+        select: :select_field,
         scope: :scope_field,
         enum: :collection_radio_buttons,
         time: :datetime_field
@@ -49,6 +50,8 @@ module Decidim
             form.send(:translated, form_method, name, options)
           elsif form_method == :collection_radio_buttons
             render_enum_form_field(form, attribute, name, i18n_scope, options)
+          elsif form_method == :select_field
+            render_select_form_field(form, attribute, name, i18n_scope, options)
           elsif form_method == :scope_field
             scopes_picker_field(form, name)
           else
@@ -59,6 +62,16 @@ module Decidim
 
       private
 
+      def render_select_form_field(form, attribute, name, i18n_scope, options)
+        html = form.select(
+          name,
+          attribute.build_choices.map { |o| [t("#{name}_options.#{o}", scope: i18n_scope), o] },
+          { include_blank: attribute.include_blank, label: options[:label] }
+        )
+        html << content_tag(:p, options[:help_text], class: "help-text") if options[:help_text]
+        html
+      end
+
       # Returns a radio buttons collection input for the given attribute
       def render_enum_form_field(form, attribute, name, i18n_scope, options)
         html = label_tag(name) do

data/app/packs/entrypoints/decidim_admin.js

@@ -20,7 +20,6 @@ import "src/decidim/admin/resources_permissions"
 import "src/decidim/admin/welcome_notification"
 import "src/decidim/admin/newsletters"
 import "src/decidim/admin/form"
-import "src/decidim/admin/import_guidance"
 import "src/decidim/admin/external_domain_whitelist"
 import "src/decidim/confirm"
 import "src/decidim/admin/draggable-list"