decidim-admin 0.20.1 → 0.21.0

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Officializations
+      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
+            [:officialized_at_null]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Paginable
+      # Common logic to paginate admin resources
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Paginable
+
+        def per_page
+          params[:per_page].present? ? params[:per_page].to_i : Decidim::Admin.per_page_range.first
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # The controller to handle the Admin
+    # Terms of use agreement.
+    class AdminTermsController < Decidim::Admin::ApplicationController
+      def accept
+        current_user.admin_terms_accepted_at = Time.current
+        if current_user.save!
+          flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_use")
+          redirect_to decidim_admin.root_path
+        else
+          flash[:alert] = t("accept.error", scope: "decidim.admin.admin_terms_of_use")
+          redirect_to decidim_admin.admin_terms_show_path
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       include NeedsPermission
       include FormFactory
       include LocaleSwitcher
+      include UseOrganizationTimeZone
       include PayloadInfo
       include HttpCachingDisabler
 
@@ -17,6 +18,7 @@ module Decidim
       helper Decidim::Admin::IconLinkHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
+      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

data/app/controllers/decidim/admin/components/base_controller.rb

@@ -22,7 +22,7 @@ module Decidim
                       :parent_path
 
         before_action except: [:index, :show] do
-          enforce_permission_to :manage, :component, component: current_component
+          enforce_permission_to :manage, :component, component: current_component unless skip_manage_component_permission
         end
 
         before_action on: [:index, :show] do
@@ -59,6 +59,10 @@ module Decidim
         def parent_path
           @parent_path ||= ::Decidim::EngineRouter.admin_proxy(current_participatory_space).components_path
         end
+
+        def skip_manage_component_permission
+          false
+        end
       end
     end
   end

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

@@ -27,7 +27,7 @@ module Decidim
       end
 
       def create
-        @form = form(ComponentForm).from_params(form_params)
+        @form = form(ComponentForm).from_params(component_params)
         enforce_permission_to :create, :component
 
         CreateComponent.call(@form) do
@@ -52,7 +52,7 @@ module Decidim
 
       def update
         @component = query_scope.find(params[:id])
-        @form = form(ComponentForm).from_params(form_params)
+        @form = form(ComponentForm).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
         UpdateComponent.call(@form, @component) do
@@ -113,28 +113,24 @@ module Decidim
 
       private
 
-      # Returns a Class with the attributes sanitized, coerced  and filtered
-      # to the right type. See Decidim::SettingsManifest#schema.
-      def new_settings_schema(name, data)
-        manifest.settings(name).schema.new(data, current_organization.default_locale)
-      end
-
       # Processes the component params so Decidim::Admin::ComponentForm
       # can assign and validate the attributes when using #from_params.
-      def form_params
-        form_params = params[:component].permit!
-        form_params[:id] = params[:id]
-        form_params[:manifest] = manifest
-        form_params[:participatory_space] = current_participatory_space
-        form_params[:settings] = new_settings_schema(:global, form_params[:settings])
-        if form_params[:default_step_settings]
-          form_params[:default_step_settings] = new_settings_schema(:step, form_params[:default_step_settings])
-        else
-          form_params[:step_settings].each do |key, value|
-            form_params[:step_settings][key] = new_settings_schema(:step, value)
+      def component_params
+        new_settings = proc { |name, data| Component.build_settings(manifest, name, data, current_organization) }
+
+        params[:component].permit!.tap do |hsh|
+          hsh[:id] = params[:id]
+          hsh[:manifest] = manifest
+          hsh[:participatory_space] = current_participatory_space
+          hsh[:settings] = new_settings.call(:global, hsh[:settings])
+          if hsh[:default_step_settings]
+            hsh[:default_step_settings] = new_settings.call(:step, hsh[:default_step_settings])
+          else
+            hsh[:step_settings].each do |key, value|
+              hsh[:step_settings][key] = new_settings.call(:step, value)
+            end
           end
         end
-        form_params
       end
 
       def query_scope

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/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
 
       def index
         enforce_permission_to :index, :newsletter
@@ -96,6 +96,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 +133,11 @@ 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
     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
@@ -54,6 +51,10 @@ module Decidim
 
       private
 
+      def collection
+        @collection ||= current_organization.users.not_deleted
+      end
+
       def user
         @user ||= Decidim::User.find_by(
           id: params[:user_id],

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

@@ -12,6 +12,7 @@ module Decidim
 
       attribute :name, String
       attribute :reference_prefix, String
+      attribute :time_zone, String
       attribute :twitter_handler, String
       attribute :facebook_handler, String
       attribute :instagram_handler, String
@@ -20,6 +21,7 @@ module Decidim
       attribute :default_locale, String
       attribute :badges_enabled, Boolean
       attribute :user_groups_enabled, Boolean
+      attribute :rich_text_editor_in_public_views, Boolean
 
       attribute :send_welcome_notification, Boolean
       attribute :customize_welcome_notification, Boolean
@@ -27,11 +29,16 @@ module Decidim
       translatable_attribute :welcome_notification_subject, String
       translatable_attribute :welcome_notification_body, String
 
+      translatable_attribute :admin_terms_of_use_body, String
+
       validates :welcome_notification_subject, :welcome_notification_body, translatable_presence: true, if: proc { |form| form.customize_welcome_notification }
 
       validates :name, presence: true
+      validates :time_zone, presence: true
+      validates :time_zone, time_zone: true
       validates :default_locale, :reference_prefix, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
+      validates :admin_terms_of_use_body, translatable_presence: true
 
       private
 

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to show Admin Terms of Use
+    module AdminTermsHelper
+      def admin_terms_of_use_body
+        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")
+        else
+          t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+        end
+      end
+
+      def button_to_accept_admin_terms
+        button_to(
+          t("decidim.admin.admin_terms_of_use.actions.accept"),
+          admin_terms_accept_path,
+          class: "button success",
+          method: :put
+        )
+      end
+
+      def button_to_refuse_admin_terms
+        link_to(
+          t("decidim.admin.admin_terms_of_use.actions.refuse"),
+          decidim.root_path,
+          class: "button clear",
+          data: {
+            confirm: t("actions.are_you_sure", scope: "decidim.admin.admin_terms_of_use")
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Decidim
       include Decidim::MetaTagsHelper
       include Decidim::MapHelper
       include Decidim::Admin::LogRenderHelper
+      include Decidim::Admin::UserRolesHelper
 
       def title
         current_organization.name

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This module includes helpers to be used in the admin dashboard, including helper methods to show the Admin Terms of Use.
+    module DashboardHelper
+      def admin_terms_announcement_args
+        {
+          callout_class: "warning",
+          announcement: announcement_body
+        }
+      end
+
+      def announcement_body
+        body = t("required_review.callout", scope: "decidim.admin.admin_terms_of_use")
+        body += " "
+        body += link_to(
+          t("required_review.cta", scope: "decidim.admin.admin_terms_of_use"),
+          admin_terms_show_path
+        )
+        body
+      end
+    end
+  end
+end

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

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # 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"
+      end
+
+      # Builds a tree of links from Decidim::Admin::Filterable::filters_with_values
+      def submenu_options_tree
+        filters_with_values.each_with_object({}) do |(filter, values), hash|
+          link = filter_link_label(filter)
+          hash[link] = if values.is_a?(Array)
+                         build_submenu_options_tree_from_array(filter, values)
+                       elsif values.is_a?(Hash)
+                         build_submenu_options_tree_from_hash(filter, values)
+                       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)
+        links = []
+        links += extra_dropdown_submenu_options_items(filter)
+        links += values.map { |value| filter_link_value(filter, value) }
+        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)
+        []
+      end
+
+      # Builds a tree of links from an Hash. The tree can have many levels.
+      def build_submenu_options_tree_from_hash(filter, values)
+        values.each_with_object({}) do |(key, value), hash|
+          link = filter_link_value(filter, key)
+          hash[link] = if value.nil?
+                         nil
+                       elsif value.is_a?(Hash)
+                         build_submenu_options_tree_from_hash(filter, value)
+                       end
+        end
+      end
+
+      # Produces the html for the dropdown submenu from the options tree.
+      # Returns a ActiveSupport::SafeBuffer.
+      def dropdown_submenu(options)
+        content_tag(:ul, class: "vertical menu") do
+          options.map do |key, value|
+            if value.nil?
+              content_tag(:li, key)
+            elsif value.is_a?(Hash)
+              content_tag(:li, class: "is-dropdown-submenu-parent") do
+                key + dropdown_submenu(value)
+              end
+            end
+          end.join.html_safe
+        end
+      end
+
+      def filter_link_label(filter)
+        link_to(i18n_filter_label(filter), href: "#")
+      end
+
+      def filter_link_value(filter, value)
+        link_to(i18n_filter_value(filter, value), query_params_with(filter => value))
+      end
+
+      def i18n_filter_label(filter)
+        t("decidim.admin.filters.#{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")
+        else
+          find_dynamic_translation(filter, value)
+        end
+      end
+
+      def applied_filters_hidden_field_tags
+        html = []
+        html += ransack_params.slice(*filters, *extra_filters).map do |filter, value|
+          hidden_field_tag("q[#{filter}]", value)
+        end
+        html += query_params.slice(*extra_allowed_params).map do |filter, value|
+          hidden_field_tag(filter, value)
+        end
+        html.join.html_safe
+      end
+
+      def applied_filters_tags
+        ransack_params.slice(*filters).map do |filter, value|
+          applied_filter_tag(filter, value)
+        end.join.html_safe
+      end
+
+      def applied_filter_tag(filter, value)
+        content_tag(:span, class: "label secondary") do
+          concat "#{i18n_filter_label(filter)}: "
+          concat i18n_filter_value(filter, value)
+          concat remove_filter_icon_link(filter)
+        end
+      end
+
+      def remove_filter_icon_link(filter)
+        icon_link_to(
+          "circle-x",
+          url_for(query_params_without(filter)),
+          t("decidim.admin.actions.cancel"),
+          class: "action-icon--remove"
+        )
+      end
+    end
+  end
+end