decidim-admin 0.21.0 → 0.22.0

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

@@ -102,7 +102,9 @@ module Decidim
             secondary: form.secondary_color,
             success: form.success_color,
             warning: form.warning_color,
-            alert: form.alert_color
+            alert: form.alert_color,
+            highlight: form.highlight_color,
+            "highlight-alternative": form.highlight_alternative_color
           }
         }
       end

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

@@ -9,6 +9,12 @@ module Decidim
         enforce_permission_to :index, :authorization_workflow
 
         @workflows = Decidim::Verifications.admin_workflows
+
+        # Decidim::Verifications::Authorizations Query
+        @authorizations = Decidim::Verifications::Authorizations.new(
+          organization: current_organization,
+          granted: true
+        ).query
       end
     end
   end

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

@@ -23,11 +23,11 @@ module Decidim
           participatory_space: current_participatory_space
         )
 
-        @form = form(ComponentForm).from_model(@component)
+        @form = form(@component.form_class).from_model(@component)
       end
 
       def create
-        @form = form(ComponentForm).from_params(component_params)
+        @form = form(manifest.component_form_class).from_params(component_params)
         enforce_permission_to :create, :component
 
         CreateComponent.call(@form) do
@@ -47,12 +47,12 @@ module Decidim
         @component = query_scope.find(params[:id])
         enforce_permission_to :update, :component, component: @component
 
-        @form = form(ComponentForm).from_model(@component)
+        @form = form(@component.form_class).from_model(@component)
       end
 
       def update
         @component = query_scope.find(params[:id])
-        @form = form(ComponentForm).from_params(component_params)
+        @form = form(@component.form_class).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
         UpdateComponent.call(@form, @component) do
@@ -113,7 +113,7 @@ module Decidim
 
       private
 
-      # Processes the component params so Decidim::Admin::ComponentForm
+      # Processes the component params so the form object defined in the manifest (component_form_class_name)
       # can assign and validate the attributes when using #from_params.
       def component_params
         new_settings = proc { |name, data| Component.build_settings(manifest, name, data, current_organization) }
@@ -126,6 +126,7 @@ module Decidim
           if hsh[:default_step_settings]
             hsh[:default_step_settings] = new_settings.call(:step, hsh[:default_step_settings])
           else
+            hsh[:step_settings] ||= {}
             hsh[:step_settings].each do |key, value|
               hsh[:step_settings][key] = new_settings.call(:step, value)
             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, :recipients_count_query
+      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
@@ -37,7 +37,7 @@ module Decidim
         enforce_permission_to :create, :newsletter
         @form = form(NewsletterForm).from_params(params)
 
-        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,7 +53,7 @@ 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
@@ -138,6 +138,24 @@ module Decidim
         @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
     end
   end
 end

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

@@ -49,6 +49,14 @@ 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

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

@@ -55,7 +55,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/forms/decidim/admin/component_form.rb

@@ -23,9 +23,6 @@ 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
-
       def settings?
         settings.manifest.attributes.any?
       end
@@ -54,26 +51,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

@@ -34,6 +34,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

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

@@ -5,44 +5,46 @@ module Decidim
     # Helper that provides methods related to Decidim::Admin::Filterable concern.
     module FilterableHelper
       # Renders the filters selector with tags in the admin panel.
-      def admin_filter_selector
-        render partial: "decidim/admin/shared/filters"
+      def admin_filter_selector(i18n_ctx = nil)
+        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: i18n_ctx }
       end
 
       # Builds a tree of links from Decidim::Admin::Filterable::filters_with_values
-      def submenu_options_tree
+      def submenu_options_tree(i18n_ctx = nil)
+        i18n_scope = filterable_i18n_scope_from_ctx(i18n_ctx)
+
         filters_with_values.each_with_object({}) do |(filter, values), hash|
-          link = filter_link_label(filter)
+          link = filter_link_label(filter, i18n_scope)
           hash[link] = if values.is_a?(Array)
-                         build_submenu_options_tree_from_array(filter, values)
+                         build_submenu_options_tree_from_array(filter, values, i18n_scope)
                        elsif values.is_a?(Hash)
-                         build_submenu_options_tree_from_hash(filter, values)
+                         build_submenu_options_tree_from_hash(filter, values, i18n_scope)
                        end
         end
       end
 
       # Builds a tree of links from an array. The tree will have only one level.
-      def build_submenu_options_tree_from_array(filter, values)
+      def build_submenu_options_tree_from_array(filter, values, i18n_scope)
         links = []
-        links += extra_dropdown_submenu_options_items(filter)
-        links += values.map { |value| filter_link_value(filter, value) }
+        links += extra_dropdown_submenu_options_items(filter, i18n_scope)
+        links += values.map { |value| filter_link_value(filter, value, i18n_scope) }
         links.each_with_object({}) { |link, hash| hash[link] = nil }
       end
 
       # To be overriden. Useful for adding links that do not match with the filter.
       # Must return an Array.
-      def extra_dropdown_submenu_options_items(_filter)
+      def extra_dropdown_submenu_options_items(_filter, _i18n_scope)
         []
       end
 
       # Builds a tree of links from an Hash. The tree can have many levels.
-      def build_submenu_options_tree_from_hash(filter, values)
+      def build_submenu_options_tree_from_hash(filter, values, i18n_scope)
         values.each_with_object({}) do |(key, value), hash|
-          link = filter_link_value(filter, key)
+          link = filter_link_value(filter, key, i18n_scope)
           hash[link] = if value.nil?
                          nil
                        elsif value.is_a?(Hash)
-                         build_submenu_options_tree_from_hash(filter, value)
+                         build_submenu_options_tree_from_hash(filter, value, i18n_scope)
                        end
         end
       end
@@ -63,21 +65,21 @@ module Decidim
         end
       end
 
-      def filter_link_label(filter)
-        link_to(i18n_filter_label(filter), href: "#")
+      def filter_link_label(filter, i18n_scope)
+        link_to(i18n_filter_label(filter, i18n_scope), href: "#")
       end
 
-      def filter_link_value(filter, value)
-        link_to(i18n_filter_value(filter, value), query_params_with(filter => value))
+      def filter_link_value(filter, value, i18n_scope)
+        link_to(i18n_filter_value(filter, value, i18n_scope), query_params_with(filter => value))
       end
 
-      def i18n_filter_label(filter)
-        t("decidim.admin.filters.#{filter}.label")
+      def i18n_filter_label(filter, i18n_scope)
+        t("#{i18n_scope}.#{filter}.label")
       end
 
-      def i18n_filter_value(filter, value)
-        if I18n.exists?("decidim.admin.filters.#{filter}.values.#{value}")
-          t(value, scope: "decidim.admin.filters.#{filter}.values")
+      def i18n_filter_value(filter, value, i18n_scope)
+        if I18n.exists?("#{i18n_scope}.#{filter}.values.#{value}")
+          t(value, scope: "#{i18n_scope}.#{filter}.values")
         else
           find_dynamic_translation(filter, value)
         end
@@ -94,16 +96,16 @@ module Decidim
         html.join.html_safe
       end
 
-      def applied_filters_tags
+      def applied_filters_tags(i18n_ctx)
         ransack_params.slice(*filters).map do |filter, value|
-          applied_filter_tag(filter, value)
+          applied_filter_tag(filter, value, filterable_i18n_scope_from_ctx(i18n_ctx))
         end.join.html_safe
       end
 
-      def applied_filter_tag(filter, value)
+      def applied_filter_tag(filter, value, i18n_scope)
         content_tag(:span, class: "label secondary") do
-          concat "#{i18n_filter_label(filter)}: "
-          concat i18n_filter_value(filter, value)
+          concat "#{i18n_filter_label(filter, i18n_scope)}: "
+          concat i18n_filter_value(filter, value, i18n_scope)
           concat remove_filter_icon_link(filter)
         end
       end
@@ -116,6 +118,12 @@ module Decidim
           class: "action-icon--remove"
         )
       end
+
+      def filterable_i18n_scope_from_ctx(i18n_ctx)
+        i18n_scope = "decidim.admin.filters"
+        i18n_scope += ".#{i18n_ctx}" if i18n_ctx
+        i18n_scope
+      end
     end
   end
 end