decidim-admin 0.24.1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d52ae9fcffb3e782e0bf7b4216019601fc4c2defffcb39fbb88dff6c46e32c
-  data.tar.gz: 2d88672aabb4301b2e94f1a4d2ea50e9d4c6ce42e69d0fbcb1e510bfbbfba3d2
+  metadata.gz: ba9be1d6c92c0df366c8123da99195741a4a425449871b05cd6817bf2668d9fd
+  data.tar.gz: d327790d313875ce63bfcef6d8a0d8982241ae817e26b2f0c13a34400bfb7820
 SHA512:
-  metadata.gz: 529eeac493175112da378e88260f4683f3586f1fc103ec76ac620e56f6020d767f93cbcca083ae4c8cc2782a5fe829c576dd44018d02327b8604b1b4e66ee37b
-  data.tar.gz: 308ffcd35991512110706245ecd84c1e3e43d226bc93852cf31210285417702fe0795eb54c2e05c154e0f110940a9ccc5f058689ee69313820766524d064471f
+  metadata.gz: 7e556f0359466879de42ba44514c6ba4b62a710f5e48571fa3c69e82881803a5152e0870079e1b8b83eba4c7d949162d4a5560d6d91ad76b988860bcc4f7086b
+  data.tar.gz: 7033fd5c958bfc75b324d98cf3d91dac969a2f9531a32bcf70c8414061917e3e1e320c750451ac5e6c0c3314b87f3cd9152f65f18ed08d399341c1a7d827091f

data/app/cells/decidim/admin/content_block/show.erb

@@ -4,10 +4,10 @@
     <div>
       <% if has_settings? %>
         <%= link_to edit_content_block_path, class: "mr-s text-muted" do %>
-          <%= icon "pencil", role: "img" %>
+          <%= icon "pencil", role: "img", "aria-hidden": true %>
         <% end %>
       <% end %>
-      <%= icon "menu", role: "img" %>
+      <%= icon "menu", role: "img", "aria-hidden": true %>
     </div>
   </div>
 </li>

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

@@ -55,6 +55,12 @@ module Decidim
           extra: {
             reportable_type: form.user.class.name,
             current_justification: form.justification
+          },
+          resource: {
+            # Make sure the action log entry gets the original user name instead
+            # of "Blocked user". Otherwise the log entries would show funny
+            # messages such as "Mr. Admin blocked user Blocked user"-
+            title: form.user.name
           }
         ) do
           form.user.blocked = true

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

@@ -46,7 +46,8 @@ module Decidim
           attached_to: @attached_to,
           weight: form.weight,
           attachment_collection: form.attachment_collection,
-          file: form.file # Define attached_to before this
+          file: form.file, # Define attached_to before this
+          content_type: form.file.content_type
         )
       end
 

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

@@ -45,6 +45,7 @@ module Decidim
           }
         ) do
           @reportable.moderation.update!(hidden_at: Time.current)
+          @reportable.try(:touch)
         end
       end
 

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

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def process_csv
-        CSV.foreach(@form.file.path) do |email, user_name|
+        CSV.foreach(@form.file.path, encoding: "BOM|UTF-8") do |email, user_name|
           ImportParticipatorySpacePrivateUserCsvJob.perform_later(email, user_name, @private_users_to, @current_user) if email.present? && user_name.present?
         end
       end

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

@@ -5,6 +5,8 @@ module Decidim
     # A command with all the business logic to update an attachment from a
     # participatory process.
     class UpdateAttachment < Rectify::Command
+      include ::Decidim::AttachmentAttributesMethods
+
       attr_reader :attachment
 
       # Public: Initializes the command.
@@ -44,7 +46,9 @@ module Decidim
           description: form.description,
           weight: form.weight,
           attachment_collection: form.attachment_collection
-        }.reject do |attribute, value|
+        }.merge(
+          attachment_attributes(:file)
+        ).reject do |attribute, value|
           value.blank? && attribute != :attachment_collection
         end
       end

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

@@ -70,7 +70,7 @@ module Decidim
           if form.images[image_name]
             content_block.images_container.send("#{image_name}=", form.images[image_name])
           elsif form.images["remove_#{image_name}".to_sym] == "1"
-            content_block.images_container.send("remove_#{image_name}=", true)
+            content_block.images_container.send("#{image_name}=", nil)
           end
         end
       end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class UpdateExternalDomainWhitelist < Rectify::Command
+      attr_reader :form, :organization
+
+      def initialize(form, organization)
+        @form = form
+        @organization = organization
+      end
+
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        save_domains!
+
+        broadcast(:ok)
+      end
+
+      private
+
+      def save_domains!
+        organization.external_domain_whitelist = form.external_domains.filter_map do |external_domain_form|
+          external_domain_form.value unless external_domain_form.deleted
+        end.flatten
+
+        organization.save!
+      end
+    end
+  end
+end

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

@@ -56,7 +56,8 @@ module Decidim
           comments_max_length: form.comments_max_length,
           enable_machine_translations: form.enable_machine_translations,
           admin_terms_of_use_body: form.admin_terms_of_use_body,
-          rich_text_editor_in_public_views: form.rich_text_editor_in_public_views
+          rich_text_editor_in_public_views: form.rich_text_editor_in_public_views,
+          enable_participatory_space_filters: form.enable_participatory_space_filters
         }.merge(welcome_notification_attributes)
           .merge(machine_translation_attributes || {})
       end

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

@@ -5,14 +5,13 @@ module Decidim
     # A command with all the business logic for updating the current
     # organization appearance.
     class UpdateOrganizationAppearance < Rectify::Command
+      include ::Decidim::AttachmentAttributesMethods
+
       # Public: Initializes the command.
       #
       # organization - The Organization that will be updated.
       # form - A form object with the params.
       def initialize(organization, form)
-        image_fields.each do |field|
-          form.send("#{field}=".to_sym, organization.send(field)) if form.send(field).blank?
-        end
         @organization = organization
         @form = form
       end
@@ -40,7 +39,7 @@ module Decidim
       private
 
       def image_fields
-        [:highlighted_content_banner_image, :logo, :favicon, :official_img_header, :official_img_footer]
+        [:logo, :highlighted_content_banner_image, :favicon, :official_img_header, :official_img_footer]
       end
 
       attr_reader :form, :organization
@@ -55,6 +54,7 @@ module Decidim
 
       def attributes
         appearance_attributes
+          .merge(attachment_attributes(*image_fields))
           .merge(highlighted_content_banner_attributes)
           .merge(omnipresent_banner_attributes)
           .merge(colors_attributes)
@@ -69,14 +69,6 @@ module Decidim
           cta_button_path: form.cta_button_path,
           cta_button_text: form.cta_button_text,
           description: form.description,
-          logo: form.logo,
-          remove_logo: form.remove_logo,
-          favicon: form.favicon,
-          remove_favicon: form.remove_favicon,
-          official_img_header: form.official_img_header,
-          remove_official_img_header: form.remove_official_img_header,
-          official_img_footer: form.official_img_footer,
-          remove_official_img_footer: form.remove_official_img_footer,
           official_url: form.official_url
         }
       end
@@ -85,8 +77,6 @@ module Decidim
         {
           highlighted_content_banner_enabled: form.highlighted_content_banner_enabled,
           highlighted_content_banner_action_url: form.highlighted_content_banner_action_url,
-          highlighted_content_banner_image: form.highlighted_content_banner_image,
-          remove_highlighted_content_banner_image: form.remove_highlighted_content_banner_image,
           highlighted_content_banner_title: form.highlighted_content_banner_title,
           highlighted_content_banner_short_description: form.highlighted_content_banner_short_description,
           highlighted_content_banner_action_title: form.highlighted_content_banner_action_title,

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

@@ -105,9 +105,7 @@ module Decidim
         # with true and false as values. If these values fit your filtering needs,
         # you won't have to declare a `filters_with_values` method in your concern.
         def filters_with_values
-          filters.each_with_object({}) do |filter, hash|
-            hash[filter] = [true, false]
-          end
+          filters.index_with { [true, false] }
         end
 
         # Plural model name. Used in search_field placeholder.

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatorySpacePrivateUsers
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def filters
+            [
+              :user_invitation_sent_at_not_null,
+              :user_invitation_accepted_at_not_null
+            ]
+          end
+
+          def search_field_predicate
+            :user_name_or_user_email_cont
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/concerns/has_attachments.rb

@@ -116,10 +116,7 @@ module Decidim
           private
 
           def attachment_params
-            {
-              id: params[:id],
-              file: @attachment.file
-            }.merge(params[:attachment].to_unsafe_h)
+            { id: params[:id] }.merge(params[:attachment].to_unsafe_h)
           end
         end
       end

data/app/controllers/decidim/admin/concerns/has_private_users.rb

@@ -13,8 +13,9 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
+          include Decidim::ParticipatorySpacePrivateUsers::Admin::Filterable
           helper PaginateHelper
-          helper_method :privatable_to, :collection
+          helper_method :privatable_to, :participatory_space_private_users
 
           def index
             enforce_permission_to :read, :space_private_user
@@ -99,8 +100,10 @@ module Decidim
             @collection ||= privatable_to
                             .participatory_space_private_users
                             .includes(:user).where.not("decidim_users.id" => nil)
-                            .page(params[:page])
-                            .per(20)
+          end
+
+          def participatory_space_private_users
+            filtered_collection
           end
         end
       end

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

@@ -5,6 +5,7 @@ module Decidim
     # This controller allows admins to import resources from a file.
     class ImportsController < Decidim::Admin::ApplicationController
       include Decidim::ComponentPathHelper
+      helper UserGroupHelper
 
       def new
         enforce_permission_to :import, :component_data, component: current_component

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

@@ -32,12 +32,16 @@ module Decidim
       private
 
       def reportable
-        @reportable ||= UserModeration.find(params[:id]).user
+        @reportable ||= base_query_finder.find(params[:id]).user
+      end
+
+      def base_query_finder
+        UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: current_organization.id })
       end
 
       def collection
         target_scope = params[:blocked] && params[:blocked] == "true" ? :blocked : :unblocked
-        UserModeration.send(target_scope)
+        base_query_finder.send(target_scope)
       end
     end
   end

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

@@ -30,10 +30,20 @@ module Decidim
       end
 
       def users
+        search(current_organization.users)
+      end
+
+      def user_entities
+        search(current_organization.user_entities)
+      end
+
+      private
+
+      def search(relation)
         respond_to do |format|
           format.json do
             if (term = params[:term].to_s).present?
-              query = current_organization.users.order(name: :asc)
+              query = relation.order(name: :asc)
               query = if term.start_with?("@")
                         query.where("nickname ILIKE ?", "#{term.delete("@")}%")
                       else

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class OrganizationExternalDomainWhitelistController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/settings"
+
+      helper_method :blank_external_domain
+
+      def edit
+        enforce_permission_to :update, :organization, organization: current_organization
+        @form = form(OrganizationExternalDomainWhitelistForm).from_model(current_organization)
+      end
+
+      def update
+        enforce_permission_to :update, :organization, organization: current_organization
+        @form = form(OrganizationExternalDomainWhitelistForm).from_params(params)
+
+        UpdateExternalDomainWhitelist.call(@form, current_organization) do
+          on(:ok) do
+            flash[:notice] = t("domain_whitelist.update.success", scope: "decidim.admin")
+            redirect_to edit_organization_external_domain_whitelist_path
+          end
+          on(:invalid) do
+            flash[:notice] = t("domain_whitelist.update.error", scope: "decidim.admin")
+            render action: "edit"
+          end
+        end
+      end
+
+      private
+
+      def blank_external_domain
+        @blank_external_domain ||= Admin::ExternalDomainForm.new
+      end
+    end
+  end
+end

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

@@ -5,9 +5,11 @@ module Decidim
     # Controller that allows managing all admins at the admin panel.
     #
     class UsersController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Officializations::Filterable
+
       def index
         enforce_permission_to :read, :admin_user
-        @users = collection.page(params[:page]).per(15)
+        @users = filtered_collection
       end
 
       def new
@@ -80,6 +82,10 @@ module Decidim
       def collection
         @collection ||= current_organization.admins.or(current_organization.users_with_any_role)
       end
+
+      def filters
+        [:invitation_accepted_at_present, :last_sign_in_at_present]
+      end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ExternalDomainForm < Form
+      attribute :value, String
+      attribute :position, Integer
+      attribute :deleted, Boolean, default: false
+
+      validates :value, presence: true, unless: :deleted
+
+      def to_param
+        return id if id.present?
+
+        "external-domain-id"
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module Decidim
   module Admin
     class ImportForm < Form
       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 :file

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

@@ -12,20 +12,20 @@ module Decidim
       mimic :organization
 
       attribute :logo
-      attribute :remove_logo
+      attribute :remove_logo, Boolean, default: false
       attribute :favicon
-      attribute :remove_favicon
+      attribute :remove_favicon, Boolean, default: false
       attribute :official_img_header
-      attribute :remove_official_img_header
+      attribute :remove_official_img_header, Boolean, default: false
       attribute :official_img_footer
-      attribute :remove_official_img_footer
+      attribute :remove_official_img_footer, Boolean, default: false
       attribute :official_url
       attribute :header_snippets, String
       attribute :cta_button_path, String
       attribute :highlighted_content_banner_enabled, Boolean, default: false
       attribute :highlighted_content_banner_action_url, String
       attribute :highlighted_content_banner_image
-      attribute :remove_highlighted_content_banner_image
+      attribute :remove_highlighted_content_banner_image, Boolean, default: false
       attribute :enable_omnipresent_banner, Boolean, default: false
       attribute :omnipresent_banner_url, String
 
@@ -52,7 +52,7 @@ module Decidim
                 :logo,
                 passthru: { to: Decidim::Organization }
 
-      validates :highlighted_content_banner_action_url, presence: true, if: :highlighted_content_banner_enabled?
+      validates :highlighted_content_banner_action_url, url: true, presence: true, if: :highlighted_content_banner_enabled?
       validates :highlighted_content_banner_image,
                 presence: true,
                 passthru: { to: Decidim::Organization },
@@ -70,7 +70,7 @@ module Decidim
                 translatable_presence: true,
                 if: :highlighted_content_banner_enabled?
 
-      validates :omnipresent_banner_url, presence: true, if: :enable_omnipresent_banner?
+      validates :omnipresent_banner_url, url: true, presence: true, if: :enable_omnipresent_banner?
       validates :omnipresent_banner_title, translatable_presence: true, if: :enable_omnipresent_banner?
       validates :omnipresent_banner_short_description, translatable_presence: true, if: :enable_omnipresent_banner?