decidim-admin 0.20.0 → 0.23.1.rc1

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

@@ -93,8 +93,12 @@ module Decidim
           end
 
           def collection
+            # there's an unidentified corner case where Decidim::User
+            # may have been destroyed, but the related ParticipatorySpacePrivateUser
+            # remains in the database. That's why filtering by not null users
             @collection ||= privatable_to
                             .participatory_space_private_users
+                            .includes(:user).where.not("decidim_users.id" => nil)
                             .page(params[:page])
                             .per(20)
           end

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

@@ -6,6 +6,8 @@ module Decidim
     #
     class DashboardController < Decidim::Admin::ApplicationController
       helper_method :latest_action_logs
+      helper_method :users_counter
+      helper_method :metrics_presenter
 
       def show
         enforce_permission_to :read, :admin_dashboard
@@ -19,7 +21,37 @@ module Decidim
                                 .includes(:participatory_space, :user, :resource, :component, :version)
                                 .for_admin
                                 .order(created_at: :desc)
-                                .first(20)
+                                .first(5)
+      end
+
+      def metrics_presenter
+        @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
+          summary: true,
+          organization: current_organization
+        )
+      end
+
+      def users_counter
+        last_day = Time.zone.yesterday
+        last_week = Time.zone.today.prev_week
+        last_month = Time.zone.today.prev_month
+
+        {
+          total_admins_last_24: users_count(last_day, true),
+          total_admins_last_week: users_count(last_week, true),
+          total_admins_last_month: users_count(last_month, true),
+          total_participants_last_24: users_count(last_day, false),
+          total_participants_last_week: users_count(last_week, false),
+          total_participants_last_month: users_count(last_month, false)
+        }
+      end
+
+      def users_count(date, admin)
+        @users_count = Decidim::Admin::ActiveUsersCounter.new(
+          organization: current_organization,
+          date: date,
+          admin: admin
+        ).query.count
       end
     end
   end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class MetricsController < Decidim::Admin::ApplicationController
+      helper_method :metrics_presenter
+
+      def index
+        enforce_permission_to :read, :metrics
+      end
+
+      private
+
+      def metrics_presenter
+        @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
+          summary: false,
+          organization: current_organization
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing newsletters.
+    class NewsletterTemplatesController < Decidim::Admin::ApplicationController
+      helper_method :templates, :template_manifest
+
+      layout "decidim/admin/newsletters"
+
+      def index
+        enforce_permission_to :index, :newsletter
+      end
+
+      def show; end
+
+      def preview
+        email = NewsletterMailer.newsletter(current_user, fake_newsletter)
+        Premailer::Rails::Hook.perform(email)
+        render html: email.html_part.body.decoded.html_safe
+      end
+
+      private
+
+      def templates
+        @templates ||= Decidim.content_blocks.for(:newsletter_template)
+      end
+
+      def template_manifest
+        @template_manifest ||= Decidim
+                               .content_blocks
+                               .for(:newsletter_template)
+                               .find { |manifest| manifest.name.to_s == params[:id] }
+      end
+
+      def fake_newsletter
+        @fake_newsletter ||= Decidim::Admin::FakeNewsletter.new(current_organization, template_manifest)
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::NewslettersHelper
       include Decidim::Admin::NewslettersHelper
       include Paginable
-      helper_method :newsletter
+      helper_method :newsletter, :recipients_count_query, :content_block
 
       def index
         enforce_permission_to :index, :newsletter
@@ -17,7 +17,7 @@ module Decidim
 
       def new
         enforce_permission_to :create, :newsletter
-        @form = form(NewsletterForm).instance
+        @form = form(NewsletterForm).from_model(content_block)
       end
 
       def show
@@ -36,8 +36,9 @@ module Decidim
       def create
         enforce_permission_to :create, :newsletter
         @form = form(NewsletterForm).from_params(params)
+        @form.images = images_block_context unless has_images_block_context?
 
-        CreateNewsletter.call(@form, current_user) do
+        CreateNewsletter.call(@form, content_block, current_user) do
           on(:ok) do |newsletter|
             flash.now[:notice] = I18n.t("newsletters.create.success", scope: "decidim.admin")
             redirect_to action: :show, id: newsletter.id
@@ -53,12 +54,13 @@ module Decidim
 
       def edit
         enforce_permission_to :update, :newsletter, newsletter: newsletter
-        @form = form(NewsletterForm).from_model(newsletter)
+        @form = form(NewsletterForm).from_model(content_block)
       end
 
       def update
         enforce_permission_to :update, :newsletter, newsletter: newsletter
         @form = form(NewsletterForm).from_params(params)
+        @form.images = images_block_context unless has_images_block_context?
 
         UpdateNewsletter.call(newsletter, @form, current_user) do
           on(:ok) do |newsletter|
@@ -96,6 +98,12 @@ module Decidim
         @form.send_to_all_users = current_user.admin?
       end
 
+      def recipients_count
+        data = params.permit(data: {}).to_h[:data]
+        @form = form(SelectiveNewsletterForm).from_params(data)
+        render plain: recipients_count_query
+      end
+
       def deliver
         enforce_permission_to :update, :newsletter, newsletter: newsletter
         @form = form(SelectiveNewsletterForm).from_params(params)
@@ -127,6 +135,37 @@ module Decidim
       def newsletter
         @newsletter ||= collection.find_by(id: params[:id])
       end
+
+      def recipients_count_query
+        @form ||= form(SelectiveNewsletterForm).instance
+        NewsletterRecipients.for(@form).size
+      end
+
+      def content_block
+        @content_block ||= content_block_for_newsletter || content_block_from_manifest
+      end
+
+      def content_block_from_manifest
+        Decidim::ContentBlock.new(
+          organization: current_organization,
+          scope_name: :newsletter_template,
+          manifest_name: params[:newsletter_template_id]
+        )
+      end
+
+      def content_block_for_newsletter
+        return nil unless @newsletter
+
+        @content_block_for_newsletter ||= @newsletter.template
+      end
+
+      def images_block_context
+        form(NewsletterForm).from_model(content_block).images
+      end
+
+      def has_images_block_context?
+        @form.images && @form.valid?
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Decidim
     # Controller that allows managing user officializations at the admin panel.
     #
     class OfficializationsController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Officializations::Filterable
+
       layout "decidim/admin/users"
 
       helper_method :user
@@ -12,12 +14,7 @@ module Decidim
 
       def index
         enforce_permission_to :read, :officialization
-        @query = params[:q]
-        @state = params[:state]
-
-        @users = Decidim::Admin::UserFilter.for(current_organization.users.not_deleted, @query, @state)
-                                           .page(params[:page])
-                                           .per(15)
+        @users = filtered_collection
       end
 
       def new
@@ -52,8 +49,20 @@ module Decidim
         end
       end
 
+      def show_email
+        enforce_permission_to :show_email, :user, user: user
+
+        Decidim.traceability.perform_action! :show_email, user, current_user
+
+        render :show_email, layout: false
+      end
+
       private
 
+      def collection
+        @collection ||= current_organization.users.not_deleted
+      end
+
       def user
         @user ||= Decidim::User.find_by(
           id: params[:user_id],

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

@@ -5,6 +5,7 @@ module Decidim
     # Controller that allows managing the appearance of the organization.
     class OrganizationAppearanceController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
+      helper Decidim::Admin::UploaderImageDimensionsHelper
 
       def edit
         enforce_permission_to :update, :organization, organization: current_organization

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

@@ -37,10 +37,11 @@ module Decidim
               query = if term.start_with?("@")
                         query.where("nickname ILIKE ?", "#{term.delete("@")}%")
                       else
-                        query.where("name ILIKE ?", "%#{term}%")
+                        query.where("name ILIKE ?", "%#{term}%").or(
+                          query.where("email ILIKE ?", "%#{term}%")
+                        )
                       end
-
-              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
+              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname}) #{u.email}" } }
             else
               render json: []
             end

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

@@ -22,6 +22,7 @@ module Decidim
             redirect_to edit_organization_homepage_path
           end
           on(:invalid) do
+            edit # Sets the model to the view so that it can render the form
             render :edit
           end
         end
@@ -55,7 +56,7 @@ module Decidim
       def content_block_from_manifest
         Decidim::ContentBlock.create!(
           organization: current_organization,
-          scope: :homepage,
+          scope_name: :homepage,
           manifest_name: params[:id]
         )
       end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ShareTokensController < Decidim::Admin::ApplicationController
+      def destroy
+        enforce_permission_to :destroy, :share_token, share_token: share_token
+
+        DestroyShareToken.call(share_token, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("share_tokens.destroy.success", scope: "decidim.admin")
+          end
+          on(:invalid) do
+            flash[:error] = I18n.t("share_tokens.destroy.error", scope: "decidim.admin")
+          end
+        end
+
+        redirect_back(fallback_location: root_path)
+      end
+
+      private
+
+      def share_token
+        @share_token ||= Decidim::ShareToken.where(
+          organization: current_organization
+        ).find(params[:id])
+      end
+    end
+  end
+end

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

@@ -16,12 +16,15 @@ module Decidim
       mimic :attachment
 
       validates :file, presence: true, unless: :persisted?
+      validates :file, passthru: { to: Decidim::Attachment }
       validates :title, :description, translatable_presence: true
       validates :attachment_collection, presence: true, if: ->(form) { form.attachment_collection_id.present? }
       validates :attachment_collection_id, inclusion: { in: :attachment_collection_ids }, allow_blank: true
 
       delegate :attached_to, to: :context, prefix: false
 
+      alias organization current_organization
+
       def attachment_collections
         @attachment_collections ||= attached_to.attachment_collections
       end

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

@@ -23,8 +23,7 @@ module Decidim
       attribute :default_step_settings, Object
       attribute :step_settings, Hash[String => Object]
 
-      validate :must_be_able_to_change_participatory_texts_setting
-      validate :amendments_visibility_options_must_be_valid
+      attribute :share_tokens, Array[ShareToken]
 
       def settings?
         settings.manifest.attributes.any?
@@ -34,6 +33,10 @@ module Decidim
         default_step_settings.manifest.attributes.any?
       end
 
+      def map_model(model)
+        self.share_tokens = model.share_tokens
+      end
+
       private
 
       # Overwrites Rectify::Form#form_attributes_valid? to validate nested `step_settings` attributes.
@@ -54,26 +57,6 @@ module Decidim
                        end
         validations.all?
       end
-
-      # Validates setting `participatory_texts_enabled` is not changed when there are proposals for the component.
-      def must_be_able_to_change_participatory_texts_setting
-        return unless manifest&.name == :proposals && (component = Component.find_by(id: id))
-        return unless settings.participatory_texts_enabled != component.settings.participatory_texts_enabled
-
-        settings.errors.add(:participatory_texts_enabled) if Decidim::Proposals::Proposal.where(component: component).any?
-      end
-
-      # Validates setting `amendments_visibility` is included in Decidim::Amendment::VisibilityStepSetting.options.
-      def amendments_visibility_options_must_be_valid
-        return unless manifest&.name == :proposals && settings.amendments_enabled
-
-        visibility_options = Decidim::Amendment::VisibilityStepSetting.options.map(&:last)
-        step_settings.each do |step, settings|
-          next unless visibility_options.exclude? settings[:amendments_visibility]
-
-          step_settings[step].errors.add(:amendments_visibility, :inclusion)
-        end
-      end
     end
   end
 end

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

@@ -3,14 +3,26 @@
 module Decidim
   module Admin
     # The form that validates the data to construct a valid Newsletter.
-    class NewsletterForm < Decidim::Form
+    class NewsletterForm < ContentBlockForm
       mimic :newsletter
 
       include TranslatableAttributes
 
       translatable_attribute :subject, String
-      translatable_attribute :body, String
-      validates :subject, :body, translatable_presence: true
+      validates :subject, translatable_presence: true
+
+      def map_model(content_block)
+        super(content_block)
+        self.subject = newsletter_for(content_block).try(:subject)
+      end
+
+      private
+
+      def newsletter_for(content_block)
+        Decidim::Newsletter
+          .where(organization: content_block.organization)
+          .find_by(id: content_block.scoped_resource_id)
+      end
     end
   end
 end

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

@@ -7,6 +7,7 @@ module Decidim
     #
     class OrganizationAppearanceForm < Form
       include TranslatableAttributes
+      include Decidim::HasUploadValidations
 
       mimic :organization
 
@@ -34,6 +35,8 @@ module Decidim
       attribute :success_color, String, default: "#57d685"
       attribute :warning_color, String, default: "#ffae00"
       attribute :alert_color, String, default: "#ec5840"
+      attribute :highlight_color, String, default: "#be6400"
+      attribute :highlight_alternative_color, String, default: "#ff5731"
 
       translatable_attribute :cta_button_text, String
       translatable_attribute :description, String
@@ -48,14 +51,12 @@ module Decidim
       validates :official_img_header,
                 :official_img_footer,
                 :logo,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
+                passthru: { to: Decidim::Organization }
 
       validates :highlighted_content_banner_action_url, presence: true, if: :highlighted_content_banner_enabled?
       validates :highlighted_content_banner_image,
                 presence: true,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] },
+                passthru: { to: Decidim::Organization },
                 if: :highlighted_content_banner_image_is_changed?
 
       validates :highlighted_content_banner_title,
@@ -74,6 +75,8 @@ module Decidim
       validates :omnipresent_banner_title, translatable_presence: true, if: :enable_omnipresent_banner?
       validates :omnipresent_banner_short_description, translatable_presence: true, if: :enable_omnipresent_banner?
 
+      alias organization current_organization
+
       private
 
       def highlighted_content_banner_enabled?