decidim-admin 0.20.0 → 0.23.1.rc1

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

@@ -32,6 +32,12 @@ module Decidim
             Option.new(scope_type.id, translated_attribute(scope_type.name))
           end
       end
+
+      def organization_scope_depths(organization = current_organization)
+        organization.scope_types.map do |scope_type|
+          Option.new(scope_type.id, translated_attribute(scope_type.name))
+        end.reverse
+      end
     end
   end
 end

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

@@ -5,11 +5,15 @@ module Decidim
     # This class contains helpers needed in order for component settings to
     # properly render.
     module SettingsHelper
+      include Decidim::ScopesHelper
+
       TYPES = {
         boolean: :check_box,
         integer: :number_field,
         string: :text_field,
-        text: :text_area
+        text: :text_area,
+        scope: :scope_field,
+        enum: :collection_radio_buttons
       }.freeze
 
       # Public: Renders a form field that matches a settings attribute's
@@ -22,41 +26,61 @@ module Decidim
       # options   - Extra options to be passed to the field helper.
       #
       # Returns a rendered form field.
-      def settings_attribute_input(form, attribute, name, options = {})
-        if name == :amendments_visibility
-          amendments_visibility_form_field(form, options)
-        elsif attribute.translated?
-          form.send(:translated, form_method_for_attribute(attribute), name, options.merge(tabs_id: "#{options[:tabs_prefix]}-#{name}-tabs"))
-        else
-          form.send(form_method_for_attribute(attribute), name, options.merge(extra_options_for(name)))
+      def settings_attribute_input(form, attribute, name, i18n_scope, options = {})
+        form_method = form_method_for_attribute(attribute)
+
+        container_class = "#{name}_container"
+        if options[:readonly]
+          container_class += " readonly_container"
+          help_text = text_for_setting(name, "readonly", i18n_scope)
         end
-      end
+        help_text ||= text_for_setting(name, "help", i18n_scope)
+        help_text_options = help_text ? { help_text: help_text } : {}
 
-      # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
-      def help_text_for_component_setting(field_name, settings_name, component_name)
-        key = "decidim.components.#{component_name}.settings.#{settings_name}.#{field_name}_help"
-        return t(key) if I18n.exists?(key)
+        options = { label: t(name, scope: i18n_scope) }
+                  .merge(help_text_options)
+                  .merge(extra_options_for_type(form_method))
+                  .merge(options)
+
+        content_tag(:div, class: container_class) do
+          if attribute.translated?
+            options[:tabs_id] = "#{options.delete(:tabs_prefix)}-#{name}-tabs"
+            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 == :scope_field
+            scopes_picker_field(form, name)
+          else
+            form.send(form_method, name, options)
+          end
+        end.html_safe
       end
 
       private
 
-      # Returns a radio buttons collection input for the component's step setting
-      # :amendments_visibility; all wrap in a label tag and with help text.
-      def amendments_visibility_form_field(form, options)
-        html = label_tag(:amendments_visibility) do
+      # 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
           concat options[:label]
           concat tag(:br)
-          concat form.collection_radio_buttons(:amendments_visibility,
-                                               Decidim::Amendment::VisibilityStepSetting.options,
+          concat form.collection_radio_buttons(name,
+                                               build_enum_choices(name, i18n_scope, attribute.build_choices),
                                                :last,
                                                :first,
-                                               { checked: form.object.amendments_visibility },
-                                               amendments_extra_options) { |b| b.label { b.radio_button + b.text } }
+                                               { checked: form.object.send(name) },
+                                               options) { |b| b.label { b.radio_button + b.text } }
         end
-        html << content_tag(:p, help_text_for_component_setting(:amendments_visibility, :step, :proposals), class: "help-text")
-        html.html_safe
+        html << content_tag(:p, options[:help_text], class: "help-text") if options[:help_text]
+        html
       end
 
+      # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
+      def text_for_setting(name, suffix, i18n_scope)
+        key = "#{i18n_scope}.#{name}_#{suffix}"
+        return t(key) if I18n.exists?(key)
+      end
+
+      # Returns the FormBuilder's method used to render
       def form_method_for_attribute(attribute)
         return :editor if attribute.type.to_sym == :text && attribute.editor?
 
@@ -65,35 +89,20 @@ module Decidim
 
       # Handles special cases.
       # Returns an empty Hash or a Hash with extra HTML options.
-      def extra_options_for(field_name)
-        case field_name
-        when :participatory_texts_enabled
-          participatory_texts_extra_options
-        when :amendment_creation_enabled,
-            :amendment_reaction_enabled,
-            :amendment_promotion_enabled
-          amendments_extra_options
+      def extra_options_for_type(input_type)
+        case input_type
+        when :text_area
+          { rows: 6 }
         else
           {}
         end
       end
 
-      # Marks :participatory_texts_enabled setting with a CSS class if the
-      # Proposals component has existing proposals, so it can be identified
-      # in "decidim/admin/form.js". Also, adds a help_text.
-      def participatory_texts_extra_options
-        return {} unless Decidim::Proposals::Proposal.where(component: @component).any?
-
-        {
-          class: "participatory_texts_disabled",
-          help_text: help_text_for_component_setting(:participatory_texts_disabled, :global, :proposals)
-        }
-      end
-
-      # Marks component_step_settings related to amendments with a CSS class,
-      # so they can be identified in "decidim/admin/form.js".
-      def amendments_extra_options
-        { class: "amendments_step_settings" }
+      # Build options for enum attributes
+      def build_enum_choices(name, i18n_scope, choices)
+        choices.map do |choice|
+          [t("#{name}_choices.#{choice}", scope: i18n_scope), choice]
+        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This class contains helpers needed to obtain information about
+    # image dimensions from the processors defined in the specific image's Uploader class
+    module UploaderImageDimensionsHelper
+      # Find the dimensions info of a model's image field and get the first value for dimensions ([w, h])
+      #
+      # model - The model to which the image belongs (An instance of `ActiveRecord`)
+      # image_name - The attribute name for the image (either a `symbol` or a `string`)
+      #
+      # Returns an integer array with [width, height]
+      def image_dimensions(model, image_name)
+        versions = model.send(image_name).dimensions_info
+        [:small, :medium, :default].map { |v| versions.dig(v, :dimensions) }.compact.first
+      end
+
+      # Find the first value for the processed image width
+      def image_width(model, image_name)
+        image_dimensions(model, image_name)[0]
+      end
+
+      # Find the first value for the processed image height
+      def image_height(model, image_name)
+        image_dimensions(model, image_name)[1]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module UserRolesHelper
+      def user_role_config
+        return @user_role_config if @user_role_config
+
+        space = current_participatory_space
+        @user_role_config = if current_user.admin?
+                              space.user_role_config_for(current_user, :organization_admin)
+                            else
+                              role = space.user_roles.find_by(user: current_user)
+                              space.user_role_config_for(current_user, role&.role)
+                            end
+      end
+    end
+  end
+end

data/app/models/decidim/admin/fake_newsletter.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # This class is used to generate fake newsletters and data to preview
+    # newsletter templates.
+    class FakeNewsletter
+      def initialize(organization, manifest)
+        @organization = organization
+        @manifest = manifest
+      end
+
+      def id
+        1
+      end
+
+      def template
+        @template ||= Decidim::ContentBlock.new(
+          in_preview: true,
+          manifest_name: manifest.name,
+          scope_name: :newsletter_template,
+          settings: manifest.settings.attributes.inject({}) do |acc, (name, attrs)|
+            value = if attrs.preview.respond_to?(:call)
+                      attrs.preview.call
+                    else
+                      attrs.preview
+                    end
+
+            acc.update(name => value)
+          end
+        )
+      end
+
+      def subject
+        organization.available_locales.inject({}) do |acc, locale|
+          acc.update(locale => "Lorem ipsum")
+        end
+      end
+
+      def sent_at
+        nil
+      end
+
+      private
+
+      attr_reader :organization, :manifest
+    end
+  end
+end

data/app/permissions/decidim/admin/permissions.rb

@@ -16,15 +16,22 @@ module Decidim
           return permission_action
         end
 
-        return user_manager_permissions if user_manager?
+        if user_manager?
+          begin
+            allow! if user_manager_permissions.allowed?
+          rescue Decidim::PermissionAction::PermissionNotSetError
+            nil
+          end
+        end
 
-        allow! if user_can_enter_space_area?
+        allow! if user_can_enter_space_area?(require_admin_terms_accepted: true)
 
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
-        if user.admin?
+        if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
+          allow! if read_metrics_action?
           allow! if static_page_action?
           allow! if organization_action?
           allow! if user_action?
@@ -38,13 +45,13 @@ module Decidim
           allow! if permission_action.subject == :scope_type
           allow! if permission_action.subject == :area
           allow! if permission_action.subject == :area_type
-          allow! if permission_action.subject == :oauth_application
           allow! if permission_action.subject == :user_group
           allow! if permission_action.subject == :officialization
           allow! if permission_action.subject == :authorization
           allow! if permission_action.subject == :authorization_workflow
           allow! if permission_action.subject == :static_page_topic
           allow! if permission_action.subject == :help_sections
+          allow! if permission_action.subject == :share_token
         end
 
         permission_action
@@ -66,6 +73,7 @@ module Decidim
       end
 
       def apply_newsletter_permissions_for_admin!
+        return unless admin_terms_accepted?
         return unless permission_action.subject == :newsletter
         return allow! if user.admin?
         return unless space_allows_admin_access?
@@ -89,6 +97,11 @@ module Decidim
         end
       end
 
+      def read_metrics_action?
+        permission_action.subject == :metrics &&
+          permission_action.action == :read
+      end
+
       def read_admin_log_action?
         permission_action.subject == :admin_log &&
           permission_action.action == :read
@@ -157,15 +170,19 @@ module Decidim
         @organization ||= context.fetch(:organization, nil) || context.fetch(:current_organization, nil)
       end
 
-      def user_can_enter_space_area?
+      def user_can_enter_space_area?(**args)
         return unless permission_action.action == :enter &&
                       permission_action.subject == :space_area
 
-        space_allows_admin_access_to_current_action?
+        space_allows_admin_access_to_current_action?(args)
       end
 
-      def space_allows_admin_access_to_current_action?
+      def space_allows_admin_access_to_current_action?(require_admin_terms_accepted: false)
         Decidim.participatory_space_manifests.any? do |manifest|
+          if manifest.name != :initiatives && require_admin_terms_accepted
+            next unless admin_terms_accepted?
+          end
+
           new_permission_action = Decidim::PermissionAction.new(
             action: permission_action.action,
             scope: permission_action.scope,
@@ -181,6 +198,12 @@ module Decidim
         Decidim::Admin::UserManagerPermissions.new(user, permission_action, context).permissions
       end
 
+      def admin_terms_accepted?
+        return unless permission_action.scope == :admin
+
+        user&.admin_terms_accepted?
+      end
+
       def available_authorization_handlers?
         user.organization.available_authorization_handlers.any?
       end

data/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class DashboardMetricChartsPresenter < Decidim::MetricChartsPresenter
+      attribute :summary, Boolean
+
+      def render_not_highlighted(metrics)
+        safe_join(
+          metrics.map do |metric|
+            render_metrics_data(metric.metric_name, klass: not_highlighted_classes, graph_klass: "small")
+          end
+        )
+      end
+
+      def highlighted_metrics
+        return super unless summary?
+
+        Decidim.metrics_registry.filtered(
+          highlight: true,
+          scope: "home"
+        ).select do |registry|
+          %w(users proposals).include? registry.metric_name
+        end
+      end
+
+      def not_highlighted_metrics
+        return super unless summary?
+
+        Decidim.metrics_registry.filtered(
+          highlight: false,
+          scope: "home"
+        ).select do |registry|
+          %w(comments meetings accepted_proposals results).include? registry.metric_name
+        end
+      end
+
+      private
+
+      def highlighted_classes
+        return "cell medium-6" if summary?
+
+        "cell medium-4"
+      end
+
+      def not_highlighted_classes
+        return "cell medium-3" if summary?
+
+        "cell medium-2"
+      end
+
+      def not_highlighted_wrapper_classes
+        "grid-x grid-margin-x"
+      end
+    end
+  end
+end

data/app/queries/decidim/admin/active_users_counter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Counts active users making a distinction between whether they are admins or participants
+    class ActiveUsersCounter < Rectify::Query
+      # Initializes the class.
+      #
+      # @param organization [Organization] Current organization
+      # @param date [Date] Period time to make users count check
+      # @param admin [boolean] Possible values : t for Admin or f for participant
+      def initialize(organization:, date:, admin: false)
+        @organization = organization
+        @date = date
+        @admin = admin
+      end
+
+      # Count the user's number who have logged in since given date
+      #
+      # Returns an ActiveRecord::Relation
+      def query
+        return Decidim::User.none unless organization && date
+
+        query = Decidim::User.left_outer_joins(:organization).where(decidim_organizations: { id: organization.id })
+        query = query.where("#{Decidim::User.table_name}.current_sign_in_at >= ?", date)
+        query = query.where(admin: admin)
+        query
+      end
+
+      private
+
+      attr_reader :organization, :date, :admin
+    end
+  end
+end